From 4da9e954df3846d01aa0536f4e8143466a1d62f3 Mon Sep 17 00:00:00 2001
From: Jesse Plamondon-Willard <Pathoschild@users.noreply.github.com>
Date: Fri, 11 Feb 2022 00:49:49 -0500
Subject: use Array.Empty to avoid unneeded array allocations

---
 .../StateTracking/FieldWatchers/ImmutableCollectionWatcher.cs        | 5 +++--
 src/SMAPI/Framework/StateTracking/LocationTracker.cs                 | 3 ++-
 src/SMAPI/Framework/StateTracking/Snapshots/PlayerSnapshot.cs        | 2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)

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

diff --git a/src/SMAPI/Framework/StateTracking/FieldWatchers/ImmutableCollectionWatcher.cs b/src/SMAPI/Framework/StateTracking/FieldWatchers/ImmutableCollectionWatcher.cs
index 30e6274f..009e0282 100644
--- a/src/SMAPI/Framework/StateTracking/FieldWatchers/ImmutableCollectionWatcher.cs
+++ b/src/SMAPI/Framework/StateTracking/FieldWatchers/ImmutableCollectionWatcher.cs
@@ -1,3 +1,4 @@
+using System;
 using System.Collections.Generic;
 
 namespace StardewModdingAPI.Framework.StateTracking.FieldWatchers
@@ -16,10 +17,10 @@ namespace StardewModdingAPI.Framework.StateTracking.FieldWatchers
         public bool IsChanged { get; } = false;
 
         /// <summary>The values added since the last reset.</summary>
-        public IEnumerable<TValue> Added { get; } = new TValue[0];
+        public IEnumerable<TValue> Added { get; } = Array.Empty<TValue>();
 
         /// <summary>The values removed since the last reset.</summary>
-        public IEnumerable<TValue> Removed { get; } = new TValue[0];
+        public IEnumerable<TValue> Removed { get; } = Array.Empty<TValue>();
 
 
         /*********
diff --git a/src/SMAPI/Framework/StateTracking/LocationTracker.cs b/src/SMAPI/Framework/StateTracking/LocationTracker.cs
index 6d3a62bb..748e4ecc 100644
--- a/src/SMAPI/Framework/StateTracking/LocationTracker.cs
+++ b/src/SMAPI/Framework/StateTracking/LocationTracker.cs
@@ -1,3 +1,4 @@
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using Microsoft.Xna.Framework;
@@ -84,7 +85,7 @@ namespace StardewModdingAPI.Framework.StateTracking
                 this.FurnitureWatcher
             });
 
-            this.UpdateChestWatcherList(added: location.Objects.Pairs, removed: new KeyValuePair<Vector2, SObject>[0]);
+            this.UpdateChestWatcherList(added: location.Objects.Pairs, removed: Array.Empty<KeyValuePair<Vector2, SObject>>());
         }
 
         /// <summary>Update the current value if needed.</summary>
diff --git a/src/SMAPI/Framework/StateTracking/Snapshots/PlayerSnapshot.cs b/src/SMAPI/Framework/StateTracking/Snapshots/PlayerSnapshot.cs
index 0908b02a..72f45a87 100644
--- a/src/SMAPI/Framework/StateTracking/Snapshots/PlayerSnapshot.cs
+++ b/src/SMAPI/Framework/StateTracking/Snapshots/PlayerSnapshot.cs
@@ -14,7 +14,7 @@ namespace StardewModdingAPI.Framework.StateTracking.Snapshots
         ** Fields
         *********/
         /// <summary>An empty item list diff.</summary>
-        private readonly SnapshotItemListDiff EmptyItemListDiff = new SnapshotItemListDiff(new Item[0], new Item[0], new ItemStackSizeChange[0]);
+        private readonly SnapshotItemListDiff EmptyItemListDiff = new SnapshotItemListDiff(Array.Empty<Item>(), Array.Empty<Item>(), Array.Empty<ItemStackSizeChange>());
 
 
         /*********
-- 
cgit 


From a593eda30f82af474887d91458b0e9158f66fefc Mon Sep 17 00:00:00 2001
From: Jesse Plamondon-Willard <Pathoschild@users.noreply.github.com>
Date: Wed, 6 Apr 2022 18:24:59 -0400
Subject: use target-typed new

---
 src/SMAPI.Installer/Framework/InstallerContext.cs  |  2 +-
 src/SMAPI.Installer/InteractiveInstaller.cs        | 18 ++++++------
 src/SMAPI.Installer/Program.cs                     |  6 ++--
 src/SMAPI.Internal.Patching/HarmonyPatcher.cs      |  2 +-
 src/SMAPI.Internal.Patching/PatchHelper.cs         |  2 +-
 .../Mock/StardewValley/Item.cs                     | 16 +++++------
 .../Mock/StardewValley/Object.cs                   |  2 +-
 .../NetFieldAnalyzerTests.cs                       |  4 +--
 .../ObsoleteFieldAnalyzerTests.cs                  |  2 +-
 .../NetFieldAnalyzer.cs                            |  4 +--
 .../ObsoleteFieldAnalyzer.cs                       |  2 +-
 src/SMAPI.ModBuildConfig/DeployModTask.cs          |  4 +--
 .../Framework/ModFileManager.cs                    |  8 +++---
 .../Framework/Commands/Player/AddCommand.cs        |  2 +-
 .../Commands/Player/ListItemTypesCommand.cs        |  2 +-
 .../Framework/Commands/Player/ListItemsCommand.cs  |  2 +-
 .../Framework/ItemRepository.cs                    |  2 +-
 src/SMAPI.Mods.ConsoleCommands/ModEntry.cs         |  2 +-
 .../Patches/SaveGamePatcher.cs                     |  2 +-
 src/SMAPI.Mods.SaveBackup/ModEntry.cs              | 12 ++++----
 src/SMAPI.Tests/Core/TranslationTests.cs           |  6 ++--
 src/SMAPI.Tests/Sample.cs                          |  2 +-
 src/SMAPI.Tests/Utilities/PathUtilitiesTests.cs    | 22 +++++++--------
 src/SMAPI.Tests/Utilities/SDateTests.cs            |  4 +--
 src/SMAPI.Tests/Utilities/SemanticVersionTests.cs  |  2 +-
 .../Framework/Clients/WebApi/WebApiClient.cs       |  4 +--
 .../Framework/Clients/Wiki/WikiClient.cs           |  2 +-
 .../Framework/GameScanning/GameScanner.cs          |  4 +--
 .../Framework/LowLevelEnvironmentUtility.cs        |  2 +-
 .../Framework/ModData/ModDataRecord.cs             |  2 +-
 .../Framework/ModScanning/ModScanner.cs            | 12 ++++----
 src/SMAPI.Toolkit/ModToolkit.cs                    |  2 +-
 src/SMAPI.Toolkit/SemanticVersionComparer.cs       |  2 +-
 src/SMAPI.Toolkit/Serialization/JsonHelper.cs      |  2 +-
 src/SMAPI.Toolkit/Utilities/PathUtilities.cs       |  4 +--
 src/SMAPI.Web/Controllers/IndexController.cs       |  2 +-
 .../Controllers/JsonValidatorController.cs         |  2 +-
 src/SMAPI.Web/Controllers/ModsApiController.cs     |  2 +-
 .../Clients/Chucklefish/ChucklefishClient.cs       |  2 +-
 .../Clients/CurseForge/CurseForgeClient.cs         |  2 +-
 .../Framework/Clients/Nexus/NexusClient.cs         |  2 +-
 src/SMAPI.Web/Framework/Compression/GzipHelper.cs  |  8 +++---
 src/SMAPI.Web/Framework/Extensions.cs              |  4 +--
 .../Framework/JobDashboardAuthorizationFilter.cs   |  2 +-
 .../Framework/LogParsing/LogMessageBuilder.cs      |  2 +-
 src/SMAPI.Web/Framework/LogParsing/LogParser.cs    | 32 +++++++++++-----------
 src/SMAPI.Web/Framework/Storage/StorageProvider.cs |  4 +--
 src/SMAPI.Web/ViewModels/LogParserModel.cs         |  2 +-
 src/SMAPI/Context.cs                               |  4 +--
 src/SMAPI/Framework/CommandManager.cs              |  2 +-
 .../Framework/Commands/HarmonySummaryCommand.cs    |  2 +-
 src/SMAPI/Framework/Content/AssetDataForMap.cs     |  4 +--
 src/SMAPI/Framework/DeprecationManager.cs          |  2 +-
 src/SMAPI/Framework/Events/ManagedEvent.cs         |  2 +-
 src/SMAPI/Framework/Input/KeyboardStateBuilder.cs  |  2 +-
 src/SMAPI/Framework/Input/SInputState.cs           | 10 +++----
 src/SMAPI/Framework/ModLoading/AssemblyLoader.cs   | 16 +++++------
 src/SMAPI/Framework/ModLoading/ModResolver.cs      |  2 +-
 .../ModLoading/Symbols/SymbolReaderProvider.cs     |  2 +-
 src/SMAPI/Framework/ModRegistry.cs                 |  4 +--
 src/SMAPI/Framework/Models/SConfig.cs              |  2 +-
 src/SMAPI/Framework/Networking/SGalaxyNetServer.cs |  6 ++--
 src/SMAPI/Framework/Networking/SLidgrenServer.cs   |  4 +--
 src/SMAPI/Framework/Reflection/Reflector.cs        |  4 +--
 src/SMAPI/Framework/SGame.cs                       |  8 +++---
 src/SMAPI/Framework/SGameRunner.cs                 |  2 +-
 src/SMAPI/Framework/SMultiplayer.cs                | 18 ++++++------
 src/SMAPI/Framework/Singleton.cs                   |  2 +-
 src/SMAPI/Framework/SnapshotListDiff.cs            |  4 +--
 src/SMAPI/Framework/StateTracking/ChestTracker.cs  |  4 +--
 .../FieldWatchers/ComparableListWatcher.cs         |  4 +--
 .../FieldWatchers/ImmutableCollectionWatcher.cs    |  2 +-
 .../FieldWatchers/NetCollectionWatcher.cs          |  4 +--
 .../FieldWatchers/ObservableCollectionWatcher.cs   |  6 ++--
 .../Framework/StateTracking/LocationTracker.cs     |  2 +-
 src/SMAPI/Framework/StateTracking/PlayerTracker.cs |  2 +-
 .../StateTracking/Snapshots/LocationSnapshot.cs    | 14 +++++-----
 .../StateTracking/Snapshots/PlayerSnapshot.cs      |  4 +--
 .../StateTracking/Snapshots/WatcherSnapshot.cs     | 16 +++++------
 .../Snapshots/WorldLocationsSnapshot.cs            |  4 +--
 .../Framework/TemporaryHacks/MiniMonoModHotfix.cs  |  4 +--
 src/SMAPI/Framework/WatcherCore.cs                 |  2 +-
 src/SMAPI/Program.cs                               |  2 +-
 83 files changed, 203 insertions(+), 203 deletions(-)

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

diff --git a/src/SMAPI.Installer/Framework/InstallerContext.cs b/src/SMAPI.Installer/Framework/InstallerContext.cs
index bb973230..abc7adde 100644
--- a/src/SMAPI.Installer/Framework/InstallerContext.cs
+++ b/src/SMAPI.Installer/Framework/InstallerContext.cs
@@ -12,7 +12,7 @@ namespace StardewModdingAPI.Installer.Framework
         ** Fields
         *********/
         /// <summary>The underlying toolkit game scanner.</summary>
-        private readonly GameScanner GameScanner = new GameScanner();
+        private readonly GameScanner GameScanner = new();
 
 
         /*********
diff --git a/src/SMAPI.Installer/InteractiveInstaller.cs b/src/SMAPI.Installer/InteractiveInstaller.cs
index b3bba883..a126c3b8 100644
--- a/src/SMAPI.Installer/InteractiveInstaller.cs
+++ b/src/SMAPI.Installer/InteractiveInstaller.cs
@@ -126,7 +126,7 @@ namespace StardewModdingApi.Installer
             /****
             ** Get basic info & set window title
             ****/
-            ModToolkit toolkit = new ModToolkit();
+            ModToolkit toolkit = new();
             var context = new InstallerContext();
             Console.Title = $"SMAPI {context.GetInstallerVersion()} installer on {context.Platform} {context.PlatformName}";
             Console.WriteLine();
@@ -246,7 +246,7 @@ namespace StardewModdingApi.Installer
                 }
 
                 // get folders
-                DirectoryInfo bundleDir = new DirectoryInfo(this.BundlePath);
+                DirectoryInfo bundleDir = new(this.BundlePath);
                 paths = new InstallerPaths(bundleDir, installDir);
             }
 
@@ -354,8 +354,8 @@ namespace StardewModdingApi.Installer
                 // move global save data folder (changed in 3.2)
                 {
                     string dataPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), "StardewValley");
-                    DirectoryInfo oldDir = new DirectoryInfo(Path.Combine(dataPath, "Saves", ".smapi"));
-                    DirectoryInfo newDir = new DirectoryInfo(Path.Combine(dataPath, ".smapi"));
+                    DirectoryInfo oldDir = new(Path.Combine(dataPath, "Saves", ".smapi"));
+                    DirectoryInfo newDir = new(Path.Combine(dataPath, ".smapi"));
 
                     if (oldDir.Exists)
                     {
@@ -428,7 +428,7 @@ namespace StardewModdingApi.Installer
                     }
 
                     // add or replace bundled mods
-                    DirectoryInfo bundledModsDir = new DirectoryInfo(Path.Combine(paths.BundlePath, "Mods"));
+                    DirectoryInfo bundledModsDir = new(Path.Combine(paths.BundlePath, "Mods"));
                     if (bundledModsDir.Exists && bundledModsDir.EnumerateDirectories().Any())
                     {
                         this.PrintDebug("Adding bundled mods...");
@@ -450,7 +450,7 @@ namespace StardewModdingApi.Installer
 
                             // find target folder
                             ModFolder targetMod = targetMods.FirstOrDefault(p => p.Manifest?.UniqueID?.Equals(sourceMod.Manifest.UniqueID, StringComparison.OrdinalIgnoreCase) == true);
-                            DirectoryInfo defaultTargetFolder = new DirectoryInfo(Path.Combine(paths.ModsPath, sourceMod.Directory.Name));
+                            DirectoryInfo defaultTargetFolder = new(Path.Combine(paths.ModsPath, sourceMod.Directory.Name));
                             DirectoryInfo targetFolder = targetMod?.Directory ?? defaultTargetFolder;
                             this.PrintDebug(targetFolder.FullName == defaultTargetFolder.FullName
                                 ? $"   adding {sourceMod.Manifest.Name}..."
@@ -593,7 +593,7 @@ namespace StardewModdingApi.Installer
                     break;
 
                 case DirectoryInfo sourceDir:
-                    DirectoryInfo targetSubfolder = new DirectoryInfo(Path.Combine(targetFolder.FullName, sourceDir.Name));
+                    DirectoryInfo targetSubfolder = new(Path.Combine(targetFolder.FullName, sourceDir.Name));
                     foreach (var entry in sourceDir.EnumerateFileSystemInfos())
                         this.RecursiveCopy(entry, targetSubfolder, filter);
                     break;
@@ -717,7 +717,7 @@ namespace StardewModdingApi.Installer
                 // get directory
                 if (File.Exists(path))
                     path = Path.GetDirectoryName(path);
-                DirectoryInfo directory = new DirectoryInfo(path);
+                DirectoryInfo directory = new(path);
 
                 // validate path
                 if (!directory.Exists)
@@ -795,7 +795,7 @@ namespace StardewModdingApi.Installer
 
             // get path
             string appDataPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), "StardewValley");
-            DirectoryInfo modDir = new DirectoryInfo(Path.Combine(appDataPath, "Mods"));
+            DirectoryInfo modDir = new(Path.Combine(appDataPath, "Mods"));
 
             // check if migration needed
             if (!modDir.Exists)
diff --git a/src/SMAPI.Installer/Program.cs b/src/SMAPI.Installer/Program.cs
index 45cfea75..2c9b2c0a 100644
--- a/src/SMAPI.Installer/Program.cs
+++ b/src/SMAPI.Installer/Program.cs
@@ -31,7 +31,7 @@ namespace StardewModdingApi.Installer
         public static void Main(string[] args)
         {
             // find install bundle
-            FileInfo zipFile = new FileInfo(Path.Combine(Program.InstallerPath, "install.dat"));
+            FileInfo zipFile = new(Path.Combine(Program.InstallerPath, "install.dat"));
             if (!zipFile.Exists)
             {
                 Console.WriteLine($"Oops! Some of the installer files are missing; try re-downloading the installer. (Missing file: {zipFile.FullName})");
@@ -40,7 +40,7 @@ namespace StardewModdingApi.Installer
             }
 
             // unzip bundle into temp folder
-            DirectoryInfo bundleDir = new DirectoryInfo(Program.ExtractedBundlePath);
+            DirectoryInfo bundleDir = new(Program.ExtractedBundlePath);
             Console.WriteLine("Extracting install files...");
             ZipFile.ExtractToDirectory(zipFile.FullName, bundleDir.FullName);
 
@@ -70,7 +70,7 @@ namespace StardewModdingApi.Installer
         {
             try
             {
-                AssemblyName name = new AssemblyName(e.Name);
+                AssemblyName name = new(e.Name);
                 foreach (FileInfo dll in new DirectoryInfo(Program.InternalFilesPath).EnumerateFiles("*.dll"))
                 {
                     if (name.Name.Equals(AssemblyName.GetAssemblyName(dll.FullName).Name, StringComparison.OrdinalIgnoreCase))
diff --git a/src/SMAPI.Internal.Patching/HarmonyPatcher.cs b/src/SMAPI.Internal.Patching/HarmonyPatcher.cs
index c07e3b41..6f30c241 100644
--- a/src/SMAPI.Internal.Patching/HarmonyPatcher.cs
+++ b/src/SMAPI.Internal.Patching/HarmonyPatcher.cs
@@ -15,7 +15,7 @@ namespace StardewModdingAPI.Internal.Patching
         /// <param name="patchers">The patchers to apply.</param>
         public static Harmony Apply(string id, IMonitor monitor, params IPatcher[] patchers)
         {
-            Harmony harmony = new Harmony(id);
+            Harmony harmony = new(id);
 
             foreach (IPatcher patcher in patchers)
             {
diff --git a/src/SMAPI.Internal.Patching/PatchHelper.cs b/src/SMAPI.Internal.Patching/PatchHelper.cs
index fc79ddf2..c9758616 100644
--- a/src/SMAPI.Internal.Patching/PatchHelper.cs
+++ b/src/SMAPI.Internal.Patching/PatchHelper.cs
@@ -43,7 +43,7 @@ namespace StardewModdingAPI.Internal.Patching
         /// <param name="generics">The method generic types, or <c>null</c> if it's not generic.</param>
         public static string GetMethodString(Type type, string name, Type[] parameters = null, Type[] generics = null)
         {
-            StringBuilder str = new StringBuilder();
+            StringBuilder str = new();
 
             // type
             str.Append(type.FullName);
diff --git a/src/SMAPI.ModBuildConfig.Analyzer.Tests/Mock/StardewValley/Item.cs b/src/SMAPI.ModBuildConfig.Analyzer.Tests/Mock/StardewValley/Item.cs
index 1b6317c1..e8da92fa 100644
--- a/src/SMAPI.ModBuildConfig.Analyzer.Tests/Mock/StardewValley/Item.cs
+++ b/src/SMAPI.ModBuildConfig.Analyzer.Tests/Mock/StardewValley/Item.cs
@@ -7,27 +7,27 @@ namespace StardewValley
     public class Item
     {
         /// <summary>A net int field with an equivalent non-net <c>Category</c> property.</summary>
-        public readonly NetInt category = new NetInt { Value = 42 };
+        public readonly NetInt category = new() { Value = 42 };
 
         /// <summary>A generic net int field with no equivalent non-net property.</summary>
-        public readonly NetInt netIntField = new NetInt { Value = 42 };
+        public readonly NetInt netIntField = new() { Value = 42 };
 
         /// <summary>A generic net ref field with no equivalent non-net property.</summary>
-        public readonly NetRef<object> netRefField = new NetRef<object>();
+        public readonly NetRef<object> netRefField = new();
 
         /// <summary>A generic net int property with no equivalent non-net property.</summary>
-        public NetInt netIntProperty = new NetInt { Value = 42 };
+        public NetInt netIntProperty = new() { Value = 42 };
 
         /// <summary>A generic net ref property with no equivalent non-net property.</summary>
-        public NetRef<object> netRefProperty { get; } = new NetRef<object>();
+        public NetRef<object> netRefProperty { get; } = new();
 
         /// <summary>A sample net list.</summary>
-        public readonly NetList<int> netList = new NetList<int>();
+        public readonly NetList<int> netList = new();
 
         /// <summary>A sample net object list.</summary>
-        public readonly NetObjectList<int> netObjectList = new NetObjectList<int>();
+        public readonly NetObjectList<int> netObjectList = new();
 
         /// <summary>A sample net collection.</summary>
-        public readonly NetCollection<int> netCollection = new NetCollection<int>();
+        public readonly NetCollection<int> netCollection = new();
     }
 }
diff --git a/src/SMAPI.ModBuildConfig.Analyzer.Tests/Mock/StardewValley/Object.cs b/src/SMAPI.ModBuildConfig.Analyzer.Tests/Mock/StardewValley/Object.cs
index 3dd66a6d..151010a7 100644
--- a/src/SMAPI.ModBuildConfig.Analyzer.Tests/Mock/StardewValley/Object.cs
+++ b/src/SMAPI.ModBuildConfig.Analyzer.Tests/Mock/StardewValley/Object.cs
@@ -7,6 +7,6 @@ namespace StardewValley
     public class Object : Item
     {
         /// <summary>A net int field with an equivalent non-net property.</summary>
-        public NetInt type = new NetInt { Value = 42 };
+        public NetInt type = new() { Value = 42 };
     }
 }
diff --git a/src/SMAPI.ModBuildConfig.Analyzer.Tests/NetFieldAnalyzerTests.cs b/src/SMAPI.ModBuildConfig.Analyzer.Tests/NetFieldAnalyzerTests.cs
index 89bd1be5..f11a59d3 100644
--- a/src/SMAPI.ModBuildConfig.Analyzer.Tests/NetFieldAnalyzerTests.cs
+++ b/src/SMAPI.ModBuildConfig.Analyzer.Tests/NetFieldAnalyzerTests.cs
@@ -93,7 +93,7 @@ namespace SMAPI.ModBuildConfig.Analyzer.Tests
         {
             // arrange
             string code = NetFieldAnalyzerTests.SampleProgram.Replace("{{test-code}}", codeText);
-            DiagnosticResult expected = new DiagnosticResult
+            DiagnosticResult expected = new()
             {
                 Id = "AvoidImplicitNetFieldCast",
                 Message = $"This implicitly converts '{expression}' from {fromType} to {toType}, but {fromType} has unintuitive implicit conversion rules. Consider comparing against the actual value instead to avoid bugs. See https://smapi.io/package/avoid-implicit-net-field-cast for details.",
@@ -135,7 +135,7 @@ namespace SMAPI.ModBuildConfig.Analyzer.Tests
         {
             // arrange
             string code = NetFieldAnalyzerTests.SampleProgram.Replace("{{test-code}}", codeText);
-            DiagnosticResult expected = new DiagnosticResult
+            DiagnosticResult expected = new()
             {
                 Id = "AvoidNetField",
                 Message = $"'{expression}' is a {netType} field; consider using the {suggestedProperty} property instead. See https://smapi.io/package/avoid-net-field for details.",
diff --git a/src/SMAPI.ModBuildConfig.Analyzer.Tests/ObsoleteFieldAnalyzerTests.cs b/src/SMAPI.ModBuildConfig.Analyzer.Tests/ObsoleteFieldAnalyzerTests.cs
index 12641e1a..76607b8e 100644
--- a/src/SMAPI.ModBuildConfig.Analyzer.Tests/ObsoleteFieldAnalyzerTests.cs
+++ b/src/SMAPI.ModBuildConfig.Analyzer.Tests/ObsoleteFieldAnalyzerTests.cs
@@ -64,7 +64,7 @@ namespace SMAPI.ModBuildConfig.Analyzer.Tests
         {
             // arrange
             string code = ObsoleteFieldAnalyzerTests.SampleProgram.Replace("{{test-code}}", codeText);
-            DiagnosticResult expected = new DiagnosticResult
+            DiagnosticResult expected = new()
             {
                 Id = "AvoidObsoleteField",
                 Message = $"The '{oldName}' field is obsolete and should be replaced with '{newName}'. See https://smapi.io/package/avoid-obsolete-field for details.",
diff --git a/src/SMAPI.ModBuildConfig.Analyzer/NetFieldAnalyzer.cs b/src/SMAPI.ModBuildConfig.Analyzer/NetFieldAnalyzer.cs
index e03c72de..8478dc54 100644
--- a/src/SMAPI.ModBuildConfig.Analyzer/NetFieldAnalyzer.cs
+++ b/src/SMAPI.ModBuildConfig.Analyzer/NetFieldAnalyzer.cs
@@ -132,7 +132,7 @@ namespace StardewModdingAPI.ModBuildConfig.Analyzer
         };
 
         /// <summary>The diagnostic info for an implicit net field cast.</summary>
-        private readonly DiagnosticDescriptor AvoidImplicitNetFieldCastRule = new DiagnosticDescriptor(
+        private readonly DiagnosticDescriptor AvoidImplicitNetFieldCastRule = new(
             id: "AvoidImplicitNetFieldCast",
             title: "Netcode types shouldn't be implicitly converted",
             messageFormat: "This implicitly converts '{0}' from {1} to {2}, but {1} has unintuitive implicit conversion rules. Consider comparing against the actual value instead to avoid bugs. See https://smapi.io/package/avoid-implicit-net-field-cast for details.",
@@ -143,7 +143,7 @@ namespace StardewModdingAPI.ModBuildConfig.Analyzer
         );
 
         /// <summary>The diagnostic info for an avoidable net field access.</summary>
-        private readonly DiagnosticDescriptor AvoidNetFieldRule = new DiagnosticDescriptor(
+        private readonly DiagnosticDescriptor AvoidNetFieldRule = new(
             id: "AvoidNetField",
             title: "Avoid Netcode types when possible",
             messageFormat: "'{0}' is a {1} field; consider using the {2} property instead. See https://smapi.io/package/avoid-net-field for details.",
diff --git a/src/SMAPI.ModBuildConfig.Analyzer/ObsoleteFieldAnalyzer.cs b/src/SMAPI.ModBuildConfig.Analyzer/ObsoleteFieldAnalyzer.cs
index 722d5227..3184147a 100644
--- a/src/SMAPI.ModBuildConfig.Analyzer/ObsoleteFieldAnalyzer.cs
+++ b/src/SMAPI.ModBuildConfig.Analyzer/ObsoleteFieldAnalyzer.cs
@@ -24,7 +24,7 @@ namespace StardewModdingAPI.ModBuildConfig.Analyzer
         /// <summary>Describes the diagnostic rule covered by the analyzer.</summary>
         private readonly IDictionary<string, DiagnosticDescriptor> Rules = new Dictionary<string, DiagnosticDescriptor>
         {
-            ["AvoidObsoleteField"] = new DiagnosticDescriptor(
+            ["AvoidObsoleteField"] = new(
                 id: "AvoidObsoleteField",
                 title: "Reference to obsolete field",
                 messageFormat: "The '{0}' field is obsolete and should be replaced with '{1}'. See https://smapi.io/package/avoid-obsolete-field for details.",
diff --git a/src/SMAPI.ModBuildConfig/DeployModTask.cs b/src/SMAPI.ModBuildConfig/DeployModTask.cs
index 140933bd..c7026ee1 100644
--- a/src/SMAPI.ModBuildConfig/DeployModTask.cs
+++ b/src/SMAPI.ModBuildConfig/DeployModTask.cs
@@ -88,7 +88,7 @@ namespace StardewModdingAPI.ModBuildConfig
                 Regex[] ignoreFilePatterns = this.GetCustomIgnorePatterns().ToArray();
 
                 // get mod info
-                ModFileManager package = new ModFileManager(this.ProjectDir, this.TargetDir, ignoreFilePaths, ignoreFilePatterns, bundleAssemblyTypes, this.ModDllName, validateRequiredModFiles: this.EnableModDeploy || this.EnableModZip);
+                ModFileManager package = new(this.ProjectDir, this.TargetDir, ignoreFilePaths, ignoreFilePatterns, bundleAssemblyTypes, this.ModDllName, validateRequiredModFiles: this.EnableModDeploy || this.EnableModZip);
 
                 // deploy mod files
                 if (this.EnableModDeploy)
@@ -246,7 +246,7 @@ namespace StardewModdingAPI.ModBuildConfig
             // create zip file
             Directory.CreateDirectory(Path.GetDirectoryName(zipPath)!);
             using Stream zipStream = new FileStream(zipPath, FileMode.Create, FileAccess.Write);
-            using ZipArchive archive = new ZipArchive(zipStream, ZipArchiveMode.Create);
+            using ZipArchive archive = new(zipStream, ZipArchiveMode.Create);
 
             foreach (var fileEntry in files)
             {
diff --git a/src/SMAPI.ModBuildConfig/Framework/ModFileManager.cs b/src/SMAPI.ModBuildConfig/Framework/ModFileManager.cs
index ad4ffdf9..80955f67 100644
--- a/src/SMAPI.ModBuildConfig/Framework/ModFileManager.cs
+++ b/src/SMAPI.ModBuildConfig/Framework/ModFileManager.cs
@@ -136,7 +136,7 @@ namespace StardewModdingAPI.ModBuildConfig.Framework
             // project manifest
             bool hasProjectManifest = false;
             {
-                FileInfo manifest = new FileInfo(Path.Combine(projectDir, this.ManifestFileName));
+                FileInfo manifest = new(Path.Combine(projectDir, this.ManifestFileName));
                 if (manifest.Exists)
                 {
                     yield return Tuple.Create(this.ManifestFileName, manifest);
@@ -146,7 +146,7 @@ namespace StardewModdingAPI.ModBuildConfig.Framework
 
             // project i18n files
             bool hasProjectTranslations = false;
-            DirectoryInfo translationsFolder = new DirectoryInfo(Path.Combine(projectDir, "i18n"));
+            DirectoryInfo translationsFolder = new(Path.Combine(projectDir, "i18n"));
             if (translationsFolder.Exists)
             {
                 foreach (FileInfo file in translationsFolder.EnumerateFiles())
@@ -156,7 +156,7 @@ namespace StardewModdingAPI.ModBuildConfig.Framework
 
             // project assets folder
             bool hasAssetsFolder = false;
-            DirectoryInfo assetsFolder = new DirectoryInfo(Path.Combine(projectDir, "assets"));
+            DirectoryInfo assetsFolder = new(Path.Combine(projectDir, "assets"));
             if (assetsFolder.Exists)
             {
                 foreach (FileInfo file in assetsFolder.EnumerateFiles("*", SearchOption.AllDirectories))
@@ -168,7 +168,7 @@ namespace StardewModdingAPI.ModBuildConfig.Framework
             }
 
             // build output
-            DirectoryInfo buildFolder = new DirectoryInfo(targetDir);
+            DirectoryInfo buildFolder = new(targetDir);
             foreach (FileInfo file in buildFolder.EnumerateFiles("*", SearchOption.AllDirectories))
             {
                 // get path info
diff --git a/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Player/AddCommand.cs b/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Player/AddCommand.cs
index 0e8f7517..fae31c23 100644
--- a/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Player/AddCommand.cs
+++ b/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Player/AddCommand.cs
@@ -13,7 +13,7 @@ namespace StardewModdingAPI.Mods.ConsoleCommands.Framework.Commands.Player
         ** Fields
         *********/
         /// <summary>Provides methods for searching and constructing items.</summary>
-        private readonly ItemRepository Items = new ItemRepository();
+        private readonly ItemRepository Items = new();
 
         /// <summary>The type names recognized by this command.</summary>
         private readonly string[] ValidTypes = Enum.GetNames(typeof(ItemType)).Concat(new[] { "Name" }).ToArray();
diff --git a/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Player/ListItemTypesCommand.cs b/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Player/ListItemTypesCommand.cs
index 1f12e5f9..af362bcd 100644
--- a/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Player/ListItemTypesCommand.cs
+++ b/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Player/ListItemTypesCommand.cs
@@ -10,7 +10,7 @@ namespace StardewModdingAPI.Mods.ConsoleCommands.Framework.Commands.Player
         ** Fields
         *********/
         /// <summary>Provides methods for searching and constructing items.</summary>
-        private readonly ItemRepository Items = new ItemRepository();
+        private readonly ItemRepository Items = new();
 
 
         /*********
diff --git a/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Player/ListItemsCommand.cs b/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Player/ListItemsCommand.cs
index 67569298..46fc1d9d 100644
--- a/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Player/ListItemsCommand.cs
+++ b/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Player/ListItemsCommand.cs
@@ -12,7 +12,7 @@ namespace StardewModdingAPI.Mods.ConsoleCommands.Framework.Commands.Player
         ** Fields
         *********/
         /// <summary>Provides methods for searching and constructing items.</summary>
-        private readonly ItemRepository Items = new ItemRepository();
+        private readonly ItemRepository Items = new();
 
 
         /*********
diff --git a/src/SMAPI.Mods.ConsoleCommands/Framework/ItemRepository.cs b/src/SMAPI.Mods.ConsoleCommands/Framework/ItemRepository.cs
index 8704a403..9b48fa99 100644
--- a/src/SMAPI.Mods.ConsoleCommands/Framework/ItemRepository.cs
+++ b/src/SMAPI.Mods.ConsoleCommands/Framework/ItemRepository.cs
@@ -285,7 +285,7 @@ namespace StardewModdingAPI.Mods.ConsoleCommands.Framework
                 case SObject.flowersCategory:
                     yield return this.TryCreate(ItemType.Object, this.CustomIDOffset * 5 + id, _ =>
                     {
-                        SObject honey = new SObject(Vector2.Zero, 340, $"{item.Name} Honey", false, true, false, false)
+                        SObject honey = new(Vector2.Zero, 340, $"{item.Name} Honey", false, true, false, false)
                         {
                             Name = $"{item.Name} Honey",
                             preservedParentSheetIndex = { id }
diff --git a/src/SMAPI.Mods.ConsoleCommands/ModEntry.cs b/src/SMAPI.Mods.ConsoleCommands/ModEntry.cs
index 91437fd3..5e594984 100644
--- a/src/SMAPI.Mods.ConsoleCommands/ModEntry.cs
+++ b/src/SMAPI.Mods.ConsoleCommands/ModEntry.cs
@@ -71,7 +71,7 @@ namespace StardewModdingAPI.Mods.ConsoleCommands
         /// <param name="args">The command arguments.</param>
         private void HandleCommand(IConsoleCommand command, string commandName, string[] args)
         {
-            ArgumentParser argParser = new ArgumentParser(commandName, args, this.Monitor);
+            ArgumentParser argParser = new(commandName, args, this.Monitor);
             command.Handle(this.Monitor, commandName, argParser);
         }
 
diff --git a/src/SMAPI.Mods.ErrorHandler/Patches/SaveGamePatcher.cs b/src/SMAPI.Mods.ErrorHandler/Patches/SaveGamePatcher.cs
index 0a7ed212..5f6dbcb3 100644
--- a/src/SMAPI.Mods.ErrorHandler/Patches/SaveGamePatcher.cs
+++ b/src/SMAPI.Mods.ErrorHandler/Patches/SaveGamePatcher.cs
@@ -121,7 +121,7 @@ namespace StardewModdingAPI.Mods.ErrorHandler.Patches
                 {
                     try
                     {
-                        BluePrint _ = new BluePrint(building.buildingType.Value);
+                        BluePrint _ = new(building.buildingType.Value);
                     }
                     catch (ContentLoadException)
                     {
diff --git a/src/SMAPI.Mods.SaveBackup/ModEntry.cs b/src/SMAPI.Mods.SaveBackup/ModEntry.cs
index b89bb9c3..f6925707 100644
--- a/src/SMAPI.Mods.SaveBackup/ModEntry.cs
+++ b/src/SMAPI.Mods.SaveBackup/ModEntry.cs
@@ -38,7 +38,7 @@ namespace StardewModdingAPI.Mods.SaveBackup
             try
             {
                 // init backup folder
-                DirectoryInfo backupFolder = new DirectoryInfo(this.BackupFolder);
+                DirectoryInfo backupFolder = new(this.BackupFolder);
                 backupFolder.Create();
 
                 // back up & prune saves
@@ -63,8 +63,8 @@ namespace StardewModdingAPI.Mods.SaveBackup
             try
             {
                 // get target path
-                FileInfo targetFile = new FileInfo(Path.Combine(backupFolder.FullName, this.FileName));
-                DirectoryInfo fallbackDir = new DirectoryInfo(Path.Combine(backupFolder.FullName, this.BackupLabel));
+                FileInfo targetFile = new(Path.Combine(backupFolder.FullName, this.FileName));
+                DirectoryInfo fallbackDir = new(Path.Combine(backupFolder.FullName, this.BackupLabel));
                 if (targetFile.Exists || fallbackDir.Exists)
                 {
                     this.Monitor.Log("Already backed up today.");
@@ -72,7 +72,7 @@ namespace StardewModdingAPI.Mods.SaveBackup
                 }
 
                 // copy saves to fallback directory (ignore non-save files/folders)
-                DirectoryInfo savesDir = new DirectoryInfo(Constants.SavesPath);
+                DirectoryInfo savesDir = new(Constants.SavesPath);
                 if (!this.RecursiveCopy(savesDir, fallbackDir, entry => this.MatchSaveFolders(savesDir, entry), copyRoot: false))
                 {
                     this.Monitor.Log("No saves found.");
@@ -190,8 +190,8 @@ namespace StardewModdingAPI.Mods.SaveBackup
         /// <param name="destination">The destination file to create.</param>
         private void CompressUsingMacProcess(string sourcePath, FileInfo destination)
         {
-            DirectoryInfo saveFolder = new DirectoryInfo(sourcePath);
-            ProcessStartInfo startInfo = new ProcessStartInfo
+            DirectoryInfo saveFolder = new(sourcePath);
+            ProcessStartInfo startInfo = new()
             {
                 FileName = "zip",
                 Arguments = $"-rq \"{destination.FullName}\" \"{saveFolder.Name}\" -x \"*.DS_Store\" -x \"__MACOSX\"",
diff --git a/src/SMAPI.Tests/Core/TranslationTests.cs b/src/SMAPI.Tests/Core/TranslationTests.cs
index 457f9fad..58bc59b1 100644
--- a/src/SMAPI.Tests/Core/TranslationTests.cs
+++ b/src/SMAPI.Tests/Core/TranslationTests.cs
@@ -116,7 +116,7 @@ namespace SMAPI.Tests.Core
         public void Translation_ToString([ValueSource(nameof(TranslationTests.Samples))] string text)
         {
             // act
-            Translation translation = new Translation("pt-BR", "key", text);
+            Translation translation = new("pt-BR", "key", text);
 
             // assert
             if (translation.HasValue())
@@ -129,7 +129,7 @@ namespace SMAPI.Tests.Core
         public void Translation_ImplicitStringConversion([ValueSource(nameof(TranslationTests.Samples))] string text)
         {
             // act
-            Translation translation = new Translation("pt-BR", "key", text);
+            Translation translation = new("pt-BR", "key", text);
 
             // assert
             if (translation.HasValue())
@@ -182,7 +182,7 @@ namespace SMAPI.Tests.Core
             string expected = $"{start} tokens are properly replaced (including {middle} {middle}) {end}";
 
             // act
-            Translation translation = new Translation("pt-BR", "key", input);
+            Translation translation = new("pt-BR", "key", input);
             switch (structure)
             {
                 case "anonymous object":
diff --git a/src/SMAPI.Tests/Sample.cs b/src/SMAPI.Tests/Sample.cs
index f4f0d88e..9587a100 100644
--- a/src/SMAPI.Tests/Sample.cs
+++ b/src/SMAPI.Tests/Sample.cs
@@ -9,7 +9,7 @@ namespace SMAPI.Tests
         ** Fields
         *********/
         /// <summary>A random number generator.</summary>
-        private static readonly Random Random = new Random();
+        private static readonly Random Random = new();
 
 
         /*********
diff --git a/src/SMAPI.Tests/Utilities/PathUtilitiesTests.cs b/src/SMAPI.Tests/Utilities/PathUtilitiesTests.cs
index ab4c2618..94819c2e 100644
--- a/src/SMAPI.Tests/Utilities/PathUtilitiesTests.cs
+++ b/src/SMAPI.Tests/Utilities/PathUtilitiesTests.cs
@@ -14,7 +14,7 @@ namespace SMAPI.Tests.Utilities
         /// <summary>Sample paths used in unit tests.</summary>
         public static readonly SamplePath[] SamplePaths = {
             // Windows absolute path
-            new SamplePath
+            new()
             {
                 OriginalPath = @"C:\Program Files (x86)\Steam\steamapps\common\Stardew Valley",
 
@@ -26,7 +26,7 @@ namespace SMAPI.Tests.Utilities
             },
 
             // Windows absolute path (with trailing slash)
-            new SamplePath
+            new()
             {
                 OriginalPath = @"C:\Program Files (x86)\Steam\steamapps\common\Stardew Valley\",
 
@@ -38,7 +38,7 @@ namespace SMAPI.Tests.Utilities
             },
 
             // Windows relative path
-            new SamplePath
+            new()
             {
                 OriginalPath = @"Content\Characters\Dialogue\Abigail",
 
@@ -50,7 +50,7 @@ namespace SMAPI.Tests.Utilities
             },
 
             // Windows relative path (with directory climbing)
-            new SamplePath
+            new()
             {
                 OriginalPath = @"..\..\Content",
 
@@ -62,7 +62,7 @@ namespace SMAPI.Tests.Utilities
             },
 
             // Windows UNC path
-            new SamplePath
+            new()
             {
                 OriginalPath = @"\\unc\path",
 
@@ -74,7 +74,7 @@ namespace SMAPI.Tests.Utilities
             },
 
             // Linux absolute path
-            new SamplePath
+            new()
             {
                 OriginalPath = @"/home/.steam/steam/steamapps/common/Stardew Valley",
 
@@ -86,7 +86,7 @@ namespace SMAPI.Tests.Utilities
             },
 
             // Linux absolute path (with trailing slash)
-            new SamplePath
+            new()
             {
                 OriginalPath = @"/home/.steam/steam/steamapps/common/Stardew Valley/",
 
@@ -98,7 +98,7 @@ namespace SMAPI.Tests.Utilities
             },
 
             // Linux absolute path (with ~)
-            new SamplePath
+            new()
             {
                 OriginalPath = @"~/.steam/steam/steamapps/common/Stardew Valley",
 
@@ -110,7 +110,7 @@ namespace SMAPI.Tests.Utilities
             },
 
             // Linux relative path
-            new SamplePath
+            new()
             {
                 OriginalPath = @"Content/Characters/Dialogue/Abigail",
 
@@ -122,7 +122,7 @@ namespace SMAPI.Tests.Utilities
             },
 
             // Linux relative path (with directory climbing)
-            new SamplePath
+            new()
             {
                 OriginalPath = @"../../Content",
 
@@ -134,7 +134,7 @@ namespace SMAPI.Tests.Utilities
             },
 
             // Mixed directory separators
-            new SamplePath
+            new()
             {
                 OriginalPath = @"C:\some/mixed\path/separators",
 
diff --git a/src/SMAPI.Tests/Utilities/SDateTests.cs b/src/SMAPI.Tests/Utilities/SDateTests.cs
index 374f4921..886f25cd 100644
--- a/src/SMAPI.Tests/Utilities/SDateTests.cs
+++ b/src/SMAPI.Tests/Utilities/SDateTests.cs
@@ -61,7 +61,7 @@ namespace SMAPI.Tests.Utilities
         public void Constructor_SetsExpectedValues([ValueSource(nameof(SDateTests.SampleSeasonValues))] string season, [ValueSource(nameof(SDateTests.ValidDays))] int day, [Values(1, 2, 100)] int year)
         {
             // act
-            SDate date = new SDate(day, season, year);
+            SDate date = new(day, season, year);
 
             // assert
             Assert.AreEqual(day, date.Day);
@@ -254,7 +254,7 @@ namespace SMAPI.Tests.Utilities
                 {
                     foreach (int day in SDateTests.ValidDays)
                     {
-                        SDate date = new SDate(day, season, year);
+                        SDate date = new(day, season, year);
                         int hash = date.GetHashCode();
                         if (hashes.TryGetValue(hash, out SDate otherDate))
                             Assert.Fail($"Received identical hash code {hash} for dates {otherDate} and {date}.");
diff --git a/src/SMAPI.Tests/Utilities/SemanticVersionTests.cs b/src/SMAPI.Tests/Utilities/SemanticVersionTests.cs
index ac4ef39b..c8270373 100644
--- a/src/SMAPI.Tests/Utilities/SemanticVersionTests.cs
+++ b/src/SMAPI.Tests/Utilities/SemanticVersionTests.cs
@@ -395,7 +395,7 @@ namespace SMAPI.Tests.Utilities
         public void GameVersion(string versionStr)
         {
             // act
-            GameVersion version = new GameVersion(versionStr);
+            GameVersion version = new(versionStr);
 
             // assert
             Assert.AreEqual(versionStr, version.ToString(), "The game version did not round-trip to the same value.");
diff --git a/src/SMAPI.Toolkit/Framework/Clients/WebApi/WebApiClient.cs b/src/SMAPI.Toolkit/Framework/Clients/WebApi/WebApiClient.cs
index c2d906a0..f7d26d21 100644
--- a/src/SMAPI.Toolkit/Framework/Clients/WebApi/WebApiClient.cs
+++ b/src/SMAPI.Toolkit/Framework/Clients/WebApi/WebApiClient.cs
@@ -62,9 +62,9 @@ namespace StardewModdingAPI.Toolkit.Framework.Clients.WebApi
         private TResult Post<TBody, TResult>(string url, TBody content)
         {
             // note: avoid HttpClient for macOS compatibility
-            using WebClient client = new WebClient();
+            using WebClient client = new();
 
-            Uri fullUrl = new Uri(this.BaseUrl, url);
+            Uri fullUrl = new(this.BaseUrl, url);
             string data = JsonConvert.SerializeObject(content);
 
             client.Headers["Content-Type"] = "application/json";
diff --git a/src/SMAPI.Toolkit/Framework/Clients/Wiki/WikiClient.cs b/src/SMAPI.Toolkit/Framework/Clients/Wiki/WikiClient.cs
index 0f5a0ec3..abbcdc81 100644
--- a/src/SMAPI.Toolkit/Framework/Clients/Wiki/WikiClient.cs
+++ b/src/SMAPI.Toolkit/Framework/Clients/Wiki/WikiClient.cs
@@ -127,7 +127,7 @@ namespace StardewModdingAPI.Toolkit.Framework.Clients.Wiki
                 string pullRequestUrl = this.GetAttribute(node, "data-pr");
 
                 // parse stable compatibility
-                WikiCompatibilityInfo compatibility = new WikiCompatibilityInfo
+                WikiCompatibilityInfo compatibility = new()
                 {
                     Status = this.GetAttributeAsEnum<WikiCompatibilityStatus>(node, "data-status") ?? WikiCompatibilityStatus.Ok,
                     BrokeIn = this.GetAttribute(node, "data-broke-in"),
diff --git a/src/SMAPI.Toolkit/Framework/GameScanning/GameScanner.cs b/src/SMAPI.Toolkit/Framework/GameScanning/GameScanner.cs
index 8d4198de..768beba1 100644
--- a/src/SMAPI.Toolkit/Framework/GameScanning/GameScanner.cs
+++ b/src/SMAPI.Toolkit/Framework/GameScanning/GameScanner.cs
@@ -45,7 +45,7 @@ namespace StardewModdingAPI.Toolkit.Framework.GameScanning
             // yield valid folders
             foreach (string path in paths)
             {
-                DirectoryInfo folder = new DirectoryInfo(path);
+                DirectoryInfo folder = new(path);
                 if (this.LooksLikeGameFolder(folder))
                     yield return folder;
             }
@@ -191,7 +191,7 @@ namespace StardewModdingAPI.Toolkit.Framework.GameScanning
                 yield break;
 
             // get targets file
-            FileInfo file = new FileInfo(Path.Combine(homePath, "stardewvalley.targets"));
+            FileInfo file = new(Path.Combine(homePath, "stardewvalley.targets"));
             if (!file.Exists)
                 yield break;
 
diff --git a/src/SMAPI.Toolkit/Framework/LowLevelEnvironmentUtility.cs b/src/SMAPI.Toolkit/Framework/LowLevelEnvironmentUtility.cs
index 8b6eb5fb..c0332331 100644
--- a/src/SMAPI.Toolkit/Framework/LowLevelEnvironmentUtility.cs
+++ b/src/SMAPI.Toolkit/Framework/LowLevelEnvironmentUtility.cs
@@ -98,7 +98,7 @@ namespace StardewModdingAPI.Toolkit.Framework
         /// </remarks>
         private static bool IsRunningAndroid()
         {
-            using Process process = new Process
+            using Process process = new()
             {
                 StartInfo =
                 {
diff --git a/src/SMAPI.Toolkit/Framework/ModData/ModDataRecord.cs b/src/SMAPI.Toolkit/Framework/ModData/ModDataRecord.cs
index 5dd32acf..7e07ffde 100644
--- a/src/SMAPI.Toolkit/Framework/ModData/ModDataRecord.cs
+++ b/src/SMAPI.Toolkit/Framework/ModData/ModDataRecord.cs
@@ -82,7 +82,7 @@ namespace StardewModdingAPI.Toolkit.Framework.ModData
         /// <param name="manifest">The manifest to match.</param>
         public ModDataRecordVersionedFields GetVersionedFields(IManifest manifest)
         {
-            ModDataRecordVersionedFields parsed = new ModDataRecordVersionedFields { DisplayName = this.DisplayName, DataRecord = this };
+            ModDataRecordVersionedFields parsed = new() { DisplayName = this.DisplayName, DataRecord = this };
             foreach (ModDataField field in this.Fields.Where(field => field.IsMatch(manifest)))
             {
                 switch (field.Key)
diff --git a/src/SMAPI.Toolkit/Framework/ModScanning/ModScanner.cs b/src/SMAPI.Toolkit/Framework/ModScanning/ModScanner.cs
index e6105f9c..d21ccec0 100644
--- a/src/SMAPI.Toolkit/Framework/ModScanning/ModScanner.cs
+++ b/src/SMAPI.Toolkit/Framework/ModScanning/ModScanner.cs
@@ -18,7 +18,7 @@ namespace StardewModdingAPI.Toolkit.Framework.ModScanning
         private readonly JsonHelper JsonHelper;
 
         /// <summary>A list of filesystem entry names to ignore when checking whether a folder should be treated as a mod.</summary>
-        private readonly HashSet<Regex> IgnoreFilesystemNames = new HashSet<Regex>
+        private readonly HashSet<Regex> IgnoreFilesystemNames = new()
         {
             new Regex(@"^__folder_managed_by_vortex$", RegexOptions.Compiled | RegexOptions.IgnoreCase), // Vortex mod manager
             new Regex(@"(?:^\._|^\.DS_Store$|^__MACOSX$|^mcs$)", RegexOptions.Compiled | RegexOptions.IgnoreCase), // macOS
@@ -26,7 +26,7 @@ namespace StardewModdingAPI.Toolkit.Framework.ModScanning
         };
 
         /// <summary>A list of file extensions to ignore when searching for mod files.</summary>
-        private readonly HashSet<string> IgnoreFileExtensions = new HashSet<string>(StringComparer.OrdinalIgnoreCase)
+        private readonly HashSet<string> IgnoreFileExtensions = new(StringComparer.OrdinalIgnoreCase)
         {
             // text
             ".doc",
@@ -60,7 +60,7 @@ namespace StardewModdingAPI.Toolkit.Framework.ModScanning
         };
 
         /// <summary>The extensions for packed content files.</summary>
-        private readonly HashSet<string> StrictXnbModExtensions = new HashSet<string>(StringComparer.OrdinalIgnoreCase)
+        private readonly HashSet<string> StrictXnbModExtensions = new(StringComparer.OrdinalIgnoreCase)
         {
             ".xgs",
             ".xnb",
@@ -69,7 +69,7 @@ namespace StardewModdingAPI.Toolkit.Framework.ModScanning
         };
 
         /// <summary>The extensions for files which an XNB mod may contain, in addition to <see cref="StrictXnbModExtensions"/>.</summary>
-        private readonly HashSet<string> PotentialXnbModExtensions = new HashSet<string>(StringComparer.OrdinalIgnoreCase)
+        private readonly HashSet<string> PotentialXnbModExtensions = new(StringComparer.OrdinalIgnoreCase)
         {
             ".json",
             ".yaml"
@@ -96,7 +96,7 @@ namespace StardewModdingAPI.Toolkit.Framework.ModScanning
         /// <param name="rootPath">The root folder containing mods.</param>
         public IEnumerable<ModFolder> GetModFolders(string rootPath)
         {
-            DirectoryInfo root = new DirectoryInfo(rootPath);
+            DirectoryInfo root = new(rootPath);
             return this.GetModFolders(root, root);
         }
 
@@ -260,7 +260,7 @@ namespace StardewModdingAPI.Toolkit.Framework.ModScanning
             while (true)
             {
                 // check for manifest in current folder
-                FileInfo file = new FileInfo(Path.Combine(folder.FullName, "manifest.json"));
+                FileInfo file = new(Path.Combine(folder.FullName, "manifest.json"));
                 if (file.Exists)
                     return file;
 
diff --git a/src/SMAPI.Toolkit/ModToolkit.cs b/src/SMAPI.Toolkit/ModToolkit.cs
index 38a67ae5..80008df7 100644
--- a/src/SMAPI.Toolkit/ModToolkit.cs
+++ b/src/SMAPI.Toolkit/ModToolkit.cs
@@ -34,7 +34,7 @@ namespace StardewModdingAPI.Toolkit
         ** Accessors
         *********/
         /// <summary>Encapsulates SMAPI's JSON parsing.</summary>
-        public JsonHelper JsonHelper { get; } = new JsonHelper();
+        public JsonHelper JsonHelper { get; } = new();
 
 
         /*********
diff --git a/src/SMAPI.Toolkit/SemanticVersionComparer.cs b/src/SMAPI.Toolkit/SemanticVersionComparer.cs
index 9f6b57a2..8eba2c9f 100644
--- a/src/SMAPI.Toolkit/SemanticVersionComparer.cs
+++ b/src/SMAPI.Toolkit/SemanticVersionComparer.cs
@@ -9,7 +9,7 @@ namespace StardewModdingAPI.Toolkit
         ** Accessors
         *********/
         /// <summary>A singleton instance of the comparer.</summary>
-        public static SemanticVersionComparer Instance { get; } = new SemanticVersionComparer();
+        public static SemanticVersionComparer Instance { get; } = new();
 
 
         /*********
diff --git a/src/SMAPI.Toolkit/Serialization/JsonHelper.cs b/src/SMAPI.Toolkit/Serialization/JsonHelper.cs
index 00db9903..5c465f3c 100644
--- a/src/SMAPI.Toolkit/Serialization/JsonHelper.cs
+++ b/src/SMAPI.Toolkit/Serialization/JsonHelper.cs
@@ -14,7 +14,7 @@ namespace StardewModdingAPI.Toolkit.Serialization
         ** Accessors
         *********/
         /// <summary>The JSON settings to use when serializing and deserializing files.</summary>
-        public JsonSerializerSettings JsonSettings { get; } = new JsonSerializerSettings
+        public JsonSerializerSettings JsonSettings { get; } = new()
         {
             Formatting = Formatting.Indented,
             ObjectCreationHandling = ObjectCreationHandling.Replace, // avoid issue where default ICollection<T> values are duplicated each time the config is loaded
diff --git a/src/SMAPI.Toolkit/Utilities/PathUtilities.cs b/src/SMAPI.Toolkit/Utilities/PathUtilities.cs
index 2e9e5eac..85e12bfa 100644
--- a/src/SMAPI.Toolkit/Utilities/PathUtilities.cs
+++ b/src/SMAPI.Toolkit/Utilities/PathUtilities.cs
@@ -100,8 +100,8 @@ namespace StardewModdingAPI.Toolkit.Utilities
             // though, this is only for compatibility with the mod build package.
 
             // convert to URIs
-            Uri from = new Uri(sourceDir.TrimEnd(PathUtilities.PossiblePathSeparators) + "/");
-            Uri to = new Uri(targetPath.TrimEnd(PathUtilities.PossiblePathSeparators) + "/");
+            Uri from = new(sourceDir.TrimEnd(PathUtilities.PossiblePathSeparators) + "/");
+            Uri to = new(targetPath.TrimEnd(PathUtilities.PossiblePathSeparators) + "/");
             if (from.Scheme != to.Scheme)
                 throw new InvalidOperationException($"Can't get path for '{targetPath}' relative to '{sourceDir}'.");
 
diff --git a/src/SMAPI.Web/Controllers/IndexController.cs b/src/SMAPI.Web/Controllers/IndexController.cs
index 5097997c..69b54f47 100644
--- a/src/SMAPI.Web/Controllers/IndexController.cs
+++ b/src/SMAPI.Web/Controllers/IndexController.cs
@@ -94,7 +94,7 @@ namespace StardewModdingAPI.Web.Controllers
                 // strip 'noinclude' blocks from release description
                 if (release != null)
                 {
-                    HtmlDocument doc = new HtmlDocument();
+                    HtmlDocument doc = new();
                     doc.LoadHtml(release.Body);
                     foreach (HtmlNode node in doc.DocumentNode.SelectNodes("//*[@class='noinclude']")?.ToArray() ?? Array.Empty<HtmlNode>())
                         node.Remove();
diff --git a/src/SMAPI.Web/Controllers/JsonValidatorController.cs b/src/SMAPI.Web/Controllers/JsonValidatorController.cs
index e06c1236..bcd4097a 100644
--- a/src/SMAPI.Web/Controllers/JsonValidatorController.cs
+++ b/src/SMAPI.Web/Controllers/JsonValidatorController.cs
@@ -197,7 +197,7 @@ namespace StardewModdingAPI.Web.Controllers
                 return null;
 
             // get matching file
-            DirectoryInfo schemaDir = new DirectoryInfo(Path.Combine(Directory.GetCurrentDirectory(), "wwwroot", "schemas"));
+            DirectoryInfo schemaDir = new(Path.Combine(Directory.GetCurrentDirectory(), "wwwroot", "schemas"));
             foreach (FileInfo file in schemaDir.EnumerateFiles("*.json"))
             {
                 if (file.Name.Equals($"{id}.json"))
diff --git a/src/SMAPI.Web/Controllers/ModsApiController.cs b/src/SMAPI.Web/Controllers/ModsApiController.cs
index dfe2504b..5329df99 100644
--- a/src/SMAPI.Web/Controllers/ModsApiController.cs
+++ b/src/SMAPI.Web/Controllers/ModsApiController.cs
@@ -135,7 +135,7 @@ namespace StardewModdingAPI.Web.Controllers
             bool isSmapiBeta = apiVersion.IsPrerelease() && apiVersion.PrereleaseTag.StartsWith("beta");
 
             // get latest versions
-            ModEntryModel result = new ModEntryModel { ID = search.ID };
+            ModEntryModel result = new() { ID = search.ID };
             IList<string> errors = new List<string>();
             ModEntryVersionModel main = null;
             ModEntryVersionModel optional = null;
diff --git a/src/SMAPI.Web/Framework/Clients/Chucklefish/ChucklefishClient.cs b/src/SMAPI.Web/Framework/Clients/Chucklefish/ChucklefishClient.cs
index b8b05878..9689807c 100644
--- a/src/SMAPI.Web/Framework/Clients/Chucklefish/ChucklefishClient.cs
+++ b/src/SMAPI.Web/Framework/Clients/Chucklefish/ChucklefishClient.cs
@@ -90,7 +90,7 @@ namespace StardewModdingAPI.Web.Framework.Clients.Chucklefish
         /// <param name="id">The mod ID.</param>
         private string GetModUrl(uint id)
         {
-            UriBuilder builder = new UriBuilder(this.Client.BaseClient.BaseAddress);
+            UriBuilder builder = new(this.Client.BaseClient.BaseAddress);
             builder.Path += string.Format(this.ModPageUrlFormat, id);
             return builder.Uri.ToString();
         }
diff --git a/src/SMAPI.Web/Framework/Clients/CurseForge/CurseForgeClient.cs b/src/SMAPI.Web/Framework/Clients/CurseForge/CurseForgeClient.cs
index d8008721..50a3336d 100644
--- a/src/SMAPI.Web/Framework/Clients/CurseForge/CurseForgeClient.cs
+++ b/src/SMAPI.Web/Framework/Clients/CurseForge/CurseForgeClient.cs
@@ -17,7 +17,7 @@ namespace StardewModdingAPI.Web.Framework.Clients.CurseForge
         private readonly IClient Client;
 
         /// <summary>A regex pattern which matches a version number in a CurseForge mod file name.</summary>
-        private readonly Regex VersionInNamePattern = new Regex(@"^(?:.+? | *)v?(\d+\.\d+(?:\.\d+)?(?:-.+?)?) *(?:\.(?:zip|rar|7z))?$", RegexOptions.Compiled);
+        private readonly Regex VersionInNamePattern = new(@"^(?:.+? | *)v?(\d+\.\d+(?:\.\d+)?(?:-.+?)?) *(?:\.(?:zip|rar|7z))?$", RegexOptions.Compiled);
 
 
         /*********
diff --git a/src/SMAPI.Web/Framework/Clients/Nexus/NexusClient.cs b/src/SMAPI.Web/Framework/Clients/Nexus/NexusClient.cs
index 4ba94f81..571f06bc 100644
--- a/src/SMAPI.Web/Framework/Clients/Nexus/NexusClient.cs
+++ b/src/SMAPI.Web/Framework/Clients/Nexus/NexusClient.cs
@@ -195,7 +195,7 @@ namespace StardewModdingAPI.Web.Framework.Clients.Nexus
         /// <param name="id">The mod ID.</param>
         private string GetModUrl(uint id)
         {
-            UriBuilder builder = new UriBuilder(this.WebClient.BaseClient.BaseAddress);
+            UriBuilder builder = new(this.WebClient.BaseClient.BaseAddress);
             builder.Path += string.Format(this.WebModUrlFormat, id);
             return builder.Uri.ToString();
         }
diff --git a/src/SMAPI.Web/Framework/Compression/GzipHelper.cs b/src/SMAPI.Web/Framework/Compression/GzipHelper.cs
index 676d660d..93cde9d3 100644
--- a/src/SMAPI.Web/Framework/Compression/GzipHelper.cs
+++ b/src/SMAPI.Web/Framework/Compression/GzipHelper.cs
@@ -29,9 +29,9 @@ namespace StardewModdingAPI.Web.Framework.Compression
 
             // compressed
             byte[] compressedData;
-            using (MemoryStream stream = new MemoryStream())
+            using (MemoryStream stream = new())
             {
-                using (GZipStream zipStream = new GZipStream(stream, CompressionLevel.Optimal, leaveOpen: true))
+                using (GZipStream zipStream = new(stream, CompressionLevel.Optimal, leaveOpen: true))
                     zipStream.Write(buffer, 0, buffer.Length);
 
                 stream.Position = 0;
@@ -69,7 +69,7 @@ namespace StardewModdingAPI.Web.Framework.Compression
                 return rawText;
 
             // decompress
-            using MemoryStream memoryStream = new MemoryStream();
+            using MemoryStream memoryStream = new();
             {
                 // read length prefix
                 int dataLength = BitConverter.ToInt32(zipBuffer, 0);
@@ -78,7 +78,7 @@ namespace StardewModdingAPI.Web.Framework.Compression
                 // read data
                 byte[] buffer = new byte[dataLength];
                 memoryStream.Position = 0;
-                using (GZipStream gZipStream = new GZipStream(memoryStream, CompressionMode.Decompress))
+                using (GZipStream gZipStream = new(memoryStream, CompressionMode.Decompress))
                     gZipStream.Read(buffer, 0, buffer.Length);
 
                 // return original string
diff --git a/src/SMAPI.Web/Framework/Extensions.cs b/src/SMAPI.Web/Framework/Extensions.cs
index 5305b142..2e767b3d 100644
--- a/src/SMAPI.Web/Framework/Extensions.cs
+++ b/src/SMAPI.Web/Framework/Extensions.cs
@@ -29,7 +29,7 @@ namespace StardewModdingAPI.Web.Framework
         public static string PlainAction(this IUrlHelper helper, [AspMvcAction] string action, [AspMvcController] string controller, object values = null, bool absoluteUrl = false)
         {
             // get route values
-            RouteValueDictionary valuesDict = new RouteValueDictionary(values);
+            RouteValueDictionary valuesDict = new(values);
             foreach (var value in helper.ActionContext.RouteData.Values)
             {
                 if (!valuesDict.ContainsKey(value.Key))
@@ -45,7 +45,7 @@ namespace StardewModdingAPI.Web.Framework
             if (absoluteUrl)
             {
                 HttpRequest request = helper.ActionContext.HttpContext.Request;
-                Uri baseUri = new Uri($"{request.Scheme}://{request.Host}");
+                Uri baseUri = new($"{request.Scheme}://{request.Host}");
                 url = new Uri(baseUri, url).ToString();
             }
 
diff --git a/src/SMAPI.Web/Framework/JobDashboardAuthorizationFilter.cs b/src/SMAPI.Web/Framework/JobDashboardAuthorizationFilter.cs
index 385c0c91..3c1405eb 100644
--- a/src/SMAPI.Web/Framework/JobDashboardAuthorizationFilter.cs
+++ b/src/SMAPI.Web/Framework/JobDashboardAuthorizationFilter.cs
@@ -9,7 +9,7 @@ namespace StardewModdingAPI.Web.Framework
         ** Fields
         *********/
         /// <summary>An authorization filter that allows local requests.</summary>
-        private static readonly LocalRequestsOnlyAuthorizationFilter LocalRequestsOnlyFilter = new LocalRequestsOnlyAuthorizationFilter();
+        private static readonly LocalRequestsOnlyAuthorizationFilter LocalRequestsOnlyFilter = new();
 
 
         /*********
diff --git a/src/SMAPI.Web/Framework/LogParsing/LogMessageBuilder.cs b/src/SMAPI.Web/Framework/LogParsing/LogMessageBuilder.cs
index 992876ef..9da27d61 100644
--- a/src/SMAPI.Web/Framework/LogParsing/LogMessageBuilder.cs
+++ b/src/SMAPI.Web/Framework/LogParsing/LogMessageBuilder.cs
@@ -23,7 +23,7 @@ namespace StardewModdingAPI.Web.Framework.LogParsing
         public string Mod { get; set; }
 
         /// <summary>The text for the next log message.</summary>
-        private readonly StringBuilder Text = new StringBuilder();
+        private readonly StringBuilder Text = new();
 
 
         /*********
diff --git a/src/SMAPI.Web/Framework/LogParsing/LogParser.cs b/src/SMAPI.Web/Framework/LogParsing/LogParser.cs
index 887d0105..6a3ea222 100644
--- a/src/SMAPI.Web/Framework/LogParsing/LogParser.cs
+++ b/src/SMAPI.Web/Framework/LogParsing/LogParser.cs
@@ -14,38 +14,38 @@ namespace StardewModdingAPI.Web.Framework.LogParsing
         ** Fields
         *********/
         /// <summary>A regex pattern matching the start of a SMAPI message.</summary>
-        private readonly Regex MessageHeaderPattern = new Regex(@"^\[(?<time>\d\d[:\.]\d\d[:\.]\d\d) (?<level>[a-z]+)(?: +screen_(?<screen>\d+))? +(?<modName>[^\]]+)\] ", RegexOptions.Compiled | RegexOptions.IgnoreCase);
+        private readonly Regex MessageHeaderPattern = new(@"^\[(?<time>\d\d[:\.]\d\d[:\.]\d\d) (?<level>[a-z]+)(?: +screen_(?<screen>\d+))? +(?<modName>[^\]]+)\] ", RegexOptions.Compiled | RegexOptions.IgnoreCase);
 
         /// <summary>A regex pattern matching SMAPI's initial platform info message.</summary>
-        private readonly Regex InfoLinePattern = new Regex(@"^SMAPI (?<apiVersion>.+) with Stardew Valley (?<gameVersion>.+) on (?<os>.+)", RegexOptions.Compiled | RegexOptions.IgnoreCase);
+        private readonly Regex InfoLinePattern = new(@"^SMAPI (?<apiVersion>.+) with Stardew Valley (?<gameVersion>.+) on (?<os>.+)", RegexOptions.Compiled | RegexOptions.IgnoreCase);
 
         /// <summary>A regex pattern matching SMAPI's mod folder path line.</summary>
-        private readonly Regex ModPathPattern = new Regex(@"^Mods go here: (?<path>.+)", RegexOptions.Compiled | RegexOptions.IgnoreCase);
+        private readonly Regex ModPathPattern = new(@"^Mods go here: (?<path>.+)", RegexOptions.Compiled | RegexOptions.IgnoreCase);
 
         /// <summary>A regex pattern matching SMAPI's log timestamp line.</summary>
-        private readonly Regex LogStartedAtPattern = new Regex(@"^Log started at (?<timestamp>.+) UTC", RegexOptions.Compiled | RegexOptions.IgnoreCase);
+        private readonly Regex LogStartedAtPattern = new(@"^Log started at (?<timestamp>.+) UTC", RegexOptions.Compiled | RegexOptions.IgnoreCase);
 
         /// <summary>A regex pattern matching the start of SMAPI's mod list.</summary>
-        private readonly Regex ModListStartPattern = new Regex(@"^Loaded \d+ mods:$", RegexOptions.Compiled | RegexOptions.IgnoreCase);
+        private readonly Regex ModListStartPattern = new(@"^Loaded \d+ mods:$", RegexOptions.Compiled | RegexOptions.IgnoreCase);
 
         /// <summary>A regex pattern matching an entry in SMAPI's mod list.</summary>
         /// <remarks>The author name and description are optional.</remarks>
-        private readonly Regex ModListEntryPattern = new Regex(@"^   (?<name>.+?) (?<version>[^\s]+)(?: by (?<author>[^\|]+))?(?: \| (?<description>.+))?$", RegexOptions.Compiled | RegexOptions.IgnoreCase);
+        private readonly Regex ModListEntryPattern = new(@"^   (?<name>.+?) (?<version>[^\s]+)(?: by (?<author>[^\|]+))?(?: \| (?<description>.+))?$", RegexOptions.Compiled | RegexOptions.IgnoreCase);
 
         /// <summary>A regex pattern matching the start of SMAPI's content pack list.</summary>
-        private readonly Regex ContentPackListStartPattern = new Regex(@"^Loaded \d+ content packs:$", RegexOptions.Compiled | RegexOptions.IgnoreCase);
+        private readonly Regex ContentPackListStartPattern = new(@"^Loaded \d+ content packs:$", RegexOptions.Compiled | RegexOptions.IgnoreCase);
 
         /// <summary>A regex pattern matching an entry in SMAPI's content pack list.</summary>
-        private readonly Regex ContentPackListEntryPattern = new Regex(@"^   (?<name>.+?) (?<version>[^\s]+)(?: by (?<author>[^\|]+))? \| for (?<for>[^\|]+)(?: \| (?<description>.+))?$", RegexOptions.Compiled | RegexOptions.IgnoreCase);
+        private readonly Regex ContentPackListEntryPattern = new(@"^   (?<name>.+?) (?<version>[^\s]+)(?: by (?<author>[^\|]+))? \| for (?<for>[^\|]+)(?: \| (?<description>.+))?$", RegexOptions.Compiled | RegexOptions.IgnoreCase);
 
         /// <summary>A regex pattern matching the start of SMAPI's mod update list.</summary>
-        private readonly Regex ModUpdateListStartPattern = new Regex(@"^You can update \d+ mods?:$", RegexOptions.Compiled | RegexOptions.IgnoreCase);
+        private readonly Regex ModUpdateListStartPattern = new(@"^You can update \d+ mods?:$", RegexOptions.Compiled | RegexOptions.IgnoreCase);
 
         /// <summary>A regex pattern matching an entry in SMAPI's mod update list.</summary>
-        private readonly Regex ModUpdateListEntryPattern = new Regex(@"^   (?<name>.+) (?<version>[^\s]+): (?<link>.+)$", RegexOptions.Compiled | RegexOptions.IgnoreCase);
+        private readonly Regex ModUpdateListEntryPattern = new(@"^   (?<name>.+) (?<version>[^\s]+): (?<link>.+)$", RegexOptions.Compiled | RegexOptions.IgnoreCase);
 
         /// <summary>A regex pattern matching SMAPI's update line.</summary>
-        private readonly Regex SmapiUpdatePattern = new Regex(@"^You can update SMAPI to (?<version>[^\s]+): (?<link>.+)$", RegexOptions.Compiled | RegexOptions.IgnoreCase);
+        private readonly Regex SmapiUpdatePattern = new(@"^You can update SMAPI to (?<version>[^\s]+): (?<link>.+)$", RegexOptions.Compiled | RegexOptions.IgnoreCase);
 
 
         /*********
@@ -69,7 +69,7 @@ namespace StardewModdingAPI.Web.Framework.LogParsing
                 }
 
                 // init log
-                ParsedLog log = new ParsedLog
+                ParsedLog log = new()
                 {
                     IsValid = true,
                     RawText = logText,
@@ -77,8 +77,8 @@ namespace StardewModdingAPI.Web.Framework.LogParsing
                 };
 
                 // parse log messages
-                LogModInfo smapiMod = new LogModInfo { Name = "SMAPI", Author = "Pathoschild", Description = "", Loaded = true };
-                LogModInfo gameMod = new LogModInfo { Name = "game", Author = "", Description = "", Loaded = true };
+                LogModInfo smapiMod = new() { Name = "SMAPI", Author = "Pathoschild", Description = "", Loaded = true };
+                LogModInfo gameMod = new() { Name = "game", Author = "", Description = "", Loaded = true };
                 IDictionary<string, List<LogModInfo>> mods = new Dictionary<string, List<LogModInfo>>();
                 bool inModList = false;
                 bool inContentPackList = false;
@@ -288,8 +288,8 @@ namespace StardewModdingAPI.Web.Framework.LogParsing
         /// <exception cref="LogParseException">The log text can't be parsed successfully.</exception>
         private IEnumerable<LogMessage> GetMessages(string logText)
         {
-            LogMessageBuilder builder = new LogMessageBuilder();
-            using StringReader reader = new StringReader(logText);
+            LogMessageBuilder builder = new();
+            using StringReader reader = new(logText);
             while (true)
             {
                 // read line
diff --git a/src/SMAPI.Web/Framework/Storage/StorageProvider.cs b/src/SMAPI.Web/Framework/Storage/StorageProvider.cs
index c6f8bac1..1104df89 100644
--- a/src/SMAPI.Web/Framework/Storage/StorageProvider.cs
+++ b/src/SMAPI.Web/Framework/Storage/StorageProvider.cs
@@ -103,7 +103,7 @@ namespace StardewModdingAPI.Web.Framework.Storage
                         // fetch file
                         Response<BlobDownloadInfo> response = await blob.DownloadAsync();
                         using BlobDownloadInfo result = response.Value;
-                        using StreamReader reader = new StreamReader(result.Content);
+                        using StreamReader reader = new(result.Content);
                         DateTimeOffset expiry = result.Details.LastModified + TimeSpan.FromDays(this.ExpiryDays);
                         string content = this.GzipHelper.DecompressString(reader.ReadToEnd());
 
@@ -130,7 +130,7 @@ namespace StardewModdingAPI.Web.Framework.Storage
                 else
                 {
                     // get file
-                    FileInfo file = new FileInfo(this.GetDevFilePath(id));
+                    FileInfo file = new(this.GetDevFilePath(id));
                     if (file.Exists && file.LastWriteTimeUtc.AddDays(this.ExpiryDays) < DateTime.UtcNow) // expired
                         file.Delete();
                     if (!file.Exists)
diff --git a/src/SMAPI.Web/ViewModels/LogParserModel.cs b/src/SMAPI.Web/ViewModels/LogParserModel.cs
index 0b6d7722..5aa2fd92 100644
--- a/src/SMAPI.Web/ViewModels/LogParserModel.cs
+++ b/src/SMAPI.Web/ViewModels/LogParserModel.cs
@@ -14,7 +14,7 @@ namespace StardewModdingAPI.Web.ViewModels
         ** Fields
         *********/
         /// <summary>A regex pattern matching characters to remove from a mod name to create the slug ID.</summary>
-        private readonly Regex SlugInvalidCharPattern = new Regex("[^a-z0-9]", RegexOptions.Compiled | RegexOptions.IgnoreCase);
+        private readonly Regex SlugInvalidCharPattern = new("[^a-z0-9]", RegexOptions.Compiled | RegexOptions.IgnoreCase);
 
 
         /*********
diff --git a/src/SMAPI/Context.cs b/src/SMAPI/Context.cs
index a745592c..4fbc9c42 100644
--- a/src/SMAPI/Context.cs
+++ b/src/SMAPI/Context.cs
@@ -14,10 +14,10 @@ namespace StardewModdingAPI
         ** Fields
         *********/
         /// <summary>Whether the player has loaded a save and the world has finished initializing.</summary>
-        private static readonly PerScreen<bool> IsWorldReadyForScreen = new PerScreen<bool>();
+        private static readonly PerScreen<bool> IsWorldReadyForScreen = new();
 
         /// <summary>The current stage in the game's loading process.</summary>
-        private static readonly PerScreen<LoadStage> LoadStageForScreen = new PerScreen<LoadStage>();
+        private static readonly PerScreen<LoadStage> LoadStageForScreen = new();
 
         /// <summary>Whether a player save has been loaded.</summary>
         internal static bool IsSaveLoaded => Game1.hasLoadedGame && !(Game1.activeClickableMenu is TitleMenu);
diff --git a/src/SMAPI/Framework/CommandManager.cs b/src/SMAPI/Framework/CommandManager.cs
index ff540ad8..a7b64cb7 100644
--- a/src/SMAPI/Framework/CommandManager.cs
+++ b/src/SMAPI/Framework/CommandManager.cs
@@ -166,7 +166,7 @@ namespace StardewModdingAPI.Framework
         {
             bool inQuotes = false;
             IList<string> args = new List<string>();
-            StringBuilder currentArg = new StringBuilder();
+            StringBuilder currentArg = new();
             foreach (char ch in input)
             {
                 if (ch == '"')
diff --git a/src/SMAPI/Framework/Commands/HarmonySummaryCommand.cs b/src/SMAPI/Framework/Commands/HarmonySummaryCommand.cs
index 45b34556..643267ce 100644
--- a/src/SMAPI/Framework/Commands/HarmonySummaryCommand.cs
+++ b/src/SMAPI/Framework/Commands/HarmonySummaryCommand.cs
@@ -30,7 +30,7 @@ namespace StardewModdingAPI.Framework.Commands
         {
             SearchResult[] matches = this.FilterPatches(args).OrderBy(p => p.MethodName).ToArray();
 
-            StringBuilder result = new StringBuilder();
+            StringBuilder result = new();
 
             if (!matches.Any())
                 result.AppendLine("No current patches match your search.");
diff --git a/src/SMAPI/Framework/Content/AssetDataForMap.cs b/src/SMAPI/Framework/Content/AssetDataForMap.cs
index 26e4986e..0458f80a 100644
--- a/src/SMAPI/Framework/Content/AssetDataForMap.cs
+++ b/src/SMAPI/Framework/Content/AssetDataForMap.cs
@@ -96,8 +96,8 @@ namespace StardewModdingAPI.Framework.Content
                 for (int y = 0; y < sourceArea.Value.Height; y++)
                 {
                     // calculate tile positions
-                    Point sourcePos = new Point(sourceArea.Value.X + x, sourceArea.Value.Y + y);
-                    Point targetPos = new Point(targetArea.Value.X + x, targetArea.Value.Y + y);
+                    Point sourcePos = new(sourceArea.Value.X + x, sourceArea.Value.Y + y);
+                    Point targetPos = new(targetArea.Value.X + x, targetArea.Value.Y + y);
 
                     // replace tiles on target-only layers
                     if (replaceAll)
diff --git a/src/SMAPI/Framework/DeprecationManager.cs b/src/SMAPI/Framework/DeprecationManager.cs
index fc1b434b..ad6a3677 100644
--- a/src/SMAPI/Framework/DeprecationManager.cs
+++ b/src/SMAPI/Framework/DeprecationManager.cs
@@ -11,7 +11,7 @@ namespace StardewModdingAPI.Framework
         ** Fields
         *********/
         /// <summary>The deprecations which have already been logged (as 'mod name::noun phrase::version').</summary>
-        private readonly HashSet<string> LoggedDeprecations = new HashSet<string>(StringComparer.OrdinalIgnoreCase);
+        private readonly HashSet<string> LoggedDeprecations = new(StringComparer.OrdinalIgnoreCase);
 
         /// <summary>Encapsulates monitoring and logging for a given module.</summary>
         private readonly IMonitor Monitor;
diff --git a/src/SMAPI/Framework/Events/ManagedEvent.cs b/src/SMAPI/Framework/Events/ManagedEvent.cs
index 154ef659..1c8b9d04 100644
--- a/src/SMAPI/Framework/Events/ManagedEvent.cs
+++ b/src/SMAPI/Framework/Events/ManagedEvent.cs
@@ -18,7 +18,7 @@ namespace StardewModdingAPI.Framework.Events
         protected readonly ModRegistry ModRegistry;
 
         /// <summary>The underlying event handlers.</summary>
-        private readonly List<ManagedEventHandler<TEventArgs>> Handlers = new List<ManagedEventHandler<TEventArgs>>();
+        private readonly List<ManagedEventHandler<TEventArgs>> Handlers = new();
 
         /// <summary>A cached snapshot of <see cref="Handlers"/>, or <c>null</c> to rebuild it next raise.</summary>
         private ManagedEventHandler<TEventArgs>[] CachedHandlers = Array.Empty<ManagedEventHandler<TEventArgs>>();
diff --git a/src/SMAPI/Framework/Input/KeyboardStateBuilder.cs b/src/SMAPI/Framework/Input/KeyboardStateBuilder.cs
index eadb7a8a..09bc48b6 100644
--- a/src/SMAPI/Framework/Input/KeyboardStateBuilder.cs
+++ b/src/SMAPI/Framework/Input/KeyboardStateBuilder.cs
@@ -14,7 +14,7 @@ namespace StardewModdingAPI.Framework.Input
         private KeyboardState? State;
 
         /// <summary>The pressed buttons.</summary>
-        private readonly HashSet<Keys> PressedButtons = new HashSet<Keys>();
+        private readonly HashSet<Keys> PressedButtons = new();
 
 
         /*********
diff --git a/src/SMAPI/Framework/Input/SInputState.cs b/src/SMAPI/Framework/Input/SInputState.cs
index a8d1f371..5ff7432b 100644
--- a/src/SMAPI/Framework/Input/SInputState.cs
+++ b/src/SMAPI/Framework/Input/SInputState.cs
@@ -21,10 +21,10 @@ namespace StardewModdingAPI.Framework.Input
         private Vector2? LastPlayerTile;
 
         /// <summary>The buttons to press until the game next handles input.</summary>
-        private readonly HashSet<SButton> CustomPressedKeys = new HashSet<SButton>();
+        private readonly HashSet<SButton> CustomPressedKeys = new();
 
         /// <summary>The buttons to consider released until the actual button is released.</summary>
-        private readonly HashSet<SButton> CustomReleasedKeys = new HashSet<SButton>();
+        private readonly HashSet<SButton> CustomReleasedKeys = new();
 
         /// <summary>Whether there are new overrides in <see cref="CustomPressedKeys"/> or <see cref="CustomReleasedKeys"/> that haven't been applied to the previous state.</summary>
         private bool HasNewOverrides;
@@ -72,7 +72,7 @@ namespace StardewModdingAPI.Framework.Input
                 var controller = new GamePadStateBuilder(base.GetGamePadState());
                 var keyboard = new KeyboardStateBuilder(base.GetKeyboardState());
                 var mouse = new MouseStateBuilder(base.GetMouseState());
-                Vector2 cursorAbsolutePos = new Vector2((mouse.X * zoomMultiplier) + Game1.viewport.X, (mouse.Y * zoomMultiplier) + Game1.viewport.Y);
+                Vector2 cursorAbsolutePos = new((mouse.X * zoomMultiplier) + Game1.viewport.X, (mouse.Y * zoomMultiplier) + Game1.viewport.Y);
                 Vector2? playerTilePos = Context.IsPlayerFree ? Game1.player.getTileLocation() : (Vector2?)null;
                 HashSet<SButton> reallyDown = new HashSet<SButton>(this.GetPressedButtons(keyboard, mouse, controller));
 
@@ -203,8 +203,8 @@ namespace StardewModdingAPI.Framework.Input
         /// <param name="zoomMultiplier">The multiplier applied to pixel coordinates to adjust them for pixel zoom.</param>
         private CursorPosition GetCursorPosition(MouseState mouseState, Vector2 absolutePixels, float zoomMultiplier)
         {
-            Vector2 screenPixels = new Vector2(mouseState.X * zoomMultiplier, mouseState.Y * zoomMultiplier);
-            Vector2 tile = new Vector2((int)((Game1.viewport.X + screenPixels.X) / Game1.tileSize), (int)((Game1.viewport.Y + screenPixels.Y) / Game1.tileSize));
+            Vector2 screenPixels = new(mouseState.X * zoomMultiplier, mouseState.Y * zoomMultiplier);
+            Vector2 tile = new((int)((Game1.viewport.X + screenPixels.X) / Game1.tileSize), (int)((Game1.viewport.Y + screenPixels.Y) / Game1.tileSize));
             Vector2 grabTile = (Game1.mouseCursorTransparency > 0 && Utility.tileWithinRadiusOfPlayer((int)tile.X, (int)tile.Y, 1, Game1.player)) // derived from Game1.pressActionButton
                 ? tile
                 : Game1.player.GetGrabTile();
diff --git a/src/SMAPI/Framework/ModLoading/AssemblyLoader.cs b/src/SMAPI/Framework/ModLoading/AssemblyLoader.cs
index cb5fa2ae..4480f4e8 100644
--- a/src/SMAPI/Framework/ModLoading/AssemblyLoader.cs
+++ b/src/SMAPI/Framework/ModLoading/AssemblyLoader.cs
@@ -36,13 +36,13 @@ namespace StardewModdingAPI.Framework.ModLoading
         private readonly AssemblyDefinitionResolver AssemblyDefinitionResolver;
 
         /// <summary>Provides assembly symbol readers for Mono.Cecil.</summary>
-        private readonly SymbolReaderProvider SymbolReaderProvider = new SymbolReaderProvider();
+        private readonly SymbolReaderProvider SymbolReaderProvider = new();
 
         /// <summary>Provides assembly symbol writers for Mono.Cecil.</summary>
-        private readonly SymbolWriterProvider SymbolWriterProvider = new SymbolWriterProvider();
+        private readonly SymbolWriterProvider SymbolWriterProvider = new();
 
         /// <summary>The objects to dispose as part of this instance.</summary>
-        private readonly HashSet<IDisposable> Disposables = new HashSet<IDisposable>();
+        private readonly HashSet<IDisposable> Disposables = new();
 
         /// <summary>Whether to rewrite mods for compatibility.</summary>
         private readonly bool RewriteMods;
@@ -141,8 +141,8 @@ namespace StardewModdingAPI.Framework.ModLoading
                         this.Monitor.Log($"      Loading {assembly.File.Name} (rewritten)...", LogLevel.Trace);
 
                     // load assembly
-                    using MemoryStream outAssemblyStream = new MemoryStream();
-                    using MemoryStream outSymbolStream = new MemoryStream();
+                    using MemoryStream outAssemblyStream = new();
+                    using MemoryStream outSymbolStream = new();
                     assembly.Definition.Write(outAssemblyStream, new WriterParameters { WriteSymbols = true, SymbolStream = outSymbolStream, SymbolWriterProvider = this.SymbolWriterProvider });
                     byte[] bytes = outAssemblyStream.ToArray();
                     lastAssembly = Assembly.Load(bytes, outSymbolStream.ToArray());
@@ -241,7 +241,7 @@ namespace StardewModdingAPI.Framework.ModLoading
                 try
                 {
                     // read assembly with symbols
-                    FileInfo symbolsFile = new FileInfo(Path.Combine(Path.GetDirectoryName(file.FullName)!, Path.GetFileNameWithoutExtension(file.FullName)) + ".pdb");
+                    FileInfo symbolsFile = new(Path.Combine(Path.GetDirectoryName(file.FullName)!, Path.GetFileNameWithoutExtension(file.FullName)) + ".pdb");
                     if (symbolsFile.Exists)
                         this.SymbolReaderProvider.TryAddSymbolData(file.Name, () => this.TrackForDisposal(symbolsFile.OpenRead()));
                     assembly = this.TrackForDisposal(AssemblyDefinition.ReadAssembly(readStream, new ReaderParameters(ReadingMode.Immediate) { AssemblyResolver = assemblyResolver, InMemory = true, ReadSymbols = true, SymbolReaderProvider = this.SymbolReaderProvider }));
@@ -266,7 +266,7 @@ namespace StardewModdingAPI.Framework.ModLoading
             // yield referenced assemblies
             foreach (AssemblyNameReference dependency in assembly.MainModule.AssemblyReferences)
             {
-                FileInfo dependencyFile = new FileInfo(Path.Combine(file.Directory.FullName, $"{dependency.Name}.dll"));
+                FileInfo dependencyFile = new(Path.Combine(file.Directory.FullName, $"{dependency.Name}.dll"));
                 foreach (AssemblyParseResult result in this.GetReferencedLocalAssemblies(dependencyFile, visitedAssemblyNames, assemblyResolver))
                     yield return result;
             }
@@ -333,7 +333,7 @@ namespace StardewModdingAPI.Framework.ModLoading
 
             // find or rewrite code
             IInstructionHandler[] handlers = new InstructionMetadata().GetHandlers(this.ParanoidMode, platformChanged, this.RewriteMods).ToArray();
-            RecursiveRewriter rewriter = new RecursiveRewriter(
+            RecursiveRewriter rewriter = new(
                 module: module,
                 rewriteModule: curModule =>
                 {
diff --git a/src/SMAPI/Framework/ModLoading/ModResolver.cs b/src/SMAPI/Framework/ModLoading/ModResolver.cs
index 4b05d1e5..e3386f75 100644
--- a/src/SMAPI/Framework/ModLoading/ModResolver.cs
+++ b/src/SMAPI/Framework/ModLoading/ModResolver.cs
@@ -401,7 +401,7 @@ namespace StardewModdingAPI.Framework.ModLoading
         {
             foreach (string modRootPath in Directory.GetDirectories(rootPath))
             {
-                DirectoryInfo directory = new DirectoryInfo(modRootPath);
+                DirectoryInfo directory = new(modRootPath);
 
                 // if a folder only contains another folder, check the inner folder instead
                 while (!directory.GetFiles().Any() && directory.GetDirectories().Length == 1)
diff --git a/src/SMAPI/Framework/ModLoading/Symbols/SymbolReaderProvider.cs b/src/SMAPI/Framework/ModLoading/Symbols/SymbolReaderProvider.cs
index 44074337..d28c4a22 100644
--- a/src/SMAPI/Framework/ModLoading/Symbols/SymbolReaderProvider.cs
+++ b/src/SMAPI/Framework/ModLoading/Symbols/SymbolReaderProvider.cs
@@ -16,7 +16,7 @@ namespace StardewModdingAPI.Framework.ModLoading.Symbols
         private readonly ISymbolReaderProvider BaseProvider = new DefaultSymbolReaderProvider(throwIfNoSymbol: false);
 
         /// <summary>The symbol data loaded by absolute assembly path.</summary>
-        private readonly Dictionary<string, Stream> SymbolsByAssemblyPath = new Dictionary<string, Stream>(StringComparer.OrdinalIgnoreCase);
+        private readonly Dictionary<string, Stream> SymbolsByAssemblyPath = new(StringComparer.OrdinalIgnoreCase);
 
 
         /*********
diff --git a/src/SMAPI/Framework/ModRegistry.cs b/src/SMAPI/Framework/ModRegistry.cs
index ef389337..99548cf8 100644
--- a/src/SMAPI/Framework/ModRegistry.cs
+++ b/src/SMAPI/Framework/ModRegistry.cs
@@ -13,7 +13,7 @@ namespace StardewModdingAPI.Framework
         ** Fields
         *********/
         /// <summary>The registered mod data.</summary>
-        private readonly List<IModMetadata> Mods = new List<IModMetadata>();
+        private readonly List<IModMetadata> Mods = new();
 
         /// <summary>An assembly full name => mod lookup.</summary>
         private readonly IDictionary<string, IModMetadata> ModNamesByAssembly = new Dictionary<string, IModMetadata>();
@@ -94,7 +94,7 @@ namespace StardewModdingAPI.Framework
         public IModMetadata GetFromStack()
         {
             // get stack frames
-            StackTrace stack = new StackTrace();
+            StackTrace stack = new();
             StackFrame[] frames = stack.GetFrames();
             if (frames == null)
                 return null;
diff --git a/src/SMAPI/Framework/Models/SConfig.cs b/src/SMAPI/Framework/Models/SConfig.cs
index 9174aea6..35180df2 100644
--- a/src/SMAPI/Framework/Models/SConfig.cs
+++ b/src/SMAPI/Framework/Models/SConfig.cs
@@ -26,7 +26,7 @@ namespace StardewModdingAPI.Framework.Models
         };
 
         /// <summary>The default values for <see cref="SuppressUpdateChecks"/>, to log changes if different.</summary>
-        private static readonly HashSet<string> DefaultSuppressUpdateChecks = new HashSet<string>(StringComparer.OrdinalIgnoreCase)
+        private static readonly HashSet<string> DefaultSuppressUpdateChecks = new(StringComparer.OrdinalIgnoreCase)
         {
             "SMAPI.ConsoleCommands",
             "SMAPI.ErrorHandler",
diff --git a/src/SMAPI/Framework/Networking/SGalaxyNetServer.cs b/src/SMAPI/Framework/Networking/SGalaxyNetServer.cs
index ac9cf313..71e11576 100644
--- a/src/SMAPI/Framework/Networking/SGalaxyNetServer.cs
+++ b/src/SMAPI/Framework/Networking/SGalaxyNetServer.cs
@@ -45,8 +45,8 @@ namespace StardewModdingAPI.Framework.Networking
         [SuppressMessage("ReSharper", "AccessToDisposedClosure", Justification = "The callback is invoked synchronously.")]
         protected override void onReceiveMessage(GalaxyID peer, Stream messageStream)
         {
-            using IncomingMessage message = new IncomingMessage();
-            using BinaryReader reader = new BinaryReader(messageStream);
+            using IncomingMessage message = new();
+            using BinaryReader reader = new(messageStream);
 
             message.Read(reader);
             ulong peerID = peer.ToUint64(); // note: GalaxyID instances get reused, so need to store the underlying ID instead
@@ -57,7 +57,7 @@ namespace StardewModdingAPI.Framework.Networking
                 else if (message.MessageType == StardewValley.Multiplayer.playerIntroduction)
                 {
                     NetFarmerRoot farmer = this.Multiplayer.readFarmer(message.Reader);
-                    GalaxyID capturedPeer = new GalaxyID(peerID);
+                    GalaxyID capturedPeer = new(peerID);
                     this.gameServer.checkFarmhandRequest(Convert.ToString(peerID), this.getConnectionId(peer), farmer, msg => this.sendMessage(capturedPeer, msg), () => this.peers[farmer.Value.UniqueMultiplayerID] = capturedPeer.ToUint64());
                 }
             });
diff --git a/src/SMAPI/Framework/Networking/SLidgrenServer.cs b/src/SMAPI/Framework/Networking/SLidgrenServer.cs
index 05c8b872..ff871e64 100644
--- a/src/SMAPI/Framework/Networking/SLidgrenServer.cs
+++ b/src/SMAPI/Framework/Networking/SLidgrenServer.cs
@@ -44,9 +44,9 @@ namespace StardewModdingAPI.Framework.Networking
         {
             // add hook to call multiplayer core
             NetConnection peer = rawMessage.SenderConnection;
-            using IncomingMessage message = new IncomingMessage();
+            using IncomingMessage message = new();
             using Stream readStream = new NetBufferReadStream(rawMessage);
-            using BinaryReader reader = new BinaryReader(readStream);
+            using BinaryReader reader = new(readStream);
 
             while (rawMessage.LengthBits - rawMessage.Position >= 8)
             {
diff --git a/src/SMAPI/Framework/Reflection/Reflector.cs b/src/SMAPI/Framework/Reflection/Reflector.cs
index 889c7ed6..3a93ab5d 100644
--- a/src/SMAPI/Framework/Reflection/Reflector.cs
+++ b/src/SMAPI/Framework/Reflection/Reflector.cs
@@ -13,7 +13,7 @@ namespace StardewModdingAPI.Framework.Reflection
         ** Fields
         *********/
         /// <summary>The cached fields and methods found via reflection.</summary>
-        private readonly MemoryCache Cache = new MemoryCache(typeof(Reflector).FullName);
+        private readonly MemoryCache Cache = new(typeof(Reflector).FullName);
 
         /// <summary>The sliding cache expiration time.</summary>
         private readonly TimeSpan SlidingCacheExpiry = TimeSpan.FromMinutes(5);
@@ -268,7 +268,7 @@ namespace StardewModdingAPI.Framework.Reflection
 
             // fetch & cache new value
             TMemberInfo result = fetch();
-            CacheEntry cacheEntry = new CacheEntry(result != null, result);
+            CacheEntry cacheEntry = new(result != null, result);
             this.Cache.Add(key, cacheEntry, new CacheItemPolicy { SlidingExpiration = this.SlidingCacheExpiry });
             return result;
         }
diff --git a/src/SMAPI/Framework/SGame.cs b/src/SMAPI/Framework/SGame.cs
index 104cf330..989b59d8 100644
--- a/src/SMAPI/Framework/SGame.cs
+++ b/src/SMAPI/Framework/SGame.cs
@@ -37,7 +37,7 @@ namespace StardewModdingAPI.Framework
         private readonly EventManager Events;
 
         /// <summary>The maximum number of consecutive attempts SMAPI should make to recover from a draw error.</summary>
-        private readonly Countdown DrawCrashTimer = new Countdown(60); // 60 ticks = roughly one second
+        private readonly Countdown DrawCrashTimer = new(60); // 60 ticks = roughly one second
 
         /// <summary>Simplifies access to private game code.</summary>
         private readonly Reflector Reflection;
@@ -71,14 +71,14 @@ namespace StardewModdingAPI.Framework
         public WatcherCore Watchers { get; private set; }
 
         /// <summary>A snapshot of the current <see cref="Watchers"/> state.</summary>
-        public WatcherSnapshot WatcherSnapshot { get; } = new WatcherSnapshot();
+        public WatcherSnapshot WatcherSnapshot { get; } = new();
 
         /// <summary>Whether the current update tick is the first one for this instance.</summary>
         public bool IsFirstTick = true;
 
         /// <summary>The number of ticks until SMAPI should notify mods that the game has loaded.</summary>
         /// <remarks>Skipping a few frames ensures the game finishes initializing the world before mods try to change it.</remarks>
-        public Countdown AfterLoadTimer { get; } = new Countdown(5);
+        public Countdown AfterLoadTimer { get; } = new(5);
 
         /// <summary>Whether the game is saving and SMAPI has already raised <see cref="IGameLoopEvents.Saving"/>.</summary>
         public bool IsBetweenSaveEvents { get; set; }
@@ -624,7 +624,7 @@ namespace StardewModdingAPI.Framework
                     if (tile != null)
                     {
                         Vector2 vector_draw_position = Game1.GlobalToLocal(Game1.viewport, tile_position * 64f);
-                        Location draw_location = new Location((int)vector_draw_position.X, (int)vector_draw_position.Y);
+                        Location draw_location = new((int)vector_draw_position.X, (int)vector_draw_position.Y);
                         Game1.mapDisplayDevice.DrawTile(tile, draw_location, (tile_position.Y * 64f - 1f) / 10000f);
                     }
                 }
diff --git a/src/SMAPI/Framework/SGameRunner.cs b/src/SMAPI/Framework/SGameRunner.cs
index b816bb7c..81cac145 100644
--- a/src/SMAPI/Framework/SGameRunner.cs
+++ b/src/SMAPI/Framework/SGameRunner.cs
@@ -93,7 +93,7 @@ namespace StardewModdingAPI.Framework
         /// <param name="instanceIndex">The instance index.</param>
         public override Game1 CreateGameInstance(PlayerIndex playerIndex = PlayerIndex.One, int instanceIndex = 0)
         {
-            SInputState inputState = new SInputState();
+            SInputState inputState = new();
             return new SGame(playerIndex, instanceIndex, this.Monitor, this.Reflection, this.Events, inputState, this.ModHooks, this.Multiplayer, this.ExitGameImmediately, this.OnPlayerInstanceUpdating, this.OnGameContentLoaded);
         }
 
diff --git a/src/SMAPI/Framework/SMultiplayer.cs b/src/SMAPI/Framework/SMultiplayer.cs
index 5956b63f..3981e4e5 100644
--- a/src/SMAPI/Framework/SMultiplayer.cs
+++ b/src/SMAPI/Framework/SMultiplayer.cs
@@ -56,10 +56,10 @@ namespace StardewModdingAPI.Framework
         private readonly bool LogNetworkTraffic;
 
         /// <summary>The backing field for <see cref="Peers"/>.</summary>
-        private readonly PerScreen<IDictionary<long, MultiplayerPeer>> PeersImpl = new PerScreen<IDictionary<long, MultiplayerPeer>>(() => new Dictionary<long, MultiplayerPeer>());
+        private readonly PerScreen<IDictionary<long, MultiplayerPeer>> PeersImpl = new(() => new Dictionary<long, MultiplayerPeer>());
 
         /// <summary>The backing field for <see cref="HostPeer"/>.</summary>
-        private readonly PerScreen<MultiplayerPeer> HostPeerImpl = new PerScreen<MultiplayerPeer>();
+        private readonly PerScreen<MultiplayerPeer> HostPeerImpl = new();
 
 
         /*********
@@ -196,7 +196,7 @@ namespace StardewModdingAPI.Framework
                         this.Monitor.Log($"Received context for farmhand {message.FarmerID} running {(model != null ? $"SMAPI {model.ApiVersion} with {model.Mods.Length} mods" : "vanilla")}.", LogLevel.Trace);
 
                         // store peer
-                        MultiplayerPeer newPeer = new MultiplayerPeer(
+                        MultiplayerPeer newPeer = new(
                             playerID: message.FarmerID,
                             screenID: this.GetScreenId(message.FarmerID),
                             model: model,
@@ -244,7 +244,7 @@ namespace StardewModdingAPI.Framework
                     if (!this.Peers.ContainsKey(message.FarmerID))
                     {
                         this.Monitor.Log($"Received connection for vanilla player {message.FarmerID}.", LogLevel.Trace);
-                        MultiplayerPeer peer = new MultiplayerPeer(
+                        MultiplayerPeer peer = new(
                             playerID: message.FarmerID,
                             screenID: this.GetScreenId(message.FarmerID),
                             model: null,
@@ -292,7 +292,7 @@ namespace StardewModdingAPI.Framework
                         this.Monitor.Log($"Received context for {(model?.IsHost == true ? "host" : "farmhand")} {message.FarmerID} running {(model != null ? $"SMAPI {model.ApiVersion} with {model.Mods.Length} mods" : "vanilla")}.", LogLevel.Trace);
 
                         // store peer
-                        MultiplayerPeer peer = new MultiplayerPeer(
+                        MultiplayerPeer peer = new(
                             playerID: message.FarmerID,
                             screenID: this.GetScreenId(message.FarmerID),
                             model: model,
@@ -420,7 +420,7 @@ namespace StardewModdingAPI.Framework
             }
 
             // get data to send
-            ModMessageModel model = new ModMessageModel(
+            ModMessageModel model = new(
                 fromPlayerID: Game1.player.UniqueMultiplayerID,
                 fromModID: fromModID,
                 toModIDs: toModIDs,
@@ -513,7 +513,7 @@ namespace StardewModdingAPI.Framework
             // forward to other players
             if (Context.IsMainPlayer && playerIDs.Any(p => p != Game1.player.UniqueMultiplayerID))
             {
-                ModMessageModel newModel = new ModMessageModel(model);
+                ModMessageModel newModel = new(model);
                 foreach (long playerID in playerIDs)
                 {
                     if (playerID != Game1.player.UniqueMultiplayerID && playerID != model.FromPlayerID && this.Peers.TryGetValue(playerID, out MultiplayerPeer peer))
@@ -544,7 +544,7 @@ namespace StardewModdingAPI.Framework
         /// <summary>Get the fields to include in a context sync message sent to other players.</summary>
         private object[] GetContextSyncMessageFields()
         {
-            RemoteContextModel model = new RemoteContextModel
+            RemoteContextModel model = new()
             {
                 IsHost = Context.IsWorldReady && Context.IsMainPlayer,
                 Platform = Constants.TargetPlatform,
@@ -571,7 +571,7 @@ namespace StardewModdingAPI.Framework
             if (!peer.HasSmapi)
                 return new object[] { "{}" };
 
-            RemoteContextModel model = new RemoteContextModel
+            RemoteContextModel model = new()
             {
                 IsHost = peer.IsHost,
                 Platform = peer.Platform.Value,
diff --git a/src/SMAPI/Framework/Singleton.cs b/src/SMAPI/Framework/Singleton.cs
index 399a8bf0..1bf318c4 100644
--- a/src/SMAPI/Framework/Singleton.cs
+++ b/src/SMAPI/Framework/Singleton.cs
@@ -5,6 +5,6 @@ namespace StardewModdingAPI.Framework
     internal static class Singleton<T> where T : new()
     {
         /// <summary>The singleton instance.</summary>
-        public static T Instance { get; } = new T();
+        public static T Instance { get; } = new();
     }
 }
diff --git a/src/SMAPI/Framework/SnapshotListDiff.cs b/src/SMAPI/Framework/SnapshotListDiff.cs
index 2d0efa0d..1c3ebfba 100644
--- a/src/SMAPI/Framework/SnapshotListDiff.cs
+++ b/src/SMAPI/Framework/SnapshotListDiff.cs
@@ -11,10 +11,10 @@ namespace StardewModdingAPI.Framework
         ** Fields
         *********/
         /// <summary>The removed values.</summary>
-        private readonly List<T> RemovedImpl = new List<T>();
+        private readonly List<T> RemovedImpl = new();
 
         /// <summary>The added values.</summary>
-        private readonly List<T> AddedImpl = new List<T>();
+        private readonly List<T> AddedImpl = new();
 
 
         /*********
diff --git a/src/SMAPI/Framework/StateTracking/ChestTracker.cs b/src/SMAPI/Framework/StateTracking/ChestTracker.cs
index 65f58ee7..56aeeb3c 100644
--- a/src/SMAPI/Framework/StateTracking/ChestTracker.cs
+++ b/src/SMAPI/Framework/StateTracking/ChestTracker.cs
@@ -18,10 +18,10 @@ namespace StardewModdingAPI.Framework.StateTracking
         private readonly IDictionary<Item, int> StackSizes;
 
         /// <summary>Items added since the last update.</summary>
-        private readonly HashSet<Item> Added = new HashSet<Item>(new ObjectReferenceComparer<Item>());
+        private readonly HashSet<Item> Added = new(new ObjectReferenceComparer<Item>());
 
         /// <summary>Items removed since the last update.</summary>
-        private readonly HashSet<Item> Removed = new HashSet<Item>(new ObjectReferenceComparer<Item>());
+        private readonly HashSet<Item> Removed = new(new ObjectReferenceComparer<Item>());
 
         /// <summary>The underlying inventory watcher.</summary>
         private readonly ICollectionWatcher<Item> InventoryWatcher;
diff --git a/src/SMAPI/Framework/StateTracking/FieldWatchers/ComparableListWatcher.cs b/src/SMAPI/Framework/StateTracking/FieldWatchers/ComparableListWatcher.cs
index 32ec8c7e..256370ce 100644
--- a/src/SMAPI/Framework/StateTracking/FieldWatchers/ComparableListWatcher.cs
+++ b/src/SMAPI/Framework/StateTracking/FieldWatchers/ComparableListWatcher.cs
@@ -17,10 +17,10 @@ namespace StardewModdingAPI.Framework.StateTracking.FieldWatchers
         private HashSet<TValue> LastValues;
 
         /// <summary>The pairs added since the last reset.</summary>
-        private readonly List<TValue> AddedImpl = new List<TValue>();
+        private readonly List<TValue> AddedImpl = new();
 
         /// <summary>The pairs removed since the last reset.</summary>
-        private readonly List<TValue> RemovedImpl = new List<TValue>();
+        private readonly List<TValue> RemovedImpl = new();
 
 
         /*********
diff --git a/src/SMAPI/Framework/StateTracking/FieldWatchers/ImmutableCollectionWatcher.cs b/src/SMAPI/Framework/StateTracking/FieldWatchers/ImmutableCollectionWatcher.cs
index 009e0282..84340fbf 100644
--- a/src/SMAPI/Framework/StateTracking/FieldWatchers/ImmutableCollectionWatcher.cs
+++ b/src/SMAPI/Framework/StateTracking/FieldWatchers/ImmutableCollectionWatcher.cs
@@ -11,7 +11,7 @@ namespace StardewModdingAPI.Framework.StateTracking.FieldWatchers
         ** Accessors
         *********/
         /// <summary>A singleton collection watcher instance.</summary>
-        public static ImmutableCollectionWatcher<TValue> Instance { get; } = new ImmutableCollectionWatcher<TValue>();
+        public static ImmutableCollectionWatcher<TValue> Instance { get; } = new();
 
         /// <summary>Whether the collection changed since the last reset.</summary>
         public bool IsChanged { get; } = false;
diff --git a/src/SMAPI/Framework/StateTracking/FieldWatchers/NetCollectionWatcher.cs b/src/SMAPI/Framework/StateTracking/FieldWatchers/NetCollectionWatcher.cs
index 21e84c47..676c9fb4 100644
--- a/src/SMAPI/Framework/StateTracking/FieldWatchers/NetCollectionWatcher.cs
+++ b/src/SMAPI/Framework/StateTracking/FieldWatchers/NetCollectionWatcher.cs
@@ -15,10 +15,10 @@ namespace StardewModdingAPI.Framework.StateTracking.FieldWatchers
         private readonly NetCollection<TValue> Field;
 
         /// <summary>The pairs added since the last reset.</summary>
-        private readonly List<TValue> AddedImpl = new List<TValue>();
+        private readonly List<TValue> AddedImpl = new();
 
         /// <summary>The pairs removed since the last reset.</summary>
-        private readonly List<TValue> RemovedImpl = new List<TValue>();
+        private readonly List<TValue> RemovedImpl = new();
 
 
         /*********
diff --git a/src/SMAPI/Framework/StateTracking/FieldWatchers/ObservableCollectionWatcher.cs b/src/SMAPI/Framework/StateTracking/FieldWatchers/ObservableCollectionWatcher.cs
index c29d2783..3e9fa8b1 100644
--- a/src/SMAPI/Framework/StateTracking/FieldWatchers/ObservableCollectionWatcher.cs
+++ b/src/SMAPI/Framework/StateTracking/FieldWatchers/ObservableCollectionWatcher.cs
@@ -16,13 +16,13 @@ namespace StardewModdingAPI.Framework.StateTracking.FieldWatchers
         private readonly ObservableCollection<TValue> Field;
 
         /// <summary>The pairs added since the last reset.</summary>
-        private readonly List<TValue> AddedImpl = new List<TValue>();
+        private readonly List<TValue> AddedImpl = new();
 
         /// <summary>The pairs removed since the last reset.</summary>
-        private readonly List<TValue> RemovedImpl = new List<TValue>();
+        private readonly List<TValue> RemovedImpl = new();
 
         /// <summary>The previous values as of the last update.</summary>
-        private readonly List<TValue> PreviousValues = new List<TValue>();
+        private readonly List<TValue> PreviousValues = new();
 
 
         /*********
diff --git a/src/SMAPI/Framework/StateTracking/LocationTracker.cs b/src/SMAPI/Framework/StateTracking/LocationTracker.cs
index 748e4ecc..f86f86ee 100644
--- a/src/SMAPI/Framework/StateTracking/LocationTracker.cs
+++ b/src/SMAPI/Framework/StateTracking/LocationTracker.cs
@@ -19,7 +19,7 @@ namespace StardewModdingAPI.Framework.StateTracking
         ** Fields
         *********/
         /// <summary>The underlying watchers.</summary>
-        private readonly List<IWatcher> Watchers = new List<IWatcher>();
+        private readonly List<IWatcher> Watchers = new();
 
 
         /*********
diff --git a/src/SMAPI/Framework/StateTracking/PlayerTracker.cs b/src/SMAPI/Framework/StateTracking/PlayerTracker.cs
index cf49a7c1..3d470b5c 100644
--- a/src/SMAPI/Framework/StateTracking/PlayerTracker.cs
+++ b/src/SMAPI/Framework/StateTracking/PlayerTracker.cs
@@ -24,7 +24,7 @@ namespace StardewModdingAPI.Framework.StateTracking
         private GameLocation LastValidLocation;
 
         /// <summary>The underlying watchers.</summary>
-        private readonly List<IWatcher> Watchers = new List<IWatcher>();
+        private readonly List<IWatcher> Watchers = new();
 
 
         /*********
diff --git a/src/SMAPI/Framework/StateTracking/Snapshots/LocationSnapshot.cs b/src/SMAPI/Framework/StateTracking/Snapshots/LocationSnapshot.cs
index 6c9cc4f5..2563d10c 100644
--- a/src/SMAPI/Framework/StateTracking/Snapshots/LocationSnapshot.cs
+++ b/src/SMAPI/Framework/StateTracking/Snapshots/LocationSnapshot.cs
@@ -17,25 +17,25 @@ namespace StardewModdingAPI.Framework.StateTracking.Snapshots
         public GameLocation Location { get; }
 
         /// <summary>Tracks added or removed buildings.</summary>
-        public SnapshotListDiff<Building> Buildings { get; } = new SnapshotListDiff<Building>();
+        public SnapshotListDiff<Building> Buildings { get; } = new();
 
         /// <summary>Tracks added or removed debris.</summary>
-        public SnapshotListDiff<Debris> Debris { get; } = new SnapshotListDiff<Debris>();
+        public SnapshotListDiff<Debris> Debris { get; } = new();
 
         /// <summary>Tracks added or removed large terrain features.</summary>
-        public SnapshotListDiff<LargeTerrainFeature> LargeTerrainFeatures { get; } = new SnapshotListDiff<LargeTerrainFeature>();
+        public SnapshotListDiff<LargeTerrainFeature> LargeTerrainFeatures { get; } = new();
 
         /// <summary>Tracks added or removed NPCs.</summary>
-        public SnapshotListDiff<NPC> Npcs { get; } = new SnapshotListDiff<NPC>();
+        public SnapshotListDiff<NPC> Npcs { get; } = new();
 
         /// <summary>Tracks added or removed objects.</summary>
-        public SnapshotListDiff<KeyValuePair<Vector2, Object>> Objects { get; } = new SnapshotListDiff<KeyValuePair<Vector2, Object>>();
+        public SnapshotListDiff<KeyValuePair<Vector2, Object>> Objects { get; } = new();
 
         /// <summary>Tracks added or removed terrain features.</summary>
-        public SnapshotListDiff<KeyValuePair<Vector2, TerrainFeature>> TerrainFeatures { get; } = new SnapshotListDiff<KeyValuePair<Vector2, TerrainFeature>>();
+        public SnapshotListDiff<KeyValuePair<Vector2, TerrainFeature>> TerrainFeatures { get; } = new();
 
         /// <summary>Tracks added or removed furniture.</summary>
-        public SnapshotListDiff<Furniture> Furniture { get; } = new SnapshotListDiff<Furniture>();
+        public SnapshotListDiff<Furniture> Furniture { get; } = new();
 
         /// <summary>Tracks changed chest inventories.</summary>
         public IDictionary<Chest, SnapshotItemListDiff> ChestItems { get; } = new Dictionary<Chest, SnapshotItemListDiff>();
diff --git a/src/SMAPI/Framework/StateTracking/Snapshots/PlayerSnapshot.cs b/src/SMAPI/Framework/StateTracking/Snapshots/PlayerSnapshot.cs
index 72f45a87..f3e42948 100644
--- a/src/SMAPI/Framework/StateTracking/Snapshots/PlayerSnapshot.cs
+++ b/src/SMAPI/Framework/StateTracking/Snapshots/PlayerSnapshot.cs
@@ -14,7 +14,7 @@ namespace StardewModdingAPI.Framework.StateTracking.Snapshots
         ** Fields
         *********/
         /// <summary>An empty item list diff.</summary>
-        private readonly SnapshotItemListDiff EmptyItemListDiff = new SnapshotItemListDiff(Array.Empty<Item>(), Array.Empty<Item>(), Array.Empty<ItemStackSizeChange>());
+        private readonly SnapshotItemListDiff EmptyItemListDiff = new(Array.Empty<Item>(), Array.Empty<Item>(), Array.Empty<ItemStackSizeChange>());
 
 
         /*********
@@ -24,7 +24,7 @@ namespace StardewModdingAPI.Framework.StateTracking.Snapshots
         public Farmer Player { get; }
 
         /// <summary>The player's current location.</summary>
-        public SnapshotDiff<GameLocation> Location { get; } = new SnapshotDiff<GameLocation>();
+        public SnapshotDiff<GameLocation> Location { get; } = new();
 
         /// <summary>Tracks changes to the player's skill levels.</summary>
         public IDictionary<SkillType, SnapshotDiff<int>> Skills { get; } =
diff --git a/src/SMAPI/Framework/StateTracking/Snapshots/WatcherSnapshot.cs b/src/SMAPI/Framework/StateTracking/Snapshots/WatcherSnapshot.cs
index cf51e040..afea7fb4 100644
--- a/src/SMAPI/Framework/StateTracking/Snapshots/WatcherSnapshot.cs
+++ b/src/SMAPI/Framework/StateTracking/Snapshots/WatcherSnapshot.cs
@@ -11,31 +11,31 @@ namespace StardewModdingAPI.Framework.StateTracking.Snapshots
         ** Accessors
         *********/
         /// <summary>Tracks changes to the window size.</summary>
-        public SnapshotDiff<Point> WindowSize { get; } = new SnapshotDiff<Point>();
+        public SnapshotDiff<Point> WindowSize { get; } = new();
 
         /// <summary>Tracks changes to the current player.</summary>
         public PlayerSnapshot CurrentPlayer { get; private set; }
 
         /// <summary>Tracks changes to the time of day (in 24-hour military format).</summary>
-        public SnapshotDiff<int> Time { get; } = new SnapshotDiff<int>();
+        public SnapshotDiff<int> Time { get; } = new();
 
         /// <summary>Tracks changes to the save ID.</summary>
-        public SnapshotDiff<ulong> SaveID { get; } = new SnapshotDiff<ulong>();
+        public SnapshotDiff<ulong> SaveID { get; } = new();
 
         /// <summary>Tracks changes to the game's locations.</summary>
-        public WorldLocationsSnapshot Locations { get; } = new WorldLocationsSnapshot();
+        public WorldLocationsSnapshot Locations { get; } = new();
 
         /// <summary>Tracks changes to <see cref="Game1.activeClickableMenu"/>.</summary>
-        public SnapshotDiff<IClickableMenu> ActiveMenu { get; } = new SnapshotDiff<IClickableMenu>();
+        public SnapshotDiff<IClickableMenu> ActiveMenu { get; } = new();
 
         /// <summary>Tracks changes to the cursor position.</summary>
-        public SnapshotDiff<ICursorPosition> Cursor { get; } = new SnapshotDiff<ICursorPosition>();
+        public SnapshotDiff<ICursorPosition> Cursor { get; } = new();
 
         /// <summary>Tracks changes to the mouse wheel scroll.</summary>
-        public SnapshotDiff<int> MouseWheelScroll { get; } = new SnapshotDiff<int>();
+        public SnapshotDiff<int> MouseWheelScroll { get; } = new();
 
         /// <summary>Tracks changes to the content locale.</summary>
-        public SnapshotDiff<LocalizedContentManager.LanguageCode> Locale { get; } = new SnapshotDiff<LocalizedContentManager.LanguageCode>();
+        public SnapshotDiff<LocalizedContentManager.LanguageCode> Locale { get; } = new();
 
 
         /*********
diff --git a/src/SMAPI/Framework/StateTracking/Snapshots/WorldLocationsSnapshot.cs b/src/SMAPI/Framework/StateTracking/Snapshots/WorldLocationsSnapshot.cs
index 73ed2d8f..7dee09ca 100644
--- a/src/SMAPI/Framework/StateTracking/Snapshots/WorldLocationsSnapshot.cs
+++ b/src/SMAPI/Framework/StateTracking/Snapshots/WorldLocationsSnapshot.cs
@@ -12,14 +12,14 @@ namespace StardewModdingAPI.Framework.StateTracking.Snapshots
         ** Fields
         *********/
         /// <summary>A map of tracked locations.</summary>
-        private readonly Dictionary<GameLocation, LocationSnapshot> LocationsDict = new Dictionary<GameLocation, LocationSnapshot>(new ObjectReferenceComparer<GameLocation>());
+        private readonly Dictionary<GameLocation, LocationSnapshot> LocationsDict = new(new ObjectReferenceComparer<GameLocation>());
 
 
         /*********
         ** Accessors
         *********/
         /// <summary>Tracks changes to the location list.</summary>
-        public SnapshotListDiff<GameLocation> LocationList { get; } = new SnapshotListDiff<GameLocation>();
+        public SnapshotListDiff<GameLocation> LocationList { get; } = new();
 
         /// <summary>The tracked locations.</summary>
         public IEnumerable<LocationSnapshot> Locations => this.LocationsDict.Values;
diff --git a/src/SMAPI/Framework/TemporaryHacks/MiniMonoModHotfix.cs b/src/SMAPI/Framework/TemporaryHacks/MiniMonoModHotfix.cs
index 173438f1..cab1a94c 100644
--- a/src/SMAPI/Framework/TemporaryHacks/MiniMonoModHotfix.cs
+++ b/src/SMAPI/Framework/TemporaryHacks/MiniMonoModHotfix.cs
@@ -55,7 +55,7 @@ namespace MonoMod.Utils
             .GetType("System.RuntimeType+RuntimeTypeCache")
             ?.GetMethod("GetPropertyList", BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance);
 
-        private static readonly ConditionalWeakTable<Type, CacheFixEntry> _CacheFixed = new ConditionalWeakTable<Type, CacheFixEntry>();
+        private static readonly ConditionalWeakTable<Type, CacheFixEntry> _CacheFixed = new();
 
         public static void Apply()
         {
@@ -144,7 +144,7 @@ namespace MonoMod.Utils
                     continue;
 
                 CacheFixEntry entry = _CacheFixed.GetValue(type, rt => {
-                    CacheFixEntry entryNew = new CacheFixEntry();
+                    CacheFixEntry entryNew = new();
                     object cache;
                     Array properties, fields;
 
diff --git a/src/SMAPI/Framework/WatcherCore.cs b/src/SMAPI/Framework/WatcherCore.cs
index 62a0c3b8..a1612e75 100644
--- a/src/SMAPI/Framework/WatcherCore.cs
+++ b/src/SMAPI/Framework/WatcherCore.cs
@@ -17,7 +17,7 @@ namespace StardewModdingAPI.Framework
         ** Fields
         *********/
         /// <summary>The underlying watchers for convenience. These are accessible individually as separate properties.</summary>
-        private readonly List<IWatcher> Watchers = new List<IWatcher>();
+        private readonly List<IWatcher> Watchers = new();
 
 
         /*********
diff --git a/src/SMAPI/Program.cs b/src/SMAPI/Program.cs
index f2f65287..29f4be1b 100644
--- a/src/SMAPI/Program.cs
+++ b/src/SMAPI/Program.cs
@@ -199,7 +199,7 @@ namespace StardewModdingAPI
             }
 
             // load SMAPI
-            using SCore core = new SCore(modsPath, writeToConsole);
+            using SCore core = new(modsPath, writeToConsole);
             core.RunInteractively();
         }
 
-- 
cgit 


From 077d8e4f401ad1806c6af0540f432366314a2300 Mon Sep 17 00:00:00 2001
From: Jesse Plamondon-Willard <Pathoschild@users.noreply.github.com>
Date: Wed, 6 Apr 2022 18:25:00 -0400
Subject: remove some unused/redundant code

---
 src/SMAPI.Installer/InteractiveInstaller.cs        |  2 +-
 src/SMAPI.Internal/ExceptionHelper.cs              | 11 +------
 .../Framework/DiagnosticVerifier.cs                |  2 +-
 .../NetFieldAnalyzer.cs                            |  3 --
 .../ObsoleteFieldAnalyzer.cs                       |  2 +-
 .../Framework/Commands/ConsoleCommand.cs           |  2 +-
 .../Commands/Other/ApplySaveFixCommand.cs          |  2 ++
 .../Framework/Commands/Other/DebugCommand.cs       |  4 ++-
 .../Framework/Commands/Other/RegenerateBundles.cs  |  2 ++
 .../Commands/Other/ShowDataFilesCommand.cs         |  4 ++-
 .../Commands/Other/ShowGameFilesCommand.cs         |  2 ++
 .../Framework/Commands/Other/TestInputCommand.cs   |  6 ++--
 .../Commands/Player/ListItemTypesCommand.cs        |  4 ++-
 .../Framework/Commands/Player/ListItemsCommand.cs  |  2 ++
 .../Framework/Commands/Player/SetColorCommand.cs   |  2 ++
 .../Commands/Player/SetFarmTypeCommand.cs          |  2 ++
 .../Framework/Commands/Player/SetHealthCommand.cs  |  2 ++
 .../Commands/Player/SetImmunityCommand.cs          |  4 ++-
 .../Commands/Player/SetMaxHealthCommand.cs         |  4 ++-
 .../Commands/Player/SetMaxStaminaCommand.cs        |  4 ++-
 .../Framework/Commands/Player/SetMoneyCommand.cs   |  2 ++
 .../Framework/Commands/Player/SetNameCommand.cs    |  2 ++
 .../Framework/Commands/Player/SetStaminaCommand.cs |  2 ++
 .../Framework/Commands/Player/SetStyleCommand.cs   |  2 ++
 .../Framework/Commands/World/ClearCommand.cs       | 12 ++++---
 .../Commands/World/DownMineLevelCommand.cs         |  2 ++
 .../Framework/Commands/World/HurryAllCommand.cs    |  2 ++
 .../Framework/Commands/World/SetDayCommand.cs      |  4 ++-
 .../Commands/World/SetMineLevelCommand.cs          |  2 ++
 .../Framework/Commands/World/SetSeasonCommand.cs   |  2 ++
 .../Framework/Commands/World/SetTimeCommand.cs     |  2 ++
 .../Framework/Commands/World/SetYearCommand.cs     |  4 ++-
 .../Framework/ItemData/SearchableItem.cs           | 10 ------
 .../Framework/ItemRepository.cs                    |  2 +-
 .../Patches/SaveGamePatcher.cs                     |  2 +-
 src/SMAPI.Mods.SaveBackup/ModEntry.cs              |  6 ++--
 src/SMAPI.Tests.ModApiConsumer/ApiConsumer.cs      |  4 +--
 src/SMAPI.Tests/Core/AssetNameTests.cs             |  4 +--
 src/SMAPI.Tests/Core/ModResolverTests.cs           | 14 ++++----
 .../WikiClient/ChangeDescriptorTests.cs            |  1 -
 .../Framework/Clients/Wiki/WikiClient.cs           |  2 +-
 src/SMAPI.Toolkit/Framework/ModData/ModDatabase.cs |  2 +-
 .../Controllers/JsonValidatorController.cs         | 11 +++----
 .../Framework/Caching/Mods/IModCacheRepository.cs  |  1 -
 .../Caching/Mods/ModCacheMemoryRepository.cs       |  1 -
 src/SMAPI.Web/Framework/LogParsing/LogParser.cs    |  2 +-
 src/SMAPI.Web/Framework/ModInfoModel.cs            |  2 --
 .../RedirectRules/RedirectHostsToUrlsRule.cs       |  2 --
 .../Framework/RedirectRules/RedirectToHttpsRule.cs |  2 +-
 src/SMAPI.Web/Startup.cs                           |  2 +-
 src/SMAPI.Web/Views/LogParser/Index.cshtml         |  6 ++--
 src/SMAPI.Web/wwwroot/Content/css/file-upload.css  |  2 +-
 src/SMAPI/Constants.cs                             |  3 --
 src/SMAPI/Framework/CommandManager.cs              |  2 +-
 src/SMAPI/Framework/Content/AssetDataForMap.cs     |  2 +-
 src/SMAPI/Framework/Content/AssetName.cs           |  2 +-
 src/SMAPI/Framework/Content/TilesheetReference.cs  |  1 -
 .../ContentManagers/BaseContentManager.cs          |  2 +-
 .../Framework/ContentManagers/ModContentManager.cs |  2 +-
 src/SMAPI/Framework/Input/SInputState.cs           |  2 +-
 src/SMAPI/Framework/InternalExtensions.cs          |  1 -
 .../Framework/ModHelpers/ModRegistryHelper.cs      |  2 +-
 src/SMAPI/Framework/ModLoading/AssemblyLoader.cs   |  4 +--
 src/SMAPI/Framework/ModLoading/ModResolver.cs      |  2 +-
 src/SMAPI/Framework/ModRegistry.cs                 |  2 --
 src/SMAPI/Framework/Monitor.cs                     |  2 +-
 src/SMAPI/Framework/SCore.cs                       | 16 ++++-----
 src/SMAPI/Framework/SMultiplayer.cs                | 38 +++++++++++-----------
 .../Framework/Serialization/KeybindConverter.cs    |  2 +-
 .../StateTracking/Snapshots/PlayerSnapshot.cs      |  2 +-
 .../Framework/TemporaryHacks/MiniMonoModHotfix.cs  |  2 +-
 src/SMAPI/Program.cs                               |  2 +-
 src/SMAPI/Translation.cs                           |  2 +-
 src/SMAPI/Utilities/PerScreen.cs                   |  2 +-
 74 files changed, 143 insertions(+), 134 deletions(-)

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

diff --git a/src/SMAPI.Installer/InteractiveInstaller.cs b/src/SMAPI.Installer/InteractiveInstaller.cs
index 49ca80a5..09183b5d 100644
--- a/src/SMAPI.Installer/InteractiveInstaller.cs
+++ b/src/SMAPI.Installer/InteractiveInstaller.cs
@@ -562,7 +562,7 @@ namespace StardewModdingApi.Installer
             {
                 try
                 {
-                    FileUtilities.ForceDelete(Directory.Exists(path) ? new DirectoryInfo(path) : (FileSystemInfo)new FileInfo(path));
+                    FileUtilities.ForceDelete(Directory.Exists(path) ? new DirectoryInfo(path) : new FileInfo(path));
                     break;
                 }
                 catch (Exception ex)
diff --git a/src/SMAPI.Internal/ExceptionHelper.cs b/src/SMAPI.Internal/ExceptionHelper.cs
index 03d48911..6bd1d579 100644
--- a/src/SMAPI.Internal/ExceptionHelper.cs
+++ b/src/SMAPI.Internal/ExceptionHelper.cs
@@ -25,7 +25,7 @@ namespace StardewModdingAPI.Internal
 
                     case ReflectionTypeLoadException ex:
                         string summary = ex.ToString();
-                        foreach (Exception childEx in ex.LoaderExceptions ?? Array.Empty<Exception>())
+                        foreach (Exception childEx in ex.LoaderExceptions)
                             summary += $"\n\n{childEx?.GetLogSummary()}";
                         message = summary;
                         break;
@@ -43,15 +43,6 @@ namespace StardewModdingAPI.Internal
             }
         }
 
-        /// <summary>Get the lowest exception in an exception stack.</summary>
-        /// <param name="exception">The exception from which to search.</param>
-        public static Exception GetInnermostException(this Exception exception)
-        {
-            while (exception.InnerException != null)
-                exception = exception.InnerException;
-            return exception;
-        }
-
         /// <summary>Simplify common patterns in exception log messages that don't convey useful info.</summary>
         /// <param name="message">The log message to simplify.</param>
         public static string SimplifyExtensionMessage(string message)
diff --git a/src/SMAPI.ModBuildConfig.Analyzer.Tests/Framework/DiagnosticVerifier.cs b/src/SMAPI.ModBuildConfig.Analyzer.Tests/Framework/DiagnosticVerifier.cs
index edaaabd4..49697dfa 100644
--- a/src/SMAPI.ModBuildConfig.Analyzer.Tests/Framework/DiagnosticVerifier.cs
+++ b/src/SMAPI.ModBuildConfig.Analyzer.Tests/Framework/DiagnosticVerifier.cs
@@ -201,7 +201,7 @@ namespace SMAPI.ModBuildConfig.Analyzer.Tests.Framework
             var builder = new StringBuilder();
             for (int i = 0; i < diagnostics.Length; ++i)
             {
-                builder.AppendLine("// " + diagnostics[i].ToString());
+                builder.AppendLine("// " + diagnostics[i]);
 
                 var analyzerType = analyzer.GetType();
                 var rules = analyzer.SupportedDiagnostics;
diff --git a/src/SMAPI.ModBuildConfig.Analyzer/NetFieldAnalyzer.cs b/src/SMAPI.ModBuildConfig.Analyzer/NetFieldAnalyzer.cs
index 8478dc54..553aae99 100644
--- a/src/SMAPI.ModBuildConfig.Analyzer/NetFieldAnalyzer.cs
+++ b/src/SMAPI.ModBuildConfig.Analyzer/NetFieldAnalyzer.cs
@@ -227,10 +227,7 @@ namespace StardewModdingAPI.ModBuildConfig.Analyzer
 
                 // warn: implicit conversion
                 if (this.IsInvalidConversion(memberType.Type, memberType.ConvertedType))
-                {
                     context.ReportDiagnostic(Diagnostic.Create(this.AvoidImplicitNetFieldCastRule, context.Node.GetLocation(), context.Node, memberType.Type.Name, memberType.ConvertedType));
-                    return;
-                }
             });
         }
 
diff --git a/src/SMAPI.ModBuildConfig.Analyzer/ObsoleteFieldAnalyzer.cs b/src/SMAPI.ModBuildConfig.Analyzer/ObsoleteFieldAnalyzer.cs
index 3184147a..ba089513 100644
--- a/src/SMAPI.ModBuildConfig.Analyzer/ObsoleteFieldAnalyzer.cs
+++ b/src/SMAPI.ModBuildConfig.Analyzer/ObsoleteFieldAnalyzer.cs
@@ -77,7 +77,7 @@ namespace StardewModdingAPI.ModBuildConfig.Analyzer
             try
             {
                 // get reference info
-                if (!AnalyzerUtilities.TryGetMemberInfo(context.Node, context.SemanticModel, out ITypeSymbol declaringType, out TypeInfo memberType, out string memberName))
+                if (!AnalyzerUtilities.TryGetMemberInfo(context.Node, context.SemanticModel, out ITypeSymbol declaringType, out _, out string memberName))
                     return;
 
                 // suggest replacement
diff --git a/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/ConsoleCommand.cs b/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/ConsoleCommand.cs
index 01cab92e..44b7824e 100644
--- a/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/ConsoleCommand.cs
+++ b/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/ConsoleCommand.cs
@@ -100,7 +100,7 @@ namespace StardewModdingAPI.Mods.ConsoleCommands.Framework.Commands
             List<string[]> lines = new List<string[]>(rows.Length + 2)
             {
                 header,
-                header.Select((value, i) => "".PadRight(widths[i], '-')).ToArray()
+                header.Select((_, i) => "".PadRight(widths[i], '-')).ToArray()
             };
             lines.AddRange(rows);
 
diff --git a/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Other/ApplySaveFixCommand.cs b/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Other/ApplySaveFixCommand.cs
index 957b0e75..b02ba4b1 100644
--- a/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Other/ApplySaveFixCommand.cs
+++ b/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Other/ApplySaveFixCommand.cs
@@ -1,10 +1,12 @@
 using System;
 using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
 using StardewValley;
 
 namespace StardewModdingAPI.Mods.ConsoleCommands.Framework.Commands.Other
 {
     /// <summary>A command which runs one of the game's save migrations.</summary>
+    [SuppressMessage("ReSharper", "UnusedMember.Global", Justification = "Loaded using reflection")]
     internal class ApplySaveFixCommand : ConsoleCommand
     {
         /*********
diff --git a/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Other/DebugCommand.cs b/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Other/DebugCommand.cs
index 1955c14e..cf1dcbce 100644
--- a/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Other/DebugCommand.cs
+++ b/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Other/DebugCommand.cs
@@ -1,8 +1,10 @@
-using StardewValley;
+using System.Diagnostics.CodeAnalysis;
+using StardewValley;
 
 namespace StardewModdingAPI.Mods.ConsoleCommands.Framework.Commands.Other
 {
     /// <summary>A command which sends a debug command to the game.</summary>
+    [SuppressMessage("ReSharper", "UnusedMember.Global", Justification = "Loaded using reflection")]
     internal class DebugCommand : ConsoleCommand
     {
         /*********
diff --git a/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Other/RegenerateBundles.cs b/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Other/RegenerateBundles.cs
index 9beedb96..159d7c4a 100644
--- a/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Other/RegenerateBundles.cs
+++ b/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Other/RegenerateBundles.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using System.Reflection;
 using Netcode;
@@ -9,6 +10,7 @@ using StardewValley.Network;
 namespace StardewModdingAPI.Mods.ConsoleCommands.Framework.Commands.Other
 {
     /// <summary>A command which regenerates the game's bundles.</summary>
+    [SuppressMessage("ReSharper", "UnusedMember.Global", Justification = "Loaded using reflection")]
     internal class RegenerateBundlesCommand : ConsoleCommand
     {
         /*********
diff --git a/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Other/ShowDataFilesCommand.cs b/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Other/ShowDataFilesCommand.cs
index 27f6ce53..a233d588 100644
--- a/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Other/ShowDataFilesCommand.cs
+++ b/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Other/ShowDataFilesCommand.cs
@@ -1,8 +1,10 @@
-using System.Diagnostics;
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
 
 namespace StardewModdingAPI.Mods.ConsoleCommands.Framework.Commands.Other
 {
     /// <summary>A command which shows the data files.</summary>
+    [SuppressMessage("ReSharper", "UnusedMember.Global", Justification = "Loaded using reflection")]
     internal class ShowDataFilesCommand : ConsoleCommand
     {
         /*********
diff --git a/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Other/ShowGameFilesCommand.cs b/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Other/ShowGameFilesCommand.cs
index b97cb3e6..745b821b 100644
--- a/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Other/ShowGameFilesCommand.cs
+++ b/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Other/ShowGameFilesCommand.cs
@@ -1,8 +1,10 @@
 using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
 
 namespace StardewModdingAPI.Mods.ConsoleCommands.Framework.Commands.Other
 {
     /// <summary>A command which shows the game files.</summary>
+    [SuppressMessage("ReSharper", "UnusedMember.Global", Justification = "Loaded using reflection")]
     internal class ShowGameFilesCommand : ConsoleCommand
     {
         /*********
diff --git a/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Other/TestInputCommand.cs b/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Other/TestInputCommand.cs
index 46583dc3..8bf9f5db 100644
--- a/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Other/TestInputCommand.cs
+++ b/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Other/TestInputCommand.cs
@@ -1,8 +1,10 @@
 using System;
+using System.Diagnostics.CodeAnalysis;
 
 namespace StardewModdingAPI.Mods.ConsoleCommands.Framework.Commands.Other
 {
     /// <summary>A command which logs the keys being pressed for 30 seconds once enabled.</summary>
+    [SuppressMessage("ReSharper", "UnusedMember.Global", Justification = "Loaded using reflection")]
     internal class TestInputCommand : ConsoleCommand
     {
         /*********
@@ -37,9 +39,7 @@ namespace StardewModdingAPI.Mods.ConsoleCommands.Framework.Commands.Other
         public override void OnUpdated(IMonitor monitor)
         {
             // handle expiry
-            if (this.ExpiryTicks == null)
-                return;
-            if (this.ExpiryTicks <= DateTime.UtcNow.Ticks)
+            if (this.ExpiryTicks != null && this.ExpiryTicks <= DateTime.UtcNow.Ticks)
             {
                 monitor.Log("No longer logging input.", LogLevel.Info);
                 this.ExpiryTicks = null;
diff --git a/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Player/ListItemTypesCommand.cs b/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Player/ListItemTypesCommand.cs
index af362bcd..ef35ad19 100644
--- a/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Player/ListItemTypesCommand.cs
+++ b/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Player/ListItemTypesCommand.cs
@@ -1,9 +1,11 @@
-using System.Linq;
+using System.Diagnostics.CodeAnalysis;
+using System.Linq;
 using StardewModdingAPI.Mods.ConsoleCommands.Framework.ItemData;
 
 namespace StardewModdingAPI.Mods.ConsoleCommands.Framework.Commands.Player
 {
     /// <summary>A command which list item types.</summary>
+    [SuppressMessage("ReSharper", "UnusedMember.Global", Justification = "Loaded using reflection")]
     internal class ListItemTypesCommand : ConsoleCommand
     {
         /*********
diff --git a/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Player/ListItemsCommand.cs b/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Player/ListItemsCommand.cs
index 46fc1d9d..5cc464fe 100644
--- a/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Player/ListItemsCommand.cs
+++ b/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Player/ListItemsCommand.cs
@@ -1,11 +1,13 @@
 using System;
 using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using StardewModdingAPI.Mods.ConsoleCommands.Framework.ItemData;
 
 namespace StardewModdingAPI.Mods.ConsoleCommands.Framework.Commands.Player
 {
     /// <summary>A command which list items available to spawn.</summary>
+    [SuppressMessage("ReSharper", "UnusedMember.Global", Justification = "Loaded using reflection")]
     internal class ListItemsCommand : ConsoleCommand
     {
         /*********
diff --git a/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Player/SetColorCommand.cs b/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Player/SetColorCommand.cs
index 7b7cbf83..af7f2d18 100644
--- a/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Player/SetColorCommand.cs
+++ b/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Player/SetColorCommand.cs
@@ -1,9 +1,11 @@
+using System.Diagnostics.CodeAnalysis;
 using Microsoft.Xna.Framework;
 using StardewValley;
 
 namespace StardewModdingAPI.Mods.ConsoleCommands.Framework.Commands.Player
 {
     /// <summary>A command which edits the color of a player feature.</summary>
+    [SuppressMessage("ReSharper", "UnusedMember.Global", Justification = "Loaded using reflection")]
     internal class SetColorCommand : ConsoleCommand
     {
         /*********
diff --git a/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Player/SetFarmTypeCommand.cs b/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Player/SetFarmTypeCommand.cs
index 6fb399ae..2809df9c 100644
--- a/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Player/SetFarmTypeCommand.cs
+++ b/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Player/SetFarmTypeCommand.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using System.Reflection;
 using System.Text;
@@ -10,6 +11,7 @@ using StardewValley.GameData;
 namespace StardewModdingAPI.Mods.ConsoleCommands.Framework.Commands.Player
 {
     /// <summary>A command which changes the player's farm type.</summary>
+    [SuppressMessage("ReSharper", "UnusedMember.Global", Justification = "Loaded using reflection")]
     internal class SetFarmTypeCommand : ConsoleCommand
     {
         /*********
diff --git a/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Player/SetHealthCommand.cs b/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Player/SetHealthCommand.cs
index f27b336f..f169159f 100644
--- a/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Player/SetHealthCommand.cs
+++ b/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Player/SetHealthCommand.cs
@@ -1,9 +1,11 @@
+using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using StardewValley;
 
 namespace StardewModdingAPI.Mods.ConsoleCommands.Framework.Commands.Player
 {
     /// <summary>A command which edits the player's current health.</summary>
+    [SuppressMessage("ReSharper", "UnusedMember.Global", Justification = "Loaded using reflection")]
     internal class SetHealthCommand : ConsoleCommand
     {
         /*********
diff --git a/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Player/SetImmunityCommand.cs b/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Player/SetImmunityCommand.cs
index df90adf2..1065bd21 100644
--- a/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Player/SetImmunityCommand.cs
+++ b/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Player/SetImmunityCommand.cs
@@ -1,9 +1,11 @@
-using System.Linq;
+using System.Diagnostics.CodeAnalysis;
+using System.Linq;
 using StardewValley;
 
 namespace StardewModdingAPI.Mods.ConsoleCommands.Framework.Commands.Player
 {
     /// <summary>A command which edits the player's current immunity.</summary>
+    [SuppressMessage("ReSharper", "UnusedMember.Global", Justification = "Loaded using reflection")]
     internal class SetImmunityCommand : ConsoleCommand
     {
         /*********
diff --git a/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Player/SetMaxHealthCommand.cs b/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Player/SetMaxHealthCommand.cs
index a5f7f444..c2c4931d 100644
--- a/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Player/SetMaxHealthCommand.cs
+++ b/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Player/SetMaxHealthCommand.cs
@@ -1,9 +1,11 @@
-using System.Linq;
+using System.Diagnostics.CodeAnalysis;
+using System.Linq;
 using StardewValley;
 
 namespace StardewModdingAPI.Mods.ConsoleCommands.Framework.Commands.Player
 {
     /// <summary>A command which edits the player's maximum health.</summary>
+    [SuppressMessage("ReSharper", "UnusedMember.Global", Justification = "Loaded using reflection")]
     internal class SetMaxHealthCommand : ConsoleCommand
     {
         /*********
diff --git a/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Player/SetMaxStaminaCommand.cs b/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Player/SetMaxStaminaCommand.cs
index e3c2f011..8c794e75 100644
--- a/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Player/SetMaxStaminaCommand.cs
+++ b/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Player/SetMaxStaminaCommand.cs
@@ -1,9 +1,11 @@
-using System.Linq;
+using System.Diagnostics.CodeAnalysis;
+using System.Linq;
 using StardewValley;
 
 namespace StardewModdingAPI.Mods.ConsoleCommands.Framework.Commands.Player
 {
     /// <summary>A command which edits the player's maximum stamina.</summary>
+    [SuppressMessage("ReSharper", "UnusedMember.Global", Justification = "Loaded using reflection")]
     internal class SetMaxStaminaCommand : ConsoleCommand
     {
         /*********
diff --git a/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Player/SetMoneyCommand.cs b/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Player/SetMoneyCommand.cs
index 787ce920..3afcc62b 100644
--- a/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Player/SetMoneyCommand.cs
+++ b/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Player/SetMoneyCommand.cs
@@ -1,9 +1,11 @@
+using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using StardewValley;
 
 namespace StardewModdingAPI.Mods.ConsoleCommands.Framework.Commands.Player
 {
     /// <summary>A command which edits the player's current money.</summary>
+    [SuppressMessage("ReSharper", "UnusedMember.Global", Justification = "Loaded using reflection")]
     internal class SetMoneyCommand : ConsoleCommand
     {
         /*********
diff --git a/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Player/SetNameCommand.cs b/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Player/SetNameCommand.cs
index 4911ad1c..12d6b6e8 100644
--- a/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Player/SetNameCommand.cs
+++ b/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Player/SetNameCommand.cs
@@ -1,8 +1,10 @@
+using System.Diagnostics.CodeAnalysis;
 using StardewValley;
 
 namespace StardewModdingAPI.Mods.ConsoleCommands.Framework.Commands.Player
 {
     /// <summary>A command which edits the player's name.</summary>
+    [SuppressMessage("ReSharper", "UnusedMember.Global", Justification = "Loaded using reflection")]
     internal class SetNameCommand : ConsoleCommand
     {
         /*********
diff --git a/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Player/SetStaminaCommand.cs b/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Player/SetStaminaCommand.cs
index c78378ef..24718ace 100644
--- a/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Player/SetStaminaCommand.cs
+++ b/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Player/SetStaminaCommand.cs
@@ -1,9 +1,11 @@
+using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using StardewValley;
 
 namespace StardewModdingAPI.Mods.ConsoleCommands.Framework.Commands.Player
 {
     /// <summary>A command which edits the player's current stamina.</summary>
+    [SuppressMessage("ReSharper", "UnusedMember.Global", Justification = "Loaded using reflection")]
     internal class SetStaminaCommand : ConsoleCommand
     {
         /*********
diff --git a/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Player/SetStyleCommand.cs b/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Player/SetStyleCommand.cs
index 98f6c330..558c327d 100644
--- a/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Player/SetStyleCommand.cs
+++ b/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Player/SetStyleCommand.cs
@@ -1,8 +1,10 @@
+using System.Diagnostics.CodeAnalysis;
 using StardewValley;
 
 namespace StardewModdingAPI.Mods.ConsoleCommands.Framework.Commands.Player
 {
     /// <summary>A command which edits a player style.</summary>
+    [SuppressMessage("ReSharper", "UnusedMember.Global", Justification = "Loaded using reflection")]
     internal class SetStyleCommand : ConsoleCommand
     {
         /*********
diff --git a/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/World/ClearCommand.cs b/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/World/ClearCommand.cs
index 7935b05f..eeb95553 100644
--- a/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/World/ClearCommand.cs
+++ b/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/World/ClearCommand.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using StardewValley;
 using StardewValley.Locations;
@@ -9,6 +10,7 @@ using SObject = StardewValley.Object;
 namespace StardewModdingAPI.Mods.ConsoleCommands.Framework.Commands.World
 {
     /// <summary>A command which clears in-game objects.</summary>
+    [SuppressMessage("ReSharper", "UnusedMember.Global", Justification = "Loaded using reflection")]
     internal class ClearCommand : ConsoleCommand
     {
         /*********
@@ -113,7 +115,7 @@ namespace StardewModdingAPI.Mods.ConsoleCommands.Framework.Commands.World
 
                 case "furniture":
                     {
-                        int removed = this.RemoveFurniture(location, furniture => true);
+                        int removed = this.RemoveFurniture(location, _ => true);
                         monitor.Log($"Done! Removed {removed} entities from {location.Name}.", LogLevel.Info);
                         break;
                     }
@@ -137,11 +139,11 @@ namespace StardewModdingAPI.Mods.ConsoleCommands.Framework.Commands.World
                     {
                         bool everything = type == "everything";
                         int removed =
-                            this.RemoveFurniture(location, p => true)
-                            + this.RemoveObjects(location, p => true)
-                            + this.RemoveTerrainFeatures(location, p => true)
+                            this.RemoveFurniture(location, _ => true)
+                            + this.RemoveObjects(location, _ => true)
+                            + this.RemoveTerrainFeatures(location, _ => true)
                             + this.RemoveLargeTerrainFeatures(location, p => everything || p is not Bush bush || bush.isDestroyable(location, p.currentTileLocation))
-                            + this.RemoveResourceClumps(location, p => true);
+                            + this.RemoveResourceClumps(location, _ => true);
                         monitor.Log($"Done! Removed {removed} entities from {location.Name}.", LogLevel.Info);
                         break;
                     }
diff --git a/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/World/DownMineLevelCommand.cs b/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/World/DownMineLevelCommand.cs
index 0aa9c9c3..5b1a4a13 100644
--- a/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/World/DownMineLevelCommand.cs
+++ b/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/World/DownMineLevelCommand.cs
@@ -1,9 +1,11 @@
+using System.Diagnostics.CodeAnalysis;
 using StardewValley;
 using StardewValley.Locations;
 
 namespace StardewModdingAPI.Mods.ConsoleCommands.Framework.Commands.World
 {
     /// <summary>A command which moves the player to the next mine level.</summary>
+    [SuppressMessage("ReSharper", "UnusedMember.Global", Justification = "Loaded using reflection")]
     internal class DownMineLevelCommand : ConsoleCommand
     {
         /*********
diff --git a/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/World/HurryAllCommand.cs b/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/World/HurryAllCommand.cs
index 2deac5f8..09531720 100644
--- a/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/World/HurryAllCommand.cs
+++ b/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/World/HurryAllCommand.cs
@@ -1,9 +1,11 @@
 using System;
+using System.Diagnostics.CodeAnalysis;
 using StardewValley;
 
 namespace StardewModdingAPI.Mods.ConsoleCommands.Framework.Commands.World
 {
     /// <summary>A command which immediately warps all NPCs to their scheduled positions. To hurry a single NPC, see <c>debug hurry npc-name</c> instead.</summary>
+    [SuppressMessage("ReSharper", "UnusedMember.Global", Justification = "Loaded using reflection")]
     internal class HurryAllCommand : ConsoleCommand
     {
         /*********
diff --git a/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/World/SetDayCommand.cs b/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/World/SetDayCommand.cs
index 4028b3dc..399fd934 100644
--- a/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/World/SetDayCommand.cs
+++ b/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/World/SetDayCommand.cs
@@ -1,10 +1,12 @@
-using System.Linq;
+using System.Diagnostics.CodeAnalysis;
+using System.Linq;
 using StardewModdingAPI.Utilities;
 using StardewValley;
 
 namespace StardewModdingAPI.Mods.ConsoleCommands.Framework.Commands.World
 {
     /// <summary>A command which sets the current day.</summary>
+    [SuppressMessage("ReSharper", "UnusedMember.Global", Justification = "Loaded using reflection")]
     internal class SetDayCommand : ConsoleCommand
     {
         /*********
diff --git a/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/World/SetMineLevelCommand.cs b/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/World/SetMineLevelCommand.cs
index 40f4b19f..f977fce3 100644
--- a/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/World/SetMineLevelCommand.cs
+++ b/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/World/SetMineLevelCommand.cs
@@ -1,9 +1,11 @@
 using System;
+using System.Diagnostics.CodeAnalysis;
 using StardewValley;
 
 namespace StardewModdingAPI.Mods.ConsoleCommands.Framework.Commands.World
 {
     /// <summary>A command which moves the player to the given mine level.</summary>
+    [SuppressMessage("ReSharper", "UnusedMember.Global", Justification = "Loaded using reflection")]
     internal class SetMineLevelCommand : ConsoleCommand
     {
         /*********
diff --git a/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/World/SetSeasonCommand.cs b/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/World/SetSeasonCommand.cs
index a4cb35bb..d839c037 100644
--- a/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/World/SetSeasonCommand.cs
+++ b/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/World/SetSeasonCommand.cs
@@ -1,3 +1,4 @@
+using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using StardewModdingAPI.Utilities;
 using StardewValley;
@@ -5,6 +6,7 @@ using StardewValley;
 namespace StardewModdingAPI.Mods.ConsoleCommands.Framework.Commands.World
 {
     /// <summary>A command which sets the current season.</summary>
+    [SuppressMessage("ReSharper", "UnusedMember.Global", Justification = "Loaded using reflection")]
     internal class SetSeasonCommand : ConsoleCommand
     {
         /*********
diff --git a/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/World/SetTimeCommand.cs b/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/World/SetTimeCommand.cs
index 2d4b4565..8c4458dd 100644
--- a/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/World/SetTimeCommand.cs
+++ b/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/World/SetTimeCommand.cs
@@ -1,3 +1,4 @@
+using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using Microsoft.Xna.Framework;
 using StardewValley;
@@ -5,6 +6,7 @@ using StardewValley;
 namespace StardewModdingAPI.Mods.ConsoleCommands.Framework.Commands.World
 {
     /// <summary>A command which sets the current time.</summary>
+    [SuppressMessage("ReSharper", "UnusedMember.Global", Justification = "Loaded using reflection")]
     internal class SetTimeCommand : ConsoleCommand
     {
         /*********
diff --git a/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/World/SetYearCommand.cs b/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/World/SetYearCommand.cs
index 95401962..a666a634 100644
--- a/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/World/SetYearCommand.cs
+++ b/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/World/SetYearCommand.cs
@@ -1,10 +1,12 @@
-using System.Linq;
+using System.Diagnostics.CodeAnalysis;
+using System.Linq;
 using StardewModdingAPI.Utilities;
 using StardewValley;
 
 namespace StardewModdingAPI.Mods.ConsoleCommands.Framework.Commands.World
 {
     /// <summary>A command which sets the current year.</summary>
+    [SuppressMessage("ReSharper", "UnusedMember.Global", Justification = "Loaded using reflection")]
     internal class SetYearCommand : ConsoleCommand
     {
         /*********
diff --git a/src/SMAPI.Mods.ConsoleCommands/Framework/ItemData/SearchableItem.cs b/src/SMAPI.Mods.ConsoleCommands/Framework/ItemData/SearchableItem.cs
index 72d01eb7..3675a963 100644
--- a/src/SMAPI.Mods.ConsoleCommands/Framework/ItemData/SearchableItem.cs
+++ b/src/SMAPI.Mods.ConsoleCommands/Framework/ItemData/SearchableItem.cs
@@ -43,16 +43,6 @@ namespace StardewModdingAPI.Mods.ConsoleCommands.Framework.ItemData
             this.Item = createItem(this);
         }
 
-        /// <summary>Construct an instance.</summary>
-        /// <param name="item">The item metadata to copy.</param>
-        public SearchableItem(SearchableItem item)
-        {
-            this.Type = item.Type;
-            this.ID = item.ID;
-            this.CreateItem = item.CreateItem;
-            this.Item = item.Item;
-        }
-
         /// <summary>Get whether the item name contains a case-insensitive substring.</summary>
         /// <param name="substring">The substring to find.</param>
         public bool NameContains(string substring)
diff --git a/src/SMAPI.Mods.ConsoleCommands/Framework/ItemRepository.cs b/src/SMAPI.Mods.ConsoleCommands/Framework/ItemRepository.cs
index ca313f41..3915db9a 100644
--- a/src/SMAPI.Mods.ConsoleCommands/Framework/ItemRepository.cs
+++ b/src/SMAPI.Mods.ConsoleCommands/Framework/ItemRepository.cs
@@ -107,7 +107,7 @@ namespace StardewModdingAPI.Mods.ConsoleCommands.Framework
                     foreach (int id in this.TryLoad<int, string>("Data\\weapons").Keys)
                     {
                         yield return this.TryCreate(ItemType.Weapon, id, p => p.ID is >= 32 and <= 34
-                            ? (Item)new Slingshot(p.ID)
+                            ? new Slingshot(p.ID)
                             : new MeleeWeapon(p.ID)
                         );
                     }
diff --git a/src/SMAPI.Mods.ErrorHandler/Patches/SaveGamePatcher.cs b/src/SMAPI.Mods.ErrorHandler/Patches/SaveGamePatcher.cs
index 5f6dbcb3..01bfb888 100644
--- a/src/SMAPI.Mods.ErrorHandler/Patches/SaveGamePatcher.cs
+++ b/src/SMAPI.Mods.ErrorHandler/Patches/SaveGamePatcher.cs
@@ -77,7 +77,7 @@ namespace StardewModdingAPI.Mods.ErrorHandler.Patches
         private static Exception Finalize_LoadFarmType(Exception __exception)
         {
             // missing custom farm type
-            if (__exception?.Message?.Contains("not a valid farm type") == true && !int.TryParse(SaveGame.loaded.whichFarm, out _))
+            if (__exception?.Message.Contains("not a valid farm type") == true && !int.TryParse(SaveGame.loaded.whichFarm, out _))
             {
                 SaveGamePatcher.Monitor.Log(__exception.GetLogSummary(), LogLevel.Error);
                 SaveGamePatcher.Monitor.Log($"Removed invalid custom farm type '{SaveGame.loaded.whichFarm}' to avoid a crash when loading save '{Constants.SaveFolderName}'. (Did you remove a custom farm type mod?)", LogLevel.Warn);
diff --git a/src/SMAPI.Mods.SaveBackup/ModEntry.cs b/src/SMAPI.Mods.SaveBackup/ModEntry.cs
index f6925707..273b1434 100644
--- a/src/SMAPI.Mods.SaveBackup/ModEntry.cs
+++ b/src/SMAPI.Mods.SaveBackup/ModEntry.cs
@@ -44,7 +44,7 @@ namespace StardewModdingAPI.Mods.SaveBackup
                 // back up & prune saves
                 Task
                     .Run(() => this.CreateBackup(backupFolder))
-                    .ContinueWith(backupTask => this.PruneBackups(backupFolder, this.BackupsToKeep));
+                    .ContinueWith(_ => this.PruneBackups(backupFolder, this.BackupsToKeep));
             }
             catch (Exception ex)
             {
@@ -170,8 +170,8 @@ namespace StardewModdingAPI.Mods.SaveBackup
             try
             {
                 // create compressed backup
-                Assembly coreAssembly = Assembly.Load("System.IO.Compression, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089") ?? throw new InvalidOperationException("Can't load System.IO.Compression assembly.");
-                Assembly fsAssembly = Assembly.Load("System.IO.Compression.FileSystem, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089") ?? throw new InvalidOperationException("Can't load System.IO.Compression assembly.");
+                Assembly coreAssembly = Assembly.Load("System.IO.Compression, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089");
+                Assembly fsAssembly = Assembly.Load("System.IO.Compression.FileSystem, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089");
                 Type compressionLevelType = coreAssembly.GetType("System.IO.Compression.CompressionLevel") ?? throw new InvalidOperationException("Can't load CompressionLevel type.");
                 Type zipFileType = fsAssembly.GetType("System.IO.Compression.ZipFile") ?? throw new InvalidOperationException("Can't load ZipFile type.");
                 createFromDirectory = zipFileType.GetMethod("CreateFromDirectory", new[] { typeof(string), typeof(string), compressionLevelType, typeof(bool) }) ?? throw new InvalidOperationException("Can't load ZipFile.CreateFromDirectory method.");
diff --git a/src/SMAPI.Tests.ModApiConsumer/ApiConsumer.cs b/src/SMAPI.Tests.ModApiConsumer/ApiConsumer.cs
index 2c7f9952..ac7bd338 100644
--- a/src/SMAPI.Tests.ModApiConsumer/ApiConsumer.cs
+++ b/src/SMAPI.Tests.ModApiConsumer/ApiConsumer.cs
@@ -17,7 +17,7 @@ namespace SMAPI.Tests.ModApiConsumer
             // act
             int calls = 0;
             int lastValue = -1;
-            api.OnEventRaised += (sender, value) =>
+            api.OnEventRaised += (_, value) =>
             {
                 calls++;
                 lastValue = value;
@@ -34,7 +34,7 @@ namespace SMAPI.Tests.ModApiConsumer
             // act
             int calls = 0;
             int lastValue = -1;
-            api.OnEventRaisedProperty += (sender, value) =>
+            api.OnEventRaisedProperty += (_, value) =>
             {
                 calls++;
                 lastValue = value;
diff --git a/src/SMAPI.Tests/Core/AssetNameTests.cs b/src/SMAPI.Tests/Core/AssetNameTests.cs
index 8785aab8..7b817d13 100644
--- a/src/SMAPI.Tests/Core/AssetNameTests.cs
+++ b/src/SMAPI.Tests/Core/AssetNameTests.cs
@@ -33,7 +33,7 @@ namespace SMAPI.Tests.Core
 
             // act
             string calledWithLocale = null;
-            IAssetName assetName = AssetName.Parse(name, parseLocale: locale => expectedLanguageCode);
+            IAssetName assetName = AssetName.Parse(name, parseLocale: _ => expectedLanguageCode);
 
             // assert
             assetName.Name.Should()
@@ -161,7 +161,7 @@ namespace SMAPI.Tests.Core
             AssetName name = AssetName.Parse(mainAssetName, _ => null);
 
             // assert value is the same for any combination of options
-            bool result = name.StartsWith(prefix, true, true);
+            bool result = name.StartsWith(prefix);
             foreach (bool allowPartialWord in new[] { true, false })
             {
                 foreach (bool allowSubfolder in new[] { true, true })
diff --git a/src/SMAPI.Tests/Core/ModResolverTests.cs b/src/SMAPI.Tests/Core/ModResolverTests.cs
index 1755f644..86c50606 100644
--- a/src/SMAPI.Tests/Core/ModResolverTests.cs
+++ b/src/SMAPI.Tests/Core/ModResolverTests.cs
@@ -123,7 +123,7 @@ namespace SMAPI.Tests.Core
         [Test(Description = "Assert that validation doesn't fail if there are no mods installed.")]
         public void ValidateManifests_NoMods_DoesNothing()
         {
-            new ModResolver().ValidateManifests(Array.Empty<ModMetadata>(), apiVersion: new SemanticVersion("1.0"), getUpdateUrl: key => null);
+            new ModResolver().ValidateManifests(Array.Empty<ModMetadata>(), apiVersion: new SemanticVersion("1.0"), getUpdateUrl: _ => null);
         }
 
         [Test(Description = "Assert that validation skips manifests that have already failed without calling any other properties.")]
@@ -134,7 +134,7 @@ namespace SMAPI.Tests.Core
             mock.Setup(p => p.Status).Returns(ModMetadataStatus.Failed);
 
             // act
-            new ModResolver().ValidateManifests(new[] { mock.Object }, apiVersion: new SemanticVersion("1.0"), getUpdateUrl: key => null);
+            new ModResolver().ValidateManifests(new[] { mock.Object }, apiVersion: new SemanticVersion("1.0"), getUpdateUrl: _ => null);
 
             // assert
             mock.VerifyGet(p => p.Status, Times.Once, "The validation did not check the manifest status.");
@@ -151,7 +151,7 @@ namespace SMAPI.Tests.Core
             });
 
             // act
-            new ModResolver().ValidateManifests(new[] { mock.Object }, apiVersion: new SemanticVersion("1.0"), getUpdateUrl: key => null);
+            new ModResolver().ValidateManifests(new[] { mock.Object }, apiVersion: new SemanticVersion("1.0"), getUpdateUrl: _ => null);
 
             // assert
             mock.Verify(p => p.SetStatus(ModMetadataStatus.Failed, It.IsAny<ModFailReason>(), It.IsAny<string>(), It.IsAny<string>()), Times.Once, "The validation did not fail the metadata.");
@@ -166,7 +166,7 @@ namespace SMAPI.Tests.Core
             this.SetupMetadataForValidation(mock);
 
             // act
-            new ModResolver().ValidateManifests(new[] { mock.Object }, apiVersion: new SemanticVersion("1.0"), getUpdateUrl: key => null);
+            new ModResolver().ValidateManifests(new[] { mock.Object }, apiVersion: new SemanticVersion("1.0"), getUpdateUrl: _ => null);
 
             // assert
             mock.Verify(p => p.SetStatus(ModMetadataStatus.Failed, It.IsAny<ModFailReason>(), It.IsAny<string>(), It.IsAny<string>()), Times.Once, "The validation did not fail the metadata.");
@@ -180,7 +180,7 @@ namespace SMAPI.Tests.Core
             this.SetupMetadataForValidation(mock);
 
             // act
-            new ModResolver().ValidateManifests(new[] { mock.Object }, apiVersion: new SemanticVersion("1.0"), getUpdateUrl: key => null);
+            new ModResolver().ValidateManifests(new[] { mock.Object }, apiVersion: new SemanticVersion("1.0"), getUpdateUrl: _ => null);
 
             // assert
             mock.Verify(p => p.SetStatus(ModMetadataStatus.Failed, It.IsAny<ModFailReason>(), It.IsAny<string>(), It.IsAny<string>()), Times.Once, "The validation did not fail the metadata.");
@@ -197,7 +197,7 @@ namespace SMAPI.Tests.Core
                 this.SetupMetadataForValidation(mod);
 
             // act
-            new ModResolver().ValidateManifests(new[] { modA.Object, modB.Object }, apiVersion: new SemanticVersion("1.0"), getUpdateUrl: key => null);
+            new ModResolver().ValidateManifests(new[] { modA.Object, modB.Object }, apiVersion: new SemanticVersion("1.0"), getUpdateUrl: _ => null);
 
             // assert
             modA.Verify(p => p.SetStatus(ModMetadataStatus.Failed, It.IsAny<ModFailReason>(), It.IsAny<string>(), It.IsAny<string>()), Times.Once, "The validation did not fail the first mod with a unique ID.");
@@ -223,7 +223,7 @@ namespace SMAPI.Tests.Core
             mock.Setup(p => p.DirectoryPath).Returns(modFolder);
 
             // act
-            new ModResolver().ValidateManifests(new[] { mock.Object }, apiVersion: new SemanticVersion("1.0"), getUpdateUrl: key => null);
+            new ModResolver().ValidateManifests(new[] { mock.Object }, apiVersion: new SemanticVersion("1.0"), getUpdateUrl: _ => null);
 
             // assert
             // if Moq doesn't throw a method-not-setup exception, the validation didn't override the status.
diff --git a/src/SMAPI.Tests/WikiClient/ChangeDescriptorTests.cs b/src/SMAPI.Tests/WikiClient/ChangeDescriptorTests.cs
index b896b09c..84cae8df 100644
--- a/src/SMAPI.Tests/WikiClient/ChangeDescriptorTests.cs
+++ b/src/SMAPI.Tests/WikiClient/ChangeDescriptorTests.cs
@@ -1,5 +1,4 @@
 using System.Collections.Generic;
-using System.Linq;
 using NUnit.Framework;
 using StardewModdingAPI;
 using StardewModdingAPI.Toolkit.Framework.Clients.Wiki;
diff --git a/src/SMAPI.Toolkit/Framework/Clients/Wiki/WikiClient.cs b/src/SMAPI.Toolkit/Framework/Clients/Wiki/WikiClient.cs
index abbcdc81..c936bb3e 100644
--- a/src/SMAPI.Toolkit/Framework/Clients/Wiki/WikiClient.cs
+++ b/src/SMAPI.Toolkit/Framework/Clients/Wiki/WikiClient.cs
@@ -65,7 +65,7 @@ namespace StardewModdingAPI.Toolkit.Framework.Clients.Wiki
 
                 foreach (var entry in this.ParseOverrideEntries(modNodes))
                 {
-                    if (entry.Ids?.Any() != true || !entry.HasChanges)
+                    if (entry.Ids.Any() != true || !entry.HasChanges)
                         continue;
 
                     foreach (string id in entry.Ids)
diff --git a/src/SMAPI.Toolkit/Framework/ModData/ModDatabase.cs b/src/SMAPI.Toolkit/Framework/ModData/ModDatabase.cs
index 5b7e2a02..9bb3f558 100644
--- a/src/SMAPI.Toolkit/Framework/ModData/ModDatabase.cs
+++ b/src/SMAPI.Toolkit/Framework/ModData/ModDatabase.cs
@@ -22,7 +22,7 @@ namespace StardewModdingAPI.Toolkit.Framework.ModData
         *********/
         /// <summary>Construct an empty instance.</summary>
         public ModDatabase()
-        : this(Array.Empty<ModDataRecord>(), key => null) { }
+        : this(Array.Empty<ModDataRecord>(), _ => null) { }
 
         /// <summary>Construct an instance.</summary>
         /// <param name="records">The underlying mod data records indexed by default display name.</param>
diff --git a/src/SMAPI.Web/Controllers/JsonValidatorController.cs b/src/SMAPI.Web/Controllers/JsonValidatorController.cs
index bcd4097a..985f91ae 100644
--- a/src/SMAPI.Web/Controllers/JsonValidatorController.cs
+++ b/src/SMAPI.Web/Controllers/JsonValidatorController.cs
@@ -161,7 +161,7 @@ namespace StardewModdingAPI.Web.Controllers
                 return this.View("Index", this.GetModel(result.ID, schemaName, isEditView: true).SetContent(input, null).SetUploadError(result.UploadError));
 
             // redirect to view
-            return this.Redirect(this.Url.PlainAction("Index", "JsonValidator", new { schemaName = schemaName, id = result.ID }));
+            return this.Redirect(this.Url.PlainAction("Index", "JsonValidator", new { schemaName, id = result.ID }));
         }
 
 
@@ -317,13 +317,10 @@ namespace StardewModdingAPI.Web.Controllers
         /// <param name="key">The case-insensitive field key.</param>
         private T GetExtensionField<T>(JSchema schema, string key)
         {
-            if (schema.ExtensionData != null)
+            foreach ((string curKey, JToken value) in schema.ExtensionData)
             {
-                foreach ((string curKey, JToken value) in schema.ExtensionData)
-                {
-                    if (curKey.Equals(key, StringComparison.OrdinalIgnoreCase))
-                        return value.ToObject<T>();
-                }
+                if (curKey.Equals(key, StringComparison.OrdinalIgnoreCase))
+                    return value.ToObject<T>();
             }
 
             return default;
diff --git a/src/SMAPI.Web/Framework/Caching/Mods/IModCacheRepository.cs b/src/SMAPI.Web/Framework/Caching/Mods/IModCacheRepository.cs
index 0d912c7b..a16e6b73 100644
--- a/src/SMAPI.Web/Framework/Caching/Mods/IModCacheRepository.cs
+++ b/src/SMAPI.Web/Framework/Caching/Mods/IModCacheRepository.cs
@@ -1,6 +1,5 @@
 using System;
 using StardewModdingAPI.Toolkit.Framework.UpdateData;
-using StardewModdingAPI.Web.Framework.Clients;
 
 namespace StardewModdingAPI.Web.Framework.Caching.Mods
 {
diff --git a/src/SMAPI.Web/Framework/Caching/Mods/ModCacheMemoryRepository.cs b/src/SMAPI.Web/Framework/Caching/Mods/ModCacheMemoryRepository.cs
index 9769793c..f871a9da 100644
--- a/src/SMAPI.Web/Framework/Caching/Mods/ModCacheMemoryRepository.cs
+++ b/src/SMAPI.Web/Framework/Caching/Mods/ModCacheMemoryRepository.cs
@@ -2,7 +2,6 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using StardewModdingAPI.Toolkit.Framework.UpdateData;
-using StardewModdingAPI.Web.Framework.Clients;
 
 namespace StardewModdingAPI.Web.Framework.Caching.Mods
 {
diff --git a/src/SMAPI.Web/Framework/LogParsing/LogParser.cs b/src/SMAPI.Web/Framework/LogParsing/LogParser.cs
index 6a3ea222..864caef1 100644
--- a/src/SMAPI.Web/Framework/LogParsing/LogParser.cs
+++ b/src/SMAPI.Web/Framework/LogParsing/LogParser.cs
@@ -211,7 +211,7 @@ namespace StardewModdingAPI.Web.Framework.LogParsing
                         {
                             Match match = this.ModPathPattern.Match(message.Text);
                             log.ModPath = match.Groups["path"].Value;
-                            int lastDelimiterPos = log.ModPath.LastIndexOfAny(new char[] { '/', '\\' });
+                            int lastDelimiterPos = log.ModPath.LastIndexOfAny(new[] { '/', '\\' });
                             log.GamePath = lastDelimiterPos >= 0
                                 ? log.ModPath.Substring(0, lastDelimiterPos)
                                 : log.ModPath;
diff --git a/src/SMAPI.Web/Framework/ModInfoModel.cs b/src/SMAPI.Web/Framework/ModInfoModel.cs
index 7845b8c5..86f70788 100644
--- a/src/SMAPI.Web/Framework/ModInfoModel.cs
+++ b/src/SMAPI.Web/Framework/ModInfoModel.cs
@@ -1,5 +1,3 @@
-using StardewModdingAPI.Web.Framework.Clients;
-
 namespace StardewModdingAPI.Web.Framework
 {
     /// <summary>Generic metadata about a mod.</summary>
diff --git a/src/SMAPI.Web/Framework/RedirectRules/RedirectHostsToUrlsRule.cs b/src/SMAPI.Web/Framework/RedirectRules/RedirectHostsToUrlsRule.cs
index d75ee791..d67b5156 100644
--- a/src/SMAPI.Web/Framework/RedirectRules/RedirectHostsToUrlsRule.cs
+++ b/src/SMAPI.Web/Framework/RedirectRules/RedirectHostsToUrlsRule.cs
@@ -37,8 +37,6 @@ namespace StardewModdingAPI.Web.Framework.RedirectRules
         {
             // get requested host
             string host = context.HttpContext.Request.Host.Host;
-            if (host == null)
-                return null;
 
             // get new host
             host = this.Map(host);
diff --git a/src/SMAPI.Web/Framework/RedirectRules/RedirectToHttpsRule.cs b/src/SMAPI.Web/Framework/RedirectRules/RedirectToHttpsRule.cs
index 2a503ae3..265a605f 100644
--- a/src/SMAPI.Web/Framework/RedirectRules/RedirectToHttpsRule.cs
+++ b/src/SMAPI.Web/Framework/RedirectRules/RedirectToHttpsRule.cs
@@ -22,7 +22,7 @@ namespace StardewModdingAPI.Web.Framework.RedirectRules
         /// <param name="except">Matches requests which should be ignored.</param>
         public RedirectToHttpsRule(Func<HttpRequest, bool> except = null)
         {
-            this.Except = except ?? (req => false);
+            this.Except = except ?? (_ => false);
             this.StatusCode = HttpStatusCode.RedirectKeepVerb;
         }
 
diff --git a/src/SMAPI.Web/Startup.cs b/src/SMAPI.Web/Startup.cs
index d8561172..6d9591ee 100644
--- a/src/SMAPI.Web/Startup.cs
+++ b/src/SMAPI.Web/Startup.cs
@@ -81,7 +81,7 @@ namespace StardewModdingAPI.Web
 
             // init Hangfire
             services
-                .AddHangfire((serv, config) =>
+                .AddHangfire((_, config) =>
                 {
                     config
                         .SetDataCompatibilityLevel(CompatibilityLevel.Version_170)
diff --git a/src/SMAPI.Web/Views/LogParser/Index.cshtml b/src/SMAPI.Web/Views/LogParser/Index.cshtml
index b54867b1..3ddc6303 100644
--- a/src/SMAPI.Web/Views/LogParser/Index.cshtml
+++ b/src/SMAPI.Web/Views/LogParser/Index.cshtml
@@ -40,8 +40,8 @@
             smapi.logParser({
                 logStarted: new Date(@this.ForJson(log?.Timestamp)),
                 showPopup: @this.ForJson(log == null),
-                showMods: @this.ForJson(log?.Mods?.Select(p => Model.GetSlug(p.Name)).Distinct().ToDictionary(slug => slug, slug => true)),
-                showSections: @this.ForJson(Enum.GetNames(typeof(LogSection)).ToDictionary(section => section, section => false)),
+                showMods: @this.ForJson(log?.Mods?.Select(p => Model.GetSlug(p.Name)).Distinct().ToDictionary(slug => slug, _ => true)),
+                showSections: @this.ForJson(Enum.GetNames(typeof(LogSection)).ToDictionary(section => section, _ => false)),
                 showLevels: @this.ForJson(defaultFilters),
                 enableFilters: @this.ForJson(!Model.ShowRaw),
                 screenIds: @this.ForJson(screenIds)
@@ -207,7 +207,7 @@ else if (log?.IsValid == true)
                                     @if (mod.HasUpdate)
                                     {
                                         <a href="@mod.UpdateLink" target="_blank">
-                                            @(mod.Version == null ? @mod.UpdateVersion : $"{mod.Version} → {mod.UpdateVersion}")
+                                            @(mod.Version == null ? mod.UpdateVersion : $"{mod.Version} → {mod.UpdateVersion}")
                                         </a>
                                     }
                                     else
diff --git a/src/SMAPI.Web/wwwroot/Content/css/file-upload.css b/src/SMAPI.Web/wwwroot/Content/css/file-upload.css
index ff170691..f29d46aa 100644
--- a/src/SMAPI.Web/wwwroot/Content/css/file-upload.css
+++ b/src/SMAPI.Web/wwwroot/Content/css/file-upload.css
@@ -11,7 +11,7 @@
     border-radius: 5px;
     border: 1px solid #000088;
     outline: none;
-    box-shadow: inset 0px 0px 1px 1px rgba(0, 0, 192, .2);
+    box-shadow: inset 0 0 1px 1px rgba(0, 0, 192, .2);
 }
 
 #submit {
diff --git a/src/SMAPI/Constants.cs b/src/SMAPI/Constants.cs
index 76f4ef87..6b9e9b05 100644
--- a/src/SMAPI/Constants.cs
+++ b/src/SMAPI/Constants.cs
@@ -170,9 +170,6 @@ namespace StardewModdingAPI
         /// <summary>The target game platform as a SMAPI toolkit constant.</summary>
         internal static Platform Platform { get; } = (Platform)Constants.TargetPlatform;
 
-        /// <summary>The language code for non-translated mod assets.</summary>
-        internal static LocalizedContentManager.LanguageCode DefaultLanguage { get; } = LocalizedContentManager.LanguageCode.en;
-
 
         /*********
         ** Internal methods
diff --git a/src/SMAPI/Framework/CommandManager.cs b/src/SMAPI/Framework/CommandManager.cs
index a7b64cb7..0c0f6685 100644
--- a/src/SMAPI/Framework/CommandManager.cs
+++ b/src/SMAPI/Framework/CommandManager.cs
@@ -65,7 +65,7 @@ namespace StardewModdingAPI.Framework
         /// <exception cref="ArgumentException">There's already a command with that name.</exception>
         public CommandManager Add(IInternalCommand command, IMonitor monitor)
         {
-            return this.Add(null, command.Name, command.Description, (name, args) => command.HandleCommand(args, monitor));
+            return this.Add(null, command.Name, command.Description, (_, args) => command.HandleCommand(args, monitor));
         }
 
         /// <summary>Get a command by its unique name.</summary>
diff --git a/src/SMAPI/Framework/Content/AssetDataForMap.cs b/src/SMAPI/Framework/Content/AssetDataForMap.cs
index 0458f80a..5986e797 100644
--- a/src/SMAPI/Framework/Content/AssetDataForMap.cs
+++ b/src/SMAPI/Framework/Content/AssetDataForMap.cs
@@ -147,7 +147,7 @@ namespace StardewModdingAPI.Framework.Content
         {
             switch (sourceTile)
             {
-                case StaticTile _:
+                case StaticTile:
                     return new StaticTile(targetLayer, targetSheet, sourceTile.BlendMode, sourceTile.TileIndex);
 
                 case AnimatedTile animatedTile:
diff --git a/src/SMAPI/Framework/Content/AssetName.cs b/src/SMAPI/Framework/Content/AssetName.cs
index a1d37b0b..4973b444 100644
--- a/src/SMAPI/Framework/Content/AssetName.cs
+++ b/src/SMAPI/Framework/Content/AssetName.cs
@@ -107,7 +107,7 @@ namespace StardewModdingAPI.Framework.Content
                 return this.BaseName.Equals(assetName?.BaseName, StringComparison.OrdinalIgnoreCase);
 
             if (assetName is AssetName impl)
-                return this.ComparableName == impl?.ComparableName;
+                return this.ComparableName == impl.ComparableName;
 
             return this.Name.Equals(assetName?.Name, StringComparison.OrdinalIgnoreCase);
         }
diff --git a/src/SMAPI/Framework/Content/TilesheetReference.cs b/src/SMAPI/Framework/Content/TilesheetReference.cs
index 0919bb44..0339b802 100644
--- a/src/SMAPI/Framework/Content/TilesheetReference.cs
+++ b/src/SMAPI/Framework/Content/TilesheetReference.cs
@@ -1,4 +1,3 @@
-using System.Numerics;
 using xTile.Dimensions;
 
 namespace StardewModdingAPI.Framework.Content
diff --git a/src/SMAPI/Framework/ContentManagers/BaseContentManager.cs b/src/SMAPI/Framework/ContentManagers/BaseContentManager.cs
index 31199b3a..c803905a 100644
--- a/src/SMAPI/Framework/ContentManagers/BaseContentManager.cs
+++ b/src/SMAPI/Framework/ContentManagers/BaseContentManager.cs
@@ -308,7 +308,7 @@ namespace StardewModdingAPI.Framework.ContentManagers
         {
             return useCache
                 ? base.LoadBase<T>(assetName.Name)
-                : base.ReadAsset<T>(assetName.Name, disposable => this.Disposables.Add(new WeakReference<IDisposable>(disposable)));
+                : this.ReadAsset<T>(assetName.Name, disposable => this.Disposables.Add(new WeakReference<IDisposable>(disposable)));
         }
 
         /// <summary>Add tracking data to an asset and add it to the cache.</summary>
diff --git a/src/SMAPI/Framework/ContentManagers/ModContentManager.cs b/src/SMAPI/Framework/ContentManagers/ModContentManager.cs
index 63070d85..e0c85265 100644
--- a/src/SMAPI/Framework/ContentManagers/ModContentManager.cs
+++ b/src/SMAPI/Framework/ContentManagers/ModContentManager.cs
@@ -124,7 +124,7 @@ namespace StardewModdingAPI.Framework.ContentManagers
             }
 
             // track & return asset
-            this.TrackAsset(assetName, asset, useCache);
+            this.TrackAsset(assetName, asset, useCache: false);
             return asset;
         }
 
diff --git a/src/SMAPI/Framework/Input/SInputState.cs b/src/SMAPI/Framework/Input/SInputState.cs
index d5feaf94..72adca02 100644
--- a/src/SMAPI/Framework/Input/SInputState.cs
+++ b/src/SMAPI/Framework/Input/SInputState.cs
@@ -73,7 +73,7 @@ namespace StardewModdingAPI.Framework.Input
                 var keyboard = new KeyboardStateBuilder(base.GetKeyboardState());
                 var mouse = new MouseStateBuilder(base.GetMouseState());
                 Vector2 cursorAbsolutePos = new((mouse.X * zoomMultiplier) + Game1.viewport.X, (mouse.Y * zoomMultiplier) + Game1.viewport.Y);
-                Vector2? playerTilePos = Context.IsPlayerFree ? Game1.player.getTileLocation() : (Vector2?)null;
+                Vector2? playerTilePos = Context.IsPlayerFree ? Game1.player.getTileLocation() : null;
                 HashSet<SButton> reallyDown = new HashSet<SButton>(this.GetPressedButtons(keyboard, mouse, controller));
 
                 // apply overrides
diff --git a/src/SMAPI/Framework/InternalExtensions.cs b/src/SMAPI/Framework/InternalExtensions.cs
index fe10b045..54aeffd7 100644
--- a/src/SMAPI/Framework/InternalExtensions.cs
+++ b/src/SMAPI/Framework/InternalExtensions.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Reflection;
 using System.Threading;
 using Microsoft.Xna.Framework.Graphics;
 using StardewModdingAPI.Framework.Events;
diff --git a/src/SMAPI/Framework/ModHelpers/ModRegistryHelper.cs b/src/SMAPI/Framework/ModHelpers/ModRegistryHelper.cs
index 95eb03f3..09a392a6 100644
--- a/src/SMAPI/Framework/ModHelpers/ModRegistryHelper.cs
+++ b/src/SMAPI/Framework/ModHelpers/ModRegistryHelper.cs
@@ -69,7 +69,7 @@ namespace StardewModdingAPI.Framework.ModHelpers
             // get raw API
             IModMetadata mod = this.Registry.Get(uniqueID);
             if (mod?.Api != null && this.AccessedModApis.Add(mod.Manifest.UniqueID))
-                this.Monitor.Log($"Accessed mod-provided API for {mod.DisplayName}.", LogLevel.Trace);
+                this.Monitor.Log($"Accessed mod-provided API for {mod.DisplayName}.");
             return mod?.Api;
         }
 
diff --git a/src/SMAPI/Framework/ModLoading/AssemblyLoader.cs b/src/SMAPI/Framework/ModLoading/AssemblyLoader.cs
index 4480f4e8..24214c96 100644
--- a/src/SMAPI/Framework/ModLoading/AssemblyLoader.cs
+++ b/src/SMAPI/Framework/ModLoading/AssemblyLoader.cs
@@ -138,7 +138,7 @@ namespace StardewModdingAPI.Framework.ModLoading
                 if (changed)
                 {
                     if (!oneAssembly)
-                        this.Monitor.Log($"      Loading {assembly.File.Name} (rewritten)...", LogLevel.Trace);
+                        this.Monitor.Log($"      Loading {assembly.File.Name} (rewritten)...");
 
                     // load assembly
                     using MemoryStream outAssemblyStream = new();
@@ -150,7 +150,7 @@ namespace StardewModdingAPI.Framework.ModLoading
                 else
                 {
                     if (!oneAssembly)
-                        this.Monitor.Log($"      Loading {assembly.File.Name}...", LogLevel.Trace);
+                        this.Monitor.Log($"      Loading {assembly.File.Name}...");
                     lastAssembly = Assembly.UnsafeLoadFrom(assembly.File.FullName);
                 }
 
diff --git a/src/SMAPI/Framework/ModLoading/ModResolver.cs b/src/SMAPI/Framework/ModLoading/ModResolver.cs
index 21366bb4..d52cdbb4 100644
--- a/src/SMAPI/Framework/ModLoading/ModResolver.cs
+++ b/src/SMAPI/Framework/ModLoading/ModResolver.cs
@@ -237,7 +237,7 @@ namespace StardewModdingAPI.Framework.ModLoading
             // initialize metadata
             mods = mods.ToArray();
             var sortedMods = new Stack<IModMetadata>();
-            var states = mods.ToDictionary(mod => mod, mod => ModDependencyStatus.Queued);
+            var states = mods.ToDictionary(mod => mod, _ => ModDependencyStatus.Queued);
 
             // handle failed mods
             foreach (IModMetadata mod in mods.Where(m => m.Status == ModMetadataStatus.Failed))
diff --git a/src/SMAPI/Framework/ModRegistry.cs b/src/SMAPI/Framework/ModRegistry.cs
index 99548cf8..c0f8d537 100644
--- a/src/SMAPI/Framework/ModRegistry.cs
+++ b/src/SMAPI/Framework/ModRegistry.cs
@@ -96,8 +96,6 @@ namespace StardewModdingAPI.Framework
             // get stack frames
             StackTrace stack = new();
             StackFrame[] frames = stack.GetFrames();
-            if (frames == null)
-                return null;
 
             // search stack for a source assembly
             foreach (StackFrame frame in frames)
diff --git a/src/SMAPI/Framework/Monitor.cs b/src/SMAPI/Framework/Monitor.cs
index ab76e7c0..6b53daff 100644
--- a/src/SMAPI/Framework/Monitor.cs
+++ b/src/SMAPI/Framework/Monitor.cs
@@ -92,7 +92,7 @@ namespace StardewModdingAPI.Framework
         public void VerboseLog(string message)
         {
             if (this.IsVerbose)
-                this.Log(message, LogLevel.Trace);
+                this.Log(message);
         }
 
         /// <summary>Write a newline to the console and log file.</summary>
diff --git a/src/SMAPI/Framework/SCore.cs b/src/SMAPI/Framework/SCore.cs
index c8e0842e..cc531de9 100644
--- a/src/SMAPI/Framework/SCore.cs
+++ b/src/SMAPI/Framework/SCore.cs
@@ -232,13 +232,13 @@ namespace StardewModdingAPI.Framework
                     this.Toolkit.JsonHelper.JsonSettings.Converters.Add(converter);
 
                 // add error handlers
-                AppDomain.CurrentDomain.UnhandledException += (sender, e) => this.Monitor.Log($"Critical app domain exception: {e.ExceptionObject}", LogLevel.Error);
+                AppDomain.CurrentDomain.UnhandledException += (_, e) => this.Monitor.Log($"Critical app domain exception: {e.ExceptionObject}", LogLevel.Error);
 
                 // add more lenient assembly resolver
-                AppDomain.CurrentDomain.AssemblyResolve += (sender, e) => AssemblyLoader.ResolveAssembly(e.Name);
+                AppDomain.CurrentDomain.AssemblyResolve += (_, e) => AssemblyLoader.ResolveAssembly(e.Name);
 
                 // hook locale event
-                LocalizedContentManager.OnLanguageChange += locale => this.OnLocaleChanged();
+                LocalizedContentManager.OnLanguageChange += _ => this.OnLocaleChanged();
 
                 // override game
                 this.Multiplayer = new SMultiplayer(this.Monitor, this.EventManager, this.Toolkit.JsonHelper, this.ModRegistry, this.Reflection, this.OnModMessageReceived, this.Settings.LogNetworkTraffic);
@@ -1453,14 +1453,12 @@ namespace StardewModdingAPI.Framework
                 // check Stardew64Installer version
                 if (Constants.IsPatchedByStardew64Installer(out ISemanticVersion patchedByVersion))
                 {
-                    ISemanticVersion updateFound = null;
-                    string updateUrl = null;
                     try
                     {
                         // fetch update check
                         ModEntryModel response = client.GetModInfo(new[] { new ModSearchEntryModel("Steviegt6.Stardew64Installer", patchedByVersion, new[] { $"GitHub:{this.Settings.Stardew64InstallerGitHubProjectName}" }) }, apiVersion: Constants.ApiVersion, gameVersion: Constants.GameVersion, platform: Constants.Platform).Single().Value;
-                        updateFound = response.SuggestedUpdate?.Version;
-                        updateUrl = response.SuggestedUpdate?.Url ?? Constants.HomePageUrl;
+                        ISemanticVersion updateFound = response.SuggestedUpdate?.Version;
+                        string updateUrl = response.SuggestedUpdate?.Url ?? Constants.HomePageUrl;
 
                         // log message
                         if (updateFound != null)
@@ -1658,8 +1656,8 @@ namespace StardewModdingAPI.Framework
                     // ReSharper restore SuspiciousTypeConversion.Global
 
                     ContentHelper content = helper.GetLegacyContentHelper();
-                    content.ObservableAssetEditors.CollectionChanged += (sender, e) => this.OnAssetInterceptorsChanged(metadata, e.NewItems?.Cast<IAssetEditor>(), e.OldItems?.Cast<IAssetEditor>(), this.ContentCore.Editors);
-                    content.ObservableAssetLoaders.CollectionChanged += (sender, e) => this.OnAssetInterceptorsChanged(metadata, e.NewItems?.Cast<IAssetLoader>(), e.OldItems?.Cast<IAssetLoader>(), this.ContentCore.Loaders);
+                    content.ObservableAssetEditors.CollectionChanged += (_, e) => this.OnAssetInterceptorsChanged(metadata, e.NewItems?.Cast<IAssetEditor>(), e.OldItems?.Cast<IAssetEditor>(), this.ContentCore.Editors);
+                    content.ObservableAssetLoaders.CollectionChanged += (_, e) => this.OnAssetInterceptorsChanged(metadata, e.NewItems?.Cast<IAssetLoader>(), e.OldItems?.Cast<IAssetLoader>(), this.ContentCore.Loaders);
                 }
 
                 // call entry method
diff --git a/src/SMAPI/Framework/SMultiplayer.cs b/src/SMAPI/Framework/SMultiplayer.cs
index 3981e4e5..bcf97006 100644
--- a/src/SMAPI/Framework/SMultiplayer.cs
+++ b/src/SMAPI/Framework/SMultiplayer.cs
@@ -111,20 +111,20 @@ namespace StardewModdingAPI.Framework
         {
             switch (client)
             {
-                case LidgrenClient _:
+                case LidgrenClient:
                     {
                         string address = this.Reflection.GetField<string>(client, "address").GetValue();
                         return new SLidgrenClient(address, this.OnClientProcessingMessage, this.OnClientSendingMessage);
                     }
 
-                case GalaxyNetClient _:
+                case GalaxyNetClient:
                     {
                         GalaxyID address = this.Reflection.GetField<GalaxyID>(client, "lobbyId").GetValue();
                         return new SGalaxyNetClient(address, this.OnClientProcessingMessage, this.OnClientSendingMessage);
                     }
 
                 default:
-                    this.Monitor.Log($"Unknown multiplayer client type: {client.GetType().AssemblyQualifiedName}", LogLevel.Trace);
+                    this.Monitor.Log($"Unknown multiplayer client type: {client.GetType().AssemblyQualifiedName}");
                     return client;
             }
         }
@@ -135,20 +135,20 @@ namespace StardewModdingAPI.Framework
         {
             switch (server)
             {
-                case LidgrenServer _:
+                case LidgrenServer:
                     {
                         IGameServer gameServer = this.Reflection.GetField<IGameServer>(server, "gameServer").GetValue();
                         return new SLidgrenServer(gameServer, this, this.OnServerProcessingMessage);
                     }
 
-                case GalaxyNetServer _:
+                case GalaxyNetServer:
                     {
                         IGameServer gameServer = this.Reflection.GetField<IGameServer>(server, "gameServer").GetValue();
                         return new SGalaxyNetServer(gameServer, this, this.OnServerProcessingMessage);
                     }
 
                 default:
-                    this.Monitor.Log($"Unknown multiplayer server type: {server.GetType().AssemblyQualifiedName}", LogLevel.Trace);
+                    this.Monitor.Log($"Unknown multiplayer server type: {server.GetType().AssemblyQualifiedName}");
                     return server;
             }
         }
@@ -160,7 +160,7 @@ namespace StardewModdingAPI.Framework
         protected void OnClientSendingMessage(OutgoingMessage message, Action<OutgoingMessage> sendMessage, Action resume)
         {
             if (this.LogNetworkTraffic)
-                this.Monitor.Log($"CLIENT SEND {(MessageType)message.MessageType} {message.FarmerID}", LogLevel.Trace);
+                this.Monitor.Log($"CLIENT SEND {(MessageType)message.MessageType} {message.FarmerID}");
 
             switch (message.MessageType)
             {
@@ -184,7 +184,7 @@ namespace StardewModdingAPI.Framework
         public void OnServerProcessingMessage(IncomingMessage message, Action<OutgoingMessage> sendMessage, Action resume)
         {
             if (this.LogNetworkTraffic)
-                this.Monitor.Log($"SERVER RECV {(MessageType)message.MessageType} {message.FarmerID}", LogLevel.Trace);
+                this.Monitor.Log($"SERVER RECV {(MessageType)message.MessageType} {message.FarmerID}");
 
             switch (message.MessageType)
             {
@@ -193,7 +193,7 @@ namespace StardewModdingAPI.Framework
                     {
                         // parse message
                         RemoteContextModel model = this.ReadContext(message.Reader);
-                        this.Monitor.Log($"Received context for farmhand {message.FarmerID} running {(model != null ? $"SMAPI {model.ApiVersion} with {model.Mods.Length} mods" : "vanilla")}.", LogLevel.Trace);
+                        this.Monitor.Log($"Received context for farmhand {message.FarmerID} running {(model != null ? $"SMAPI {model.ApiVersion} with {model.Mods.Length} mods" : "vanilla")}.");
 
                         // store peer
                         MultiplayerPeer newPeer = new(
@@ -243,7 +243,7 @@ namespace StardewModdingAPI.Framework
                     // store peer if new
                     if (!this.Peers.ContainsKey(message.FarmerID))
                     {
-                        this.Monitor.Log($"Received connection for vanilla player {message.FarmerID}.", LogLevel.Trace);
+                        this.Monitor.Log($"Received connection for vanilla player {message.FarmerID}.");
                         MultiplayerPeer peer = new(
                             playerID: message.FarmerID,
                             screenID: this.GetScreenId(message.FarmerID),
@@ -280,7 +280,7 @@ namespace StardewModdingAPI.Framework
         public void OnClientProcessingMessage(IncomingMessage message, Action<OutgoingMessage> sendMessage, Action resume)
         {
             if (this.LogNetworkTraffic)
-                this.Monitor.Log($"CLIENT RECV {(MessageType)message.MessageType} {message.FarmerID}", LogLevel.Trace);
+                this.Monitor.Log($"CLIENT RECV {(MessageType)message.MessageType} {message.FarmerID}");
 
             switch (message.MessageType)
             {
@@ -289,7 +289,7 @@ namespace StardewModdingAPI.Framework
                     {
                         // parse message
                         RemoteContextModel model = this.ReadContext(message.Reader);
-                        this.Monitor.Log($"Received context for {(model?.IsHost == true ? "host" : "farmhand")} {message.FarmerID} running {(model != null ? $"SMAPI {model.ApiVersion} with {model.Mods.Length} mods" : "vanilla")}.", LogLevel.Trace);
+                        this.Monitor.Log($"Received context for {(model?.IsHost == true ? "host" : "farmhand")} {message.FarmerID} running {(model != null ? $"SMAPI {model.ApiVersion} with {model.Mods.Length} mods" : "vanilla")}.");
 
                         // store peer
                         MultiplayerPeer peer = new(
@@ -314,7 +314,7 @@ namespace StardewModdingAPI.Framework
                         // store peer
                         if (!this.Peers.ContainsKey(message.FarmerID) && this.HostPeer == null)
                         {
-                            this.Monitor.Log($"Received connection for vanilla host {message.FarmerID}.", LogLevel.Trace);
+                            this.Monitor.Log($"Received connection for vanilla host {message.FarmerID}.");
                             var peer = new MultiplayerPeer(
                                 playerID: message.FarmerID,
                                 screenID: this.GetScreenId(message.FarmerID),
@@ -341,7 +341,7 @@ namespace StardewModdingAPI.Framework
                                 sendMessage: sendMessage,
                                 isHost: this.HostPeer == null
                             );
-                            this.Monitor.Log($"Received connection for vanilla {(peer.IsHost ? "host" : "farmhand")} {message.FarmerID}.", LogLevel.Trace);
+                            this.Monitor.Log($"Received connection for vanilla {(peer.IsHost ? "host" : "farmhand")} {message.FarmerID}.");
                             this.AddPeer(peer, canBeHost: true);
                         }
 
@@ -367,7 +367,7 @@ namespace StardewModdingAPI.Framework
             {
                 if (this.Peers.TryGetValue(playerID, out MultiplayerPeer peer))
                 {
-                    this.Monitor.Log($"Player quit: {playerID}", LogLevel.Trace);
+                    this.Monitor.Log($"Player quit: {playerID}");
                     this.Peers.Remove(playerID);
                     this.EventManager.PeerDisconnected.Raise(new PeerDisconnectedEventArgs(peer));
                 }
@@ -434,7 +434,7 @@ namespace StardewModdingAPI.Framework
             if (sendToSelf)
             {
                 if (this.LogNetworkTraffic)
-                    this.Monitor.Log($"Broadcasting '{messageType}' message to self: {data}.", LogLevel.Trace);
+                    this.Monitor.Log($"Broadcasting '{messageType}' message to self: {data}.");
 
                 this.OnModMessageReceived(model);
             }
@@ -447,7 +447,7 @@ namespace StardewModdingAPI.Framework
                     foreach (MultiplayerPeer peer in sendToPeers)
                     {
                         if (this.LogNetworkTraffic)
-                            this.Monitor.Log($"Broadcasting '{messageType}' message to farmhand {peer.PlayerID}: {data}.", LogLevel.Trace);
+                            this.Monitor.Log($"Broadcasting '{messageType}' message to farmhand {peer.PlayerID}: {data}.");
 
                         peer.SendMessage(new OutgoingMessage((byte)MessageType.ModMessage, peer.PlayerID, data));
                     }
@@ -455,7 +455,7 @@ namespace StardewModdingAPI.Framework
                 else if (this.HostPeer?.HasSmapi == true)
                 {
                     if (this.LogNetworkTraffic)
-                        this.Monitor.Log($"Broadcasting '{messageType}' message to host {this.HostPeer.PlayerID}: {data}.", LogLevel.Trace);
+                        this.Monitor.Log($"Broadcasting '{messageType}' message to host {this.HostPeer.PlayerID}: {data}.");
 
                     this.HostPeer.SendMessage(new OutgoingMessage((byte)MessageType.ModMessage, this.HostPeer.PlayerID, data));
                 }
@@ -504,7 +504,7 @@ namespace StardewModdingAPI.Framework
             ModMessageModel model = this.JsonHelper.Deserialize<ModMessageModel>(json);
             HashSet<long> playerIDs = new HashSet<long>(model.ToPlayerIDs ?? this.GetKnownPlayerIDs());
             if (this.LogNetworkTraffic)
-                this.Monitor.Log($"Received message: {json}.", LogLevel.Trace);
+                this.Monitor.Log($"Received message: {json}.");
 
             // notify local mods
             if (playerIDs.Contains(Game1.player.UniqueMultiplayerID))
diff --git a/src/SMAPI/Framework/Serialization/KeybindConverter.cs b/src/SMAPI/Framework/Serialization/KeybindConverter.cs
index 93a274a8..7c5db3ad 100644
--- a/src/SMAPI/Framework/Serialization/KeybindConverter.cs
+++ b/src/SMAPI/Framework/Serialization/KeybindConverter.cs
@@ -44,7 +44,7 @@ namespace StardewModdingAPI.Framework.Serialization
             {
                 case JsonToken.Null:
                     return objectType == typeof(Keybind)
-                        ? (object)new Keybind()
+                        ? new Keybind()
                         : new KeybindList();
 
                 case JsonToken.String:
diff --git a/src/SMAPI/Framework/StateTracking/Snapshots/PlayerSnapshot.cs b/src/SMAPI/Framework/StateTracking/Snapshots/PlayerSnapshot.cs
index f3e42948..e113d27c 100644
--- a/src/SMAPI/Framework/StateTracking/Snapshots/PlayerSnapshot.cs
+++ b/src/SMAPI/Framework/StateTracking/Snapshots/PlayerSnapshot.cs
@@ -31,7 +31,7 @@ namespace StardewModdingAPI.Framework.StateTracking.Snapshots
             Enum
                 .GetValues(typeof(SkillType))
                 .Cast<SkillType>()
-                .ToDictionary(skill => skill, skill => new SnapshotDiff<int>());
+                .ToDictionary(skill => skill, _ => new SnapshotDiff<int>());
 
         /// <summary>Get a list of inventory changes.</summary>
         public SnapshotItemListDiff Inventory { get; private set; }
diff --git a/src/SMAPI/Framework/TemporaryHacks/MiniMonoModHotfix.cs b/src/SMAPI/Framework/TemporaryHacks/MiniMonoModHotfix.cs
index cab1a94c..c0f119f1 100644
--- a/src/SMAPI/Framework/TemporaryHacks/MiniMonoModHotfix.cs
+++ b/src/SMAPI/Framework/TemporaryHacks/MiniMonoModHotfix.cs
@@ -126,7 +126,7 @@ namespace MonoMod.Utils
         }
 
         public static Type GetRealDeclaringType(this MemberInfo member)
-            => member.DeclaringType ?? member.Module?.GetModuleType();
+            => member.DeclaringType ?? member.Module.GetModuleType();
 
         public static void FixReflectionCache(this Type type)
         {
diff --git a/src/SMAPI/Program.cs b/src/SMAPI/Program.cs
index 29f4be1b..1039cc9a 100644
--- a/src/SMAPI/Program.cs
+++ b/src/SMAPI/Program.cs
@@ -78,7 +78,7 @@ namespace StardewModdingAPI
                         }
                         catch
                         {
-                            continue;
+                            // ignore invalid DLL
                         }
                     }
                 }
diff --git a/src/SMAPI/Translation.cs b/src/SMAPI/Translation.cs
index 149f6728..5ab432f0 100644
--- a/src/SMAPI/Translation.cs
+++ b/src/SMAPI/Translation.cs
@@ -74,7 +74,7 @@ namespace StardewModdingAPI
                 {
                     foreach (DictionaryEntry entry in inputLookup)
                     {
-                        string key = entry.Key?.ToString().Trim();
+                        string key = entry.Key.ToString()?.Trim();
                         if (key != null)
                             tokenLookup[key] = entry.Value?.ToString();
                     }
diff --git a/src/SMAPI/Utilities/PerScreen.cs b/src/SMAPI/Utilities/PerScreen.cs
index 20b8fbce..6b7153ac 100644
--- a/src/SMAPI/Utilities/PerScreen.cs
+++ b/src/SMAPI/Utilities/PerScreen.cs
@@ -76,7 +76,7 @@ namespace StardewModdingAPI.Utilities
         /// <summary>Remove all active values.</summary>
         public void ResetAllScreens()
         {
-            this.RemoveScreens(p => true);
+            this.RemoveScreens(_ => true);
         }
 
 
-- 
cgit 


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.
---
 build/common.targets                                                | 1 +
 src/SMAPI.Installer/Framework/InstallerContext.cs                   | 2 ++
 src/SMAPI.Installer/Framework/InstallerPaths.cs                     | 2 ++
 src/SMAPI.Installer/InteractiveInstaller.cs                         | 2 ++
 src/SMAPI.Installer/Program.cs                                      | 2 ++
 src/SMAPI.Internal.Patching/BasePatcher.cs                          | 2 ++
 src/SMAPI.Internal.Patching/HarmonyPatcher.cs                       | 2 ++
 src/SMAPI.Internal.Patching/IPatcher.cs                             | 2 ++
 src/SMAPI.Internal.Patching/PatchHelper.cs                          | 2 ++
 src/SMAPI.Internal/ConsoleWriting/ColorSchemeConfig.cs              | 2 ++
 src/SMAPI.Internal/ConsoleWriting/ColorfulConsoleWriter.cs          | 2 ++
 src/SMAPI.Internal/ConsoleWriting/IConsoleWriter.cs                 | 2 ++
 src/SMAPI.Internal/ExceptionHelper.cs                               | 2 ++
 .../Framework/DiagnosticResult.cs                                   | 2 ++
 .../Framework/DiagnosticVerifier.Helper.cs                          | 2 ++
 .../Framework/DiagnosticVerifier.cs                                 | 2 ++
 .../Mock/Netcode/NetCollection.cs                                   | 2 ++
 .../Mock/Netcode/NetFieldBase.cs                                    | 2 ++
 src/SMAPI.ModBuildConfig.Analyzer.Tests/Mock/Netcode/NetInt.cs      | 2 ++
 src/SMAPI.ModBuildConfig.Analyzer.Tests/Mock/Netcode/NetList.cs     | 2 ++
 .../Mock/Netcode/NetObjectList.cs                                   | 2 ++
 .../Mock/StardewValley/Farmer.cs                                    | 2 ++
 src/SMAPI.ModBuildConfig.Analyzer.Tests/Mock/StardewValley/Item.cs  | 2 ++
 .../Mock/StardewValley/Object.cs                                    | 2 ++
 src/SMAPI.ModBuildConfig.Analyzer.Tests/NetFieldAnalyzerTests.cs    | 2 ++
 .../ObsoleteFieldAnalyzerTests.cs                                   | 2 ++
 src/SMAPI.ModBuildConfig.Analyzer/AnalyzerUtilities.cs              | 2 ++
 src/SMAPI.ModBuildConfig.Analyzer/NetFieldAnalyzer.cs               | 2 ++
 src/SMAPI.ModBuildConfig.Analyzer/ObsoleteFieldAnalyzer.cs          | 2 ++
 src/SMAPI.ModBuildConfig/DeployModTask.cs                           | 2 ++
 src/SMAPI.ModBuildConfig/Framework/ModFileManager.cs                | 2 ++
 src/SMAPI.ModBuildConfig/Framework/UserErrorException.cs            | 2 ++
 src/SMAPI.Mods.ConsoleCommands/Framework/Commands/ArgumentParser.cs | 2 ++
 src/SMAPI.Mods.ConsoleCommands/Framework/Commands/ConsoleCommand.cs | 2 ++
 .../Framework/Commands/IConsoleCommand.cs                           | 2 ++
 .../Framework/Commands/Other/ApplySaveFixCommand.cs                 | 2 ++
 .../Framework/Commands/Other/DebugCommand.cs                        | 2 ++
 .../Framework/Commands/Other/RegenerateBundles.cs                   | 2 ++
 .../Framework/Commands/Other/ShowDataFilesCommand.cs                | 2 ++
 .../Framework/Commands/Other/ShowGameFilesCommand.cs                | 2 ++
 .../Framework/Commands/Other/TestInputCommand.cs                    | 2 ++
 .../Framework/Commands/Player/AddCommand.cs                         | 2 ++
 .../Framework/Commands/Player/ListItemTypesCommand.cs               | 2 ++
 .../Framework/Commands/Player/ListItemsCommand.cs                   | 2 ++
 .../Framework/Commands/Player/SetColorCommand.cs                    | 2 ++
 .../Framework/Commands/Player/SetFarmTypeCommand.cs                 | 2 ++
 .../Framework/Commands/Player/SetHealthCommand.cs                   | 2 ++
 .../Framework/Commands/Player/SetImmunityCommand.cs                 | 2 ++
 .../Framework/Commands/Player/SetMaxHealthCommand.cs                | 2 ++
 .../Framework/Commands/Player/SetMaxStaminaCommand.cs               | 2 ++
 .../Framework/Commands/Player/SetMoneyCommand.cs                    | 2 ++
 .../Framework/Commands/Player/SetNameCommand.cs                     | 2 ++
 .../Framework/Commands/Player/SetStaminaCommand.cs                  | 2 ++
 .../Framework/Commands/Player/SetStyleCommand.cs                    | 2 ++
 .../Framework/Commands/World/ClearCommand.cs                        | 2 ++
 .../Framework/Commands/World/DownMineLevelCommand.cs                | 2 ++
 .../Framework/Commands/World/FreezeTimeCommand.cs                   | 2 ++
 .../Framework/Commands/World/HurryAllCommand.cs                     | 2 ++
 .../Framework/Commands/World/SetDayCommand.cs                       | 2 ++
 .../Framework/Commands/World/SetMineLevelCommand.cs                 | 2 ++
 .../Framework/Commands/World/SetSeasonCommand.cs                    | 2 ++
 .../Framework/Commands/World/SetTimeCommand.cs                      | 2 ++
 .../Framework/Commands/World/SetYearCommand.cs                      | 2 ++
 src/SMAPI.Mods.ConsoleCommands/Framework/ItemData/SearchableItem.cs | 2 ++
 src/SMAPI.Mods.ConsoleCommands/Framework/ItemRepository.cs          | 2 ++
 src/SMAPI.Mods.ConsoleCommands/ModEntry.cs                          | 2 ++
 src/SMAPI.Mods.ErrorHandler/ModEntry.cs                             | 2 ++
 src/SMAPI.Mods.ErrorHandler/Patches/DialoguePatcher.cs              | 2 ++
 src/SMAPI.Mods.ErrorHandler/Patches/EventPatcher.cs                 | 2 ++
 src/SMAPI.Mods.ErrorHandler/Patches/GameLocationPatcher.cs          | 2 ++
 src/SMAPI.Mods.ErrorHandler/Patches/IClickableMenuPatcher.cs        | 2 ++
 src/SMAPI.Mods.ErrorHandler/Patches/NpcPatcher.cs                   | 2 ++
 src/SMAPI.Mods.ErrorHandler/Patches/ObjectPatcher.cs                | 2 ++
 src/SMAPI.Mods.ErrorHandler/Patches/SaveGamePatcher.cs              | 2 ++
 src/SMAPI.Mods.ErrorHandler/Patches/SpriteBatchPatcher.cs           | 2 ++
 src/SMAPI.Mods.ErrorHandler/Patches/UtilityPatcher.cs               | 2 ++
 src/SMAPI.Mods.SaveBackup/ModEntry.cs                               | 2 ++
 src/SMAPI.Tests.ModApiConsumer/ApiConsumer.cs                       | 2 ++
 src/SMAPI.Tests.ModApiConsumer/Interfaces/ISimpleApi.cs             | 2 ++
 src/SMAPI.Tests.ModApiProvider/Framework/BaseApi.cs                 | 2 ++
 src/SMAPI.Tests.ModApiProvider/Framework/SimpleApi.cs               | 2 ++
 src/SMAPI.Tests.ModApiProvider/ProviderMod.cs                       | 2 ++
 src/SMAPI.Tests/Core/AssetNameTests.cs                              | 2 ++
 src/SMAPI.Tests/Core/InterfaceProxyTests.cs                         | 2 ++
 src/SMAPI.Tests/Core/ModResolverTests.cs                            | 2 ++
 src/SMAPI.Tests/Core/TranslationTests.cs                            | 2 ++
 src/SMAPI.Tests/Sample.cs                                           | 2 ++
 src/SMAPI.Tests/Utilities/KeybindListTests.cs                       | 2 ++
 src/SMAPI.Tests/Utilities/PathUtilitiesTests.cs                     | 2 ++
 src/SMAPI.Tests/Utilities/SDateTests.cs                             | 2 ++
 src/SMAPI.Tests/Utilities/SemanticVersionTests.cs                   | 2 ++
 src/SMAPI.Tests/WikiClient/ChangeDescriptorTests.cs                 | 2 ++
 src/SMAPI.Toolkit.CoreInterfaces/IManifest.cs                       | 2 ++
 src/SMAPI.Toolkit.CoreInterfaces/IManifestContentPackFor.cs         | 2 ++
 src/SMAPI.Toolkit.CoreInterfaces/IManifestDependency.cs             | 2 ++
 src/SMAPI.Toolkit.CoreInterfaces/ISemanticVersion.cs                | 2 ++
 src/SMAPI.Toolkit/Framework/Clients/WebApi/ModEntryModel.cs         | 2 ++
 src/SMAPI.Toolkit/Framework/Clients/WebApi/ModEntryVersionModel.cs  | 2 ++
 .../Framework/Clients/WebApi/ModExtendedMetadataModel.cs            | 2 ++
 src/SMAPI.Toolkit/Framework/Clients/WebApi/ModSearchEntryModel.cs   | 2 ++
 src/SMAPI.Toolkit/Framework/Clients/WebApi/ModSearchModel.cs        | 2 ++
 src/SMAPI.Toolkit/Framework/Clients/WebApi/WebApiClient.cs          | 2 ++
 src/SMAPI.Toolkit/Framework/Clients/Wiki/ChangeDescriptor.cs        | 2 ++
 src/SMAPI.Toolkit/Framework/Clients/Wiki/WikiClient.cs              | 2 ++
 src/SMAPI.Toolkit/Framework/Clients/Wiki/WikiCompatibilityInfo.cs   | 2 ++
 src/SMAPI.Toolkit/Framework/Clients/Wiki/WikiCompatibilityStatus.cs | 2 ++
 src/SMAPI.Toolkit/Framework/Clients/Wiki/WikiDataOverrideEntry.cs   | 2 --
 src/SMAPI.Toolkit/Framework/Clients/Wiki/WikiModEntry.cs            | 2 ++
 src/SMAPI.Toolkit/Framework/Clients/Wiki/WikiModList.cs             | 2 ++
 src/SMAPI.Toolkit/Framework/Constants.cs                            | 2 ++
 src/SMAPI.Toolkit/Framework/GameScanning/GameScanner.cs             | 2 ++
 src/SMAPI.Toolkit/Framework/LowLevelEnvironmentUtility.cs           | 2 ++
 src/SMAPI.Toolkit/Framework/ModData/MetadataModel.cs                | 2 ++
 src/SMAPI.Toolkit/Framework/ModData/ModDataField.cs                 | 2 ++
 src/SMAPI.Toolkit/Framework/ModData/ModDataModel.cs                 | 2 ++
 src/SMAPI.Toolkit/Framework/ModData/ModDataRecord.cs                | 2 ++
 src/SMAPI.Toolkit/Framework/ModData/ModDataRecordVersionedFields.cs | 2 ++
 src/SMAPI.Toolkit/Framework/ModData/ModDatabase.cs                  | 2 ++
 src/SMAPI.Toolkit/Framework/ModScanning/ModFolder.cs                | 2 ++
 src/SMAPI.Toolkit/Framework/ModScanning/ModScanner.cs               | 2 ++
 src/SMAPI.Toolkit/Framework/SemanticVersionReader.cs                | 2 ++
 src/SMAPI.Toolkit/Framework/UpdateData/UpdateKey.cs                 | 2 ++
 src/SMAPI.Toolkit/ModToolkit.cs                                     | 2 ++
 src/SMAPI.Toolkit/SemanticVersion.cs                                | 2 ++
 src/SMAPI.Toolkit/SemanticVersionComparer.cs                        | 2 ++
 .../Serialization/Converters/ManifestContentPackForConverter.cs     | 2 ++
 .../Serialization/Converters/ManifestDependencyArrayConverter.cs    | 2 ++
 .../Serialization/Converters/SemanticVersionConverter.cs            | 2 ++
 .../Serialization/Converters/SimpleReadOnlyConverter.cs             | 2 ++
 src/SMAPI.Toolkit/Serialization/InternalExtensions.cs               | 2 ++
 src/SMAPI.Toolkit/Serialization/JsonHelper.cs                       | 2 ++
 src/SMAPI.Toolkit/Serialization/Models/Manifest.cs                  | 2 ++
 src/SMAPI.Toolkit/Serialization/Models/ManifestContentPackFor.cs    | 2 ++
 src/SMAPI.Toolkit/Serialization/Models/ManifestDependency.cs        | 2 ++
 src/SMAPI.Toolkit/Serialization/SParseException.cs                  | 2 ++
 src/SMAPI.Toolkit/Utilities/EnvironmentUtility.cs                   | 2 ++
 src/SMAPI.Toolkit/Utilities/FileUtilities.cs                        | 2 ++
 src/SMAPI.Toolkit/Utilities/PathUtilities.cs                        | 2 ++
 src/SMAPI.Web/BackgroundService.cs                                  | 2 ++
 src/SMAPI.Web/Controllers/IndexController.cs                        | 2 ++
 src/SMAPI.Web/Controllers/JsonValidatorController.cs                | 2 ++
 src/SMAPI.Web/Controllers/LogParserController.cs                    | 2 ++
 src/SMAPI.Web/Controllers/ModsApiController.cs                      | 2 ++
 src/SMAPI.Web/Controllers/ModsController.cs                         | 2 ++
 src/SMAPI.Web/Framework/AllowLargePostsAttribute.cs                 | 2 ++
 src/SMAPI.Web/Framework/Caching/Cached.cs                           | 2 ++
 src/SMAPI.Web/Framework/Caching/Mods/IModCacheRepository.cs         | 2 ++
 src/SMAPI.Web/Framework/Caching/Mods/ModCacheMemoryRepository.cs    | 2 ++
 src/SMAPI.Web/Framework/Caching/Wiki/IWikiCacheRepository.cs        | 2 ++
 src/SMAPI.Web/Framework/Caching/Wiki/WikiCacheMemoryRepository.cs   | 2 ++
 src/SMAPI.Web/Framework/Caching/Wiki/WikiMetadata.cs                | 2 ++
 src/SMAPI.Web/Framework/Clients/Chucklefish/ChucklefishClient.cs    | 2 ++
 src/SMAPI.Web/Framework/Clients/CurseForge/CurseForgeClient.cs      | 2 ++
 .../Framework/Clients/CurseForge/ResponseModels/ModFileModel.cs     | 2 ++
 .../Framework/Clients/CurseForge/ResponseModels/ModModel.cs         | 2 ++
 src/SMAPI.Web/Framework/Clients/GenericModDownload.cs               | 2 ++
 src/SMAPI.Web/Framework/Clients/GenericModPage.cs                   | 2 ++
 src/SMAPI.Web/Framework/Clients/GitHub/GitAsset.cs                  | 2 ++
 src/SMAPI.Web/Framework/Clients/GitHub/GitHubClient.cs              | 2 ++
 src/SMAPI.Web/Framework/Clients/GitHub/GitLicense.cs                | 2 ++
 src/SMAPI.Web/Framework/Clients/GitHub/GitRelease.cs                | 2 ++
 src/SMAPI.Web/Framework/Clients/GitHub/GitRepo.cs                   | 2 ++
 src/SMAPI.Web/Framework/Clients/GitHub/IGitHubClient.cs             | 2 ++
 src/SMAPI.Web/Framework/Clients/IModSiteClient.cs                   | 2 ++
 src/SMAPI.Web/Framework/Clients/ModDrop/ModDropClient.cs            | 2 ++
 .../Framework/Clients/ModDrop/ResponseModels/FileDataModel.cs       | 2 ++
 .../Framework/Clients/ModDrop/ResponseModels/ModDataModel.cs        | 2 ++
 .../Framework/Clients/ModDrop/ResponseModels/ModListModel.cs        | 2 ++
 src/SMAPI.Web/Framework/Clients/ModDrop/ResponseModels/ModModel.cs  | 2 ++
 src/SMAPI.Web/Framework/Clients/Nexus/NexusClient.cs                | 2 ++
 src/SMAPI.Web/Framework/Clients/Nexus/ResponseModels/NexusMod.cs    | 2 ++
 src/SMAPI.Web/Framework/Clients/Pastebin/IPastebinClient.cs         | 2 ++
 src/SMAPI.Web/Framework/Clients/Pastebin/PasteInfo.cs               | 2 ++
 src/SMAPI.Web/Framework/Clients/Pastebin/PastebinClient.cs          | 2 ++
 src/SMAPI.Web/Framework/Compression/GzipHelper.cs                   | 2 ++
 src/SMAPI.Web/Framework/Compression/IGzipHelper.cs                  | 2 ++
 src/SMAPI.Web/Framework/ConfigModels/ApiClientsConfig.cs            | 2 ++
 src/SMAPI.Web/Framework/ConfigModels/ModOverrideConfig.cs           | 2 ++
 src/SMAPI.Web/Framework/ConfigModels/ModUpdateCheckConfig.cs        | 2 ++
 src/SMAPI.Web/Framework/ConfigModels/SiteConfig.cs                  | 2 ++
 src/SMAPI.Web/Framework/ConfigModels/SmapiInfoConfig.cs             | 2 ++
 src/SMAPI.Web/Framework/Extensions.cs                               | 2 ++
 src/SMAPI.Web/Framework/IModDownload.cs                             | 2 ++
 src/SMAPI.Web/Framework/IModPage.cs                                 | 2 ++
 src/SMAPI.Web/Framework/InternalControllerFeatureProvider.cs        | 2 ++
 src/SMAPI.Web/Framework/JobDashboardAuthorizationFilter.cs          | 2 ++
 src/SMAPI.Web/Framework/LogParsing/LogMessageBuilder.cs             | 2 ++
 src/SMAPI.Web/Framework/LogParsing/LogParseException.cs             | 5 ++++-
 src/SMAPI.Web/Framework/LogParsing/LogParser.cs                     | 2 ++
 src/SMAPI.Web/Framework/LogParsing/Models/LogMessage.cs             | 2 ++
 src/SMAPI.Web/Framework/LogParsing/Models/LogModInfo.cs             | 2 ++
 src/SMAPI.Web/Framework/LogParsing/Models/ParsedLog.cs              | 2 ++
 src/SMAPI.Web/Framework/ModInfoModel.cs                             | 2 ++
 src/SMAPI.Web/Framework/ModSiteManager.cs                           | 2 ++
 src/SMAPI.Web/Framework/RedirectRules/RedirectHostsToUrlsRule.cs    | 2 ++
 src/SMAPI.Web/Framework/RedirectRules/RedirectMatchRule.cs          | 2 ++
 src/SMAPI.Web/Framework/RedirectRules/RedirectPathsToUrlsRule.cs    | 2 ++
 src/SMAPI.Web/Framework/RedirectRules/RedirectToHttpsRule.cs        | 2 ++
 src/SMAPI.Web/Framework/Storage/IStorageProvider.cs                 | 2 ++
 src/SMAPI.Web/Framework/Storage/StorageProvider.cs                  | 2 ++
 src/SMAPI.Web/Framework/Storage/StoredFileInfo.cs                   | 2 ++
 src/SMAPI.Web/Framework/Storage/UploadResult.cs                     | 2 ++
 src/SMAPI.Web/Framework/VersionConstraint.cs                        | 2 ++
 src/SMAPI.Web/Program.cs                                            | 2 ++
 src/SMAPI.Web/Startup.cs                                            | 2 ++
 src/SMAPI.Web/ViewModels/IndexModel.cs                              | 2 ++
 src/SMAPI.Web/ViewModels/IndexVersionModel.cs                       | 2 ++
 src/SMAPI.Web/ViewModels/JsonValidator/JsonValidatorErrorModel.cs   | 2 ++
 src/SMAPI.Web/ViewModels/JsonValidator/JsonValidatorModel.cs        | 2 ++
 src/SMAPI.Web/ViewModels/JsonValidator/JsonValidatorRequestModel.cs | 2 ++
 src/SMAPI.Web/ViewModels/LogParserModel.cs                          | 2 ++
 src/SMAPI.Web/ViewModels/ModCompatibilityModel.cs                   | 2 ++
 src/SMAPI.Web/ViewModels/ModLinkModel.cs                            | 2 ++
 src/SMAPI.Web/ViewModels/ModListModel.cs                            | 2 ++
 src/SMAPI.Web/ViewModels/ModModel.cs                                | 2 ++
 src/SMAPI.Web/Views/Index/Index.cshtml                              | 4 ++++
 src/SMAPI.Web/Views/Index/Privacy.cshtml                            | 4 ++++
 src/SMAPI.Web/Views/JsonValidator/Index.cshtml                      | 4 ++++
 src/SMAPI.Web/Views/LogParser/Index.cshtml                          | 4 ++++
 src/SMAPI.Web/Views/Mods/Index.cshtml                               | 4 ++++
 src/SMAPI.Web/Views/Shared/_Layout.cshtml                           | 4 ++++
 src/SMAPI.Web/Views/_ViewStart.cshtml                               | 6 +++++-
 src/SMAPI/Constants.cs                                              | 2 ++
 src/SMAPI/Context.cs                                                | 2 ++
 src/SMAPI/Events/AssetReadyEventArgs.cs                             | 2 ++
 src/SMAPI/Events/AssetRequestedEventArgs.cs                         | 2 ++
 src/SMAPI/Events/AssetsInvalidatedEventArgs.cs                      | 2 ++
 src/SMAPI/Events/BuildingListChangedEventArgs.cs                    | 2 ++
 src/SMAPI/Events/ButtonPressedEventArgs.cs                          | 2 ++
 src/SMAPI/Events/ButtonReleasedEventArgs.cs                         | 2 ++
 src/SMAPI/Events/ButtonsChangedEventArgs.cs                         | 2 ++
 src/SMAPI/Events/ChestInventoryChangedEventArgs.cs                  | 2 ++
 src/SMAPI/Events/CursorMovedEventArgs.cs                            | 2 ++
 src/SMAPI/Events/DebrisListChangedEventArgs.cs                      | 2 ++
 src/SMAPI/Events/FurnitureListChangedEventArgs.cs                   | 2 ++
 src/SMAPI/Events/IContentEvents.cs                                  | 2 ++
 src/SMAPI/Events/IDisplayEvents.cs                                  | 2 ++
 src/SMAPI/Events/IGameLoopEvents.cs                                 | 2 ++
 src/SMAPI/Events/IInputEvents.cs                                    | 2 ++
 src/SMAPI/Events/IModEvents.cs                                      | 2 ++
 src/SMAPI/Events/IMultiplayerEvents.cs                              | 2 ++
 src/SMAPI/Events/IPlayerEvents.cs                                   | 2 ++
 src/SMAPI/Events/ISpecialisedEvents.cs                              | 2 ++
 src/SMAPI/Events/IWorldEvents.cs                                    | 2 ++
 src/SMAPI/Events/InventoryChangedEventArgs.cs                       | 2 ++
 src/SMAPI/Events/ItemStackSizeChange.cs                             | 2 ++
 src/SMAPI/Events/LargeTerrainFeatureListChangedEventArgs.cs         | 2 ++
 src/SMAPI/Events/LevelChangedEventArgs.cs                           | 2 ++
 src/SMAPI/Events/LocaleChangedEventArgs.cs                          | 2 ++
 src/SMAPI/Events/LocationListChangedEventArgs.cs                    | 2 ++
 src/SMAPI/Events/MenuChangedEventArgs.cs                            | 2 ++
 src/SMAPI/Events/ModMessageReceivedEventArgs.cs                     | 2 ++
 src/SMAPI/Events/NpcListChangedEventArgs.cs                         | 2 ++
 src/SMAPI/Events/ObjectListChangedEventArgs.cs                      | 2 ++
 src/SMAPI/Events/PeerConnectedEventArgs.cs                          | 2 ++
 src/SMAPI/Events/PeerContextReceivedEventArgs.cs                    | 2 ++
 src/SMAPI/Events/PeerDisconnectedEventArgs.cs                       | 2 ++
 src/SMAPI/Events/RenderedActiveMenuEventArgs.cs                     | 2 ++
 src/SMAPI/Events/RenderedEventArgs.cs                               | 2 ++
 src/SMAPI/Events/RenderedHudEventArgs.cs                            | 2 ++
 src/SMAPI/Events/RenderedWorldEventArgs.cs                          | 2 ++
 src/SMAPI/Events/RenderingActiveMenuEventArgs.cs                    | 2 ++
 src/SMAPI/Events/RenderingEventArgs.cs                              | 2 ++
 src/SMAPI/Events/RenderingHudEventArgs.cs                           | 2 ++
 src/SMAPI/Events/RenderingWorldEventArgs.cs                         | 2 ++
 src/SMAPI/Events/TerrainFeatureListChangedEventArgs.cs              | 2 ++
 src/SMAPI/Events/WarpedEventArgs.cs                                 | 2 ++
 src/SMAPI/Framework/Command.cs                                      | 2 ++
 src/SMAPI/Framework/CommandManager.cs                               | 2 ++
 src/SMAPI/Framework/Commands/HarmonySummaryCommand.cs               | 2 ++
 src/SMAPI/Framework/Commands/HelpCommand.cs                         | 2 ++
 src/SMAPI/Framework/Commands/IInternalCommand.cs                    | 2 ++
 src/SMAPI/Framework/Commands/ReloadI18nCommand.cs                   | 2 ++
 src/SMAPI/Framework/Content/AssetData.cs                            | 2 ++
 src/SMAPI/Framework/Content/AssetDataForDictionary.cs               | 2 ++
 src/SMAPI/Framework/Content/AssetDataForImage.cs                    | 2 ++
 src/SMAPI/Framework/Content/AssetDataForMap.cs                      | 2 ++
 src/SMAPI/Framework/Content/AssetDataForObject.cs                   | 2 ++
 src/SMAPI/Framework/Content/AssetEditOperation.cs                   | 2 ++
 src/SMAPI/Framework/Content/AssetInfo.cs                            | 2 ++
 src/SMAPI/Framework/Content/AssetInterceptorChange.cs               | 2 ++
 src/SMAPI/Framework/Content/AssetLoadOperation.cs                   | 2 ++
 src/SMAPI/Framework/Content/AssetName.cs                            | 2 ++
 src/SMAPI/Framework/Content/AssetOperationGroup.cs                  | 2 ++
 src/SMAPI/Framework/Content/ContentCache.cs                         | 2 ++
 src/SMAPI/Framework/Content/TilesheetReference.cs                   | 2 ++
 src/SMAPI/Framework/ContentCoordinator.cs                           | 2 ++
 src/SMAPI/Framework/ContentManagers/BaseContentManager.cs           | 2 ++
 src/SMAPI/Framework/ContentManagers/GameContentManager.cs           | 2 ++
 .../ContentManagers/GameContentManagerForAssetPropagation.cs        | 2 ++
 src/SMAPI/Framework/ContentManagers/IContentManager.cs              | 2 ++
 src/SMAPI/Framework/ContentManagers/ModContentManager.cs            | 2 ++
 src/SMAPI/Framework/ContentPack.cs                                  | 2 ++
 src/SMAPI/Framework/CursorPosition.cs                               | 2 ++
 src/SMAPI/Framework/DeprecationManager.cs                           | 2 ++
 src/SMAPI/Framework/DeprecationWarning.cs                           | 2 ++
 src/SMAPI/Framework/Events/EventManager.cs                          | 2 ++
 src/SMAPI/Framework/Events/IManagedEvent.cs                         | 2 ++
 src/SMAPI/Framework/Events/ManagedEvent.cs                          | 2 ++
 src/SMAPI/Framework/Events/ManagedEventHandler.cs                   | 2 ++
 src/SMAPI/Framework/Events/ModContentEvents.cs                      | 2 ++
 src/SMAPI/Framework/Events/ModDisplayEvents.cs                      | 2 ++
 src/SMAPI/Framework/Events/ModEvents.cs                             | 2 ++
 src/SMAPI/Framework/Events/ModEventsBase.cs                         | 2 ++
 src/SMAPI/Framework/Events/ModGameLoopEvents.cs                     | 2 ++
 src/SMAPI/Framework/Events/ModInputEvents.cs                        | 2 ++
 src/SMAPI/Framework/Events/ModMultiplayerEvents.cs                  | 2 ++
 src/SMAPI/Framework/Events/ModPlayerEvents.cs                       | 2 ++
 src/SMAPI/Framework/Events/ModSpecialisedEvents.cs                  | 2 ++
 src/SMAPI/Framework/Events/ModWorldEvents.cs                        | 2 ++
 src/SMAPI/Framework/Exceptions/SAssemblyLoadFailedException.cs      | 2 ++
 src/SMAPI/Framework/Exceptions/SContentLoadException.cs             | 4 +++-
 src/SMAPI/Framework/GameVersion.cs                                  | 2 ++
 src/SMAPI/Framework/IModMetadata.cs                                 | 2 ++
 src/SMAPI/Framework/Input/GamePadStateBuilder.cs                    | 2 ++
 src/SMAPI/Framework/Input/IInputStateBuilder.cs                     | 2 ++
 src/SMAPI/Framework/Input/KeyboardStateBuilder.cs                   | 2 ++
 src/SMAPI/Framework/Input/MouseStateBuilder.cs                      | 2 ++
 src/SMAPI/Framework/Input/SInputState.cs                            | 2 ++
 src/SMAPI/Framework/InternalExtensions.cs                           | 2 ++
 src/SMAPI/Framework/Logging/InterceptingTextWriter.cs               | 2 ++
 src/SMAPI/Framework/Logging/LogFileManager.cs                       | 2 ++
 src/SMAPI/Framework/Logging/LogManager.cs                           | 2 ++
 src/SMAPI/Framework/ModHelpers/BaseHelper.cs                        | 2 ++
 src/SMAPI/Framework/ModHelpers/CommandHelper.cs                     | 2 ++
 src/SMAPI/Framework/ModHelpers/ContentHelper.cs                     | 2 ++
 src/SMAPI/Framework/ModHelpers/ContentPackHelper.cs                 | 2 ++
 src/SMAPI/Framework/ModHelpers/DataHelper.cs                        | 2 ++
 src/SMAPI/Framework/ModHelpers/GameContentHelper.cs                 | 2 ++
 src/SMAPI/Framework/ModHelpers/InputHelper.cs                       | 2 ++
 src/SMAPI/Framework/ModHelpers/ModContentHelper.cs                  | 2 ++
 src/SMAPI/Framework/ModHelpers/ModHelper.cs                         | 2 ++
 src/SMAPI/Framework/ModHelpers/ModRegistryHelper.cs                 | 2 ++
 src/SMAPI/Framework/ModHelpers/MultiplayerHelper.cs                 | 2 ++
 src/SMAPI/Framework/ModHelpers/ReflectionHelper.cs                  | 2 ++
 src/SMAPI/Framework/ModHelpers/TranslationHelper.cs                 | 2 ++
 src/SMAPI/Framework/ModLinked.cs                                    | 2 ++
 src/SMAPI/Framework/ModLoading/AssemblyDefinitionResolver.cs        | 2 ++
 src/SMAPI/Framework/ModLoading/AssemblyLoadStatus.cs                | 2 ++
 src/SMAPI/Framework/ModLoading/AssemblyLoader.cs                    | 2 ++
 src/SMAPI/Framework/ModLoading/AssemblyParseResult.cs               | 2 ++
 src/SMAPI/Framework/ModLoading/Finders/EventFinder.cs               | 2 ++
 src/SMAPI/Framework/ModLoading/Finders/FieldFinder.cs               | 2 ++
 src/SMAPI/Framework/ModLoading/Finders/MethodFinder.cs              | 2 ++
 src/SMAPI/Framework/ModLoading/Finders/PropertyFinder.cs            | 2 ++
 .../ModLoading/Finders/ReferenceToMemberWithUnexpectedTypeFinder.cs | 2 ++
 .../Framework/ModLoading/Finders/ReferenceToMissingMemberFinder.cs  | 2 ++
 src/SMAPI/Framework/ModLoading/Finders/TypeAssemblyFinder.cs        | 2 ++
 src/SMAPI/Framework/ModLoading/Finders/TypeFinder.cs                | 2 ++
 src/SMAPI/Framework/ModLoading/Framework/BaseInstructionHandler.cs  | 2 ++
 src/SMAPI/Framework/ModLoading/Framework/RecursiveRewriter.cs       | 2 ++
 src/SMAPI/Framework/ModLoading/Framework/RewriteHelper.cs           | 2 ++
 src/SMAPI/Framework/ModLoading/IInstructionHandler.cs               | 2 ++
 src/SMAPI/Framework/ModLoading/IncompatibleInstructionException.cs  | 2 ++
 src/SMAPI/Framework/ModLoading/InvalidModStateException.cs          | 2 ++
 src/SMAPI/Framework/ModLoading/ModMetadata.cs                       | 2 ++
 src/SMAPI/Framework/ModLoading/ModResolver.cs                       | 2 ++
 src/SMAPI/Framework/ModLoading/PlatformAssemblyMap.cs               | 2 ++
 src/SMAPI/Framework/ModLoading/RewriteFacades/AccessToolsFacade.cs  | 2 ++
 .../Framework/ModLoading/RewriteFacades/HarmonyInstanceFacade.cs    | 2 ++
 .../Framework/ModLoading/RewriteFacades/HarmonyMethodFacade.cs      | 2 ++
 src/SMAPI/Framework/ModLoading/RewriteFacades/SpriteBatchFacade.cs  | 2 ++
 .../Framework/ModLoading/Rewriters/ArchitectureAssemblyRewriter.cs  | 2 ++
 src/SMAPI/Framework/ModLoading/Rewriters/FieldReplaceRewriter.cs    | 2 ++
 src/SMAPI/Framework/ModLoading/Rewriters/HarmonyRewriter.cs         | 2 ++
 src/SMAPI/Framework/ModLoading/Rewriters/HeuristicFieldRewriter.cs  | 2 ++
 src/SMAPI/Framework/ModLoading/Rewriters/HeuristicMethodRewriter.cs | 2 ++
 src/SMAPI/Framework/ModLoading/Rewriters/MethodParentRewriter.cs    | 2 ++
 src/SMAPI/Framework/ModLoading/Rewriters/TypeReferenceRewriter.cs   | 2 ++
 src/SMAPI/Framework/ModLoading/Symbols/SymbolReader.cs              | 2 ++
 src/SMAPI/Framework/ModLoading/Symbols/SymbolReaderProvider.cs      | 2 ++
 src/SMAPI/Framework/ModLoading/Symbols/SymbolWriterProvider.cs      | 2 ++
 src/SMAPI/Framework/ModLoading/TypeReferenceComparer.cs             | 2 ++
 src/SMAPI/Framework/ModRegistry.cs                                  | 2 ++
 src/SMAPI/Framework/Models/SConfig.cs                               | 2 ++
 src/SMAPI/Framework/Monitor.cs                                      | 2 ++
 src/SMAPI/Framework/Networking/ModMessageModel.cs                   | 2 ++
 src/SMAPI/Framework/Networking/MultiplayerPeer.cs                   | 2 ++
 src/SMAPI/Framework/Networking/MultiplayerPeerMod.cs                | 2 ++
 src/SMAPI/Framework/Networking/RemoteContextModModel.cs             | 2 ++
 src/SMAPI/Framework/Networking/RemoteContextModel.cs                | 2 ++
 src/SMAPI/Framework/Networking/SGalaxyNetClient.cs                  | 2 ++
 src/SMAPI/Framework/Networking/SGalaxyNetServer.cs                  | 2 ++
 src/SMAPI/Framework/Networking/SLidgrenClient.cs                    | 2 ++
 src/SMAPI/Framework/Networking/SLidgrenServer.cs                    | 2 ++
 src/SMAPI/Framework/Reflection/CacheEntry.cs                        | 2 ++
 src/SMAPI/Framework/Reflection/InterfaceProxyFactory.cs             | 2 ++
 src/SMAPI/Framework/Reflection/ReflectedField.cs                    | 2 ++
 src/SMAPI/Framework/Reflection/ReflectedMethod.cs                   | 2 ++
 src/SMAPI/Framework/Reflection/ReflectedProperty.cs                 | 2 ++
 src/SMAPI/Framework/Reflection/Reflector.cs                         | 2 ++
 src/SMAPI/Framework/Rendering/SDisplayDevice.cs                     | 2 ++
 src/SMAPI/Framework/Rendering/SXnaDisplayDevice.cs                  | 2 ++
 src/SMAPI/Framework/RequestExitDelegate.cs                          | 2 ++
 src/SMAPI/Framework/SChatBox.cs                                     | 2 ++
 src/SMAPI/Framework/SCore.cs                                        | 2 ++
 src/SMAPI/Framework/SGame.cs                                        | 2 ++
 src/SMAPI/Framework/SGameRunner.cs                                  | 2 ++
 src/SMAPI/Framework/SModHooks.cs                                    | 2 ++
 src/SMAPI/Framework/SMultiplayer.cs                                 | 2 ++
 src/SMAPI/Framework/Serialization/ColorConverter.cs                 | 2 ++
 src/SMAPI/Framework/Serialization/KeybindConverter.cs               | 2 ++
 src/SMAPI/Framework/Serialization/PointConverter.cs                 | 2 ++
 src/SMAPI/Framework/Serialization/RectangleConverter.cs             | 2 ++
 src/SMAPI/Framework/Serialization/Vector2Converter.cs               | 2 ++
 src/SMAPI/Framework/Singleton.cs                                    | 2 ++
 src/SMAPI/Framework/SnapshotDiff.cs                                 | 2 ++
 src/SMAPI/Framework/SnapshotItemListDiff.cs                         | 2 ++
 src/SMAPI/Framework/SnapshotListDiff.cs                             | 2 ++
 src/SMAPI/Framework/StateTracking/ChestTracker.cs                   | 2 ++
 src/SMAPI/Framework/StateTracking/Comparers/EquatableComparer.cs    | 2 ++
 .../Framework/StateTracking/Comparers/GenericEqualsComparer.cs      | 2 ++
 .../Framework/StateTracking/Comparers/ObjectReferenceComparer.cs    | 2 ++
 .../Framework/StateTracking/FieldWatchers/BaseDisposableWatcher.cs  | 2 ++
 .../Framework/StateTracking/FieldWatchers/ComparableListWatcher.cs  | 2 ++
 .../Framework/StateTracking/FieldWatchers/ComparableWatcher.cs      | 2 ++
 .../StateTracking/FieldWatchers/ImmutableCollectionWatcher.cs       | 2 ++
 .../Framework/StateTracking/FieldWatchers/NetCollectionWatcher.cs   | 2 ++
 .../Framework/StateTracking/FieldWatchers/NetDictionaryWatcher.cs   | 2 ++
 src/SMAPI/Framework/StateTracking/FieldWatchers/NetListWatcher.cs   | 2 ++
 src/SMAPI/Framework/StateTracking/FieldWatchers/NetValueWatcher.cs  | 2 ++
 .../StateTracking/FieldWatchers/ObservableCollectionWatcher.cs      | 2 ++
 src/SMAPI/Framework/StateTracking/FieldWatchers/WatcherFactory.cs   | 2 ++
 src/SMAPI/Framework/StateTracking/ICollectionWatcher.cs             | 2 ++
 src/SMAPI/Framework/StateTracking/IDictionaryWatcher.cs             | 2 ++
 src/SMAPI/Framework/StateTracking/IValueWatcher.cs                  | 2 ++
 src/SMAPI/Framework/StateTracking/IWatcher.cs                       | 2 ++
 src/SMAPI/Framework/StateTracking/LocationTracker.cs                | 2 ++
 src/SMAPI/Framework/StateTracking/PlayerTracker.cs                  | 2 ++
 src/SMAPI/Framework/StateTracking/Snapshots/LocationSnapshot.cs     | 2 ++
 src/SMAPI/Framework/StateTracking/Snapshots/PlayerSnapshot.cs       | 2 ++
 src/SMAPI/Framework/StateTracking/Snapshots/WatcherSnapshot.cs      | 2 ++
 .../Framework/StateTracking/Snapshots/WorldLocationsSnapshot.cs     | 2 ++
 src/SMAPI/Framework/StateTracking/WorldLocationsTracker.cs          | 2 ++
 src/SMAPI/Framework/TemporaryHacks/MiniMonoModHotfix.cs             | 2 ++
 src/SMAPI/Framework/Translator.cs                                   | 2 ++
 src/SMAPI/Framework/Utilities/ContextHash.cs                        | 2 ++
 src/SMAPI/Framework/Utilities/Countdown.cs                          | 2 +-
 src/SMAPI/Framework/Utilities/TickCacheDictionary.cs                | 2 ++
 src/SMAPI/Framework/WatcherCore.cs                                  | 2 ++
 src/SMAPI/GamePlatform.cs                                           | 2 ++
 src/SMAPI/IAssetData.cs                                             | 2 ++
 src/SMAPI/IAssetDataForDictionary.cs                                | 2 ++
 src/SMAPI/IAssetDataForImage.cs                                     | 2 ++
 src/SMAPI/IAssetDataForMap.cs                                       | 2 ++
 src/SMAPI/IAssetEditor.cs                                           | 2 ++
 src/SMAPI/IAssetInfo.cs                                             | 2 ++
 src/SMAPI/IAssetLoader.cs                                           | 2 ++
 src/SMAPI/IAssetName.cs                                             | 2 ++
 src/SMAPI/ICommandHelper.cs                                         | 2 ++
 src/SMAPI/IContentHelper.cs                                         | 2 ++
 src/SMAPI/IContentPack.cs                                           | 2 ++
 src/SMAPI/IContentPackHelper.cs                                     | 2 ++
 src/SMAPI/ICursorPosition.cs                                        | 2 ++
 src/SMAPI/IDataHelper.cs                                            | 2 ++
 src/SMAPI/IGameContentHelper.cs                                     | 2 ++
 src/SMAPI/IInputHelper.cs                                           | 2 ++
 src/SMAPI/IMod.cs                                                   | 2 ++
 src/SMAPI/IModContentHelper.cs                                      | 2 ++
 src/SMAPI/IModHelper.cs                                             | 2 ++
 src/SMAPI/IModInfo.cs                                               | 2 ++
 src/SMAPI/IModLinked.cs                                             | 2 ++
 src/SMAPI/IModRegistry.cs                                           | 2 ++
 src/SMAPI/IMonitor.cs                                               | 2 ++
 src/SMAPI/IMultiplayerHelper.cs                                     | 2 ++
 src/SMAPI/IMultiplayerPeer.cs                                       | 2 ++
 src/SMAPI/IMultiplayerPeerMod.cs                                    | 2 ++
 src/SMAPI/IReflectedField.cs                                        | 4 +++-
 src/SMAPI/IReflectedMethod.cs                                       | 4 +++-
 src/SMAPI/IReflectedProperty.cs                                     | 2 ++
 src/SMAPI/IReflectionHelper.cs                                      | 2 ++
 src/SMAPI/ITranslationHelper.cs                                     | 2 ++
 src/SMAPI/Metadata/CoreAssetPropagator.cs                           | 2 ++
 src/SMAPI/Metadata/InstructionMetadata.cs                           | 2 ++
 src/SMAPI/Mod.cs                                                    | 2 ++
 src/SMAPI/Patches/Game1Patcher.cs                                   | 2 ++
 src/SMAPI/Patches/TitleMenuPatcher.cs                               | 2 ++
 src/SMAPI/Program.cs                                                | 2 ++
 src/SMAPI/SemanticVersion.cs                                        | 2 ++
 src/SMAPI/Translation.cs                                            | 2 ++
 src/SMAPI/Utilities/CaseInsensitivePathCache.cs                     | 2 ++
 src/SMAPI/Utilities/Keybind.cs                                      | 2 ++
 src/SMAPI/Utilities/KeybindList.cs                                  | 2 ++
 src/SMAPI/Utilities/PathUtilities.cs                                | 2 ++
 src/SMAPI/Utilities/PerScreen.cs                                    | 2 ++
 src/SMAPI/Utilities/SDate.cs                                        | 2 ++
 486 files changed, 988 insertions(+), 8 deletions(-)

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

diff --git a/build/common.targets b/build/common.targets
index bcb0e9e1..258b48f2 100644
--- a/build/common.targets
+++ b/build/common.targets
@@ -5,6 +5,7 @@
     <Product>SMAPI</Product>
     <LangVersion>latest</LangVersion>
     <AssemblySearchPaths>$(AssemblySearchPaths);{GAC}</AssemblySearchPaths>
+    <Nullable>enable</Nullable>
 
     <!--set platform-->
     <DefineConstants Condition="$(OS) == 'Windows_NT'">$(DefineConstants);SMAPI_FOR_WINDOWS</DefineConstants>
diff --git a/src/SMAPI.Installer/Framework/InstallerContext.cs b/src/SMAPI.Installer/Framework/InstallerContext.cs
index abc7adde..23d5b17c 100644
--- a/src/SMAPI.Installer/Framework/InstallerContext.cs
+++ b/src/SMAPI.Installer/Framework/InstallerContext.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System.IO;
 using StardewModdingAPI.Toolkit;
 using StardewModdingAPI.Toolkit.Framework.GameScanning;
diff --git a/src/SMAPI.Installer/Framework/InstallerPaths.cs b/src/SMAPI.Installer/Framework/InstallerPaths.cs
index 0976eceb..fd9d1be6 100644
--- a/src/SMAPI.Installer/Framework/InstallerPaths.cs
+++ b/src/SMAPI.Installer/Framework/InstallerPaths.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System.IO;
 using StardewModdingAPI.Toolkit.Framework;
 
diff --git a/src/SMAPI.Installer/InteractiveInstaller.cs b/src/SMAPI.Installer/InteractiveInstaller.cs
index 09183b5d..b07c0461 100644
--- a/src/SMAPI.Installer/InteractiveInstaller.cs
+++ b/src/SMAPI.Installer/InteractiveInstaller.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
diff --git a/src/SMAPI.Installer/Program.cs b/src/SMAPI.Installer/Program.cs
index 2c9b2c0a..5139513f 100644
--- a/src/SMAPI.Installer/Program.cs
+++ b/src/SMAPI.Installer/Program.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 using System.Diagnostics.CodeAnalysis;
 using System.IO;
diff --git a/src/SMAPI.Internal.Patching/BasePatcher.cs b/src/SMAPI.Internal.Patching/BasePatcher.cs
index 87155d7f..6d019b52 100644
--- a/src/SMAPI.Internal.Patching/BasePatcher.cs
+++ b/src/SMAPI.Internal.Patching/BasePatcher.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 using System.Reflection;
 using HarmonyLib;
diff --git a/src/SMAPI.Internal.Patching/HarmonyPatcher.cs b/src/SMAPI.Internal.Patching/HarmonyPatcher.cs
index 6f30c241..fc239fd2 100644
--- a/src/SMAPI.Internal.Patching/HarmonyPatcher.cs
+++ b/src/SMAPI.Internal.Patching/HarmonyPatcher.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 using HarmonyLib;
 
diff --git a/src/SMAPI.Internal.Patching/IPatcher.cs b/src/SMAPI.Internal.Patching/IPatcher.cs
index a732d64f..5b373117 100644
--- a/src/SMAPI.Internal.Patching/IPatcher.cs
+++ b/src/SMAPI.Internal.Patching/IPatcher.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using HarmonyLib;
 
 namespace StardewModdingAPI.Internal.Patching
diff --git a/src/SMAPI.Internal.Patching/PatchHelper.cs b/src/SMAPI.Internal.Patching/PatchHelper.cs
index c9758616..52b15fd1 100644
--- a/src/SMAPI.Internal.Patching/PatchHelper.cs
+++ b/src/SMAPI.Internal.Patching/PatchHelper.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 using System.Linq;
 using System.Reflection;
diff --git a/src/SMAPI.Internal/ConsoleWriting/ColorSchemeConfig.cs b/src/SMAPI.Internal/ConsoleWriting/ColorSchemeConfig.cs
index 001840bf..b22aa231 100644
--- a/src/SMAPI.Internal/ConsoleWriting/ColorSchemeConfig.cs
+++ b/src/SMAPI.Internal/ConsoleWriting/ColorSchemeConfig.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 using System.Collections.Generic;
 
diff --git a/src/SMAPI.Internal/ConsoleWriting/ColorfulConsoleWriter.cs b/src/SMAPI.Internal/ConsoleWriting/ColorfulConsoleWriter.cs
index bfe155e0..19a31c7b 100644
--- a/src/SMAPI.Internal/ConsoleWriting/ColorfulConsoleWriter.cs
+++ b/src/SMAPI.Internal/ConsoleWriting/ColorfulConsoleWriter.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 using System.Collections.Generic;
 using StardewModdingAPI.Toolkit.Utilities;
diff --git a/src/SMAPI.Internal/ConsoleWriting/IConsoleWriter.cs b/src/SMAPI.Internal/ConsoleWriting/IConsoleWriter.cs
index fbcf161c..84e17207 100644
--- a/src/SMAPI.Internal/ConsoleWriting/IConsoleWriter.cs
+++ b/src/SMAPI.Internal/ConsoleWriting/IConsoleWriter.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 namespace StardewModdingAPI.Internal.ConsoleWriting
 {
     /// <summary>Writes text to the console.</summary>
diff --git a/src/SMAPI.Internal/ExceptionHelper.cs b/src/SMAPI.Internal/ExceptionHelper.cs
index 6bd1d579..a856cf71 100644
--- a/src/SMAPI.Internal/ExceptionHelper.cs
+++ b/src/SMAPI.Internal/ExceptionHelper.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 using System.Reflection;
 using System.Text.RegularExpressions;
diff --git a/src/SMAPI.ModBuildConfig.Analyzer.Tests/Framework/DiagnosticResult.cs b/src/SMAPI.ModBuildConfig.Analyzer.Tests/Framework/DiagnosticResult.cs
index 896c2cb8..8c24eda9 100644
--- a/src/SMAPI.ModBuildConfig.Analyzer.Tests/Framework/DiagnosticResult.cs
+++ b/src/SMAPI.ModBuildConfig.Analyzer.Tests/Framework/DiagnosticResult.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 // <generated />
 using Microsoft.CodeAnalysis;
 using System;
diff --git a/src/SMAPI.ModBuildConfig.Analyzer.Tests/Framework/DiagnosticVerifier.Helper.cs b/src/SMAPI.ModBuildConfig.Analyzer.Tests/Framework/DiagnosticVerifier.Helper.cs
index 0247288e..8d72fea1 100644
--- a/src/SMAPI.ModBuildConfig.Analyzer.Tests/Framework/DiagnosticVerifier.Helper.cs
+++ b/src/SMAPI.ModBuildConfig.Analyzer.Tests/Framework/DiagnosticVerifier.Helper.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 // <generated />
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.CSharp;
diff --git a/src/SMAPI.ModBuildConfig.Analyzer.Tests/Framework/DiagnosticVerifier.cs b/src/SMAPI.ModBuildConfig.Analyzer.Tests/Framework/DiagnosticVerifier.cs
index 49697dfa..09d3a3f8 100644
--- a/src/SMAPI.ModBuildConfig.Analyzer.Tests/Framework/DiagnosticVerifier.cs
+++ b/src/SMAPI.ModBuildConfig.Analyzer.Tests/Framework/DiagnosticVerifier.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 // <generated />
 using System.Collections.Generic;
 using System.Linq;
diff --git a/src/SMAPI.ModBuildConfig.Analyzer.Tests/Mock/Netcode/NetCollection.cs b/src/SMAPI.ModBuildConfig.Analyzer.Tests/Mock/Netcode/NetCollection.cs
index d160610e..54aa1c6c 100644
--- a/src/SMAPI.ModBuildConfig.Analyzer.Tests/Mock/Netcode/NetCollection.cs
+++ b/src/SMAPI.ModBuildConfig.Analyzer.Tests/Mock/Netcode/NetCollection.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 // ReSharper disable CheckNamespace -- matches Stardew Valley's code
 using System.Collections;
 using System.Collections.Generic;
diff --git a/src/SMAPI.ModBuildConfig.Analyzer.Tests/Mock/Netcode/NetFieldBase.cs b/src/SMAPI.ModBuildConfig.Analyzer.Tests/Mock/Netcode/NetFieldBase.cs
index 140c6f59..1c349a0b 100644
--- a/src/SMAPI.ModBuildConfig.Analyzer.Tests/Mock/Netcode/NetFieldBase.cs
+++ b/src/SMAPI.ModBuildConfig.Analyzer.Tests/Mock/Netcode/NetFieldBase.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 // ReSharper disable CheckNamespace -- matches Stardew Valley's code
 namespace Netcode
 {
diff --git a/src/SMAPI.ModBuildConfig.Analyzer.Tests/Mock/Netcode/NetInt.cs b/src/SMAPI.ModBuildConfig.Analyzer.Tests/Mock/Netcode/NetInt.cs
index b3abc467..e8e1dc63 100644
--- a/src/SMAPI.ModBuildConfig.Analyzer.Tests/Mock/Netcode/NetInt.cs
+++ b/src/SMAPI.ModBuildConfig.Analyzer.Tests/Mock/Netcode/NetInt.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 // ReSharper disable CheckNamespace -- matches Stardew Valley's code
 namespace Netcode
 {
diff --git a/src/SMAPI.ModBuildConfig.Analyzer.Tests/Mock/Netcode/NetList.cs b/src/SMAPI.ModBuildConfig.Analyzer.Tests/Mock/Netcode/NetList.cs
index 1699f71c..f7fb9617 100644
--- a/src/SMAPI.ModBuildConfig.Analyzer.Tests/Mock/Netcode/NetList.cs
+++ b/src/SMAPI.ModBuildConfig.Analyzer.Tests/Mock/Netcode/NetList.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 // ReSharper disable CheckNamespace -- matches Stardew Valley's code
 using System.Collections;
 using System.Collections.Generic;
diff --git a/src/SMAPI.ModBuildConfig.Analyzer.Tests/Mock/Netcode/NetObjectList.cs b/src/SMAPI.ModBuildConfig.Analyzer.Tests/Mock/Netcode/NetObjectList.cs
index 7814e7d6..74c17843 100644
--- a/src/SMAPI.ModBuildConfig.Analyzer.Tests/Mock/Netcode/NetObjectList.cs
+++ b/src/SMAPI.ModBuildConfig.Analyzer.Tests/Mock/Netcode/NetObjectList.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 // ReSharper disable CheckNamespace -- matches Stardew Valley's code
 namespace Netcode
 {
diff --git a/src/SMAPI.ModBuildConfig.Analyzer.Tests/Mock/StardewValley/Farmer.cs b/src/SMAPI.ModBuildConfig.Analyzer.Tests/Mock/StardewValley/Farmer.cs
index 13fab069..bdbf9b45 100644
--- a/src/SMAPI.ModBuildConfig.Analyzer.Tests/Mock/StardewValley/Farmer.cs
+++ b/src/SMAPI.ModBuildConfig.Analyzer.Tests/Mock/StardewValley/Farmer.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 // ReSharper disable CheckNamespace, InconsistentNaming -- matches Stardew Valley's code
 #pragma warning disable 649 // (never assigned) -- only used to test type conversions
 using System.Collections.Generic;
diff --git a/src/SMAPI.ModBuildConfig.Analyzer.Tests/Mock/StardewValley/Item.cs b/src/SMAPI.ModBuildConfig.Analyzer.Tests/Mock/StardewValley/Item.cs
index e8da92fa..d1f0afc4 100644
--- a/src/SMAPI.ModBuildConfig.Analyzer.Tests/Mock/StardewValley/Item.cs
+++ b/src/SMAPI.ModBuildConfig.Analyzer.Tests/Mock/StardewValley/Item.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 // ReSharper disable CheckNamespace, InconsistentNaming -- matches Stardew Valley's code
 using Netcode;
 
diff --git a/src/SMAPI.ModBuildConfig.Analyzer.Tests/Mock/StardewValley/Object.cs b/src/SMAPI.ModBuildConfig.Analyzer.Tests/Mock/StardewValley/Object.cs
index 151010a7..f54b22fe 100644
--- a/src/SMAPI.ModBuildConfig.Analyzer.Tests/Mock/StardewValley/Object.cs
+++ b/src/SMAPI.ModBuildConfig.Analyzer.Tests/Mock/StardewValley/Object.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 // ReSharper disable CheckNamespace, InconsistentNaming -- matches Stardew Valley's code
 using Netcode;
 
diff --git a/src/SMAPI.ModBuildConfig.Analyzer.Tests/NetFieldAnalyzerTests.cs b/src/SMAPI.ModBuildConfig.Analyzer.Tests/NetFieldAnalyzerTests.cs
index f11a59d3..29f3b956 100644
--- a/src/SMAPI.ModBuildConfig.Analyzer.Tests/NetFieldAnalyzerTests.cs
+++ b/src/SMAPI.ModBuildConfig.Analyzer.Tests/NetFieldAnalyzerTests.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.Diagnostics;
 using NUnit.Framework;
diff --git a/src/SMAPI.ModBuildConfig.Analyzer.Tests/ObsoleteFieldAnalyzerTests.cs b/src/SMAPI.ModBuildConfig.Analyzer.Tests/ObsoleteFieldAnalyzerTests.cs
index 76607b8e..1cf7369f 100644
--- a/src/SMAPI.ModBuildConfig.Analyzer.Tests/ObsoleteFieldAnalyzerTests.cs
+++ b/src/SMAPI.ModBuildConfig.Analyzer.Tests/ObsoleteFieldAnalyzerTests.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.Diagnostics;
 using NUnit.Framework;
diff --git a/src/SMAPI.ModBuildConfig.Analyzer/AnalyzerUtilities.cs b/src/SMAPI.ModBuildConfig.Analyzer/AnalyzerUtilities.cs
index a1ad8aa4..1cc37b38 100644
--- a/src/SMAPI.ModBuildConfig.Analyzer/AnalyzerUtilities.cs
+++ b/src/SMAPI.ModBuildConfig.Analyzer/AnalyzerUtilities.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System.Collections.Generic;
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.CSharp;
diff --git a/src/SMAPI.ModBuildConfig.Analyzer/NetFieldAnalyzer.cs b/src/SMAPI.ModBuildConfig.Analyzer/NetFieldAnalyzer.cs
index 553aae99..cb2856da 100644
--- a/src/SMAPI.ModBuildConfig.Analyzer/NetFieldAnalyzer.cs
+++ b/src/SMAPI.ModBuildConfig.Analyzer/NetFieldAnalyzer.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 using System.Collections.Generic;
 using System.Collections.Immutable;
diff --git a/src/SMAPI.ModBuildConfig.Analyzer/ObsoleteFieldAnalyzer.cs b/src/SMAPI.ModBuildConfig.Analyzer/ObsoleteFieldAnalyzer.cs
index ba089513..158d7243 100644
--- a/src/SMAPI.ModBuildConfig.Analyzer/ObsoleteFieldAnalyzer.cs
+++ b/src/SMAPI.ModBuildConfig.Analyzer/ObsoleteFieldAnalyzer.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 using System.Collections.Generic;
 using System.Collections.Immutable;
diff --git a/src/SMAPI.ModBuildConfig/DeployModTask.cs b/src/SMAPI.ModBuildConfig/DeployModTask.cs
index c7026ee1..43fac9d5 100644
--- a/src/SMAPI.ModBuildConfig/DeployModTask.cs
+++ b/src/SMAPI.ModBuildConfig/DeployModTask.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 using System.Collections.Generic;
 using System.IO;
diff --git a/src/SMAPI.ModBuildConfig/Framework/ModFileManager.cs b/src/SMAPI.ModBuildConfig/Framework/ModFileManager.cs
index 80955f67..ad2c0de3 100644
--- a/src/SMAPI.ModBuildConfig/Framework/ModFileManager.cs
+++ b/src/SMAPI.ModBuildConfig/Framework/ModFileManager.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 using System.Collections.Generic;
 using System.IO;
diff --git a/src/SMAPI.ModBuildConfig/Framework/UserErrorException.cs b/src/SMAPI.ModBuildConfig/Framework/UserErrorException.cs
index 64e31c29..588118ef 100644
--- a/src/SMAPI.ModBuildConfig/Framework/UserErrorException.cs
+++ b/src/SMAPI.ModBuildConfig/Framework/UserErrorException.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 
 namespace StardewModdingAPI.ModBuildConfig.Framework
diff --git a/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/ArgumentParser.cs b/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/ArgumentParser.cs
index 7e157c38..8fcbf711 100644
--- a/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/ArgumentParser.cs
+++ b/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/ArgumentParser.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 using System.Collections;
 using System.Collections.Generic;
diff --git a/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/ConsoleCommand.cs b/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/ConsoleCommand.cs
index 44b7824e..a8dd41f5 100644
--- a/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/ConsoleCommand.cs
+++ b/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/ConsoleCommand.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 using System.Collections.Generic;
 using System.Linq;
diff --git a/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/IConsoleCommand.cs b/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/IConsoleCommand.cs
index 9c82bbd3..4c6df538 100644
--- a/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/IConsoleCommand.cs
+++ b/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/IConsoleCommand.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 namespace StardewModdingAPI.Mods.ConsoleCommands.Framework.Commands
 {
     /// <summary>A console command to register.</summary>
diff --git a/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Other/ApplySaveFixCommand.cs b/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Other/ApplySaveFixCommand.cs
index b02ba4b1..f31457ed 100644
--- a/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Other/ApplySaveFixCommand.cs
+++ b/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Other/ApplySaveFixCommand.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
diff --git a/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Other/DebugCommand.cs b/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Other/DebugCommand.cs
index cf1dcbce..f289c669 100644
--- a/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Other/DebugCommand.cs
+++ b/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Other/DebugCommand.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System.Diagnostics.CodeAnalysis;
 using StardewValley;
 
diff --git a/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Other/RegenerateBundles.cs b/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Other/RegenerateBundles.cs
index 159d7c4a..81a8c570 100644
--- a/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Other/RegenerateBundles.cs
+++ b/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Other/RegenerateBundles.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
diff --git a/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Other/ShowDataFilesCommand.cs b/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Other/ShowDataFilesCommand.cs
index a233d588..d762d8bf 100644
--- a/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Other/ShowDataFilesCommand.cs
+++ b/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Other/ShowDataFilesCommand.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System.Diagnostics;
 using System.Diagnostics.CodeAnalysis;
 
diff --git a/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Other/ShowGameFilesCommand.cs b/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Other/ShowGameFilesCommand.cs
index 745b821b..b5733eb9 100644
--- a/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Other/ShowGameFilesCommand.cs
+++ b/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Other/ShowGameFilesCommand.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System.Diagnostics;
 using System.Diagnostics.CodeAnalysis;
 
diff --git a/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Other/TestInputCommand.cs b/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Other/TestInputCommand.cs
index 8bf9f5db..5484fc7c 100644
--- a/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Other/TestInputCommand.cs
+++ b/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Other/TestInputCommand.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 using System.Diagnostics.CodeAnalysis;
 
diff --git a/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Player/AddCommand.cs b/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Player/AddCommand.cs
index fae31c23..0d8db870 100644
--- a/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Player/AddCommand.cs
+++ b/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Player/AddCommand.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 using System.Linq;
 using StardewModdingAPI.Mods.ConsoleCommands.Framework.ItemData;
diff --git a/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Player/ListItemTypesCommand.cs b/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Player/ListItemTypesCommand.cs
index ef35ad19..e57d4065 100644
--- a/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Player/ListItemTypesCommand.cs
+++ b/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Player/ListItemTypesCommand.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using StardewModdingAPI.Mods.ConsoleCommands.Framework.ItemData;
diff --git a/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Player/ListItemsCommand.cs b/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Player/ListItemsCommand.cs
index 5cc464fe..5a21b459 100644
--- a/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Player/ListItemsCommand.cs
+++ b/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Player/ListItemsCommand.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
diff --git a/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Player/SetColorCommand.cs b/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Player/SetColorCommand.cs
index af7f2d18..e8605163 100644
--- a/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Player/SetColorCommand.cs
+++ b/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Player/SetColorCommand.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System.Diagnostics.CodeAnalysis;
 using Microsoft.Xna.Framework;
 using StardewValley;
diff --git a/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Player/SetFarmTypeCommand.cs b/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Player/SetFarmTypeCommand.cs
index 2809df9c..02670911 100644
--- a/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Player/SetFarmTypeCommand.cs
+++ b/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Player/SetFarmTypeCommand.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 using System.Collections;
 using System.Collections.Generic;
diff --git a/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Player/SetHealthCommand.cs b/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Player/SetHealthCommand.cs
index f169159f..1a1a9eab 100644
--- a/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Player/SetHealthCommand.cs
+++ b/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Player/SetHealthCommand.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using StardewValley;
diff --git a/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Player/SetImmunityCommand.cs b/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Player/SetImmunityCommand.cs
index 1065bd21..d1dede1f 100644
--- a/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Player/SetImmunityCommand.cs
+++ b/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Player/SetImmunityCommand.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using StardewValley;
diff --git a/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Player/SetMaxHealthCommand.cs b/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Player/SetMaxHealthCommand.cs
index c2c4931d..2b3b140c 100644
--- a/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Player/SetMaxHealthCommand.cs
+++ b/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Player/SetMaxHealthCommand.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using StardewValley;
diff --git a/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Player/SetMaxStaminaCommand.cs b/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Player/SetMaxStaminaCommand.cs
index 8c794e75..f9ed6c58 100644
--- a/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Player/SetMaxStaminaCommand.cs
+++ b/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Player/SetMaxStaminaCommand.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using StardewValley;
diff --git a/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Player/SetMoneyCommand.cs b/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Player/SetMoneyCommand.cs
index 3afcc62b..56447a65 100644
--- a/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Player/SetMoneyCommand.cs
+++ b/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Player/SetMoneyCommand.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using StardewValley;
diff --git a/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Player/SetNameCommand.cs b/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Player/SetNameCommand.cs
index 12d6b6e8..4ce7e1f8 100644
--- a/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Player/SetNameCommand.cs
+++ b/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Player/SetNameCommand.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System.Diagnostics.CodeAnalysis;
 using StardewValley;
 
diff --git a/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Player/SetStaminaCommand.cs b/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Player/SetStaminaCommand.cs
index 24718ace..ea8d74c2 100644
--- a/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Player/SetStaminaCommand.cs
+++ b/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Player/SetStaminaCommand.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using StardewValley;
diff --git a/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Player/SetStyleCommand.cs b/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Player/SetStyleCommand.cs
index 558c327d..84625a34 100644
--- a/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Player/SetStyleCommand.cs
+++ b/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Player/SetStyleCommand.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System.Diagnostics.CodeAnalysis;
 using StardewValley;
 
diff --git a/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/World/ClearCommand.cs b/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/World/ClearCommand.cs
index eeb95553..92c73e08 100644
--- a/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/World/ClearCommand.cs
+++ b/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/World/ClearCommand.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
diff --git a/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/World/DownMineLevelCommand.cs b/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/World/DownMineLevelCommand.cs
index 5b1a4a13..0f18c760 100644
--- a/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/World/DownMineLevelCommand.cs
+++ b/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/World/DownMineLevelCommand.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System.Diagnostics.CodeAnalysis;
 using StardewValley;
 using StardewValley.Locations;
diff --git a/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/World/FreezeTimeCommand.cs b/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/World/FreezeTimeCommand.cs
index 16faa2fe..8808fe35 100644
--- a/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/World/FreezeTimeCommand.cs
+++ b/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/World/FreezeTimeCommand.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System.Linq;
 using StardewValley;
 
diff --git a/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/World/HurryAllCommand.cs b/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/World/HurryAllCommand.cs
index 09531720..f9810dc3 100644
--- a/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/World/HurryAllCommand.cs
+++ b/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/World/HurryAllCommand.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 using System.Diagnostics.CodeAnalysis;
 using StardewValley;
diff --git a/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/World/SetDayCommand.cs b/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/World/SetDayCommand.cs
index 399fd934..8aa27d93 100644
--- a/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/World/SetDayCommand.cs
+++ b/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/World/SetDayCommand.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using StardewModdingAPI.Utilities;
diff --git a/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/World/SetMineLevelCommand.cs b/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/World/SetMineLevelCommand.cs
index f977fce3..ad6ac777 100644
--- a/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/World/SetMineLevelCommand.cs
+++ b/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/World/SetMineLevelCommand.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 using System.Diagnostics.CodeAnalysis;
 using StardewValley;
diff --git a/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/World/SetSeasonCommand.cs b/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/World/SetSeasonCommand.cs
index d839c037..ebe58913 100644
--- a/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/World/SetSeasonCommand.cs
+++ b/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/World/SetSeasonCommand.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using StardewModdingAPI.Utilities;
diff --git a/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/World/SetTimeCommand.cs b/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/World/SetTimeCommand.cs
index 8c4458dd..1e6bab96 100644
--- a/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/World/SetTimeCommand.cs
+++ b/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/World/SetTimeCommand.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using Microsoft.Xna.Framework;
diff --git a/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/World/SetYearCommand.cs b/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/World/SetYearCommand.cs
index a666a634..995f222e 100644
--- a/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/World/SetYearCommand.cs
+++ b/src/SMAPI.Mods.ConsoleCommands/Framework/Commands/World/SetYearCommand.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using StardewModdingAPI.Utilities;
diff --git a/src/SMAPI.Mods.ConsoleCommands/Framework/ItemData/SearchableItem.cs b/src/SMAPI.Mods.ConsoleCommands/Framework/ItemData/SearchableItem.cs
index 3675a963..ab0b2e05 100644
--- a/src/SMAPI.Mods.ConsoleCommands/Framework/ItemData/SearchableItem.cs
+++ b/src/SMAPI.Mods.ConsoleCommands/Framework/ItemData/SearchableItem.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 using StardewValley;
 
diff --git a/src/SMAPI.Mods.ConsoleCommands/Framework/ItemRepository.cs b/src/SMAPI.Mods.ConsoleCommands/Framework/ItemRepository.cs
index 3915db9a..7d2a1662 100644
--- a/src/SMAPI.Mods.ConsoleCommands/Framework/ItemRepository.cs
+++ b/src/SMAPI.Mods.ConsoleCommands/Framework/ItemRepository.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
diff --git a/src/SMAPI.Mods.ConsoleCommands/ModEntry.cs b/src/SMAPI.Mods.ConsoleCommands/ModEntry.cs
index 5e594984..e3ca1a39 100644
--- a/src/SMAPI.Mods.ConsoleCommands/ModEntry.cs
+++ b/src/SMAPI.Mods.ConsoleCommands/ModEntry.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 using System.Collections.Generic;
 using System.Linq;
diff --git a/src/SMAPI.Mods.ErrorHandler/ModEntry.cs b/src/SMAPI.Mods.ErrorHandler/ModEntry.cs
index 2d6242cf..fa171012 100644
--- a/src/SMAPI.Mods.ErrorHandler/ModEntry.cs
+++ b/src/SMAPI.Mods.ErrorHandler/ModEntry.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 using System.Reflection;
 using StardewModdingAPI.Events;
diff --git a/src/SMAPI.Mods.ErrorHandler/Patches/DialoguePatcher.cs b/src/SMAPI.Mods.ErrorHandler/Patches/DialoguePatcher.cs
index 7a3af39c..b05c8cca 100644
--- a/src/SMAPI.Mods.ErrorHandler/Patches/DialoguePatcher.cs
+++ b/src/SMAPI.Mods.ErrorHandler/Patches/DialoguePatcher.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 using System.Diagnostics.CodeAnalysis;
 using HarmonyLib;
diff --git a/src/SMAPI.Mods.ErrorHandler/Patches/EventPatcher.cs b/src/SMAPI.Mods.ErrorHandler/Patches/EventPatcher.cs
index 1b706147..63674d09 100644
--- a/src/SMAPI.Mods.ErrorHandler/Patches/EventPatcher.cs
+++ b/src/SMAPI.Mods.ErrorHandler/Patches/EventPatcher.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 using System.Diagnostics.CodeAnalysis;
 using HarmonyLib;
diff --git a/src/SMAPI.Mods.ErrorHandler/Patches/GameLocationPatcher.cs b/src/SMAPI.Mods.ErrorHandler/Patches/GameLocationPatcher.cs
index 7df6b0a2..98aa4a38 100644
--- a/src/SMAPI.Mods.ErrorHandler/Patches/GameLocationPatcher.cs
+++ b/src/SMAPI.Mods.ErrorHandler/Patches/GameLocationPatcher.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 using System.Diagnostics.CodeAnalysis;
 using HarmonyLib;
diff --git a/src/SMAPI.Mods.ErrorHandler/Patches/IClickableMenuPatcher.cs b/src/SMAPI.Mods.ErrorHandler/Patches/IClickableMenuPatcher.cs
index b65a695a..85ce8ac4 100644
--- a/src/SMAPI.Mods.ErrorHandler/Patches/IClickableMenuPatcher.cs
+++ b/src/SMAPI.Mods.ErrorHandler/Patches/IClickableMenuPatcher.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System.Diagnostics.CodeAnalysis;
 using HarmonyLib;
 using StardewModdingAPI.Internal.Patching;
diff --git a/src/SMAPI.Mods.ErrorHandler/Patches/NpcPatcher.cs b/src/SMAPI.Mods.ErrorHandler/Patches/NpcPatcher.cs
index 275bb5bf..5354f724 100644
--- a/src/SMAPI.Mods.ErrorHandler/Patches/NpcPatcher.cs
+++ b/src/SMAPI.Mods.ErrorHandler/Patches/NpcPatcher.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
diff --git a/src/SMAPI.Mods.ErrorHandler/Patches/ObjectPatcher.cs b/src/SMAPI.Mods.ErrorHandler/Patches/ObjectPatcher.cs
index fd4ea35c..499718b0 100644
--- a/src/SMAPI.Mods.ErrorHandler/Patches/ObjectPatcher.cs
+++ b/src/SMAPI.Mods.ErrorHandler/Patches/ObjectPatcher.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
diff --git a/src/SMAPI.Mods.ErrorHandler/Patches/SaveGamePatcher.cs b/src/SMAPI.Mods.ErrorHandler/Patches/SaveGamePatcher.cs
index 01bfb888..1941d2a8 100644
--- a/src/SMAPI.Mods.ErrorHandler/Patches/SaveGamePatcher.cs
+++ b/src/SMAPI.Mods.ErrorHandler/Patches/SaveGamePatcher.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
diff --git a/src/SMAPI.Mods.ErrorHandler/Patches/SpriteBatchPatcher.cs b/src/SMAPI.Mods.ErrorHandler/Patches/SpriteBatchPatcher.cs
index f243c6d1..b4c03bb9 100644
--- a/src/SMAPI.Mods.ErrorHandler/Patches/SpriteBatchPatcher.cs
+++ b/src/SMAPI.Mods.ErrorHandler/Patches/SpriteBatchPatcher.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 using System.Diagnostics.CodeAnalysis;
 using HarmonyLib;
diff --git a/src/SMAPI.Mods.ErrorHandler/Patches/UtilityPatcher.cs b/src/SMAPI.Mods.ErrorHandler/Patches/UtilityPatcher.cs
index ce85d0c2..108ed585 100644
--- a/src/SMAPI.Mods.ErrorHandler/Patches/UtilityPatcher.cs
+++ b/src/SMAPI.Mods.ErrorHandler/Patches/UtilityPatcher.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 using System.Diagnostics.CodeAnalysis;
 using HarmonyLib;
diff --git a/src/SMAPI.Mods.SaveBackup/ModEntry.cs b/src/SMAPI.Mods.SaveBackup/ModEntry.cs
index 273b1434..b2b41ca6 100644
--- a/src/SMAPI.Mods.SaveBackup/ModEntry.cs
+++ b/src/SMAPI.Mods.SaveBackup/ModEntry.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 using System.Diagnostics;
 using System.IO;
diff --git a/src/SMAPI.Tests.ModApiConsumer/ApiConsumer.cs b/src/SMAPI.Tests.ModApiConsumer/ApiConsumer.cs
index ac7bd338..285dd259 100644
--- a/src/SMAPI.Tests.ModApiConsumer/ApiConsumer.cs
+++ b/src/SMAPI.Tests.ModApiConsumer/ApiConsumer.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 using SMAPI.Tests.ModApiConsumer.Interfaces;
 
diff --git a/src/SMAPI.Tests.ModApiConsumer/Interfaces/ISimpleApi.cs b/src/SMAPI.Tests.ModApiConsumer/Interfaces/ISimpleApi.cs
index 7f94e137..23491fd1 100644
--- a/src/SMAPI.Tests.ModApiConsumer/Interfaces/ISimpleApi.cs
+++ b/src/SMAPI.Tests.ModApiConsumer/Interfaces/ISimpleApi.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 using System.Collections.Generic;
 using System.Reflection;
diff --git a/src/SMAPI.Tests.ModApiProvider/Framework/BaseApi.cs b/src/SMAPI.Tests.ModApiProvider/Framework/BaseApi.cs
index 8092e3e7..b5870baa 100644
--- a/src/SMAPI.Tests.ModApiProvider/Framework/BaseApi.cs
+++ b/src/SMAPI.Tests.ModApiProvider/Framework/BaseApi.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 namespace SMAPI.Tests.ModApiProvider.Framework
 {
     /// <summary>The base class for <see cref="SimpleApi"/>.</summary>
diff --git a/src/SMAPI.Tests.ModApiProvider/Framework/SimpleApi.cs b/src/SMAPI.Tests.ModApiProvider/Framework/SimpleApi.cs
index 1100af36..82e902f5 100644
--- a/src/SMAPI.Tests.ModApiProvider/Framework/SimpleApi.cs
+++ b/src/SMAPI.Tests.ModApiProvider/Framework/SimpleApi.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 using System.Collections.Generic;
 using System.Reflection;
diff --git a/src/SMAPI.Tests.ModApiProvider/ProviderMod.cs b/src/SMAPI.Tests.ModApiProvider/ProviderMod.cs
index c36e1c6d..3fc8d749 100644
--- a/src/SMAPI.Tests.ModApiProvider/ProviderMod.cs
+++ b/src/SMAPI.Tests.ModApiProvider/ProviderMod.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System.Collections.Generic;
 using System.Reflection;
 using SMAPI.Tests.ModApiProvider.Framework;
diff --git a/src/SMAPI.Tests/Core/AssetNameTests.cs b/src/SMAPI.Tests/Core/AssetNameTests.cs
index 7b817d13..b7e34191 100644
--- a/src/SMAPI.Tests/Core/AssetNameTests.cs
+++ b/src/SMAPI.Tests/Core/AssetNameTests.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 using System.Collections.Generic;
 using FluentAssertions;
diff --git a/src/SMAPI.Tests/Core/InterfaceProxyTests.cs b/src/SMAPI.Tests/Core/InterfaceProxyTests.cs
index 99c1298f..1bf2ed68 100644
--- a/src/SMAPI.Tests/Core/InterfaceProxyTests.cs
+++ b/src/SMAPI.Tests/Core/InterfaceProxyTests.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
diff --git a/src/SMAPI.Tests/Core/ModResolverTests.cs b/src/SMAPI.Tests/Core/ModResolverTests.cs
index 86c50606..2ce1c74e 100644
--- a/src/SMAPI.Tests/Core/ModResolverTests.cs
+++ b/src/SMAPI.Tests/Core/ModResolverTests.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 using System.Collections.Generic;
 using System.IO;
diff --git a/src/SMAPI.Tests/Core/TranslationTests.cs b/src/SMAPI.Tests/Core/TranslationTests.cs
index 58bc59b1..f8f0e315 100644
--- a/src/SMAPI.Tests/Core/TranslationTests.cs
+++ b/src/SMAPI.Tests/Core/TranslationTests.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 using System.Collections.Generic;
 using System.Linq;
diff --git a/src/SMAPI.Tests/Sample.cs b/src/SMAPI.Tests/Sample.cs
index 9587a100..6d4339ca 100644
--- a/src/SMAPI.Tests/Sample.cs
+++ b/src/SMAPI.Tests/Sample.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 
 namespace SMAPI.Tests
diff --git a/src/SMAPI.Tests/Utilities/KeybindListTests.cs b/src/SMAPI.Tests/Utilities/KeybindListTests.cs
index 0bd6ec17..f5c156c4 100644
--- a/src/SMAPI.Tests/Utilities/KeybindListTests.cs
+++ b/src/SMAPI.Tests/Utilities/KeybindListTests.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 using System.Collections.Generic;
 using NUnit.Framework;
diff --git a/src/SMAPI.Tests/Utilities/PathUtilitiesTests.cs b/src/SMAPI.Tests/Utilities/PathUtilitiesTests.cs
index 94819c2e..ae2cc6ce 100644
--- a/src/SMAPI.Tests/Utilities/PathUtilitiesTests.cs
+++ b/src/SMAPI.Tests/Utilities/PathUtilitiesTests.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System.IO;
 using NUnit.Framework;
 using StardewModdingAPI.Toolkit.Utilities;
diff --git a/src/SMAPI.Tests/Utilities/SDateTests.cs b/src/SMAPI.Tests/Utilities/SDateTests.cs
index 886f25cd..a4a36828 100644
--- a/src/SMAPI.Tests/Utilities/SDateTests.cs
+++ b/src/SMAPI.Tests/Utilities/SDateTests.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
diff --git a/src/SMAPI.Tests/Utilities/SemanticVersionTests.cs b/src/SMAPI.Tests/Utilities/SemanticVersionTests.cs
index 142c9814..66181ea6 100644
--- a/src/SMAPI.Tests/Utilities/SemanticVersionTests.cs
+++ b/src/SMAPI.Tests/Utilities/SemanticVersionTests.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 using System.Diagnostics.CodeAnalysis;
 using Newtonsoft.Json;
diff --git a/src/SMAPI.Tests/WikiClient/ChangeDescriptorTests.cs b/src/SMAPI.Tests/WikiClient/ChangeDescriptorTests.cs
index 84cae8df..7695fbf8 100644
--- a/src/SMAPI.Tests/WikiClient/ChangeDescriptorTests.cs
+++ b/src/SMAPI.Tests/WikiClient/ChangeDescriptorTests.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System.Collections.Generic;
 using NUnit.Framework;
 using StardewModdingAPI;
diff --git a/src/SMAPI.Toolkit.CoreInterfaces/IManifest.cs b/src/SMAPI.Toolkit.CoreInterfaces/IManifest.cs
index 7375f005..a9251446 100644
--- a/src/SMAPI.Toolkit.CoreInterfaces/IManifest.cs
+++ b/src/SMAPI.Toolkit.CoreInterfaces/IManifest.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System.Collections.Generic;
 
 namespace StardewModdingAPI
diff --git a/src/SMAPI.Toolkit.CoreInterfaces/IManifestContentPackFor.cs b/src/SMAPI.Toolkit.CoreInterfaces/IManifestContentPackFor.cs
index f05a3873..d898b716 100644
--- a/src/SMAPI.Toolkit.CoreInterfaces/IManifestContentPackFor.cs
+++ b/src/SMAPI.Toolkit.CoreInterfaces/IManifestContentPackFor.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 namespace StardewModdingAPI
 {
     /// <summary>Indicates which mod can read the content pack represented by the containing manifest.</summary>
diff --git a/src/SMAPI.Toolkit.CoreInterfaces/IManifestDependency.cs b/src/SMAPI.Toolkit.CoreInterfaces/IManifestDependency.cs
index e86cd1f4..49b7aed6 100644
--- a/src/SMAPI.Toolkit.CoreInterfaces/IManifestDependency.cs
+++ b/src/SMAPI.Toolkit.CoreInterfaces/IManifestDependency.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 namespace StardewModdingAPI
 {
     /// <summary>A mod dependency listed in a mod manifest.</summary>
diff --git a/src/SMAPI.Toolkit.CoreInterfaces/ISemanticVersion.cs b/src/SMAPI.Toolkit.CoreInterfaces/ISemanticVersion.cs
index b228b2d1..52cec52e 100644
--- a/src/SMAPI.Toolkit.CoreInterfaces/ISemanticVersion.cs
+++ b/src/SMAPI.Toolkit.CoreInterfaces/ISemanticVersion.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 
 namespace StardewModdingAPI
diff --git a/src/SMAPI.Toolkit/Framework/Clients/WebApi/ModEntryModel.cs b/src/SMAPI.Toolkit/Framework/Clients/WebApi/ModEntryModel.cs
index 0115fbf3..d5ca2034 100644
--- a/src/SMAPI.Toolkit/Framework/Clients/WebApi/ModEntryModel.cs
+++ b/src/SMAPI.Toolkit/Framework/Clients/WebApi/ModEntryModel.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 
 namespace StardewModdingAPI.Toolkit.Framework.Clients.WebApi
diff --git a/src/SMAPI.Toolkit/Framework/Clients/WebApi/ModEntryVersionModel.cs b/src/SMAPI.Toolkit/Framework/Clients/WebApi/ModEntryVersionModel.cs
index 188db31d..9aac7fd3 100644
--- a/src/SMAPI.Toolkit/Framework/Clients/WebApi/ModEntryVersionModel.cs
+++ b/src/SMAPI.Toolkit/Framework/Clients/WebApi/ModEntryVersionModel.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using Newtonsoft.Json;
 using StardewModdingAPI.Toolkit.Serialization.Converters;
 
diff --git a/src/SMAPI.Toolkit/Framework/Clients/WebApi/ModExtendedMetadataModel.cs b/src/SMAPI.Toolkit/Framework/Clients/WebApi/ModExtendedMetadataModel.cs
index 0fa4a74d..eb54ec78 100644
--- a/src/SMAPI.Toolkit/Framework/Clients/WebApi/ModExtendedMetadataModel.cs
+++ b/src/SMAPI.Toolkit/Framework/Clients/WebApi/ModExtendedMetadataModel.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 using System.Collections.Generic;
 using System.Linq;
diff --git a/src/SMAPI.Toolkit/Framework/Clients/WebApi/ModSearchEntryModel.cs b/src/SMAPI.Toolkit/Framework/Clients/WebApi/ModSearchEntryModel.cs
index 404d4618..8fe8fa2a 100644
--- a/src/SMAPI.Toolkit/Framework/Clients/WebApi/ModSearchEntryModel.cs
+++ b/src/SMAPI.Toolkit/Framework/Clients/WebApi/ModSearchEntryModel.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 
 namespace StardewModdingAPI.Toolkit.Framework.Clients.WebApi
diff --git a/src/SMAPI.Toolkit/Framework/Clients/WebApi/ModSearchModel.cs b/src/SMAPI.Toolkit/Framework/Clients/WebApi/ModSearchModel.cs
index 73698173..393391f7 100644
--- a/src/SMAPI.Toolkit/Framework/Clients/WebApi/ModSearchModel.cs
+++ b/src/SMAPI.Toolkit/Framework/Clients/WebApi/ModSearchModel.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System.Linq;
 using StardewModdingAPI.Toolkit.Utilities;
 
diff --git a/src/SMAPI.Toolkit/Framework/Clients/WebApi/WebApiClient.cs b/src/SMAPI.Toolkit/Framework/Clients/WebApi/WebApiClient.cs
index f7d26d21..56acb768 100644
--- a/src/SMAPI.Toolkit/Framework/Clients/WebApi/WebApiClient.cs
+++ b/src/SMAPI.Toolkit/Framework/Clients/WebApi/WebApiClient.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 using System.Collections.Generic;
 using System.Linq;
diff --git a/src/SMAPI.Toolkit/Framework/Clients/Wiki/ChangeDescriptor.cs b/src/SMAPI.Toolkit/Framework/Clients/Wiki/ChangeDescriptor.cs
index 2ed255c8..910bf793 100644
--- a/src/SMAPI.Toolkit/Framework/Clients/Wiki/ChangeDescriptor.cs
+++ b/src/SMAPI.Toolkit/Framework/Clients/Wiki/ChangeDescriptor.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
diff --git a/src/SMAPI.Toolkit/Framework/Clients/Wiki/WikiClient.cs b/src/SMAPI.Toolkit/Framework/Clients/Wiki/WikiClient.cs
index c936bb3e..86c3bd75 100644
--- a/src/SMAPI.Toolkit/Framework/Clients/Wiki/WikiClient.cs
+++ b/src/SMAPI.Toolkit/Framework/Clients/Wiki/WikiClient.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
diff --git a/src/SMAPI.Toolkit/Framework/Clients/Wiki/WikiCompatibilityInfo.cs b/src/SMAPI.Toolkit/Framework/Clients/Wiki/WikiCompatibilityInfo.cs
index 204acd2b..30e76d04 100644
--- a/src/SMAPI.Toolkit/Framework/Clients/Wiki/WikiCompatibilityInfo.cs
+++ b/src/SMAPI.Toolkit/Framework/Clients/Wiki/WikiCompatibilityInfo.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 namespace StardewModdingAPI.Toolkit.Framework.Clients.Wiki
 {
     /// <summary>Compatibility info for a mod.</summary>
diff --git a/src/SMAPI.Toolkit/Framework/Clients/Wiki/WikiCompatibilityStatus.cs b/src/SMAPI.Toolkit/Framework/Clients/Wiki/WikiCompatibilityStatus.cs
index 5cdf489f..2c222b71 100644
--- a/src/SMAPI.Toolkit/Framework/Clients/Wiki/WikiCompatibilityStatus.cs
+++ b/src/SMAPI.Toolkit/Framework/Clients/Wiki/WikiCompatibilityStatus.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 namespace StardewModdingAPI.Toolkit.Framework.Clients.Wiki
 {
     /// <summary>The compatibility status for a mod.</summary>
diff --git a/src/SMAPI.Toolkit/Framework/Clients/Wiki/WikiDataOverrideEntry.cs b/src/SMAPI.Toolkit/Framework/Clients/Wiki/WikiDataOverrideEntry.cs
index 03c0d214..a6f5a88f 100644
--- a/src/SMAPI.Toolkit/Framework/Clients/Wiki/WikiDataOverrideEntry.cs
+++ b/src/SMAPI.Toolkit/Framework/Clients/Wiki/WikiDataOverrideEntry.cs
@@ -1,7 +1,5 @@
 using System;
 
-#nullable enable
-
 namespace StardewModdingAPI.Toolkit.Framework.Clients.Wiki
 {
     /// <summary>The data overrides to apply to matching mods.</summary>
diff --git a/src/SMAPI.Toolkit/Framework/Clients/Wiki/WikiModEntry.cs b/src/SMAPI.Toolkit/Framework/Clients/Wiki/WikiModEntry.cs
index 4e0104da..91943ff9 100644
--- a/src/SMAPI.Toolkit/Framework/Clients/Wiki/WikiModEntry.cs
+++ b/src/SMAPI.Toolkit/Framework/Clients/Wiki/WikiModEntry.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 namespace StardewModdingAPI.Toolkit.Framework.Clients.Wiki
 {
     /// <summary>A mod entry in the wiki list.</summary>
diff --git a/src/SMAPI.Toolkit/Framework/Clients/Wiki/WikiModList.cs b/src/SMAPI.Toolkit/Framework/Clients/Wiki/WikiModList.cs
index 0d614f28..1787197a 100644
--- a/src/SMAPI.Toolkit/Framework/Clients/Wiki/WikiModList.cs
+++ b/src/SMAPI.Toolkit/Framework/Clients/Wiki/WikiModList.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 namespace StardewModdingAPI.Toolkit.Framework.Clients.Wiki
 {
     /// <summary>Metadata from the wiki's mod compatibility list.</summary>
diff --git a/src/SMAPI.Toolkit/Framework/Constants.cs b/src/SMAPI.Toolkit/Framework/Constants.cs
index 55f26582..c3a787c7 100644
--- a/src/SMAPI.Toolkit/Framework/Constants.cs
+++ b/src/SMAPI.Toolkit/Framework/Constants.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 namespace StardewModdingAPI.Toolkit.Framework
 {
     /// <summary>Contains the SMAPI installer's constants and assumptions.</summary>
diff --git a/src/SMAPI.Toolkit/Framework/GameScanning/GameScanner.cs b/src/SMAPI.Toolkit/Framework/GameScanning/GameScanner.cs
index 768beba1..ac6fe411 100644
--- a/src/SMAPI.Toolkit/Framework/GameScanning/GameScanner.cs
+++ b/src/SMAPI.Toolkit/Framework/GameScanning/GameScanner.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 using System.Collections.Generic;
 using System.IO;
diff --git a/src/SMAPI.Toolkit/Framework/LowLevelEnvironmentUtility.cs b/src/SMAPI.Toolkit/Framework/LowLevelEnvironmentUtility.cs
index c0332331..9998edec 100644
--- a/src/SMAPI.Toolkit/Framework/LowLevelEnvironmentUtility.cs
+++ b/src/SMAPI.Toolkit/Framework/LowLevelEnvironmentUtility.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 using System.Diagnostics;
 using System.Diagnostics.CodeAnalysis;
diff --git a/src/SMAPI.Toolkit/Framework/ModData/MetadataModel.cs b/src/SMAPI.Toolkit/Framework/ModData/MetadataModel.cs
index ef6d4dd9..3fa70615 100644
--- a/src/SMAPI.Toolkit/Framework/ModData/MetadataModel.cs
+++ b/src/SMAPI.Toolkit/Framework/ModData/MetadataModel.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System.Collections.Generic;
 
 namespace StardewModdingAPI.Toolkit.Framework.ModData
diff --git a/src/SMAPI.Toolkit/Framework/ModData/ModDataField.cs b/src/SMAPI.Toolkit/Framework/ModData/ModDataField.cs
index b02be3e4..46cb81e1 100644
--- a/src/SMAPI.Toolkit/Framework/ModData/ModDataField.cs
+++ b/src/SMAPI.Toolkit/Framework/ModData/ModDataField.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System.Linq;
 
 namespace StardewModdingAPI.Toolkit.Framework.ModData
diff --git a/src/SMAPI.Toolkit/Framework/ModData/ModDataModel.cs b/src/SMAPI.Toolkit/Framework/ModData/ModDataModel.cs
index 2167d3e5..4d96a555 100644
--- a/src/SMAPI.Toolkit/Framework/ModData/ModDataModel.cs
+++ b/src/SMAPI.Toolkit/Framework/ModData/ModDataModel.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 using System.Collections.Generic;
 using System.Linq;
diff --git a/src/SMAPI.Toolkit/Framework/ModData/ModDataRecord.cs b/src/SMAPI.Toolkit/Framework/ModData/ModDataRecord.cs
index 7e07ffde..4c09e1ba 100644
--- a/src/SMAPI.Toolkit/Framework/ModData/ModDataRecord.cs
+++ b/src/SMAPI.Toolkit/Framework/ModData/ModDataRecord.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 using System.Collections.Generic;
 using System.Linq;
diff --git a/src/SMAPI.Toolkit/Framework/ModData/ModDataRecordVersionedFields.cs b/src/SMAPI.Toolkit/Framework/ModData/ModDataRecordVersionedFields.cs
index 5aaabd51..b599b343 100644
--- a/src/SMAPI.Toolkit/Framework/ModData/ModDataRecordVersionedFields.cs
+++ b/src/SMAPI.Toolkit/Framework/ModData/ModDataRecordVersionedFields.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 namespace StardewModdingAPI.Toolkit.Framework.ModData
 {
     /// <summary>The versioned fields from a <see cref="ModDataRecord"/> for a specific manifest.</summary>
diff --git a/src/SMAPI.Toolkit/Framework/ModData/ModDatabase.cs b/src/SMAPI.Toolkit/Framework/ModData/ModDatabase.cs
index 9bb3f558..a5237334 100644
--- a/src/SMAPI.Toolkit/Framework/ModData/ModDatabase.cs
+++ b/src/SMAPI.Toolkit/Framework/ModData/ModDatabase.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 using System.Collections.Generic;
 using System.Linq;
diff --git a/src/SMAPI.Toolkit/Framework/ModScanning/ModFolder.cs b/src/SMAPI.Toolkit/Framework/ModScanning/ModFolder.cs
index 825b98e5..81d72c0b 100644
--- a/src/SMAPI.Toolkit/Framework/ModScanning/ModFolder.cs
+++ b/src/SMAPI.Toolkit/Framework/ModScanning/ModFolder.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
diff --git a/src/SMAPI.Toolkit/Framework/ModScanning/ModScanner.cs b/src/SMAPI.Toolkit/Framework/ModScanning/ModScanner.cs
index e16af3a8..4deaf19b 100644
--- a/src/SMAPI.Toolkit/Framework/ModScanning/ModScanner.cs
+++ b/src/SMAPI.Toolkit/Framework/ModScanning/ModScanner.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 using System.Collections.Generic;
 using System.IO;
diff --git a/src/SMAPI.Toolkit/Framework/SemanticVersionReader.cs b/src/SMAPI.Toolkit/Framework/SemanticVersionReader.cs
index 489e1c4d..57eea2f7 100644
--- a/src/SMAPI.Toolkit/Framework/SemanticVersionReader.cs
+++ b/src/SMAPI.Toolkit/Framework/SemanticVersionReader.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 namespace StardewModdingAPI.Toolkit.Framework
 {
     /// <summary>Reads strings into a semantic version.</summary>
diff --git a/src/SMAPI.Toolkit/Framework/UpdateData/UpdateKey.cs b/src/SMAPI.Toolkit/Framework/UpdateData/UpdateKey.cs
index 077c0361..ec94ed51 100644
--- a/src/SMAPI.Toolkit/Framework/UpdateData/UpdateKey.cs
+++ b/src/SMAPI.Toolkit/Framework/UpdateData/UpdateKey.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 
 namespace StardewModdingAPI.Toolkit.Framework.UpdateData
diff --git a/src/SMAPI.Toolkit/ModToolkit.cs b/src/SMAPI.Toolkit/ModToolkit.cs
index 80008df7..9ae8cd1c 100644
--- a/src/SMAPI.Toolkit/ModToolkit.cs
+++ b/src/SMAPI.Toolkit/ModToolkit.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
diff --git a/src/SMAPI.Toolkit/SemanticVersion.cs b/src/SMAPI.Toolkit/SemanticVersion.cs
index 2f3e282b..97b92555 100644
--- a/src/SMAPI.Toolkit/SemanticVersion.cs
+++ b/src/SMAPI.Toolkit/SemanticVersion.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 using System.Text.RegularExpressions;
 using StardewModdingAPI.Toolkit.Framework;
diff --git a/src/SMAPI.Toolkit/SemanticVersionComparer.cs b/src/SMAPI.Toolkit/SemanticVersionComparer.cs
index 8eba2c9f..a0472f62 100644
--- a/src/SMAPI.Toolkit/SemanticVersionComparer.cs
+++ b/src/SMAPI.Toolkit/SemanticVersionComparer.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System.Collections.Generic;
 
 namespace StardewModdingAPI.Toolkit
diff --git a/src/SMAPI.Toolkit/Serialization/Converters/ManifestContentPackForConverter.cs b/src/SMAPI.Toolkit/Serialization/Converters/ManifestContentPackForConverter.cs
index 5cabe9d8..d2dc0d22 100644
--- a/src/SMAPI.Toolkit/Serialization/Converters/ManifestContentPackForConverter.cs
+++ b/src/SMAPI.Toolkit/Serialization/Converters/ManifestContentPackForConverter.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 using Newtonsoft.Json;
 using StardewModdingAPI.Toolkit.Serialization.Models;
diff --git a/src/SMAPI.Toolkit/Serialization/Converters/ManifestDependencyArrayConverter.cs b/src/SMAPI.Toolkit/Serialization/Converters/ManifestDependencyArrayConverter.cs
index 7b88d6b7..2c3c2ee7 100644
--- a/src/SMAPI.Toolkit/Serialization/Converters/ManifestDependencyArrayConverter.cs
+++ b/src/SMAPI.Toolkit/Serialization/Converters/ManifestDependencyArrayConverter.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 using System.Collections.Generic;
 using Newtonsoft.Json;
diff --git a/src/SMAPI.Toolkit/Serialization/Converters/SemanticVersionConverter.cs b/src/SMAPI.Toolkit/Serialization/Converters/SemanticVersionConverter.cs
index cf69104d..9205cebe 100644
--- a/src/SMAPI.Toolkit/Serialization/Converters/SemanticVersionConverter.cs
+++ b/src/SMAPI.Toolkit/Serialization/Converters/SemanticVersionConverter.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
diff --git a/src/SMAPI.Toolkit/Serialization/Converters/SimpleReadOnlyConverter.cs b/src/SMAPI.Toolkit/Serialization/Converters/SimpleReadOnlyConverter.cs
index ccc5158b..c923350c 100644
--- a/src/SMAPI.Toolkit/Serialization/Converters/SimpleReadOnlyConverter.cs
+++ b/src/SMAPI.Toolkit/Serialization/Converters/SimpleReadOnlyConverter.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
diff --git a/src/SMAPI.Toolkit/Serialization/InternalExtensions.cs b/src/SMAPI.Toolkit/Serialization/InternalExtensions.cs
index 10f88dde..1fce5f9d 100644
--- a/src/SMAPI.Toolkit/Serialization/InternalExtensions.cs
+++ b/src/SMAPI.Toolkit/Serialization/InternalExtensions.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 using Newtonsoft.Json.Linq;
 
diff --git a/src/SMAPI.Toolkit/Serialization/JsonHelper.cs b/src/SMAPI.Toolkit/Serialization/JsonHelper.cs
index 91c2e9d3..9700e712 100644
--- a/src/SMAPI.Toolkit/Serialization/JsonHelper.cs
+++ b/src/SMAPI.Toolkit/Serialization/JsonHelper.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 using System.Collections.Generic;
 using System.IO;
diff --git a/src/SMAPI.Toolkit/Serialization/Models/Manifest.cs b/src/SMAPI.Toolkit/Serialization/Models/Manifest.cs
index 4ad97b6d..a5dbf604 100644
--- a/src/SMAPI.Toolkit/Serialization/Models/Manifest.cs
+++ b/src/SMAPI.Toolkit/Serialization/Models/Manifest.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 using System.Collections.Generic;
 using System.Runtime.Serialization;
diff --git a/src/SMAPI.Toolkit/Serialization/Models/ManifestContentPackFor.cs b/src/SMAPI.Toolkit/Serialization/Models/ManifestContentPackFor.cs
index 1eb80889..ea5f0e6c 100644
--- a/src/SMAPI.Toolkit/Serialization/Models/ManifestContentPackFor.cs
+++ b/src/SMAPI.Toolkit/Serialization/Models/ManifestContentPackFor.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 namespace StardewModdingAPI.Toolkit.Serialization.Models
 {
     /// <summary>Indicates which mod can read the content pack represented by the containing manifest.</summary>
diff --git a/src/SMAPI.Toolkit/Serialization/Models/ManifestDependency.cs b/src/SMAPI.Toolkit/Serialization/Models/ManifestDependency.cs
index 00f168f4..f52dd5ee 100644
--- a/src/SMAPI.Toolkit/Serialization/Models/ManifestDependency.cs
+++ b/src/SMAPI.Toolkit/Serialization/Models/ManifestDependency.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 namespace StardewModdingAPI.Toolkit.Serialization.Models
 {
     /// <summary>A mod dependency listed in a mod manifest.</summary>
diff --git a/src/SMAPI.Toolkit/Serialization/SParseException.cs b/src/SMAPI.Toolkit/Serialization/SParseException.cs
index 5f58b5b8..1581e027 100644
--- a/src/SMAPI.Toolkit/Serialization/SParseException.cs
+++ b/src/SMAPI.Toolkit/Serialization/SParseException.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 
 namespace StardewModdingAPI.Toolkit.Serialization
diff --git a/src/SMAPI.Toolkit/Utilities/EnvironmentUtility.cs b/src/SMAPI.Toolkit/Utilities/EnvironmentUtility.cs
index 7536337a..f14678be 100644
--- a/src/SMAPI.Toolkit/Utilities/EnvironmentUtility.cs
+++ b/src/SMAPI.Toolkit/Utilities/EnvironmentUtility.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 using System.Diagnostics.CodeAnalysis;
 using StardewModdingAPI.Toolkit.Framework;
diff --git a/src/SMAPI.Toolkit/Utilities/FileUtilities.cs b/src/SMAPI.Toolkit/Utilities/FileUtilities.cs
index a6bf5929..ba2d0f47 100644
--- a/src/SMAPI.Toolkit/Utilities/FileUtilities.cs
+++ b/src/SMAPI.Toolkit/Utilities/FileUtilities.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 using System.IO;
 using System.Security.Cryptography;
diff --git a/src/SMAPI.Toolkit/Utilities/PathUtilities.cs b/src/SMAPI.Toolkit/Utilities/PathUtilities.cs
index 85e12bfa..9a0e2ea7 100644
--- a/src/SMAPI.Toolkit/Utilities/PathUtilities.cs
+++ b/src/SMAPI.Toolkit/Utilities/PathUtilities.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 using System.Diagnostics.Contracts;
 using System.IO;
diff --git a/src/SMAPI.Web/BackgroundService.cs b/src/SMAPI.Web/BackgroundService.cs
index 64bd5ca5..7706b276 100644
--- a/src/SMAPI.Web/BackgroundService.cs
+++ b/src/SMAPI.Web/BackgroundService.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 using System.Diagnostics.CodeAnalysis;
 using System.Threading;
diff --git a/src/SMAPI.Web/Controllers/IndexController.cs b/src/SMAPI.Web/Controllers/IndexController.cs
index 69b54f47..f7834b9c 100644
--- a/src/SMAPI.Web/Controllers/IndexController.cs
+++ b/src/SMAPI.Web/Controllers/IndexController.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 using System.Collections.Generic;
 using System.Linq;
diff --git a/src/SMAPI.Web/Controllers/JsonValidatorController.cs b/src/SMAPI.Web/Controllers/JsonValidatorController.cs
index 985f91ae..5791d834 100644
--- a/src/SMAPI.Web/Controllers/JsonValidatorController.cs
+++ b/src/SMAPI.Web/Controllers/JsonValidatorController.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 using System.Collections.Generic;
 using System.IO;
diff --git a/src/SMAPI.Web/Controllers/LogParserController.cs b/src/SMAPI.Web/Controllers/LogParserController.cs
index db53d942..524cfbcc 100644
--- a/src/SMAPI.Web/Controllers/LogParserController.cs
+++ b/src/SMAPI.Web/Controllers/LogParserController.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 using System.Linq;
 using System.Text;
diff --git a/src/SMAPI.Web/Controllers/ModsApiController.cs b/src/SMAPI.Web/Controllers/ModsApiController.cs
index 5329df99..3dc1e366 100644
--- a/src/SMAPI.Web/Controllers/ModsApiController.cs
+++ b/src/SMAPI.Web/Controllers/ModsApiController.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 using System.Collections.Generic;
 using System.IO;
diff --git a/src/SMAPI.Web/Controllers/ModsController.cs b/src/SMAPI.Web/Controllers/ModsController.cs
index c62ed605..5292e1ce 100644
--- a/src/SMAPI.Web/Controllers/ModsController.cs
+++ b/src/SMAPI.Web/Controllers/ModsController.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System.Linq;
 using System.Text.RegularExpressions;
 using Microsoft.AspNetCore.Mvc;
diff --git a/src/SMAPI.Web/Framework/AllowLargePostsAttribute.cs b/src/SMAPI.Web/Framework/AllowLargePostsAttribute.cs
index 864aa215..108ceff7 100644
--- a/src/SMAPI.Web/Framework/AllowLargePostsAttribute.cs
+++ b/src/SMAPI.Web/Framework/AllowLargePostsAttribute.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 using Microsoft.AspNetCore.Http.Features;
 using Microsoft.AspNetCore.Mvc.Filters;
diff --git a/src/SMAPI.Web/Framework/Caching/Cached.cs b/src/SMAPI.Web/Framework/Caching/Cached.cs
index 52041a16..aabbf146 100644
--- a/src/SMAPI.Web/Framework/Caching/Cached.cs
+++ b/src/SMAPI.Web/Framework/Caching/Cached.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 
 namespace StardewModdingAPI.Web.Framework.Caching
diff --git a/src/SMAPI.Web/Framework/Caching/Mods/IModCacheRepository.cs b/src/SMAPI.Web/Framework/Caching/Mods/IModCacheRepository.cs
index a16e6b73..2020d747 100644
--- a/src/SMAPI.Web/Framework/Caching/Mods/IModCacheRepository.cs
+++ b/src/SMAPI.Web/Framework/Caching/Mods/IModCacheRepository.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 using StardewModdingAPI.Toolkit.Framework.UpdateData;
 
diff --git a/src/SMAPI.Web/Framework/Caching/Mods/ModCacheMemoryRepository.cs b/src/SMAPI.Web/Framework/Caching/Mods/ModCacheMemoryRepository.cs
index f871a9da..338562d8 100644
--- a/src/SMAPI.Web/Framework/Caching/Mods/ModCacheMemoryRepository.cs
+++ b/src/SMAPI.Web/Framework/Caching/Mods/ModCacheMemoryRepository.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 using System.Collections.Generic;
 using System.Linq;
diff --git a/src/SMAPI.Web/Framework/Caching/Wiki/IWikiCacheRepository.cs b/src/SMAPI.Web/Framework/Caching/Wiki/IWikiCacheRepository.cs
index 2ab7ea5a..6edafddc 100644
--- a/src/SMAPI.Web/Framework/Caching/Wiki/IWikiCacheRepository.cs
+++ b/src/SMAPI.Web/Framework/Caching/Wiki/IWikiCacheRepository.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 using System.Collections.Generic;
 using StardewModdingAPI.Toolkit.Framework.Clients.Wiki;
diff --git a/src/SMAPI.Web/Framework/Caching/Wiki/WikiCacheMemoryRepository.cs b/src/SMAPI.Web/Framework/Caching/Wiki/WikiCacheMemoryRepository.cs
index d037a123..d1ccb9c7 100644
--- a/src/SMAPI.Web/Framework/Caching/Wiki/WikiCacheMemoryRepository.cs
+++ b/src/SMAPI.Web/Framework/Caching/Wiki/WikiCacheMemoryRepository.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 using System.Collections.Generic;
 using System.Linq;
diff --git a/src/SMAPI.Web/Framework/Caching/Wiki/WikiMetadata.cs b/src/SMAPI.Web/Framework/Caching/Wiki/WikiMetadata.cs
index c04de4a5..6ae42488 100644
--- a/src/SMAPI.Web/Framework/Caching/Wiki/WikiMetadata.cs
+++ b/src/SMAPI.Web/Framework/Caching/Wiki/WikiMetadata.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 namespace StardewModdingAPI.Web.Framework.Caching.Wiki
 {
     /// <summary>The model for cached wiki metadata.</summary>
diff --git a/src/SMAPI.Web/Framework/Clients/Chucklefish/ChucklefishClient.cs b/src/SMAPI.Web/Framework/Clients/Chucklefish/ChucklefishClient.cs
index 269a04d4..4d041c1b 100644
--- a/src/SMAPI.Web/Framework/Clients/Chucklefish/ChucklefishClient.cs
+++ b/src/SMAPI.Web/Framework/Clients/Chucklefish/ChucklefishClient.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 using System.Net;
 using System.Threading.Tasks;
diff --git a/src/SMAPI.Web/Framework/Clients/CurseForge/CurseForgeClient.cs b/src/SMAPI.Web/Framework/Clients/CurseForge/CurseForgeClient.cs
index 50a3336d..5ef369d5 100644
--- a/src/SMAPI.Web/Framework/Clients/CurseForge/CurseForgeClient.cs
+++ b/src/SMAPI.Web/Framework/Clients/CurseForge/CurseForgeClient.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System.Collections.Generic;
 using System.Text.RegularExpressions;
 using System.Threading.Tasks;
diff --git a/src/SMAPI.Web/Framework/Clients/CurseForge/ResponseModels/ModFileModel.cs b/src/SMAPI.Web/Framework/Clients/CurseForge/ResponseModels/ModFileModel.cs
index 9de74847..eabef9f0 100644
--- a/src/SMAPI.Web/Framework/Clients/CurseForge/ResponseModels/ModFileModel.cs
+++ b/src/SMAPI.Web/Framework/Clients/CurseForge/ResponseModels/ModFileModel.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 namespace StardewModdingAPI.Web.Framework.Clients.CurseForge.ResponseModels
 {
     /// <summary>Metadata from the CurseForge API about a mod file.</summary>
diff --git a/src/SMAPI.Web/Framework/Clients/CurseForge/ResponseModels/ModModel.cs b/src/SMAPI.Web/Framework/Clients/CurseForge/ResponseModels/ModModel.cs
index 48cd185b..a95df7f1 100644
--- a/src/SMAPI.Web/Framework/Clients/CurseForge/ResponseModels/ModModel.cs
+++ b/src/SMAPI.Web/Framework/Clients/CurseForge/ResponseModels/ModModel.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 namespace StardewModdingAPI.Web.Framework.Clients.CurseForge.ResponseModels
 {
     /// <summary>An mod from the CurseForge API.</summary>
diff --git a/src/SMAPI.Web/Framework/Clients/GenericModDownload.cs b/src/SMAPI.Web/Framework/Clients/GenericModDownload.cs
index f08b471c..919072b0 100644
--- a/src/SMAPI.Web/Framework/Clients/GenericModDownload.cs
+++ b/src/SMAPI.Web/Framework/Clients/GenericModDownload.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 namespace StardewModdingAPI.Web.Framework.Clients
 {
     /// <summary>Generic metadata about a file download on a mod page.</summary>
diff --git a/src/SMAPI.Web/Framework/Clients/GenericModPage.cs b/src/SMAPI.Web/Framework/Clients/GenericModPage.cs
index a5f7c9b9..4788aa2a 100644
--- a/src/SMAPI.Web/Framework/Clients/GenericModPage.cs
+++ b/src/SMAPI.Web/Framework/Clients/GenericModPage.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 using System.Collections.Generic;
 using System.Linq;
diff --git a/src/SMAPI.Web/Framework/Clients/GitHub/GitAsset.cs b/src/SMAPI.Web/Framework/Clients/GitHub/GitAsset.cs
index 73ce4025..39ebf94e 100644
--- a/src/SMAPI.Web/Framework/Clients/GitHub/GitAsset.cs
+++ b/src/SMAPI.Web/Framework/Clients/GitHub/GitAsset.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using Newtonsoft.Json;
 
 namespace StardewModdingAPI.Web.Framework.Clients.GitHub
diff --git a/src/SMAPI.Web/Framework/Clients/GitHub/GitHubClient.cs b/src/SMAPI.Web/Framework/Clients/GitHub/GitHubClient.cs
index 671f077c..0e68e2c2 100644
--- a/src/SMAPI.Web/Framework/Clients/GitHub/GitHubClient.cs
+++ b/src/SMAPI.Web/Framework/Clients/GitHub/GitHubClient.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 using System.Linq;
 using System.Net;
diff --git a/src/SMAPI.Web/Framework/Clients/GitHub/GitLicense.cs b/src/SMAPI.Web/Framework/Clients/GitHub/GitLicense.cs
index 736efbe6..275c775a 100644
--- a/src/SMAPI.Web/Framework/Clients/GitHub/GitLicense.cs
+++ b/src/SMAPI.Web/Framework/Clients/GitHub/GitLicense.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using Newtonsoft.Json;
 
 namespace StardewModdingAPI.Web.Framework.Clients.GitHub
diff --git a/src/SMAPI.Web/Framework/Clients/GitHub/GitRelease.cs b/src/SMAPI.Web/Framework/Clients/GitHub/GitRelease.cs
index d0db5297..383775d2 100644
--- a/src/SMAPI.Web/Framework/Clients/GitHub/GitRelease.cs
+++ b/src/SMAPI.Web/Framework/Clients/GitHub/GitRelease.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using Newtonsoft.Json;
 
 namespace StardewModdingAPI.Web.Framework.Clients.GitHub
diff --git a/src/SMAPI.Web/Framework/Clients/GitHub/GitRepo.cs b/src/SMAPI.Web/Framework/Clients/GitHub/GitRepo.cs
index 7d80576e..5b5ce6a6 100644
--- a/src/SMAPI.Web/Framework/Clients/GitHub/GitRepo.cs
+++ b/src/SMAPI.Web/Framework/Clients/GitHub/GitRepo.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using Newtonsoft.Json;
 
 namespace StardewModdingAPI.Web.Framework.Clients.GitHub
diff --git a/src/SMAPI.Web/Framework/Clients/GitHub/IGitHubClient.cs b/src/SMAPI.Web/Framework/Clients/GitHub/IGitHubClient.cs
index 0d6f4643..e1961416 100644
--- a/src/SMAPI.Web/Framework/Clients/GitHub/IGitHubClient.cs
+++ b/src/SMAPI.Web/Framework/Clients/GitHub/IGitHubClient.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 using System.Threading.Tasks;
 
diff --git a/src/SMAPI.Web/Framework/Clients/IModSiteClient.cs b/src/SMAPI.Web/Framework/Clients/IModSiteClient.cs
index 33277711..2cd1f635 100644
--- a/src/SMAPI.Web/Framework/Clients/IModSiteClient.cs
+++ b/src/SMAPI.Web/Framework/Clients/IModSiteClient.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System.Threading.Tasks;
 using StardewModdingAPI.Toolkit.Framework.UpdateData;
 
diff --git a/src/SMAPI.Web/Framework/Clients/ModDrop/ModDropClient.cs b/src/SMAPI.Web/Framework/Clients/ModDrop/ModDropClient.cs
index 3a1c5b9d..1a11a606 100644
--- a/src/SMAPI.Web/Framework/Clients/ModDrop/ModDropClient.cs
+++ b/src/SMAPI.Web/Framework/Clients/ModDrop/ModDropClient.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System.Collections.Generic;
 using System.Threading.Tasks;
 using Pathoschild.Http.Client;
diff --git a/src/SMAPI.Web/Framework/Clients/ModDrop/ResponseModels/FileDataModel.cs b/src/SMAPI.Web/Framework/Clients/ModDrop/ResponseModels/FileDataModel.cs
index b01196f4..dd6a95e0 100644
--- a/src/SMAPI.Web/Framework/Clients/ModDrop/ResponseModels/FileDataModel.cs
+++ b/src/SMAPI.Web/Framework/Clients/ModDrop/ResponseModels/FileDataModel.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using Newtonsoft.Json;
 
 namespace StardewModdingAPI.Web.Framework.Clients.ModDrop.ResponseModels
diff --git a/src/SMAPI.Web/Framework/Clients/ModDrop/ResponseModels/ModDataModel.cs b/src/SMAPI.Web/Framework/Clients/ModDrop/ResponseModels/ModDataModel.cs
index cfdd6a4e..6cae16d9 100644
--- a/src/SMAPI.Web/Framework/Clients/ModDrop/ResponseModels/ModDataModel.cs
+++ b/src/SMAPI.Web/Framework/Clients/ModDrop/ResponseModels/ModDataModel.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 namespace StardewModdingAPI.Web.Framework.Clients.ModDrop.ResponseModels
 {
     /// <summary>Metadata about a mod from the ModDrop API.</summary>
diff --git a/src/SMAPI.Web/Framework/Clients/ModDrop/ResponseModels/ModListModel.cs b/src/SMAPI.Web/Framework/Clients/ModDrop/ResponseModels/ModListModel.cs
index 7f692ca1..445e25cb 100644
--- a/src/SMAPI.Web/Framework/Clients/ModDrop/ResponseModels/ModListModel.cs
+++ b/src/SMAPI.Web/Framework/Clients/ModDrop/ResponseModels/ModListModel.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System.Collections.Generic;
 
 namespace StardewModdingAPI.Web.Framework.Clients.ModDrop.ResponseModels
diff --git a/src/SMAPI.Web/Framework/Clients/ModDrop/ResponseModels/ModModel.cs b/src/SMAPI.Web/Framework/Clients/ModDrop/ResponseModels/ModModel.cs
index 9f4b2c6f..8869193e 100644
--- a/src/SMAPI.Web/Framework/Clients/ModDrop/ResponseModels/ModModel.cs
+++ b/src/SMAPI.Web/Framework/Clients/ModDrop/ResponseModels/ModModel.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 namespace StardewModdingAPI.Web.Framework.Clients.ModDrop.ResponseModels
 {
     /// <summary>An entry in a mod list from the ModDrop API.</summary>
diff --git a/src/SMAPI.Web/Framework/Clients/Nexus/NexusClient.cs b/src/SMAPI.Web/Framework/Clients/Nexus/NexusClient.cs
index a6da0c1c..dd0bb94f 100644
--- a/src/SMAPI.Web/Framework/Clients/Nexus/NexusClient.cs
+++ b/src/SMAPI.Web/Framework/Clients/Nexus/NexusClient.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 using System.Collections.Generic;
 using System.Linq;
diff --git a/src/SMAPI.Web/Framework/Clients/Nexus/ResponseModels/NexusMod.cs b/src/SMAPI.Web/Framework/Clients/Nexus/ResponseModels/NexusMod.cs
index aef90ede..358c4633 100644
--- a/src/SMAPI.Web/Framework/Clients/Nexus/ResponseModels/NexusMod.cs
+++ b/src/SMAPI.Web/Framework/Clients/Nexus/ResponseModels/NexusMod.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using Newtonsoft.Json;
 
 namespace StardewModdingAPI.Web.Framework.Clients.Nexus.ResponseModels
diff --git a/src/SMAPI.Web/Framework/Clients/Pastebin/IPastebinClient.cs b/src/SMAPI.Web/Framework/Clients/Pastebin/IPastebinClient.cs
index 431fed7b..03c78e01 100644
--- a/src/SMAPI.Web/Framework/Clients/Pastebin/IPastebinClient.cs
+++ b/src/SMAPI.Web/Framework/Clients/Pastebin/IPastebinClient.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 using System.Threading.Tasks;
 
diff --git a/src/SMAPI.Web/Framework/Clients/Pastebin/PasteInfo.cs b/src/SMAPI.Web/Framework/Clients/Pastebin/PasteInfo.cs
index 813ea115..2d48a7ae 100644
--- a/src/SMAPI.Web/Framework/Clients/Pastebin/PasteInfo.cs
+++ b/src/SMAPI.Web/Framework/Clients/Pastebin/PasteInfo.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 namespace StardewModdingAPI.Web.Framework.Clients.Pastebin
 {
     /// <summary>The response for a get-paste request.</summary>
diff --git a/src/SMAPI.Web/Framework/Clients/Pastebin/PastebinClient.cs b/src/SMAPI.Web/Framework/Clients/Pastebin/PastebinClient.cs
index 1be00be7..d0cdf374 100644
--- a/src/SMAPI.Web/Framework/Clients/Pastebin/PastebinClient.cs
+++ b/src/SMAPI.Web/Framework/Clients/Pastebin/PastebinClient.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 using System.Net;
 using System.Threading.Tasks;
diff --git a/src/SMAPI.Web/Framework/Compression/GzipHelper.cs b/src/SMAPI.Web/Framework/Compression/GzipHelper.cs
index 93cde9d3..843b7735 100644
--- a/src/SMAPI.Web/Framework/Compression/GzipHelper.cs
+++ b/src/SMAPI.Web/Framework/Compression/GzipHelper.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 using System.IO;
 using System.IO.Compression;
diff --git a/src/SMAPI.Web/Framework/Compression/IGzipHelper.cs b/src/SMAPI.Web/Framework/Compression/IGzipHelper.cs
index a000865e..e1ec9b67 100644
--- a/src/SMAPI.Web/Framework/Compression/IGzipHelper.cs
+++ b/src/SMAPI.Web/Framework/Compression/IGzipHelper.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 namespace StardewModdingAPI.Web.Framework.Compression
 {
     /// <summary>Handles GZip compression logic.</summary>
diff --git a/src/SMAPI.Web/Framework/ConfigModels/ApiClientsConfig.cs b/src/SMAPI.Web/Framework/ConfigModels/ApiClientsConfig.cs
index 878130bf..3730a9db 100644
--- a/src/SMAPI.Web/Framework/ConfigModels/ApiClientsConfig.cs
+++ b/src/SMAPI.Web/Framework/ConfigModels/ApiClientsConfig.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 namespace StardewModdingAPI.Web.Framework.ConfigModels
 {
     /// <summary>The config settings for the API clients.</summary>
diff --git a/src/SMAPI.Web/Framework/ConfigModels/ModOverrideConfig.cs b/src/SMAPI.Web/Framework/ConfigModels/ModOverrideConfig.cs
index f382d7b5..682c97e6 100644
--- a/src/SMAPI.Web/Framework/ConfigModels/ModOverrideConfig.cs
+++ b/src/SMAPI.Web/Framework/ConfigModels/ModOverrideConfig.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 namespace StardewModdingAPI.Web.Framework.ConfigModels
 {
     /// <summary>Override update-check metadata for a mod.</summary>
diff --git a/src/SMAPI.Web/Framework/ConfigModels/ModUpdateCheckConfig.cs b/src/SMAPI.Web/Framework/ConfigModels/ModUpdateCheckConfig.cs
index aea695b8..e525e09a 100644
--- a/src/SMAPI.Web/Framework/ConfigModels/ModUpdateCheckConfig.cs
+++ b/src/SMAPI.Web/Framework/ConfigModels/ModUpdateCheckConfig.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 namespace StardewModdingAPI.Web.Framework.ConfigModels
 {
     /// <summary>The config settings for mod update checks.</summary>
diff --git a/src/SMAPI.Web/Framework/ConfigModels/SiteConfig.cs b/src/SMAPI.Web/Framework/ConfigModels/SiteConfig.cs
index 664dbef3..ef6c2659 100644
--- a/src/SMAPI.Web/Framework/ConfigModels/SiteConfig.cs
+++ b/src/SMAPI.Web/Framework/ConfigModels/SiteConfig.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 namespace StardewModdingAPI.Web.Framework.ConfigModels
 {
     /// <summary>The site config settings.</summary>
diff --git a/src/SMAPI.Web/Framework/ConfigModels/SmapiInfoConfig.cs b/src/SMAPI.Web/Framework/ConfigModels/SmapiInfoConfig.cs
index d69fabb3..dbf58817 100644
--- a/src/SMAPI.Web/Framework/ConfigModels/SmapiInfoConfig.cs
+++ b/src/SMAPI.Web/Framework/ConfigModels/SmapiInfoConfig.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 namespace StardewModdingAPI.Web.Framework.ConfigModels
 {
     /// <summary>The update-check config for SMAPI's own update checks.</summary>
diff --git a/src/SMAPI.Web/Framework/Extensions.cs b/src/SMAPI.Web/Framework/Extensions.cs
index 2e767b3d..a72c12c1 100644
--- a/src/SMAPI.Web/Framework/Extensions.cs
+++ b/src/SMAPI.Web/Framework/Extensions.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 using JetBrains.Annotations;
 using Microsoft.AspNetCore.Html;
diff --git a/src/SMAPI.Web/Framework/IModDownload.cs b/src/SMAPI.Web/Framework/IModDownload.cs
index dc058bcb..b8d1f62c 100644
--- a/src/SMAPI.Web/Framework/IModDownload.cs
+++ b/src/SMAPI.Web/Framework/IModDownload.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 namespace StardewModdingAPI.Web.Framework
 {
     /// <summary>Generic metadata about a file download on a mod page.</summary>
diff --git a/src/SMAPI.Web/Framework/IModPage.cs b/src/SMAPI.Web/Framework/IModPage.cs
index e66d401f..68220b49 100644
--- a/src/SMAPI.Web/Framework/IModPage.cs
+++ b/src/SMAPI.Web/Framework/IModPage.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System.Collections.Generic;
 using StardewModdingAPI.Toolkit.Framework.UpdateData;
 
diff --git a/src/SMAPI.Web/Framework/InternalControllerFeatureProvider.cs b/src/SMAPI.Web/Framework/InternalControllerFeatureProvider.cs
index 2c24c610..98738a82 100644
--- a/src/SMAPI.Web/Framework/InternalControllerFeatureProvider.cs
+++ b/src/SMAPI.Web/Framework/InternalControllerFeatureProvider.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 using System.Reflection;
 using Microsoft.AspNetCore.Mvc;
diff --git a/src/SMAPI.Web/Framework/JobDashboardAuthorizationFilter.cs b/src/SMAPI.Web/Framework/JobDashboardAuthorizationFilter.cs
index 3c1405eb..8db43dca 100644
--- a/src/SMAPI.Web/Framework/JobDashboardAuthorizationFilter.cs
+++ b/src/SMAPI.Web/Framework/JobDashboardAuthorizationFilter.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using Hangfire.Dashboard;
 
 namespace StardewModdingAPI.Web.Framework
diff --git a/src/SMAPI.Web/Framework/LogParsing/LogMessageBuilder.cs b/src/SMAPI.Web/Framework/LogParsing/LogMessageBuilder.cs
index 9da27d61..1b692e63 100644
--- a/src/SMAPI.Web/Framework/LogParsing/LogMessageBuilder.cs
+++ b/src/SMAPI.Web/Framework/LogParsing/LogMessageBuilder.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 using System.Text;
 using StardewModdingAPI.Web.Framework.LogParsing.Models;
diff --git a/src/SMAPI.Web/Framework/LogParsing/LogParseException.cs b/src/SMAPI.Web/Framework/LogParsing/LogParseException.cs
index 5d4c8c08..4ee58433 100644
--- a/src/SMAPI.Web/Framework/LogParsing/LogParseException.cs
+++ b/src/SMAPI.Web/Framework/LogParsing/LogParseException.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 
 namespace StardewModdingAPI.Web.Framework.LogParsing
@@ -10,6 +12,7 @@ namespace StardewModdingAPI.Web.Framework.LogParsing
         *********/
         /// <summary>Construct an instance.</summary>
         /// <param name="message">The user-friendly error message.</param>
-        public LogParseException(string message) : base(message) { }
+        public LogParseException(string message)
+            : base(message) { }
     }
 }
diff --git a/src/SMAPI.Web/Framework/LogParsing/LogParser.cs b/src/SMAPI.Web/Framework/LogParsing/LogParser.cs
index 864caef1..4e61ac95 100644
--- a/src/SMAPI.Web/Framework/LogParsing/LogParser.cs
+++ b/src/SMAPI.Web/Framework/LogParsing/LogParser.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 using System.Collections.Generic;
 using System.IO;
diff --git a/src/SMAPI.Web/Framework/LogParsing/Models/LogMessage.cs b/src/SMAPI.Web/Framework/LogParsing/Models/LogMessage.cs
index 1e08be78..57d28755 100644
--- a/src/SMAPI.Web/Framework/LogParsing/Models/LogMessage.cs
+++ b/src/SMAPI.Web/Framework/LogParsing/Models/LogMessage.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 namespace StardewModdingAPI.Web.Framework.LogParsing.Models
 {
     /// <summary>A parsed log message.</summary>
diff --git a/src/SMAPI.Web/Framework/LogParsing/Models/LogModInfo.cs b/src/SMAPI.Web/Framework/LogParsing/Models/LogModInfo.cs
index 92bfe5c7..349312df 100644
--- a/src/SMAPI.Web/Framework/LogParsing/Models/LogModInfo.cs
+++ b/src/SMAPI.Web/Framework/LogParsing/Models/LogModInfo.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 namespace StardewModdingAPI.Web.Framework.LogParsing.Models
 {
     /// <summary>Metadata about a mod or content pack in the log.</summary>
diff --git a/src/SMAPI.Web/Framework/LogParsing/Models/ParsedLog.cs b/src/SMAPI.Web/Framework/LogParsing/Models/ParsedLog.cs
index 693a16ec..dae91d84 100644
--- a/src/SMAPI.Web/Framework/LogParsing/Models/ParsedLog.cs
+++ b/src/SMAPI.Web/Framework/LogParsing/Models/ParsedLog.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 
 namespace StardewModdingAPI.Web.Framework.LogParsing.Models
diff --git a/src/SMAPI.Web/Framework/ModInfoModel.cs b/src/SMAPI.Web/Framework/ModInfoModel.cs
index 86f70788..021d14fb 100644
--- a/src/SMAPI.Web/Framework/ModInfoModel.cs
+++ b/src/SMAPI.Web/Framework/ModInfoModel.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 namespace StardewModdingAPI.Web.Framework
 {
     /// <summary>Generic metadata about a mod.</summary>
diff --git a/src/SMAPI.Web/Framework/ModSiteManager.cs b/src/SMAPI.Web/Framework/ModSiteManager.cs
index a2b92aa4..2d6755d8 100644
--- a/src/SMAPI.Web/Framework/ModSiteManager.cs
+++ b/src/SMAPI.Web/Framework/ModSiteManager.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 using System.Collections.Generic;
 using System.Linq;
diff --git a/src/SMAPI.Web/Framework/RedirectRules/RedirectHostsToUrlsRule.cs b/src/SMAPI.Web/Framework/RedirectRules/RedirectHostsToUrlsRule.cs
index d67b5156..fe601524 100644
--- a/src/SMAPI.Web/Framework/RedirectRules/RedirectHostsToUrlsRule.cs
+++ b/src/SMAPI.Web/Framework/RedirectRules/RedirectHostsToUrlsRule.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 using System.Net;
 using Microsoft.AspNetCore.Rewrite;
diff --git a/src/SMAPI.Web/Framework/RedirectRules/RedirectMatchRule.cs b/src/SMAPI.Web/Framework/RedirectRules/RedirectMatchRule.cs
index 6e81c4ca..81a265c9 100644
--- a/src/SMAPI.Web/Framework/RedirectRules/RedirectMatchRule.cs
+++ b/src/SMAPI.Web/Framework/RedirectRules/RedirectMatchRule.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 using System.Net;
 using Microsoft.AspNetCore.Http;
diff --git a/src/SMAPI.Web/Framework/RedirectRules/RedirectPathsToUrlsRule.cs b/src/SMAPI.Web/Framework/RedirectRules/RedirectPathsToUrlsRule.cs
index d9d44641..cb3e53ef 100644
--- a/src/SMAPI.Web/Framework/RedirectRules/RedirectPathsToUrlsRule.cs
+++ b/src/SMAPI.Web/Framework/RedirectRules/RedirectPathsToUrlsRule.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System.Collections.Generic;
 using System.Linq;
 using System.Net;
diff --git a/src/SMAPI.Web/Framework/RedirectRules/RedirectToHttpsRule.cs b/src/SMAPI.Web/Framework/RedirectRules/RedirectToHttpsRule.cs
index 265a605f..dd7c836f 100644
--- a/src/SMAPI.Web/Framework/RedirectRules/RedirectToHttpsRule.cs
+++ b/src/SMAPI.Web/Framework/RedirectRules/RedirectToHttpsRule.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 using System.Net;
 using Microsoft.AspNetCore.Http;
diff --git a/src/SMAPI.Web/Framework/Storage/IStorageProvider.cs b/src/SMAPI.Web/Framework/Storage/IStorageProvider.cs
index dfc1fb47..2eca4845 100644
--- a/src/SMAPI.Web/Framework/Storage/IStorageProvider.cs
+++ b/src/SMAPI.Web/Framework/Storage/IStorageProvider.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System.Threading.Tasks;
 
 namespace StardewModdingAPI.Web.Framework.Storage
diff --git a/src/SMAPI.Web/Framework/Storage/StorageProvider.cs b/src/SMAPI.Web/Framework/Storage/StorageProvider.cs
index 1104df89..0177e602 100644
--- a/src/SMAPI.Web/Framework/Storage/StorageProvider.cs
+++ b/src/SMAPI.Web/Framework/Storage/StorageProvider.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 using System.Collections.Generic;
 using System.IO;
diff --git a/src/SMAPI.Web/Framework/Storage/StoredFileInfo.cs b/src/SMAPI.Web/Framework/Storage/StoredFileInfo.cs
index 30676c88..cd941c94 100644
--- a/src/SMAPI.Web/Framework/Storage/StoredFileInfo.cs
+++ b/src/SMAPI.Web/Framework/Storage/StoredFileInfo.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 
 namespace StardewModdingAPI.Web.Framework.Storage
diff --git a/src/SMAPI.Web/Framework/Storage/UploadResult.cs b/src/SMAPI.Web/Framework/Storage/UploadResult.cs
index 483c1769..b1eedd59 100644
--- a/src/SMAPI.Web/Framework/Storage/UploadResult.cs
+++ b/src/SMAPI.Web/Framework/Storage/UploadResult.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 namespace StardewModdingAPI.Web.Framework.Storage
 {
     /// <summary>The result of an attempt to upload a file.</summary>
diff --git a/src/SMAPI.Web/Framework/VersionConstraint.cs b/src/SMAPI.Web/Framework/VersionConstraint.cs
index f0c57c41..f230a95b 100644
--- a/src/SMAPI.Web/Framework/VersionConstraint.cs
+++ b/src/SMAPI.Web/Framework/VersionConstraint.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Routing;
diff --git a/src/SMAPI.Web/Program.cs b/src/SMAPI.Web/Program.cs
index 1fdd3185..5134791a 100644
--- a/src/SMAPI.Web/Program.cs
+++ b/src/SMAPI.Web/Program.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.Hosting;
 
diff --git a/src/SMAPI.Web/Startup.cs b/src/SMAPI.Web/Startup.cs
index 6d9591ee..0199938d 100644
--- a/src/SMAPI.Web/Startup.cs
+++ b/src/SMAPI.Web/Startup.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System.Collections.Generic;
 using System.Net;
 using Hangfire;
diff --git a/src/SMAPI.Web/ViewModels/IndexModel.cs b/src/SMAPI.Web/ViewModels/IndexModel.cs
index d8d2d27f..2283acd9 100644
--- a/src/SMAPI.Web/ViewModels/IndexModel.cs
+++ b/src/SMAPI.Web/ViewModels/IndexModel.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 namespace StardewModdingAPI.Web.ViewModels
 {
     /// <summary>The view model for the index page.</summary>
diff --git a/src/SMAPI.Web/ViewModels/IndexVersionModel.cs b/src/SMAPI.Web/ViewModels/IndexVersionModel.cs
index 4f63b979..1f5d4ec0 100644
--- a/src/SMAPI.Web/ViewModels/IndexVersionModel.cs
+++ b/src/SMAPI.Web/ViewModels/IndexVersionModel.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 namespace StardewModdingAPI.Web.ViewModels
 {
     /// <summary>The fields for a SMAPI version.</summary>
diff --git a/src/SMAPI.Web/ViewModels/JsonValidator/JsonValidatorErrorModel.cs b/src/SMAPI.Web/ViewModels/JsonValidator/JsonValidatorErrorModel.cs
index 62b95501..3c63b730 100644
--- a/src/SMAPI.Web/ViewModels/JsonValidator/JsonValidatorErrorModel.cs
+++ b/src/SMAPI.Web/ViewModels/JsonValidator/JsonValidatorErrorModel.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using Newtonsoft.Json.Schema;
 
 namespace StardewModdingAPI.Web.ViewModels.JsonValidator
diff --git a/src/SMAPI.Web/ViewModels/JsonValidator/JsonValidatorModel.cs b/src/SMAPI.Web/ViewModels/JsonValidator/JsonValidatorModel.cs
index e659b389..2543807f 100644
--- a/src/SMAPI.Web/ViewModels/JsonValidator/JsonValidatorModel.cs
+++ b/src/SMAPI.Web/ViewModels/JsonValidator/JsonValidatorModel.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 using System.Collections.Generic;
 using System.Linq;
diff --git a/src/SMAPI.Web/ViewModels/JsonValidator/JsonValidatorRequestModel.cs b/src/SMAPI.Web/ViewModels/JsonValidator/JsonValidatorRequestModel.cs
index c8e851bf..43114d94 100644
--- a/src/SMAPI.Web/ViewModels/JsonValidator/JsonValidatorRequestModel.cs
+++ b/src/SMAPI.Web/ViewModels/JsonValidator/JsonValidatorRequestModel.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 namespace StardewModdingAPI.Web.ViewModels.JsonValidator
 {
     /// <summary>The view model for a JSON validation request.</summary>
diff --git a/src/SMAPI.Web/ViewModels/LogParserModel.cs b/src/SMAPI.Web/ViewModels/LogParserModel.cs
index 5aa2fd92..c768a08c 100644
--- a/src/SMAPI.Web/ViewModels/LogParserModel.cs
+++ b/src/SMAPI.Web/ViewModels/LogParserModel.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 using System.Collections.Generic;
 using System.Linq;
diff --git a/src/SMAPI.Web/ViewModels/ModCompatibilityModel.cs b/src/SMAPI.Web/ViewModels/ModCompatibilityModel.cs
index 85bf1e46..2af30cc3 100644
--- a/src/SMAPI.Web/ViewModels/ModCompatibilityModel.cs
+++ b/src/SMAPI.Web/ViewModels/ModCompatibilityModel.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using StardewModdingAPI.Toolkit.Framework.Clients.Wiki;
 
 namespace StardewModdingAPI.Web.ViewModels
diff --git a/src/SMAPI.Web/ViewModels/ModLinkModel.cs b/src/SMAPI.Web/ViewModels/ModLinkModel.cs
index 97dd215c..3039702e 100644
--- a/src/SMAPI.Web/ViewModels/ModLinkModel.cs
+++ b/src/SMAPI.Web/ViewModels/ModLinkModel.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 namespace StardewModdingAPI.Web.ViewModels
 {
     /// <summary>Metadata about a link.</summary>
diff --git a/src/SMAPI.Web/ViewModels/ModListModel.cs b/src/SMAPI.Web/ViewModels/ModListModel.cs
index 6b8279c1..f0cf0c3a 100644
--- a/src/SMAPI.Web/ViewModels/ModListModel.cs
+++ b/src/SMAPI.Web/ViewModels/ModListModel.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 using System.Collections.Generic;
 using System.Linq;
diff --git a/src/SMAPI.Web/ViewModels/ModModel.cs b/src/SMAPI.Web/ViewModels/ModModel.cs
index 575d596a..d0d7373b 100644
--- a/src/SMAPI.Web/ViewModels/ModModel.cs
+++ b/src/SMAPI.Web/ViewModels/ModModel.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System.Collections.Generic;
 using System.Linq;
 using StardewModdingAPI.Toolkit.Framework.Clients.Wiki;
diff --git a/src/SMAPI.Web/Views/Index/Index.cshtml b/src/SMAPI.Web/Views/Index/Index.cshtml
index 669cfd99..9841ca42 100644
--- a/src/SMAPI.Web/Views/Index/Index.cshtml
+++ b/src/SMAPI.Web/Views/Index/Index.cshtml
@@ -1,3 +1,7 @@
+@{
+    #nullable disable
+}
+
 @using Microsoft.Extensions.Options
 @using StardewModdingAPI.Web.Framework
 @using StardewModdingAPI.Web.Framework.ConfigModels
diff --git a/src/SMAPI.Web/Views/Index/Privacy.cshtml b/src/SMAPI.Web/Views/Index/Privacy.cshtml
index fd78f908..1dc327d7 100644
--- a/src/SMAPI.Web/Views/Index/Privacy.cshtml
+++ b/src/SMAPI.Web/Views/Index/Privacy.cshtml
@@ -1,3 +1,7 @@
+@{
+    #nullable disable
+}
+
 @using Microsoft.Extensions.Options
 @using StardewModdingAPI.Web.Framework
 @using StardewModdingAPI.Web.Framework.ConfigModels
diff --git a/src/SMAPI.Web/Views/JsonValidator/Index.cshtml b/src/SMAPI.Web/Views/JsonValidator/Index.cshtml
index 1db79857..5e38e4dc 100644
--- a/src/SMAPI.Web/Views/JsonValidator/Index.cshtml
+++ b/src/SMAPI.Web/Views/JsonValidator/Index.cshtml
@@ -1,3 +1,7 @@
+@{
+    #nullable disable
+}
+
 @using Humanizer
 @using StardewModdingAPI.Web.Framework
 @using StardewModdingAPI.Web.ViewModels.JsonValidator
diff --git a/src/SMAPI.Web/Views/LogParser/Index.cshtml b/src/SMAPI.Web/Views/LogParser/Index.cshtml
index 3ddc6303..c26ec230 100644
--- a/src/SMAPI.Web/Views/LogParser/Index.cshtml
+++ b/src/SMAPI.Web/Views/LogParser/Index.cshtml
@@ -1,3 +1,7 @@
+@{
+    #nullable disable
+}
+
 @using Humanizer
 @using StardewModdingAPI.Toolkit.Utilities
 @using StardewModdingAPI.Web.Framework
diff --git a/src/SMAPI.Web/Views/Mods/Index.cshtml b/src/SMAPI.Web/Views/Mods/Index.cshtml
index 416468e4..4b6400ad 100644
--- a/src/SMAPI.Web/Views/Mods/Index.cshtml
+++ b/src/SMAPI.Web/Views/Mods/Index.cshtml
@@ -1,3 +1,7 @@
+@{
+    #nullable disable
+}
+
 @using Humanizer
 @using Humanizer.Localisation
 @using StardewModdingAPI.Web.Framework
diff --git a/src/SMAPI.Web/Views/Shared/_Layout.cshtml b/src/SMAPI.Web/Views/Shared/_Layout.cshtml
index 67dcd3b3..7c86a68c 100644
--- a/src/SMAPI.Web/Views/Shared/_Layout.cshtml
+++ b/src/SMAPI.Web/Views/Shared/_Layout.cshtml
@@ -1,3 +1,7 @@
+@{
+    #nullable disable
+}
+
 @using Microsoft.Extensions.Options
 @using StardewModdingAPI.Web.Framework
 @using StardewModdingAPI.Web.Framework.ConfigModels
diff --git a/src/SMAPI.Web/Views/_ViewStart.cshtml b/src/SMAPI.Web/Views/_ViewStart.cshtml
index a5f10045..0dbac246 100644
--- a/src/SMAPI.Web/Views/_ViewStart.cshtml
+++ b/src/SMAPI.Web/Views/_ViewStart.cshtml
@@ -1,3 +1,7 @@
-@{
+@{
+    #nullable disable
+}
+
+@{
     Layout = "_Layout";
 }
diff --git a/src/SMAPI/Constants.cs b/src/SMAPI/Constants.cs
index 2fac8c94..2d9ab666 100644
--- a/src/SMAPI/Constants.cs
+++ b/src/SMAPI/Constants.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 using System.Collections.Generic;
 using System.IO;
diff --git a/src/SMAPI/Context.cs b/src/SMAPI/Context.cs
index aa4ecf35..e906375b 100644
--- a/src/SMAPI/Context.cs
+++ b/src/SMAPI/Context.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System.Collections.Generic;
 using StardewModdingAPI.Enums;
 using StardewModdingAPI.Events;
diff --git a/src/SMAPI/Events/AssetReadyEventArgs.cs b/src/SMAPI/Events/AssetReadyEventArgs.cs
index 2c308f18..19e5a9df 100644
--- a/src/SMAPI/Events/AssetReadyEventArgs.cs
+++ b/src/SMAPI/Events/AssetReadyEventArgs.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 
 namespace StardewModdingAPI.Events
diff --git a/src/SMAPI/Events/AssetRequestedEventArgs.cs b/src/SMAPI/Events/AssetRequestedEventArgs.cs
index c0cbd8fb..82b59290 100644
--- a/src/SMAPI/Events/AssetRequestedEventArgs.cs
+++ b/src/SMAPI/Events/AssetRequestedEventArgs.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 using System.Collections.Generic;
 using Microsoft.Xna.Framework.Graphics;
diff --git a/src/SMAPI/Events/AssetsInvalidatedEventArgs.cs b/src/SMAPI/Events/AssetsInvalidatedEventArgs.cs
index 614cdf49..bd0df598 100644
--- a/src/SMAPI/Events/AssetsInvalidatedEventArgs.cs
+++ b/src/SMAPI/Events/AssetsInvalidatedEventArgs.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 using System.Collections.Generic;
 using System.Collections.Immutable;
diff --git a/src/SMAPI/Events/BuildingListChangedEventArgs.cs b/src/SMAPI/Events/BuildingListChangedEventArgs.cs
index 74f37710..ba9574cc 100644
--- a/src/SMAPI/Events/BuildingListChangedEventArgs.cs
+++ b/src/SMAPI/Events/BuildingListChangedEventArgs.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 using System.Collections.Generic;
 using System.Linq;
diff --git a/src/SMAPI/Events/ButtonPressedEventArgs.cs b/src/SMAPI/Events/ButtonPressedEventArgs.cs
index 1b30fd23..94684513 100644
--- a/src/SMAPI/Events/ButtonPressedEventArgs.cs
+++ b/src/SMAPI/Events/ButtonPressedEventArgs.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 using StardewModdingAPI.Framework.Input;
 
diff --git a/src/SMAPI/Events/ButtonReleasedEventArgs.cs b/src/SMAPI/Events/ButtonReleasedEventArgs.cs
index 40ec1cc1..6ff3727d 100644
--- a/src/SMAPI/Events/ButtonReleasedEventArgs.cs
+++ b/src/SMAPI/Events/ButtonReleasedEventArgs.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 using StardewModdingAPI.Framework.Input;
 
diff --git a/src/SMAPI/Events/ButtonsChangedEventArgs.cs b/src/SMAPI/Events/ButtonsChangedEventArgs.cs
index a5e87735..c63d34e6 100644
--- a/src/SMAPI/Events/ButtonsChangedEventArgs.cs
+++ b/src/SMAPI/Events/ButtonsChangedEventArgs.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 using System.Collections.Generic;
 using System.Linq;
diff --git a/src/SMAPI/Events/ChestInventoryChangedEventArgs.cs b/src/SMAPI/Events/ChestInventoryChangedEventArgs.cs
index 4b4c4210..bc8ac0c0 100644
--- a/src/SMAPI/Events/ChestInventoryChangedEventArgs.cs
+++ b/src/SMAPI/Events/ChestInventoryChangedEventArgs.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 using System.Collections.Generic;
 using StardewValley;
diff --git a/src/SMAPI/Events/CursorMovedEventArgs.cs b/src/SMAPI/Events/CursorMovedEventArgs.cs
index 43ff90ce..f3e7513b 100644
--- a/src/SMAPI/Events/CursorMovedEventArgs.cs
+++ b/src/SMAPI/Events/CursorMovedEventArgs.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 
 namespace StardewModdingAPI.Events
diff --git a/src/SMAPI/Events/DebrisListChangedEventArgs.cs b/src/SMAPI/Events/DebrisListChangedEventArgs.cs
index 61b7590a..56b1f30a 100644
--- a/src/SMAPI/Events/DebrisListChangedEventArgs.cs
+++ b/src/SMAPI/Events/DebrisListChangedEventArgs.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 using System.Collections.Generic;
 using System.Linq;
diff --git a/src/SMAPI/Events/FurnitureListChangedEventArgs.cs b/src/SMAPI/Events/FurnitureListChangedEventArgs.cs
index 683f4620..cda1b6cc 100644
--- a/src/SMAPI/Events/FurnitureListChangedEventArgs.cs
+++ b/src/SMAPI/Events/FurnitureListChangedEventArgs.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 using System.Collections.Generic;
 using System.Linq;
diff --git a/src/SMAPI/Events/IContentEvents.cs b/src/SMAPI/Events/IContentEvents.cs
index d537db70..109f9753 100644
--- a/src/SMAPI/Events/IContentEvents.cs
+++ b/src/SMAPI/Events/IContentEvents.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 
 namespace StardewModdingAPI.Events
diff --git a/src/SMAPI/Events/IDisplayEvents.cs b/src/SMAPI/Events/IDisplayEvents.cs
index dbf8d90f..b8b89120 100644
--- a/src/SMAPI/Events/IDisplayEvents.cs
+++ b/src/SMAPI/Events/IDisplayEvents.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 using StardewValley;
 
diff --git a/src/SMAPI/Events/IGameLoopEvents.cs b/src/SMAPI/Events/IGameLoopEvents.cs
index 6855737b..52bac3f8 100644
--- a/src/SMAPI/Events/IGameLoopEvents.cs
+++ b/src/SMAPI/Events/IGameLoopEvents.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 
 namespace StardewModdingAPI.Events
diff --git a/src/SMAPI/Events/IInputEvents.cs b/src/SMAPI/Events/IInputEvents.cs
index 081c40c0..01ceb224 100644
--- a/src/SMAPI/Events/IInputEvents.cs
+++ b/src/SMAPI/Events/IInputEvents.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 
 namespace StardewModdingAPI.Events
diff --git a/src/SMAPI/Events/IModEvents.cs b/src/SMAPI/Events/IModEvents.cs
index 2603961b..a1aacbce 100644
--- a/src/SMAPI/Events/IModEvents.cs
+++ b/src/SMAPI/Events/IModEvents.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 namespace StardewModdingAPI.Events
 {
     /// <summary>Manages access to events raised by SMAPI.</summary>
diff --git a/src/SMAPI/Events/IMultiplayerEvents.cs b/src/SMAPI/Events/IMultiplayerEvents.cs
index af9b5f17..c50eaf04 100644
--- a/src/SMAPI/Events/IMultiplayerEvents.cs
+++ b/src/SMAPI/Events/IMultiplayerEvents.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 
 namespace StardewModdingAPI.Events
diff --git a/src/SMAPI/Events/IPlayerEvents.cs b/src/SMAPI/Events/IPlayerEvents.cs
index 81e17b1a..9d18bfad 100644
--- a/src/SMAPI/Events/IPlayerEvents.cs
+++ b/src/SMAPI/Events/IPlayerEvents.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 
 namespace StardewModdingAPI.Events
diff --git a/src/SMAPI/Events/ISpecialisedEvents.cs b/src/SMAPI/Events/ISpecialisedEvents.cs
index bf70956d..0ec5bf54 100644
--- a/src/SMAPI/Events/ISpecialisedEvents.cs
+++ b/src/SMAPI/Events/ISpecialisedEvents.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 
 namespace StardewModdingAPI.Events
diff --git a/src/SMAPI/Events/IWorldEvents.cs b/src/SMAPI/Events/IWorldEvents.cs
index c023e1f0..785dfa8f 100644
--- a/src/SMAPI/Events/IWorldEvents.cs
+++ b/src/SMAPI/Events/IWorldEvents.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 
 namespace StardewModdingAPI.Events
diff --git a/src/SMAPI/Events/InventoryChangedEventArgs.cs b/src/SMAPI/Events/InventoryChangedEventArgs.cs
index 40cd4128..58c0ff8f 100644
--- a/src/SMAPI/Events/InventoryChangedEventArgs.cs
+++ b/src/SMAPI/Events/InventoryChangedEventArgs.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 using System.Collections.Generic;
 using StardewValley;
diff --git a/src/SMAPI/Events/ItemStackSizeChange.cs b/src/SMAPI/Events/ItemStackSizeChange.cs
index 35369be2..5d0986aa 100644
--- a/src/SMAPI/Events/ItemStackSizeChange.cs
+++ b/src/SMAPI/Events/ItemStackSizeChange.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using StardewValley;
 
 namespace StardewModdingAPI.Events
diff --git a/src/SMAPI/Events/LargeTerrainFeatureListChangedEventArgs.cs b/src/SMAPI/Events/LargeTerrainFeatureListChangedEventArgs.cs
index 59d79f0f..aedb0e46 100644
--- a/src/SMAPI/Events/LargeTerrainFeatureListChangedEventArgs.cs
+++ b/src/SMAPI/Events/LargeTerrainFeatureListChangedEventArgs.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 using System.Collections.Generic;
 using System.Linq;
diff --git a/src/SMAPI/Events/LevelChangedEventArgs.cs b/src/SMAPI/Events/LevelChangedEventArgs.cs
index c7303603..3beb9fd5 100644
--- a/src/SMAPI/Events/LevelChangedEventArgs.cs
+++ b/src/SMAPI/Events/LevelChangedEventArgs.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 using StardewModdingAPI.Enums;
 using StardewValley;
diff --git a/src/SMAPI/Events/LocaleChangedEventArgs.cs b/src/SMAPI/Events/LocaleChangedEventArgs.cs
index 09d3f6e5..015e7ec8 100644
--- a/src/SMAPI/Events/LocaleChangedEventArgs.cs
+++ b/src/SMAPI/Events/LocaleChangedEventArgs.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 using LanguageCode = StardewValley.LocalizedContentManager.LanguageCode;
 
diff --git a/src/SMAPI/Events/LocationListChangedEventArgs.cs b/src/SMAPI/Events/LocationListChangedEventArgs.cs
index 1ebb3e2d..055463dd 100644
--- a/src/SMAPI/Events/LocationListChangedEventArgs.cs
+++ b/src/SMAPI/Events/LocationListChangedEventArgs.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 using System.Collections.Generic;
 using System.Linq;
diff --git a/src/SMAPI/Events/MenuChangedEventArgs.cs b/src/SMAPI/Events/MenuChangedEventArgs.cs
index 977ba38b..362accec 100644
--- a/src/SMAPI/Events/MenuChangedEventArgs.cs
+++ b/src/SMAPI/Events/MenuChangedEventArgs.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 using StardewValley.Menus;
 
diff --git a/src/SMAPI/Events/ModMessageReceivedEventArgs.cs b/src/SMAPI/Events/ModMessageReceivedEventArgs.cs
index d75a7540..671bdf38 100644
--- a/src/SMAPI/Events/ModMessageReceivedEventArgs.cs
+++ b/src/SMAPI/Events/ModMessageReceivedEventArgs.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 using StardewModdingAPI.Framework.Networking;
 using StardewModdingAPI.Toolkit.Serialization;
diff --git a/src/SMAPI/Events/NpcListChangedEventArgs.cs b/src/SMAPI/Events/NpcListChangedEventArgs.cs
index 3a37f1e7..fb6dc1c5 100644
--- a/src/SMAPI/Events/NpcListChangedEventArgs.cs
+++ b/src/SMAPI/Events/NpcListChangedEventArgs.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 using System.Collections.Generic;
 using System.Linq;
diff --git a/src/SMAPI/Events/ObjectListChangedEventArgs.cs b/src/SMAPI/Events/ObjectListChangedEventArgs.cs
index b21d2867..b1a636aa 100644
--- a/src/SMAPI/Events/ObjectListChangedEventArgs.cs
+++ b/src/SMAPI/Events/ObjectListChangedEventArgs.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 using System.Collections.Generic;
 using System.Linq;
diff --git a/src/SMAPI/Events/PeerConnectedEventArgs.cs b/src/SMAPI/Events/PeerConnectedEventArgs.cs
index bfaa2bd3..3d11a3b5 100644
--- a/src/SMAPI/Events/PeerConnectedEventArgs.cs
+++ b/src/SMAPI/Events/PeerConnectedEventArgs.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 
 namespace StardewModdingAPI.Events
diff --git a/src/SMAPI/Events/PeerContextReceivedEventArgs.cs b/src/SMAPI/Events/PeerContextReceivedEventArgs.cs
index 151a295c..35a4b20d 100644
--- a/src/SMAPI/Events/PeerContextReceivedEventArgs.cs
+++ b/src/SMAPI/Events/PeerContextReceivedEventArgs.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 
 namespace StardewModdingAPI.Events
diff --git a/src/SMAPI/Events/PeerDisconnectedEventArgs.cs b/src/SMAPI/Events/PeerDisconnectedEventArgs.cs
index 8517988a..0675b8fe 100644
--- a/src/SMAPI/Events/PeerDisconnectedEventArgs.cs
+++ b/src/SMAPI/Events/PeerDisconnectedEventArgs.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 
 namespace StardewModdingAPI.Events
diff --git a/src/SMAPI/Events/RenderedActiveMenuEventArgs.cs b/src/SMAPI/Events/RenderedActiveMenuEventArgs.cs
index efd4163b..3da0b4b4 100644
--- a/src/SMAPI/Events/RenderedActiveMenuEventArgs.cs
+++ b/src/SMAPI/Events/RenderedActiveMenuEventArgs.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 using Microsoft.Xna.Framework.Graphics;
 using StardewValley;
diff --git a/src/SMAPI/Events/RenderedEventArgs.cs b/src/SMAPI/Events/RenderedEventArgs.cs
index d6341b19..e8beaaac 100644
--- a/src/SMAPI/Events/RenderedEventArgs.cs
+++ b/src/SMAPI/Events/RenderedEventArgs.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 using Microsoft.Xna.Framework.Graphics;
 using StardewValley;
diff --git a/src/SMAPI/Events/RenderedHudEventArgs.cs b/src/SMAPI/Events/RenderedHudEventArgs.cs
index 46e89013..b25ecd4c 100644
--- a/src/SMAPI/Events/RenderedHudEventArgs.cs
+++ b/src/SMAPI/Events/RenderedHudEventArgs.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 using Microsoft.Xna.Framework.Graphics;
 using StardewValley;
diff --git a/src/SMAPI/Events/RenderedWorldEventArgs.cs b/src/SMAPI/Events/RenderedWorldEventArgs.cs
index 56145381..a99d6ab3 100644
--- a/src/SMAPI/Events/RenderedWorldEventArgs.cs
+++ b/src/SMAPI/Events/RenderedWorldEventArgs.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 using Microsoft.Xna.Framework.Graphics;
 using StardewValley;
diff --git a/src/SMAPI/Events/RenderingActiveMenuEventArgs.cs b/src/SMAPI/Events/RenderingActiveMenuEventArgs.cs
index 103f56df..3e3f3258 100644
--- a/src/SMAPI/Events/RenderingActiveMenuEventArgs.cs
+++ b/src/SMAPI/Events/RenderingActiveMenuEventArgs.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 using Microsoft.Xna.Framework.Graphics;
 using StardewValley;
diff --git a/src/SMAPI/Events/RenderingEventArgs.cs b/src/SMAPI/Events/RenderingEventArgs.cs
index 5acbef09..8f6b3557 100644
--- a/src/SMAPI/Events/RenderingEventArgs.cs
+++ b/src/SMAPI/Events/RenderingEventArgs.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 using Microsoft.Xna.Framework.Graphics;
 using StardewValley;
diff --git a/src/SMAPI/Events/RenderingHudEventArgs.cs b/src/SMAPI/Events/RenderingHudEventArgs.cs
index 84c96ecd..87269b90 100644
--- a/src/SMAPI/Events/RenderingHudEventArgs.cs
+++ b/src/SMAPI/Events/RenderingHudEventArgs.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 using Microsoft.Xna.Framework.Graphics;
 using StardewValley;
diff --git a/src/SMAPI/Events/RenderingWorldEventArgs.cs b/src/SMAPI/Events/RenderingWorldEventArgs.cs
index d0d44789..2fc9964f 100644
--- a/src/SMAPI/Events/RenderingWorldEventArgs.cs
+++ b/src/SMAPI/Events/RenderingWorldEventArgs.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 using Microsoft.Xna.Framework.Graphics;
 using StardewValley;
diff --git a/src/SMAPI/Events/TerrainFeatureListChangedEventArgs.cs b/src/SMAPI/Events/TerrainFeatureListChangedEventArgs.cs
index cdf1e6dc..77a73102 100644
--- a/src/SMAPI/Events/TerrainFeatureListChangedEventArgs.cs
+++ b/src/SMAPI/Events/TerrainFeatureListChangedEventArgs.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 using System.Collections.Generic;
 using System.Linq;
diff --git a/src/SMAPI/Events/WarpedEventArgs.cs b/src/SMAPI/Events/WarpedEventArgs.cs
index 9afe4a4e..92a8ea77 100644
--- a/src/SMAPI/Events/WarpedEventArgs.cs
+++ b/src/SMAPI/Events/WarpedEventArgs.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 using StardewValley;
 
diff --git a/src/SMAPI/Framework/Command.cs b/src/SMAPI/Framework/Command.cs
index 8c9df47d..776ba238 100644
--- a/src/SMAPI/Framework/Command.cs
+++ b/src/SMAPI/Framework/Command.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 
 namespace StardewModdingAPI.Framework
diff --git a/src/SMAPI/Framework/CommandManager.cs b/src/SMAPI/Framework/CommandManager.cs
index 0c0f6685..df798b0c 100644
--- a/src/SMAPI/Framework/CommandManager.cs
+++ b/src/SMAPI/Framework/CommandManager.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 using System.Collections.Generic;
 using System.Linq;
diff --git a/src/SMAPI/Framework/Commands/HarmonySummaryCommand.cs b/src/SMAPI/Framework/Commands/HarmonySummaryCommand.cs
index 643267ce..fcfa928e 100644
--- a/src/SMAPI/Framework/Commands/HarmonySummaryCommand.cs
+++ b/src/SMAPI/Framework/Commands/HarmonySummaryCommand.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 using System.Collections.Generic;
 using System.Linq;
diff --git a/src/SMAPI/Framework/Commands/HelpCommand.cs b/src/SMAPI/Framework/Commands/HelpCommand.cs
index baf3116e..eb6c74f5 100644
--- a/src/SMAPI/Framework/Commands/HelpCommand.cs
+++ b/src/SMAPI/Framework/Commands/HelpCommand.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System.Linq;
 
 namespace StardewModdingAPI.Framework.Commands
diff --git a/src/SMAPI/Framework/Commands/IInternalCommand.cs b/src/SMAPI/Framework/Commands/IInternalCommand.cs
index abf105b6..32e3e9f1 100644
--- a/src/SMAPI/Framework/Commands/IInternalCommand.cs
+++ b/src/SMAPI/Framework/Commands/IInternalCommand.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 namespace StardewModdingAPI.Framework.Commands
 {
     /// <summary>A core SMAPI console command.</summary>
diff --git a/src/SMAPI/Framework/Commands/ReloadI18nCommand.cs b/src/SMAPI/Framework/Commands/ReloadI18nCommand.cs
index 12328bb6..2043b35e 100644
--- a/src/SMAPI/Framework/Commands/ReloadI18nCommand.cs
+++ b/src/SMAPI/Framework/Commands/ReloadI18nCommand.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 
 namespace StardewModdingAPI.Framework.Commands
diff --git a/src/SMAPI/Framework/Content/AssetData.cs b/src/SMAPI/Framework/Content/AssetData.cs
index 05be8a3b..be4a7ce6 100644
--- a/src/SMAPI/Framework/Content/AssetData.cs
+++ b/src/SMAPI/Framework/Content/AssetData.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 
 namespace StardewModdingAPI.Framework.Content
diff --git a/src/SMAPI/Framework/Content/AssetDataForDictionary.cs b/src/SMAPI/Framework/Content/AssetDataForDictionary.cs
index 735b651c..06dbe259 100644
--- a/src/SMAPI/Framework/Content/AssetDataForDictionary.cs
+++ b/src/SMAPI/Framework/Content/AssetDataForDictionary.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 using System.Collections.Generic;
 
diff --git a/src/SMAPI/Framework/Content/AssetDataForImage.cs b/src/SMAPI/Framework/Content/AssetDataForImage.cs
index b0f1b5c7..8e59cd27 100644
--- a/src/SMAPI/Framework/Content/AssetDataForImage.cs
+++ b/src/SMAPI/Framework/Content/AssetDataForImage.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 using Microsoft.Xna.Framework;
 using Microsoft.Xna.Framework.Graphics;
diff --git a/src/SMAPI/Framework/Content/AssetDataForMap.cs b/src/SMAPI/Framework/Content/AssetDataForMap.cs
index 5986e797..0425e195 100644
--- a/src/SMAPI/Framework/Content/AssetDataForMap.cs
+++ b/src/SMAPI/Framework/Content/AssetDataForMap.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 using System.Collections.Generic;
 using System.Linq;
diff --git a/src/SMAPI/Framework/Content/AssetDataForObject.cs b/src/SMAPI/Framework/Content/AssetDataForObject.cs
index bafd8941..4a6df64b 100644
--- a/src/SMAPI/Framework/Content/AssetDataForObject.cs
+++ b/src/SMAPI/Framework/Content/AssetDataForObject.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 using System.Collections.Generic;
 using Microsoft.Xna.Framework.Graphics;
diff --git a/src/SMAPI/Framework/Content/AssetEditOperation.cs b/src/SMAPI/Framework/Content/AssetEditOperation.cs
index 818209fa..1b7d0c93 100644
--- a/src/SMAPI/Framework/Content/AssetEditOperation.cs
+++ b/src/SMAPI/Framework/Content/AssetEditOperation.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 using StardewModdingAPI.Events;
 
diff --git a/src/SMAPI/Framework/Content/AssetInfo.cs b/src/SMAPI/Framework/Content/AssetInfo.cs
index f5da5d69..51dcc61f 100644
--- a/src/SMAPI/Framework/Content/AssetInfo.cs
+++ b/src/SMAPI/Framework/Content/AssetInfo.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 using System.Collections.Generic;
 using Microsoft.Xna.Framework.Graphics;
diff --git a/src/SMAPI/Framework/Content/AssetInterceptorChange.cs b/src/SMAPI/Framework/Content/AssetInterceptorChange.cs
index 03d6da5a..7f53db9b 100644
--- a/src/SMAPI/Framework/Content/AssetInterceptorChange.cs
+++ b/src/SMAPI/Framework/Content/AssetInterceptorChange.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 using System.Reflection;
 using StardewModdingAPI.Internal;
diff --git a/src/SMAPI/Framework/Content/AssetLoadOperation.cs b/src/SMAPI/Framework/Content/AssetLoadOperation.cs
index b12958d6..73e60e24 100644
--- a/src/SMAPI/Framework/Content/AssetLoadOperation.cs
+++ b/src/SMAPI/Framework/Content/AssetLoadOperation.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 using StardewModdingAPI.Events;
 
diff --git a/src/SMAPI/Framework/Content/AssetName.cs b/src/SMAPI/Framework/Content/AssetName.cs
index 4973b444..4d583d82 100644
--- a/src/SMAPI/Framework/Content/AssetName.cs
+++ b/src/SMAPI/Framework/Content/AssetName.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 using StardewModdingAPI.Toolkit.Utilities;
 using StardewValley;
diff --git a/src/SMAPI/Framework/Content/AssetOperationGroup.cs b/src/SMAPI/Framework/Content/AssetOperationGroup.cs
index a2fcb722..e3c3f92c 100644
--- a/src/SMAPI/Framework/Content/AssetOperationGroup.cs
+++ b/src/SMAPI/Framework/Content/AssetOperationGroup.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 namespace StardewModdingAPI.Framework.Content
 {
     /// <summary>A set of operations to apply to an asset for a given <see cref="IAssetEditor"/> or <see cref="IAssetLoader"/> implementation.</summary>
diff --git a/src/SMAPI/Framework/Content/ContentCache.cs b/src/SMAPI/Framework/Content/ContentCache.cs
index 8e0c6228..4e620d28 100644
--- a/src/SMAPI/Framework/Content/ContentCache.cs
+++ b/src/SMAPI/Framework/Content/ContentCache.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 using System.Collections.Generic;
 using System.Diagnostics.Contracts;
diff --git a/src/SMAPI/Framework/Content/TilesheetReference.cs b/src/SMAPI/Framework/Content/TilesheetReference.cs
index 0339b802..cdc4bc62 100644
--- a/src/SMAPI/Framework/Content/TilesheetReference.cs
+++ b/src/SMAPI/Framework/Content/TilesheetReference.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using xTile.Dimensions;
 
 namespace StardewModdingAPI.Framework.Content
diff --git a/src/SMAPI/Framework/ContentCoordinator.cs b/src/SMAPI/Framework/ContentCoordinator.cs
index 88ed96da..bfde649a 100644
--- a/src/SMAPI/Framework/ContentCoordinator.cs
+++ b/src/SMAPI/Framework/ContentCoordinator.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
diff --git a/src/SMAPI/Framework/ContentManagers/BaseContentManager.cs b/src/SMAPI/Framework/ContentManagers/BaseContentManager.cs
index c803905a..4594d235 100644
--- a/src/SMAPI/Framework/ContentManagers/BaseContentManager.cs
+++ b/src/SMAPI/Framework/ContentManagers/BaseContentManager.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
diff --git a/src/SMAPI/Framework/ContentManagers/GameContentManager.cs b/src/SMAPI/Framework/ContentManagers/GameContentManager.cs
index cad5f6db..f4e1bda4 100644
--- a/src/SMAPI/Framework/ContentManagers/GameContentManager.cs
+++ b/src/SMAPI/Framework/ContentManagers/GameContentManager.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 using System.Collections.Generic;
 using System.Globalization;
diff --git a/src/SMAPI/Framework/ContentManagers/GameContentManagerForAssetPropagation.cs b/src/SMAPI/Framework/ContentManagers/GameContentManagerForAssetPropagation.cs
index 3f7188da..46d5d24e 100644
--- a/src/SMAPI/Framework/ContentManagers/GameContentManagerForAssetPropagation.cs
+++ b/src/SMAPI/Framework/ContentManagers/GameContentManagerForAssetPropagation.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 using System.Globalization;
 using Microsoft.Xna.Framework.Graphics;
diff --git a/src/SMAPI/Framework/ContentManagers/IContentManager.cs b/src/SMAPI/Framework/ContentManagers/IContentManager.cs
index 90095492..c4625761 100644
--- a/src/SMAPI/Framework/ContentManagers/IContentManager.cs
+++ b/src/SMAPI/Framework/ContentManagers/IContentManager.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 using System.Collections.Generic;
 using Microsoft.Xna.Framework.Content;
diff --git a/src/SMAPI/Framework/ContentManagers/ModContentManager.cs b/src/SMAPI/Framework/ContentManagers/ModContentManager.cs
index e0c85265..8051c296 100644
--- a/src/SMAPI/Framework/ContentManagers/ModContentManager.cs
+++ b/src/SMAPI/Framework/ContentManagers/ModContentManager.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 using System.Globalization;
 using System.IO;
diff --git a/src/SMAPI/Framework/ContentPack.cs b/src/SMAPI/Framework/ContentPack.cs
index e02ef88b..2d33a22e 100644
--- a/src/SMAPI/Framework/ContentPack.cs
+++ b/src/SMAPI/Framework/ContentPack.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 using System.IO;
 using StardewModdingAPI.Framework.ModHelpers;
diff --git a/src/SMAPI/Framework/CursorPosition.cs b/src/SMAPI/Framework/CursorPosition.cs
index 107481e7..8f36a554 100644
--- a/src/SMAPI/Framework/CursorPosition.cs
+++ b/src/SMAPI/Framework/CursorPosition.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using Microsoft.Xna.Framework;
 using StardewValley;
 
diff --git a/src/SMAPI/Framework/DeprecationManager.cs b/src/SMAPI/Framework/DeprecationManager.cs
index ad6a3677..fe1b623f 100644
--- a/src/SMAPI/Framework/DeprecationManager.cs
+++ b/src/SMAPI/Framework/DeprecationManager.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 using System.Collections.Generic;
 using System.Linq;
diff --git a/src/SMAPI/Framework/DeprecationWarning.cs b/src/SMAPI/Framework/DeprecationWarning.cs
index 5201b06c..f155358b 100644
--- a/src/SMAPI/Framework/DeprecationWarning.cs
+++ b/src/SMAPI/Framework/DeprecationWarning.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 namespace StardewModdingAPI.Framework
 {
     /// <summary>A deprecation warning for a mod.</summary>
diff --git a/src/SMAPI/Framework/Events/EventManager.cs b/src/SMAPI/Framework/Events/EventManager.cs
index 41540047..c977e73d 100644
--- a/src/SMAPI/Framework/Events/EventManager.cs
+++ b/src/SMAPI/Framework/Events/EventManager.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using StardewModdingAPI.Events;
 
 namespace StardewModdingAPI.Framework.Events
diff --git a/src/SMAPI/Framework/Events/IManagedEvent.cs b/src/SMAPI/Framework/Events/IManagedEvent.cs
index e4e3ca08..57277576 100644
--- a/src/SMAPI/Framework/Events/IManagedEvent.cs
+++ b/src/SMAPI/Framework/Events/IManagedEvent.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 namespace StardewModdingAPI.Framework.Events
 {
     /// <summary>Metadata for an event raised by SMAPI.</summary>
diff --git a/src/SMAPI/Framework/Events/ManagedEvent.cs b/src/SMAPI/Framework/Events/ManagedEvent.cs
index 1c8b9d04..8fa31165 100644
--- a/src/SMAPI/Framework/Events/ManagedEvent.cs
+++ b/src/SMAPI/Framework/Events/ManagedEvent.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 using System.Collections.Generic;
 using System.Linq;
diff --git a/src/SMAPI/Framework/Events/ManagedEventHandler.cs b/src/SMAPI/Framework/Events/ManagedEventHandler.cs
index 97040f76..f31bc04d 100644
--- a/src/SMAPI/Framework/Events/ManagedEventHandler.cs
+++ b/src/SMAPI/Framework/Events/ManagedEventHandler.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 using StardewModdingAPI.Events;
 
diff --git a/src/SMAPI/Framework/Events/ModContentEvents.cs b/src/SMAPI/Framework/Events/ModContentEvents.cs
index beb96031..f198b793 100644
--- a/src/SMAPI/Framework/Events/ModContentEvents.cs
+++ b/src/SMAPI/Framework/Events/ModContentEvents.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 using StardewModdingAPI.Events;
 
diff --git a/src/SMAPI/Framework/Events/ModDisplayEvents.cs b/src/SMAPI/Framework/Events/ModDisplayEvents.cs
index 48f55324..b2110cce 100644
--- a/src/SMAPI/Framework/Events/ModDisplayEvents.cs
+++ b/src/SMAPI/Framework/Events/ModDisplayEvents.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 using StardewModdingAPI.Events;
 
diff --git a/src/SMAPI/Framework/Events/ModEvents.cs b/src/SMAPI/Framework/Events/ModEvents.cs
index 1fb3482c..e8f8885d 100644
--- a/src/SMAPI/Framework/Events/ModEvents.cs
+++ b/src/SMAPI/Framework/Events/ModEvents.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using StardewModdingAPI.Events;
 
 namespace StardewModdingAPI.Framework.Events
diff --git a/src/SMAPI/Framework/Events/ModEventsBase.cs b/src/SMAPI/Framework/Events/ModEventsBase.cs
index 77708fc1..295caa0d 100644
--- a/src/SMAPI/Framework/Events/ModEventsBase.cs
+++ b/src/SMAPI/Framework/Events/ModEventsBase.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 namespace StardewModdingAPI.Framework.Events
 {
     /// <summary>An internal base class for event API classes.</summary>
diff --git a/src/SMAPI/Framework/Events/ModGameLoopEvents.cs b/src/SMAPI/Framework/Events/ModGameLoopEvents.cs
index 5f0db369..51803daf 100644
--- a/src/SMAPI/Framework/Events/ModGameLoopEvents.cs
+++ b/src/SMAPI/Framework/Events/ModGameLoopEvents.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 using StardewModdingAPI.Events;
 
diff --git a/src/SMAPI/Framework/Events/ModInputEvents.cs b/src/SMAPI/Framework/Events/ModInputEvents.cs
index 40edf806..6af79c59 100644
--- a/src/SMAPI/Framework/Events/ModInputEvents.cs
+++ b/src/SMAPI/Framework/Events/ModInputEvents.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 using StardewModdingAPI.Events;
 
diff --git a/src/SMAPI/Framework/Events/ModMultiplayerEvents.cs b/src/SMAPI/Framework/Events/ModMultiplayerEvents.cs
index b90f64fa..7d3ce510 100644
--- a/src/SMAPI/Framework/Events/ModMultiplayerEvents.cs
+++ b/src/SMAPI/Framework/Events/ModMultiplayerEvents.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 using StardewModdingAPI.Events;
 
diff --git a/src/SMAPI/Framework/Events/ModPlayerEvents.cs b/src/SMAPI/Framework/Events/ModPlayerEvents.cs
index b2d89e9a..dac8f05b 100644
--- a/src/SMAPI/Framework/Events/ModPlayerEvents.cs
+++ b/src/SMAPI/Framework/Events/ModPlayerEvents.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 using StardewModdingAPI.Events;
 
diff --git a/src/SMAPI/Framework/Events/ModSpecialisedEvents.cs b/src/SMAPI/Framework/Events/ModSpecialisedEvents.cs
index 7980208b..4b438034 100644
--- a/src/SMAPI/Framework/Events/ModSpecialisedEvents.cs
+++ b/src/SMAPI/Framework/Events/ModSpecialisedEvents.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 using StardewModdingAPI.Events;
 
diff --git a/src/SMAPI/Framework/Events/ModWorldEvents.cs b/src/SMAPI/Framework/Events/ModWorldEvents.cs
index a7b7d799..614945c7 100644
--- a/src/SMAPI/Framework/Events/ModWorldEvents.cs
+++ b/src/SMAPI/Framework/Events/ModWorldEvents.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 using StardewModdingAPI.Events;
 
diff --git a/src/SMAPI/Framework/Exceptions/SAssemblyLoadFailedException.cs b/src/SMAPI/Framework/Exceptions/SAssemblyLoadFailedException.cs
index ec9279f1..4e03a687 100644
--- a/src/SMAPI/Framework/Exceptions/SAssemblyLoadFailedException.cs
+++ b/src/SMAPI/Framework/Exceptions/SAssemblyLoadFailedException.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 
 namespace StardewModdingAPI.Framework.Exceptions
diff --git a/src/SMAPI/Framework/Exceptions/SContentLoadException.cs b/src/SMAPI/Framework/Exceptions/SContentLoadException.cs
index 85d85e3d..c21a6b0e 100644
--- a/src/SMAPI/Framework/Exceptions/SContentLoadException.cs
+++ b/src/SMAPI/Framework/Exceptions/SContentLoadException.cs
@@ -1,4 +1,6 @@
-using System;
+#nullable disable
+
+using System;
 using Microsoft.Xna.Framework.Content;
 
 namespace StardewModdingAPI.Framework.Exceptions
diff --git a/src/SMAPI/Framework/GameVersion.cs b/src/SMAPI/Framework/GameVersion.cs
index b69c6757..aa91d8f3 100644
--- a/src/SMAPI/Framework/GameVersion.cs
+++ b/src/SMAPI/Framework/GameVersion.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 using System.Collections.Generic;
 
diff --git a/src/SMAPI/Framework/IModMetadata.cs b/src/SMAPI/Framework/IModMetadata.cs
index cb876ee4..800b198a 100644
--- a/src/SMAPI/Framework/IModMetadata.cs
+++ b/src/SMAPI/Framework/IModMetadata.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 using System.Collections.Generic;
 using StardewModdingAPI.Framework.ModHelpers;
diff --git a/src/SMAPI/Framework/Input/GamePadStateBuilder.cs b/src/SMAPI/Framework/Input/GamePadStateBuilder.cs
index ad254828..21168b7a 100644
--- a/src/SMAPI/Framework/Input/GamePadStateBuilder.cs
+++ b/src/SMAPI/Framework/Input/GamePadStateBuilder.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System.Collections.Generic;
 using System.Linq;
 using Microsoft.Xna.Framework;
diff --git a/src/SMAPI/Framework/Input/IInputStateBuilder.cs b/src/SMAPI/Framework/Input/IInputStateBuilder.cs
index 28d62439..3fb62686 100644
--- a/src/SMAPI/Framework/Input/IInputStateBuilder.cs
+++ b/src/SMAPI/Framework/Input/IInputStateBuilder.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System.Collections.Generic;
 
 namespace StardewModdingAPI.Framework.Input
diff --git a/src/SMAPI/Framework/Input/KeyboardStateBuilder.cs b/src/SMAPI/Framework/Input/KeyboardStateBuilder.cs
index 09bc48b6..81ca0ebb 100644
--- a/src/SMAPI/Framework/Input/KeyboardStateBuilder.cs
+++ b/src/SMAPI/Framework/Input/KeyboardStateBuilder.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System.Collections.Generic;
 using System.Linq;
 using Microsoft.Xna.Framework.Input;
diff --git a/src/SMAPI/Framework/Input/MouseStateBuilder.cs b/src/SMAPI/Framework/Input/MouseStateBuilder.cs
index c2a0891b..85b38d32 100644
--- a/src/SMAPI/Framework/Input/MouseStateBuilder.cs
+++ b/src/SMAPI/Framework/Input/MouseStateBuilder.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System.Collections.Generic;
 using Microsoft.Xna.Framework.Input;
 
diff --git a/src/SMAPI/Framework/Input/SInputState.cs b/src/SMAPI/Framework/Input/SInputState.cs
index 72adca02..37b3c8ef 100644
--- a/src/SMAPI/Framework/Input/SInputState.cs
+++ b/src/SMAPI/Framework/Input/SInputState.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 using System.Collections.Generic;
 using System.Linq;
diff --git a/src/SMAPI/Framework/InternalExtensions.cs b/src/SMAPI/Framework/InternalExtensions.cs
index 54aeffd7..a1d87487 100644
--- a/src/SMAPI/Framework/InternalExtensions.cs
+++ b/src/SMAPI/Framework/InternalExtensions.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 using System.Collections.Generic;
 using System.Linq;
diff --git a/src/SMAPI/Framework/Logging/InterceptingTextWriter.cs b/src/SMAPI/Framework/Logging/InterceptingTextWriter.cs
index bad69a2a..a0957b90 100644
--- a/src/SMAPI/Framework/Logging/InterceptingTextWriter.cs
+++ b/src/SMAPI/Framework/Logging/InterceptingTextWriter.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 using System.IO;
 using System.Text;
diff --git a/src/SMAPI/Framework/Logging/LogFileManager.cs b/src/SMAPI/Framework/Logging/LogFileManager.cs
index 6ab2bdfb..0b6f9ad2 100644
--- a/src/SMAPI/Framework/Logging/LogFileManager.cs
+++ b/src/SMAPI/Framework/Logging/LogFileManager.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 using System.IO;
 
diff --git a/src/SMAPI/Framework/Logging/LogManager.cs b/src/SMAPI/Framework/Logging/LogManager.cs
index a8a8b6ee..dab7f554 100644
--- a/src/SMAPI/Framework/Logging/LogManager.cs
+++ b/src/SMAPI/Framework/Logging/LogManager.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
diff --git a/src/SMAPI/Framework/ModHelpers/BaseHelper.cs b/src/SMAPI/Framework/ModHelpers/BaseHelper.cs
index 5a3d4bed..1cd1a6b3 100644
--- a/src/SMAPI/Framework/ModHelpers/BaseHelper.cs
+++ b/src/SMAPI/Framework/ModHelpers/BaseHelper.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 namespace StardewModdingAPI.Framework.ModHelpers
 {
     /// <summary>The common base class for mod helpers.</summary>
diff --git a/src/SMAPI/Framework/ModHelpers/CommandHelper.cs b/src/SMAPI/Framework/ModHelpers/CommandHelper.cs
index 69382009..c2b5092e 100644
--- a/src/SMAPI/Framework/ModHelpers/CommandHelper.cs
+++ b/src/SMAPI/Framework/ModHelpers/CommandHelper.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 
 namespace StardewModdingAPI.Framework.ModHelpers
diff --git a/src/SMAPI/Framework/ModHelpers/ContentHelper.cs b/src/SMAPI/Framework/ModHelpers/ContentHelper.cs
index 14aa74c2..e72e397e 100644
--- a/src/SMAPI/Framework/ModHelpers/ContentHelper.cs
+++ b/src/SMAPI/Framework/ModHelpers/ContentHelper.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
diff --git a/src/SMAPI/Framework/ModHelpers/ContentPackHelper.cs b/src/SMAPI/Framework/ModHelpers/ContentPackHelper.cs
index d39abc7d..336214e2 100644
--- a/src/SMAPI/Framework/ModHelpers/ContentPackHelper.cs
+++ b/src/SMAPI/Framework/ModHelpers/ContentPackHelper.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 using System.Collections.Generic;
 using System.IO;
diff --git a/src/SMAPI/Framework/ModHelpers/DataHelper.cs b/src/SMAPI/Framework/ModHelpers/DataHelper.cs
index 4cbfd73f..86a34ee8 100644
--- a/src/SMAPI/Framework/ModHelpers/DataHelper.cs
+++ b/src/SMAPI/Framework/ModHelpers/DataHelper.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 using System.Collections.Generic;
 using System.IO;
diff --git a/src/SMAPI/Framework/ModHelpers/GameContentHelper.cs b/src/SMAPI/Framework/ModHelpers/GameContentHelper.cs
index 0eb385d4..ed0c46d5 100644
--- a/src/SMAPI/Framework/ModHelpers/GameContentHelper.cs
+++ b/src/SMAPI/Framework/ModHelpers/GameContentHelper.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 using System.Linq;
 using StardewModdingAPI.Framework.Content;
diff --git a/src/SMAPI/Framework/ModHelpers/InputHelper.cs b/src/SMAPI/Framework/ModHelpers/InputHelper.cs
index 88caf4c3..29f80d87 100644
--- a/src/SMAPI/Framework/ModHelpers/InputHelper.cs
+++ b/src/SMAPI/Framework/ModHelpers/InputHelper.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 using StardewModdingAPI.Framework.Input;
 using StardewModdingAPI.Utilities;
diff --git a/src/SMAPI/Framework/ModHelpers/ModContentHelper.cs b/src/SMAPI/Framework/ModHelpers/ModContentHelper.cs
index 7468cda1..90064354 100644
--- a/src/SMAPI/Framework/ModHelpers/ModContentHelper.cs
+++ b/src/SMAPI/Framework/ModHelpers/ModContentHelper.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 using Microsoft.Xna.Framework.Content;
 using StardewModdingAPI.Framework.Content;
diff --git a/src/SMAPI/Framework/ModHelpers/ModHelper.cs b/src/SMAPI/Framework/ModHelpers/ModHelper.cs
index 5b567ee0..2a8aeb3a 100644
--- a/src/SMAPI/Framework/ModHelpers/ModHelper.cs
+++ b/src/SMAPI/Framework/ModHelpers/ModHelper.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 using System.IO;
 using StardewModdingAPI.Events;
diff --git a/src/SMAPI/Framework/ModHelpers/ModRegistryHelper.cs b/src/SMAPI/Framework/ModHelpers/ModRegistryHelper.cs
index 09a392a6..e277e6fa 100644
--- a/src/SMAPI/Framework/ModHelpers/ModRegistryHelper.cs
+++ b/src/SMAPI/Framework/ModHelpers/ModRegistryHelper.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System.Collections.Generic;
 using StardewModdingAPI.Framework.Reflection;
 
diff --git a/src/SMAPI/Framework/ModHelpers/MultiplayerHelper.cs b/src/SMAPI/Framework/ModHelpers/MultiplayerHelper.cs
index a7ce8692..96b074e2 100644
--- a/src/SMAPI/Framework/ModHelpers/MultiplayerHelper.cs
+++ b/src/SMAPI/Framework/ModHelpers/MultiplayerHelper.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System.Collections.Generic;
 using StardewModdingAPI.Framework.Networking;
 using StardewValley;
diff --git a/src/SMAPI/Framework/ModHelpers/ReflectionHelper.cs b/src/SMAPI/Framework/ModHelpers/ReflectionHelper.cs
index 5a4ea742..24cbd01c 100644
--- a/src/SMAPI/Framework/ModHelpers/ReflectionHelper.cs
+++ b/src/SMAPI/Framework/ModHelpers/ReflectionHelper.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 using System.Reflection;
 using StardewModdingAPI.Framework.Reflection;
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;
 
diff --git a/src/SMAPI/Framework/ModLinked.cs b/src/SMAPI/Framework/ModLinked.cs
index 8cfe6f5f..5a3e38ca 100644
--- a/src/SMAPI/Framework/ModLinked.cs
+++ b/src/SMAPI/Framework/ModLinked.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 namespace StardewModdingAPI.Framework
 {
     /// <summary>A generic tuple which links something to a mod.</summary>
diff --git a/src/SMAPI/Framework/ModLoading/AssemblyDefinitionResolver.cs b/src/SMAPI/Framework/ModLoading/AssemblyDefinitionResolver.cs
index 8e2f5ef3..1d4ddf72 100644
--- a/src/SMAPI/Framework/ModLoading/AssemblyDefinitionResolver.cs
+++ b/src/SMAPI/Framework/ModLoading/AssemblyDefinitionResolver.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System.Collections.Generic;
 using Mono.Cecil;
 
diff --git a/src/SMAPI/Framework/ModLoading/AssemblyLoadStatus.cs b/src/SMAPI/Framework/ModLoading/AssemblyLoadStatus.cs
index 11be19fc..d2d5d83b 100644
--- a/src/SMAPI/Framework/ModLoading/AssemblyLoadStatus.cs
+++ b/src/SMAPI/Framework/ModLoading/AssemblyLoadStatus.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 namespace StardewModdingAPI.Framework.ModLoading
 {
     /// <summary>Indicates the result of an assembly load.</summary>
diff --git a/src/SMAPI/Framework/ModLoading/AssemblyLoader.cs b/src/SMAPI/Framework/ModLoading/AssemblyLoader.cs
index 24214c96..070ee803 100644
--- a/src/SMAPI/Framework/ModLoading/AssemblyLoader.cs
+++ b/src/SMAPI/Framework/ModLoading/AssemblyLoader.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 using System.Collections.Generic;
 using System.IO;
diff --git a/src/SMAPI/Framework/ModLoading/AssemblyParseResult.cs b/src/SMAPI/Framework/ModLoading/AssemblyParseResult.cs
index b56a776c..56bd5a8b 100644
--- a/src/SMAPI/Framework/ModLoading/AssemblyParseResult.cs
+++ b/src/SMAPI/Framework/ModLoading/AssemblyParseResult.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System.IO;
 using Mono.Cecil;
 
diff --git a/src/SMAPI/Framework/ModLoading/Finders/EventFinder.cs b/src/SMAPI/Framework/ModLoading/Finders/EventFinder.cs
index 124951a5..7c94beb7 100644
--- a/src/SMAPI/Framework/ModLoading/Finders/EventFinder.cs
+++ b/src/SMAPI/Framework/ModLoading/Finders/EventFinder.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System.Collections.Generic;
 using System.Linq;
 using Mono.Cecil;
diff --git a/src/SMAPI/Framework/ModLoading/Finders/FieldFinder.cs b/src/SMAPI/Framework/ModLoading/Finders/FieldFinder.cs
index 68415123..96b4098a 100644
--- a/src/SMAPI/Framework/ModLoading/Finders/FieldFinder.cs
+++ b/src/SMAPI/Framework/ModLoading/Finders/FieldFinder.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System.Collections.Generic;
 using System.Linq;
 using Mono.Cecil;
diff --git a/src/SMAPI/Framework/ModLoading/Finders/MethodFinder.cs b/src/SMAPI/Framework/ModLoading/Finders/MethodFinder.cs
index d2340f01..7d3c1fd7 100644
--- a/src/SMAPI/Framework/ModLoading/Finders/MethodFinder.cs
+++ b/src/SMAPI/Framework/ModLoading/Finders/MethodFinder.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using Mono.Cecil;
 using Mono.Cecil.Cil;
 using StardewModdingAPI.Framework.ModLoading.Framework;
diff --git a/src/SMAPI/Framework/ModLoading/Finders/PropertyFinder.cs b/src/SMAPI/Framework/ModLoading/Finders/PropertyFinder.cs
index 99344848..b2f2e193 100644
--- a/src/SMAPI/Framework/ModLoading/Finders/PropertyFinder.cs
+++ b/src/SMAPI/Framework/ModLoading/Finders/PropertyFinder.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using Mono.Cecil;
 using Mono.Cecil.Cil;
 using StardewModdingAPI.Framework.ModLoading.Framework;
diff --git a/src/SMAPI/Framework/ModLoading/Finders/ReferenceToMemberWithUnexpectedTypeFinder.cs b/src/SMAPI/Framework/ModLoading/Finders/ReferenceToMemberWithUnexpectedTypeFinder.cs
index 8c1cae2b..81f90498 100644
--- a/src/SMAPI/Framework/ModLoading/Finders/ReferenceToMemberWithUnexpectedTypeFinder.cs
+++ b/src/SMAPI/Framework/ModLoading/Finders/ReferenceToMemberWithUnexpectedTypeFinder.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System.Collections.Generic;
 using System.Linq;
 using Mono.Cecil;
diff --git a/src/SMAPI/Framework/ModLoading/Finders/ReferenceToMissingMemberFinder.cs b/src/SMAPI/Framework/ModLoading/Finders/ReferenceToMissingMemberFinder.cs
index d305daf4..001d1986 100644
--- a/src/SMAPI/Framework/ModLoading/Finders/ReferenceToMissingMemberFinder.cs
+++ b/src/SMAPI/Framework/ModLoading/Finders/ReferenceToMissingMemberFinder.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System.Collections.Generic;
 using Mono.Cecil;
 using Mono.Cecil.Cil;
diff --git a/src/SMAPI/Framework/ModLoading/Finders/TypeAssemblyFinder.cs b/src/SMAPI/Framework/ModLoading/Finders/TypeAssemblyFinder.cs
index 24ab2eca..4c589ed8 100644
--- a/src/SMAPI/Framework/ModLoading/Finders/TypeAssemblyFinder.cs
+++ b/src/SMAPI/Framework/ModLoading/Finders/TypeAssemblyFinder.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 using Mono.Cecil;
 using StardewModdingAPI.Framework.ModLoading.Framework;
diff --git a/src/SMAPI/Framework/ModLoading/Finders/TypeFinder.cs b/src/SMAPI/Framework/ModLoading/Finders/TypeFinder.cs
index 260a8df8..04a5b970 100644
--- a/src/SMAPI/Framework/ModLoading/Finders/TypeFinder.cs
+++ b/src/SMAPI/Framework/ModLoading/Finders/TypeFinder.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 using System.Collections.Generic;
 using Mono.Cecil;
diff --git a/src/SMAPI/Framework/ModLoading/Framework/BaseInstructionHandler.cs b/src/SMAPI/Framework/ModLoading/Framework/BaseInstructionHandler.cs
index d5d1b38e..bea786cd 100644
--- a/src/SMAPI/Framework/ModLoading/Framework/BaseInstructionHandler.cs
+++ b/src/SMAPI/Framework/ModLoading/Framework/BaseInstructionHandler.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 using System.Collections.Generic;
 using Mono.Cecil;
diff --git a/src/SMAPI/Framework/ModLoading/Framework/RecursiveRewriter.cs b/src/SMAPI/Framework/ModLoading/Framework/RecursiveRewriter.cs
index 4f14a579..09ff78f7 100644
--- a/src/SMAPI/Framework/ModLoading/Framework/RecursiveRewriter.cs
+++ b/src/SMAPI/Framework/ModLoading/Framework/RecursiveRewriter.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 using System.Collections.Generic;
 using System.Linq;
diff --git a/src/SMAPI/Framework/ModLoading/Framework/RewriteHelper.cs b/src/SMAPI/Framework/ModLoading/Framework/RewriteHelper.cs
index d7cb2471..8f47fbdd 100644
--- a/src/SMAPI/Framework/ModLoading/Framework/RewriteHelper.cs
+++ b/src/SMAPI/Framework/ModLoading/Framework/RewriteHelper.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 using System.Linq;
 using System.Reflection;
diff --git a/src/SMAPI/Framework/ModLoading/IInstructionHandler.cs b/src/SMAPI/Framework/ModLoading/IInstructionHandler.cs
index d41732f8..126504e3 100644
--- a/src/SMAPI/Framework/ModLoading/IInstructionHandler.cs
+++ b/src/SMAPI/Framework/ModLoading/IInstructionHandler.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 using System.Collections.Generic;
 using Mono.Cecil;
diff --git a/src/SMAPI/Framework/ModLoading/IncompatibleInstructionException.cs b/src/SMAPI/Framework/ModLoading/IncompatibleInstructionException.cs
index 1f9add30..29406f2a 100644
--- a/src/SMAPI/Framework/ModLoading/IncompatibleInstructionException.cs
+++ b/src/SMAPI/Framework/ModLoading/IncompatibleInstructionException.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 
 namespace StardewModdingAPI.Framework.ModLoading
diff --git a/src/SMAPI/Framework/ModLoading/InvalidModStateException.cs b/src/SMAPI/Framework/ModLoading/InvalidModStateException.cs
index 075e237a..9dca9bc4 100644
--- a/src/SMAPI/Framework/ModLoading/InvalidModStateException.cs
+++ b/src/SMAPI/Framework/ModLoading/InvalidModStateException.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 
 namespace StardewModdingAPI.Framework.ModLoading
diff --git a/src/SMAPI/Framework/ModLoading/ModMetadata.cs b/src/SMAPI/Framework/ModLoading/ModMetadata.cs
index 9e6bc61f..0e698bfd 100644
--- a/src/SMAPI/Framework/ModLoading/ModMetadata.cs
+++ b/src/SMAPI/Framework/ModLoading/ModMetadata.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 using System.Collections.Generic;
 using System.IO;
diff --git a/src/SMAPI/Framework/ModLoading/ModResolver.cs b/src/SMAPI/Framework/ModLoading/ModResolver.cs
index d52cdbb4..51463048 100644
--- a/src/SMAPI/Framework/ModLoading/ModResolver.cs
+++ b/src/SMAPI/Framework/ModLoading/ModResolver.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 using System.Collections.Generic;
 using System.IO;
diff --git a/src/SMAPI/Framework/ModLoading/PlatformAssemblyMap.cs b/src/SMAPI/Framework/ModLoading/PlatformAssemblyMap.cs
index d4366294..0898f095 100644
--- a/src/SMAPI/Framework/ModLoading/PlatformAssemblyMap.cs
+++ b/src/SMAPI/Framework/ModLoading/PlatformAssemblyMap.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 using System.Collections.Generic;
 using System.Linq;
diff --git a/src/SMAPI/Framework/ModLoading/RewriteFacades/AccessToolsFacade.cs b/src/SMAPI/Framework/ModLoading/RewriteFacades/AccessToolsFacade.cs
index be2a1c58..c05005b8 100644
--- a/src/SMAPI/Framework/ModLoading/RewriteFacades/AccessToolsFacade.cs
+++ b/src/SMAPI/Framework/ModLoading/RewriteFacades/AccessToolsFacade.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
diff --git a/src/SMAPI/Framework/ModLoading/RewriteFacades/HarmonyInstanceFacade.cs b/src/SMAPI/Framework/ModLoading/RewriteFacades/HarmonyInstanceFacade.cs
index 135bd218..fea8c100 100644
--- a/src/SMAPI/Framework/ModLoading/RewriteFacades/HarmonyInstanceFacade.cs
+++ b/src/SMAPI/Framework/ModLoading/RewriteFacades/HarmonyInstanceFacade.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
diff --git a/src/SMAPI/Framework/ModLoading/RewriteFacades/HarmonyMethodFacade.cs b/src/SMAPI/Framework/ModLoading/RewriteFacades/HarmonyMethodFacade.cs
index 5162dda4..93124591 100644
--- a/src/SMAPI/Framework/ModLoading/RewriteFacades/HarmonyMethodFacade.cs
+++ b/src/SMAPI/Framework/ModLoading/RewriteFacades/HarmonyMethodFacade.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 using System.Diagnostics.CodeAnalysis;
 using System.Reflection;
diff --git a/src/SMAPI/Framework/ModLoading/RewriteFacades/SpriteBatchFacade.cs b/src/SMAPI/Framework/ModLoading/RewriteFacades/SpriteBatchFacade.cs
index 5f68f8d9..20a30f8f 100644
--- a/src/SMAPI/Framework/ModLoading/RewriteFacades/SpriteBatchFacade.cs
+++ b/src/SMAPI/Framework/ModLoading/RewriteFacades/SpriteBatchFacade.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System.Diagnostics.CodeAnalysis;
 using Microsoft.Xna.Framework;
 using Microsoft.Xna.Framework.Graphics;
diff --git a/src/SMAPI/Framework/ModLoading/Rewriters/ArchitectureAssemblyRewriter.cs b/src/SMAPI/Framework/ModLoading/Rewriters/ArchitectureAssemblyRewriter.cs
index cc830216..4985d72a 100644
--- a/src/SMAPI/Framework/ModLoading/Rewriters/ArchitectureAssemblyRewriter.cs
+++ b/src/SMAPI/Framework/ModLoading/Rewriters/ArchitectureAssemblyRewriter.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using Mono.Cecil;
 using StardewModdingAPI.Framework.ModLoading.Framework;
 
diff --git a/src/SMAPI/Framework/ModLoading/Rewriters/FieldReplaceRewriter.cs b/src/SMAPI/Framework/ModLoading/Rewriters/FieldReplaceRewriter.cs
index 857a2230..806fca62 100644
--- a/src/SMAPI/Framework/ModLoading/Rewriters/FieldReplaceRewriter.cs
+++ b/src/SMAPI/Framework/ModLoading/Rewriters/FieldReplaceRewriter.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 using System.Collections.Generic;
 using System.Reflection;
diff --git a/src/SMAPI/Framework/ModLoading/Rewriters/HarmonyRewriter.cs b/src/SMAPI/Framework/ModLoading/Rewriters/HarmonyRewriter.cs
index f715fb6b..92397c58 100644
--- a/src/SMAPI/Framework/ModLoading/Rewriters/HarmonyRewriter.cs
+++ b/src/SMAPI/Framework/ModLoading/Rewriters/HarmonyRewriter.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 using HarmonyLib;
 using Mono.Cecil;
diff --git a/src/SMAPI/Framework/ModLoading/Rewriters/HeuristicFieldRewriter.cs b/src/SMAPI/Framework/ModLoading/Rewriters/HeuristicFieldRewriter.cs
index 2eee8ff9..fc06e779 100644
--- a/src/SMAPI/Framework/ModLoading/Rewriters/HeuristicFieldRewriter.cs
+++ b/src/SMAPI/Framework/ModLoading/Rewriters/HeuristicFieldRewriter.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System.Collections.Generic;
 using System.Linq;
 using Mono.Cecil;
diff --git a/src/SMAPI/Framework/ModLoading/Rewriters/HeuristicMethodRewriter.cs b/src/SMAPI/Framework/ModLoading/Rewriters/HeuristicMethodRewriter.cs
index 89de437e..4860072c 100644
--- a/src/SMAPI/Framework/ModLoading/Rewriters/HeuristicMethodRewriter.cs
+++ b/src/SMAPI/Framework/ModLoading/Rewriters/HeuristicMethodRewriter.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System.Collections.Generic;
 using System.Linq;
 using Mono.Cecil;
diff --git a/src/SMAPI/Framework/ModLoading/Rewriters/MethodParentRewriter.cs b/src/SMAPI/Framework/ModLoading/Rewriters/MethodParentRewriter.cs
index 9933e2ca..00daf337 100644
--- a/src/SMAPI/Framework/ModLoading/Rewriters/MethodParentRewriter.cs
+++ b/src/SMAPI/Framework/ModLoading/Rewriters/MethodParentRewriter.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 using System.Linq;
 using Mono.Cecil;
diff --git a/src/SMAPI/Framework/ModLoading/Rewriters/TypeReferenceRewriter.cs b/src/SMAPI/Framework/ModLoading/Rewriters/TypeReferenceRewriter.cs
index ad5cb96f..bdc4c4f3 100644
--- a/src/SMAPI/Framework/ModLoading/Rewriters/TypeReferenceRewriter.cs
+++ b/src/SMAPI/Framework/ModLoading/Rewriters/TypeReferenceRewriter.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 using Mono.Cecil;
 using StardewModdingAPI.Framework.ModLoading.Framework;
diff --git a/src/SMAPI/Framework/ModLoading/Symbols/SymbolReader.cs b/src/SMAPI/Framework/ModLoading/Symbols/SymbolReader.cs
index 2171895d..55b7e0c8 100644
--- a/src/SMAPI/Framework/ModLoading/Symbols/SymbolReader.cs
+++ b/src/SMAPI/Framework/ModLoading/Symbols/SymbolReader.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System.IO;
 using Mono.Cecil;
 using Mono.Cecil.Cil;
diff --git a/src/SMAPI/Framework/ModLoading/Symbols/SymbolReaderProvider.cs b/src/SMAPI/Framework/ModLoading/Symbols/SymbolReaderProvider.cs
index d28c4a22..4af7c1e7 100644
--- a/src/SMAPI/Framework/ModLoading/Symbols/SymbolReaderProvider.cs
+++ b/src/SMAPI/Framework/ModLoading/Symbols/SymbolReaderProvider.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 using System.Collections.Generic;
 using System.IO;
diff --git a/src/SMAPI/Framework/ModLoading/Symbols/SymbolWriterProvider.cs b/src/SMAPI/Framework/ModLoading/Symbols/SymbolWriterProvider.cs
index 8f7e05d1..c2ac4cd6 100644
--- a/src/SMAPI/Framework/ModLoading/Symbols/SymbolWriterProvider.cs
+++ b/src/SMAPI/Framework/ModLoading/Symbols/SymbolWriterProvider.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System.IO;
 using Mono.Cecil;
 using Mono.Cecil.Cil;
diff --git a/src/SMAPI/Framework/ModLoading/TypeReferenceComparer.cs b/src/SMAPI/Framework/ModLoading/TypeReferenceComparer.cs
index a4ac54e2..248c29fc 100644
--- a/src/SMAPI/Framework/ModLoading/TypeReferenceComparer.cs
+++ b/src/SMAPI/Framework/ModLoading/TypeReferenceComparer.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 using System.Collections.Generic;
 using System.Linq;
diff --git a/src/SMAPI/Framework/ModRegistry.cs b/src/SMAPI/Framework/ModRegistry.cs
index c0f8d537..cae38637 100644
--- a/src/SMAPI/Framework/ModRegistry.cs
+++ b/src/SMAPI/Framework/ModRegistry.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
diff --git a/src/SMAPI/Framework/Models/SConfig.cs b/src/SMAPI/Framework/Models/SConfig.cs
index 1e78f316..e74d73b5 100644
--- a/src/SMAPI/Framework/Models/SConfig.cs
+++ b/src/SMAPI/Framework/Models/SConfig.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 using System.Collections.Generic;
 using System.Linq;
diff --git a/src/SMAPI/Framework/Monitor.cs b/src/SMAPI/Framework/Monitor.cs
index 6b53daff..de145d1d 100644
--- a/src/SMAPI/Framework/Monitor.cs
+++ b/src/SMAPI/Framework/Monitor.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 using System.Collections.Generic;
 using System.Linq;
diff --git a/src/SMAPI/Framework/Networking/ModMessageModel.cs b/src/SMAPI/Framework/Networking/ModMessageModel.cs
index 4f694f9c..4e7d01eb 100644
--- a/src/SMAPI/Framework/Networking/ModMessageModel.cs
+++ b/src/SMAPI/Framework/Networking/ModMessageModel.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System.Linq;
 using Newtonsoft.Json.Linq;
 
diff --git a/src/SMAPI/Framework/Networking/MultiplayerPeer.cs b/src/SMAPI/Framework/Networking/MultiplayerPeer.cs
index 3923700f..8ee5c309 100644
--- a/src/SMAPI/Framework/Networking/MultiplayerPeer.cs
+++ b/src/SMAPI/Framework/Networking/MultiplayerPeer.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 using System.Collections.Generic;
 using System.Linq;
diff --git a/src/SMAPI/Framework/Networking/MultiplayerPeerMod.cs b/src/SMAPI/Framework/Networking/MultiplayerPeerMod.cs
index 8087dc7e..6fdb9e54 100644
--- a/src/SMAPI/Framework/Networking/MultiplayerPeerMod.cs
+++ b/src/SMAPI/Framework/Networking/MultiplayerPeerMod.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 namespace StardewModdingAPI.Framework.Networking
 {
     internal class MultiplayerPeerMod : IMultiplayerPeerMod
diff --git a/src/SMAPI/Framework/Networking/RemoteContextModModel.cs b/src/SMAPI/Framework/Networking/RemoteContextModModel.cs
index 9795d971..0383576c 100644
--- a/src/SMAPI/Framework/Networking/RemoteContextModModel.cs
+++ b/src/SMAPI/Framework/Networking/RemoteContextModModel.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 namespace StardewModdingAPI.Framework.Networking
 {
     /// <summary>Metadata about an installed mod exchanged with connected computers.</summary>
diff --git a/src/SMAPI/Framework/Networking/RemoteContextModel.cs b/src/SMAPI/Framework/Networking/RemoteContextModel.cs
index 7befb151..37fafa67 100644
--- a/src/SMAPI/Framework/Networking/RemoteContextModel.cs
+++ b/src/SMAPI/Framework/Networking/RemoteContextModel.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 namespace StardewModdingAPI.Framework.Networking
 {
     /// <summary>Metadata about the game, SMAPI, and installed mods exchanged with connected computers.</summary>
diff --git a/src/SMAPI/Framework/Networking/SGalaxyNetClient.cs b/src/SMAPI/Framework/Networking/SGalaxyNetClient.cs
index 01095c66..8e19b4a7 100644
--- a/src/SMAPI/Framework/Networking/SGalaxyNetClient.cs
+++ b/src/SMAPI/Framework/Networking/SGalaxyNetClient.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 using Galaxy.Api;
 using StardewValley.Network;
diff --git a/src/SMAPI/Framework/Networking/SGalaxyNetServer.cs b/src/SMAPI/Framework/Networking/SGalaxyNetServer.cs
index 71e11576..07a004a2 100644
--- a/src/SMAPI/Framework/Networking/SGalaxyNetServer.cs
+++ b/src/SMAPI/Framework/Networking/SGalaxyNetServer.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 using System.Diagnostics.CodeAnalysis;
 using System.IO;
diff --git a/src/SMAPI/Framework/Networking/SLidgrenClient.cs b/src/SMAPI/Framework/Networking/SLidgrenClient.cs
index 39876744..ecf18cbd 100644
--- a/src/SMAPI/Framework/Networking/SLidgrenClient.cs
+++ b/src/SMAPI/Framework/Networking/SLidgrenClient.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 using StardewValley.Network;
 
diff --git a/src/SMAPI/Framework/Networking/SLidgrenServer.cs b/src/SMAPI/Framework/Networking/SLidgrenServer.cs
index ff871e64..c0b247c8 100644
--- a/src/SMAPI/Framework/Networking/SLidgrenServer.cs
+++ b/src/SMAPI/Framework/Networking/SLidgrenServer.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 using System.Diagnostics.CodeAnalysis;
 using System.IO;
diff --git a/src/SMAPI/Framework/Reflection/CacheEntry.cs b/src/SMAPI/Framework/Reflection/CacheEntry.cs
index 912662e3..6b18d204 100644
--- a/src/SMAPI/Framework/Reflection/CacheEntry.cs
+++ b/src/SMAPI/Framework/Reflection/CacheEntry.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System.Reflection;
 
 namespace StardewModdingAPI.Framework.Reflection
diff --git a/src/SMAPI/Framework/Reflection/InterfaceProxyFactory.cs b/src/SMAPI/Framework/Reflection/InterfaceProxyFactory.cs
index 40adde8e..4c49e219 100644
--- a/src/SMAPI/Framework/Reflection/InterfaceProxyFactory.cs
+++ b/src/SMAPI/Framework/Reflection/InterfaceProxyFactory.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System.Reflection;
 using System.Reflection.Emit;
 using Nanoray.Pintail;
diff --git a/src/SMAPI/Framework/Reflection/ReflectedField.cs b/src/SMAPI/Framework/Reflection/ReflectedField.cs
index 3c4da4fc..921876b9 100644
--- a/src/SMAPI/Framework/Reflection/ReflectedField.cs
+++ b/src/SMAPI/Framework/Reflection/ReflectedField.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 using System.Reflection;
 
diff --git a/src/SMAPI/Framework/Reflection/ReflectedMethod.cs b/src/SMAPI/Framework/Reflection/ReflectedMethod.cs
index 26112806..50f89b40 100644
--- a/src/SMAPI/Framework/Reflection/ReflectedMethod.cs
+++ b/src/SMAPI/Framework/Reflection/ReflectedMethod.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 using System.Reflection;
 
diff --git a/src/SMAPI/Framework/Reflection/ReflectedProperty.cs b/src/SMAPI/Framework/Reflection/ReflectedProperty.cs
index 42d7bb59..a6d8c75c 100644
--- a/src/SMAPI/Framework/Reflection/ReflectedProperty.cs
+++ b/src/SMAPI/Framework/Reflection/ReflectedProperty.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 using System.Reflection;
 
diff --git a/src/SMAPI/Framework/Reflection/Reflector.cs b/src/SMAPI/Framework/Reflection/Reflector.cs
index 3a93ab5d..d5938c3f 100644
--- a/src/SMAPI/Framework/Reflection/Reflector.cs
+++ b/src/SMAPI/Framework/Reflection/Reflector.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 using System.Linq;
 using System.Reflection;
diff --git a/src/SMAPI/Framework/Rendering/SDisplayDevice.cs b/src/SMAPI/Framework/Rendering/SDisplayDevice.cs
index 85e69ae6..8718bcb1 100644
--- a/src/SMAPI/Framework/Rendering/SDisplayDevice.cs
+++ b/src/SMAPI/Framework/Rendering/SDisplayDevice.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 using Microsoft.Xna.Framework;
 using Microsoft.Xna.Framework.Content;
diff --git a/src/SMAPI/Framework/Rendering/SXnaDisplayDevice.cs b/src/SMAPI/Framework/Rendering/SXnaDisplayDevice.cs
index cb499c6b..21edaedd 100644
--- a/src/SMAPI/Framework/Rendering/SXnaDisplayDevice.cs
+++ b/src/SMAPI/Framework/Rendering/SXnaDisplayDevice.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
diff --git a/src/SMAPI/Framework/RequestExitDelegate.cs b/src/SMAPI/Framework/RequestExitDelegate.cs
index 810c399b..93ef1cf9 100644
--- a/src/SMAPI/Framework/RequestExitDelegate.cs
+++ b/src/SMAPI/Framework/RequestExitDelegate.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 namespace StardewModdingAPI.Framework
 {
     /// <summary>A delegate which requests that SMAPI immediately exit the game. This should only be invoked when an irrecoverable fatal error happens that risks save corruption or game-breaking bugs.</summary>
diff --git a/src/SMAPI/Framework/SChatBox.cs b/src/SMAPI/Framework/SChatBox.cs
index e000d1cd..d6286c12 100644
--- a/src/SMAPI/Framework/SChatBox.cs
+++ b/src/SMAPI/Framework/SChatBox.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using StardewValley;
 using StardewValley.Menus;
 
diff --git a/src/SMAPI/Framework/SCore.cs b/src/SMAPI/Framework/SCore.cs
index b471c383..8a5c10f6 100644
--- a/src/SMAPI/Framework/SCore.cs
+++ b/src/SMAPI/Framework/SCore.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
diff --git a/src/SMAPI/Framework/SGame.cs b/src/SMAPI/Framework/SGame.cs
index 989b59d8..7ca89eec 100644
--- a/src/SMAPI/Framework/SGame.cs
+++ b/src/SMAPI/Framework/SGame.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 using System.Collections.ObjectModel;
 using System.Diagnostics.CodeAnalysis;
diff --git a/src/SMAPI/Framework/SGameRunner.cs b/src/SMAPI/Framework/SGameRunner.cs
index 81cac145..dae314af 100644
--- a/src/SMAPI/Framework/SGameRunner.cs
+++ b/src/SMAPI/Framework/SGameRunner.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 using System.Collections.Generic;
 using System.Linq;
diff --git a/src/SMAPI/Framework/SModHooks.cs b/src/SMAPI/Framework/SModHooks.cs
index 101e022a..7941e102 100644
--- a/src/SMAPI/Framework/SModHooks.cs
+++ b/src/SMAPI/Framework/SModHooks.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 using System.Threading.Tasks;
 using StardewValley;
diff --git a/src/SMAPI/Framework/SMultiplayer.cs b/src/SMAPI/Framework/SMultiplayer.cs
index bcf97006..de3c25a5 100644
--- a/src/SMAPI/Framework/SMultiplayer.cs
+++ b/src/SMAPI/Framework/SMultiplayer.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 using System.Collections.Generic;
 using System.IO;
diff --git a/src/SMAPI/Framework/Serialization/ColorConverter.cs b/src/SMAPI/Framework/Serialization/ColorConverter.cs
index 3b3720b5..8fb6cd9c 100644
--- a/src/SMAPI/Framework/Serialization/ColorConverter.cs
+++ b/src/SMAPI/Framework/Serialization/ColorConverter.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 using Microsoft.Xna.Framework;
 using Newtonsoft.Json.Linq;
diff --git a/src/SMAPI/Framework/Serialization/KeybindConverter.cs b/src/SMAPI/Framework/Serialization/KeybindConverter.cs
index 7c5db3ad..9cf52228 100644
--- a/src/SMAPI/Framework/Serialization/KeybindConverter.cs
+++ b/src/SMAPI/Framework/Serialization/KeybindConverter.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
diff --git a/src/SMAPI/Framework/Serialization/PointConverter.cs b/src/SMAPI/Framework/Serialization/PointConverter.cs
index 21d1f845..b48d757a 100644
--- a/src/SMAPI/Framework/Serialization/PointConverter.cs
+++ b/src/SMAPI/Framework/Serialization/PointConverter.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 using Microsoft.Xna.Framework;
 using Newtonsoft.Json.Linq;
diff --git a/src/SMAPI/Framework/Serialization/RectangleConverter.cs b/src/SMAPI/Framework/Serialization/RectangleConverter.cs
index 31f3ad77..7f060e3a 100644
--- a/src/SMAPI/Framework/Serialization/RectangleConverter.cs
+++ b/src/SMAPI/Framework/Serialization/RectangleConverter.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 using System.Text.RegularExpressions;
 using Microsoft.Xna.Framework;
diff --git a/src/SMAPI/Framework/Serialization/Vector2Converter.cs b/src/SMAPI/Framework/Serialization/Vector2Converter.cs
index 589febf8..bcd483d3 100644
--- a/src/SMAPI/Framework/Serialization/Vector2Converter.cs
+++ b/src/SMAPI/Framework/Serialization/Vector2Converter.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 using Microsoft.Xna.Framework;
 using Newtonsoft.Json.Linq;
diff --git a/src/SMAPI/Framework/Singleton.cs b/src/SMAPI/Framework/Singleton.cs
index 1bf318c4..da16c48e 100644
--- a/src/SMAPI/Framework/Singleton.cs
+++ b/src/SMAPI/Framework/Singleton.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 namespace StardewModdingAPI.Framework
 {
     /// <summary>Provides singleton instances of a given type.</summary>
diff --git a/src/SMAPI/Framework/SnapshotDiff.cs b/src/SMAPI/Framework/SnapshotDiff.cs
index 5b6288ff..eb2aebe1 100644
--- a/src/SMAPI/Framework/SnapshotDiff.cs
+++ b/src/SMAPI/Framework/SnapshotDiff.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using StardewModdingAPI.Framework.StateTracking;
 
 namespace StardewModdingAPI.Framework
diff --git a/src/SMAPI/Framework/SnapshotItemListDiff.cs b/src/SMAPI/Framework/SnapshotItemListDiff.cs
index e8ab1b1e..97942783 100644
--- a/src/SMAPI/Framework/SnapshotItemListDiff.cs
+++ b/src/SMAPI/Framework/SnapshotItemListDiff.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System.Collections.Generic;
 using System.Linq;
 using StardewModdingAPI.Events;
diff --git a/src/SMAPI/Framework/SnapshotListDiff.cs b/src/SMAPI/Framework/SnapshotListDiff.cs
index 1c3ebfba..1d585c15 100644
--- a/src/SMAPI/Framework/SnapshotListDiff.cs
+++ b/src/SMAPI/Framework/SnapshotListDiff.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System.Collections.Generic;
 using StardewModdingAPI.Framework.StateTracking;
 
diff --git a/src/SMAPI/Framework/StateTracking/ChestTracker.cs b/src/SMAPI/Framework/StateTracking/ChestTracker.cs
index 56aeeb3c..28335200 100644
--- a/src/SMAPI/Framework/StateTracking/ChestTracker.cs
+++ b/src/SMAPI/Framework/StateTracking/ChestTracker.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 using System.Collections.Generic;
 using System.Linq;
diff --git a/src/SMAPI/Framework/StateTracking/Comparers/EquatableComparer.cs b/src/SMAPI/Framework/StateTracking/Comparers/EquatableComparer.cs
index a96ffdb6..987e1820 100644
--- a/src/SMAPI/Framework/StateTracking/Comparers/EquatableComparer.cs
+++ b/src/SMAPI/Framework/StateTracking/Comparers/EquatableComparer.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 using System.Collections.Generic;
 using System.Runtime.CompilerServices;
diff --git a/src/SMAPI/Framework/StateTracking/Comparers/GenericEqualsComparer.cs b/src/SMAPI/Framework/StateTracking/Comparers/GenericEqualsComparer.cs
index cc1d6553..f6b04583 100644
--- a/src/SMAPI/Framework/StateTracking/Comparers/GenericEqualsComparer.cs
+++ b/src/SMAPI/Framework/StateTracking/Comparers/GenericEqualsComparer.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System.Collections.Generic;
 using System.Runtime.CompilerServices;
 
diff --git a/src/SMAPI/Framework/StateTracking/Comparers/ObjectReferenceComparer.cs b/src/SMAPI/Framework/StateTracking/Comparers/ObjectReferenceComparer.cs
index ef9adafb..8d3a7eb9 100644
--- a/src/SMAPI/Framework/StateTracking/Comparers/ObjectReferenceComparer.cs
+++ b/src/SMAPI/Framework/StateTracking/Comparers/ObjectReferenceComparer.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System.Collections.Generic;
 using System.Runtime.CompilerServices;
 
diff --git a/src/SMAPI/Framework/StateTracking/FieldWatchers/BaseDisposableWatcher.cs b/src/SMAPI/Framework/StateTracking/FieldWatchers/BaseDisposableWatcher.cs
index 60006c51..03bf84d9 100644
--- a/src/SMAPI/Framework/StateTracking/FieldWatchers/BaseDisposableWatcher.cs
+++ b/src/SMAPI/Framework/StateTracking/FieldWatchers/BaseDisposableWatcher.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 
 namespace StardewModdingAPI.Framework.StateTracking.FieldWatchers
diff --git a/src/SMAPI/Framework/StateTracking/FieldWatchers/ComparableListWatcher.cs b/src/SMAPI/Framework/StateTracking/FieldWatchers/ComparableListWatcher.cs
index 256370ce..52e1dbad 100644
--- a/src/SMAPI/Framework/StateTracking/FieldWatchers/ComparableListWatcher.cs
+++ b/src/SMAPI/Framework/StateTracking/FieldWatchers/ComparableListWatcher.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System.Collections.Generic;
 using System.Linq;
 
diff --git a/src/SMAPI/Framework/StateTracking/FieldWatchers/ComparableWatcher.cs b/src/SMAPI/Framework/StateTracking/FieldWatchers/ComparableWatcher.cs
index 5ca4b9f4..4f94294c 100644
--- a/src/SMAPI/Framework/StateTracking/FieldWatchers/ComparableWatcher.cs
+++ b/src/SMAPI/Framework/StateTracking/FieldWatchers/ComparableWatcher.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 using System.Collections.Generic;
 
diff --git a/src/SMAPI/Framework/StateTracking/FieldWatchers/ImmutableCollectionWatcher.cs b/src/SMAPI/Framework/StateTracking/FieldWatchers/ImmutableCollectionWatcher.cs
index 84340fbf..94ce0c8e 100644
--- a/src/SMAPI/Framework/StateTracking/FieldWatchers/ImmutableCollectionWatcher.cs
+++ b/src/SMAPI/Framework/StateTracking/FieldWatchers/ImmutableCollectionWatcher.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 using System.Collections.Generic;
 
diff --git a/src/SMAPI/Framework/StateTracking/FieldWatchers/NetCollectionWatcher.cs b/src/SMAPI/Framework/StateTracking/FieldWatchers/NetCollectionWatcher.cs
index 676c9fb4..e662c433 100644
--- a/src/SMAPI/Framework/StateTracking/FieldWatchers/NetCollectionWatcher.cs
+++ b/src/SMAPI/Framework/StateTracking/FieldWatchers/NetCollectionWatcher.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System.Collections.Generic;
 using Netcode;
 
diff --git a/src/SMAPI/Framework/StateTracking/FieldWatchers/NetDictionaryWatcher.cs b/src/SMAPI/Framework/StateTracking/FieldWatchers/NetDictionaryWatcher.cs
index e6882f7e..0d7f2ad2 100644
--- a/src/SMAPI/Framework/StateTracking/FieldWatchers/NetDictionaryWatcher.cs
+++ b/src/SMAPI/Framework/StateTracking/FieldWatchers/NetDictionaryWatcher.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System.Collections.Generic;
 using Netcode;
 
diff --git a/src/SMAPI/Framework/StateTracking/FieldWatchers/NetListWatcher.cs b/src/SMAPI/Framework/StateTracking/FieldWatchers/NetListWatcher.cs
index 0b4d3030..a97e754c 100644
--- a/src/SMAPI/Framework/StateTracking/FieldWatchers/NetListWatcher.cs
+++ b/src/SMAPI/Framework/StateTracking/FieldWatchers/NetListWatcher.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System.Collections.Generic;
 using Netcode;
 using StardewModdingAPI.Framework.StateTracking.Comparers;
diff --git a/src/SMAPI/Framework/StateTracking/FieldWatchers/NetValueWatcher.cs b/src/SMAPI/Framework/StateTracking/FieldWatchers/NetValueWatcher.cs
index 48d5d681..26641750 100644
--- a/src/SMAPI/Framework/StateTracking/FieldWatchers/NetValueWatcher.cs
+++ b/src/SMAPI/Framework/StateTracking/FieldWatchers/NetValueWatcher.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using Netcode;
 
 namespace StardewModdingAPI.Framework.StateTracking.FieldWatchers
diff --git a/src/SMAPI/Framework/StateTracking/FieldWatchers/ObservableCollectionWatcher.cs b/src/SMAPI/Framework/StateTracking/FieldWatchers/ObservableCollectionWatcher.cs
index 3e9fa8b1..82e5387e 100644
--- a/src/SMAPI/Framework/StateTracking/FieldWatchers/ObservableCollectionWatcher.cs
+++ b/src/SMAPI/Framework/StateTracking/FieldWatchers/ObservableCollectionWatcher.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Collections.Specialized;
diff --git a/src/SMAPI/Framework/StateTracking/FieldWatchers/WatcherFactory.cs b/src/SMAPI/Framework/StateTracking/FieldWatchers/WatcherFactory.cs
index bde43486..0b99914c 100644
--- a/src/SMAPI/Framework/StateTracking/FieldWatchers/WatcherFactory.cs
+++ b/src/SMAPI/Framework/StateTracking/FieldWatchers/WatcherFactory.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
diff --git a/src/SMAPI/Framework/StateTracking/ICollectionWatcher.cs b/src/SMAPI/Framework/StateTracking/ICollectionWatcher.cs
index 7a7759e3..74c9313b 100644
--- a/src/SMAPI/Framework/StateTracking/ICollectionWatcher.cs
+++ b/src/SMAPI/Framework/StateTracking/ICollectionWatcher.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System.Collections.Generic;
 
 namespace StardewModdingAPI.Framework.StateTracking
diff --git a/src/SMAPI/Framework/StateTracking/IDictionaryWatcher.cs b/src/SMAPI/Framework/StateTracking/IDictionaryWatcher.cs
index 691ed377..81fb7460 100644
--- a/src/SMAPI/Framework/StateTracking/IDictionaryWatcher.cs
+++ b/src/SMAPI/Framework/StateTracking/IDictionaryWatcher.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System.Collections.Generic;
 
 namespace StardewModdingAPI.Framework.StateTracking
diff --git a/src/SMAPI/Framework/StateTracking/IValueWatcher.cs b/src/SMAPI/Framework/StateTracking/IValueWatcher.cs
index 4afca972..7d46053c 100644
--- a/src/SMAPI/Framework/StateTracking/IValueWatcher.cs
+++ b/src/SMAPI/Framework/StateTracking/IValueWatcher.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 namespace StardewModdingAPI.Framework.StateTracking
 {
     /// <summary>A watcher which tracks changes to a value.</summary>
diff --git a/src/SMAPI/Framework/StateTracking/IWatcher.cs b/src/SMAPI/Framework/StateTracking/IWatcher.cs
index 8c7fa51c..3603b6f8 100644
--- a/src/SMAPI/Framework/StateTracking/IWatcher.cs
+++ b/src/SMAPI/Framework/StateTracking/IWatcher.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 
 namespace StardewModdingAPI.Framework.StateTracking
diff --git a/src/SMAPI/Framework/StateTracking/LocationTracker.cs b/src/SMAPI/Framework/StateTracking/LocationTracker.cs
index f86f86ee..9c2ff7f0 100644
--- a/src/SMAPI/Framework/StateTracking/LocationTracker.cs
+++ b/src/SMAPI/Framework/StateTracking/LocationTracker.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 using System.Collections.Generic;
 using System.Linq;
diff --git a/src/SMAPI/Framework/StateTracking/PlayerTracker.cs b/src/SMAPI/Framework/StateTracking/PlayerTracker.cs
index 3d470b5c..367eafea 100644
--- a/src/SMAPI/Framework/StateTracking/PlayerTracker.cs
+++ b/src/SMAPI/Framework/StateTracking/PlayerTracker.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 using System.Collections.Generic;
 using System.Linq;
diff --git a/src/SMAPI/Framework/StateTracking/Snapshots/LocationSnapshot.cs b/src/SMAPI/Framework/StateTracking/Snapshots/LocationSnapshot.cs
index 2563d10c..3d13f92b 100644
--- a/src/SMAPI/Framework/StateTracking/Snapshots/LocationSnapshot.cs
+++ b/src/SMAPI/Framework/StateTracking/Snapshots/LocationSnapshot.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System.Collections.Generic;
 using Microsoft.Xna.Framework;
 using StardewValley;
diff --git a/src/SMAPI/Framework/StateTracking/Snapshots/PlayerSnapshot.cs b/src/SMAPI/Framework/StateTracking/Snapshots/PlayerSnapshot.cs
index e113d27c..bf81a35e 100644
--- a/src/SMAPI/Framework/StateTracking/Snapshots/PlayerSnapshot.cs
+++ b/src/SMAPI/Framework/StateTracking/Snapshots/PlayerSnapshot.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 using System.Collections.Generic;
 using System.Linq;
diff --git a/src/SMAPI/Framework/StateTracking/Snapshots/WatcherSnapshot.cs b/src/SMAPI/Framework/StateTracking/Snapshots/WatcherSnapshot.cs
index afea7fb4..1d43ef26 100644
--- a/src/SMAPI/Framework/StateTracking/Snapshots/WatcherSnapshot.cs
+++ b/src/SMAPI/Framework/StateTracking/Snapshots/WatcherSnapshot.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using Microsoft.Xna.Framework;
 using StardewValley;
 using StardewValley.Menus;
diff --git a/src/SMAPI/Framework/StateTracking/Snapshots/WorldLocationsSnapshot.cs b/src/SMAPI/Framework/StateTracking/Snapshots/WorldLocationsSnapshot.cs
index 7dee09ca..88aac0df 100644
--- a/src/SMAPI/Framework/StateTracking/Snapshots/WorldLocationsSnapshot.cs
+++ b/src/SMAPI/Framework/StateTracking/Snapshots/WorldLocationsSnapshot.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System.Collections.Generic;
 using System.Linq;
 using StardewModdingAPI.Framework.StateTracking.Comparers;
diff --git a/src/SMAPI/Framework/StateTracking/WorldLocationsTracker.cs b/src/SMAPI/Framework/StateTracking/WorldLocationsTracker.cs
index e968d79c..ab02d7d5 100644
--- a/src/SMAPI/Framework/StateTracking/WorldLocationsTracker.cs
+++ b/src/SMAPI/Framework/StateTracking/WorldLocationsTracker.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Linq;
diff --git a/src/SMAPI/Framework/TemporaryHacks/MiniMonoModHotfix.cs b/src/SMAPI/Framework/TemporaryHacks/MiniMonoModHotfix.cs
index c0f119f1..5f0ecfa0 100644
--- a/src/SMAPI/Framework/TemporaryHacks/MiniMonoModHotfix.cs
+++ b/src/SMAPI/Framework/TemporaryHacks/MiniMonoModHotfix.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 // This temporary utility fixes an esoteric issue in XNA Framework where deserialization depends on
 // the order of fields returned by Type.GetFields, but that order changes after Harmony/MonoMod use
 // reflection to access the fields due to an issue in .NET Framework.
diff --git a/src/SMAPI/Framework/Translator.cs b/src/SMAPI/Framework/Translator.cs
index 4492b17f..144b043c 100644
--- a/src/SMAPI/Framework/Translator.cs
+++ b/src/SMAPI/Framework/Translator.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 using System.Collections.Generic;
 using System.Linq;
diff --git a/src/SMAPI/Framework/Utilities/ContextHash.cs b/src/SMAPI/Framework/Utilities/ContextHash.cs
index 6c0fdc90..46b9099e 100644
--- a/src/SMAPI/Framework/Utilities/ContextHash.cs
+++ b/src/SMAPI/Framework/Utilities/ContextHash.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 using System.Collections.Generic;
 
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
index d0f276d2..94ce0069 100644
--- a/src/SMAPI/Framework/Utilities/TickCacheDictionary.cs
+++ b/src/SMAPI/Framework/Utilities/TickCacheDictionary.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 using System.Collections.Generic;
 
diff --git a/src/SMAPI/Framework/WatcherCore.cs b/src/SMAPI/Framework/WatcherCore.cs
index a1612e75..bd8d3367 100644
--- a/src/SMAPI/Framework/WatcherCore.cs
+++ b/src/SMAPI/Framework/WatcherCore.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using Microsoft.Xna.Framework;
diff --git a/src/SMAPI/GamePlatform.cs b/src/SMAPI/GamePlatform.cs
index cce5ed8d..8013faa9 100644
--- a/src/SMAPI/GamePlatform.cs
+++ b/src/SMAPI/GamePlatform.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using StardewModdingAPI.Toolkit.Utilities;
 
 namespace StardewModdingAPI
diff --git a/src/SMAPI/IAssetData.cs b/src/SMAPI/IAssetData.cs
index 8df59e53..f07340e4 100644
--- a/src/SMAPI/IAssetData.cs
+++ b/src/SMAPI/IAssetData.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 
 namespace StardewModdingAPI
diff --git a/src/SMAPI/IAssetDataForDictionary.cs b/src/SMAPI/IAssetDataForDictionary.cs
index 1136316f..82ba25cb 100644
--- a/src/SMAPI/IAssetDataForDictionary.cs
+++ b/src/SMAPI/IAssetDataForDictionary.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System.Collections.Generic;
 
 namespace StardewModdingAPI
diff --git a/src/SMAPI/IAssetDataForImage.cs b/src/SMAPI/IAssetDataForImage.cs
index 27ed9267..388caa68 100644
--- a/src/SMAPI/IAssetDataForImage.cs
+++ b/src/SMAPI/IAssetDataForImage.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 using Microsoft.Xna.Framework;
 using Microsoft.Xna.Framework.Graphics;
diff --git a/src/SMAPI/IAssetDataForMap.cs b/src/SMAPI/IAssetDataForMap.cs
index 47a33de8..89ee28f2 100644
--- a/src/SMAPI/IAssetDataForMap.cs
+++ b/src/SMAPI/IAssetDataForMap.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using Microsoft.Xna.Framework;
 using xTile;
 
diff --git a/src/SMAPI/IAssetEditor.cs b/src/SMAPI/IAssetEditor.cs
index 9f22ed83..f3d91bd0 100644
--- a/src/SMAPI/IAssetEditor.cs
+++ b/src/SMAPI/IAssetEditor.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 using StardewModdingAPI.Events;
 
diff --git a/src/SMAPI/IAssetInfo.cs b/src/SMAPI/IAssetInfo.cs
index 64d10b35..5b4ac479 100644
--- a/src/SMAPI/IAssetInfo.cs
+++ b/src/SMAPI/IAssetInfo.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 
 namespace StardewModdingAPI
diff --git a/src/SMAPI/IAssetLoader.cs b/src/SMAPI/IAssetLoader.cs
index 96b98793..0d52a481 100644
--- a/src/SMAPI/IAssetLoader.cs
+++ b/src/SMAPI/IAssetLoader.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 using StardewModdingAPI.Events;
 
diff --git a/src/SMAPI/IAssetName.cs b/src/SMAPI/IAssetName.cs
index c91da266..22f5c6b7 100644
--- a/src/SMAPI/IAssetName.cs
+++ b/src/SMAPI/IAssetName.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 using StardewValley;
 
diff --git a/src/SMAPI/ICommandHelper.cs b/src/SMAPI/ICommandHelper.cs
index 9f1c345c..a0c524d6 100644
--- a/src/SMAPI/ICommandHelper.cs
+++ b/src/SMAPI/ICommandHelper.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 
 namespace StardewModdingAPI
diff --git a/src/SMAPI/IContentHelper.cs b/src/SMAPI/IContentHelper.cs
index 48f6bfd8..0ad209ab 100644
--- a/src/SMAPI/IContentHelper.cs
+++ b/src/SMAPI/IContentHelper.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 using System.Collections.Generic;
 using System.Diagnostics.Contracts;
diff --git a/src/SMAPI/IContentPack.cs b/src/SMAPI/IContentPack.cs
index 3c66faff..f853e2b4 100644
--- a/src/SMAPI/IContentPack.cs
+++ b/src/SMAPI/IContentPack.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 using Microsoft.Xna.Framework.Content;
 using Microsoft.Xna.Framework.Graphics;
diff --git a/src/SMAPI/IContentPackHelper.cs b/src/SMAPI/IContentPackHelper.cs
index c48a4f86..5464df22 100644
--- a/src/SMAPI/IContentPackHelper.cs
+++ b/src/SMAPI/IContentPackHelper.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System.Collections.Generic;
 
 namespace StardewModdingAPI
diff --git a/src/SMAPI/ICursorPosition.cs b/src/SMAPI/ICursorPosition.cs
index 99c1b84d..da6cbb62 100644
--- a/src/SMAPI/ICursorPosition.cs
+++ b/src/SMAPI/ICursorPosition.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 using Microsoft.Xna.Framework;
 using StardewValley;
diff --git a/src/SMAPI/IDataHelper.cs b/src/SMAPI/IDataHelper.cs
index 901266d7..4c96367b 100644
--- a/src/SMAPI/IDataHelper.cs
+++ b/src/SMAPI/IDataHelper.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 
 namespace StardewModdingAPI
diff --git a/src/SMAPI/IGameContentHelper.cs b/src/SMAPI/IGameContentHelper.cs
index 86bc3e0e..4b967993 100644
--- a/src/SMAPI/IGameContentHelper.cs
+++ b/src/SMAPI/IGameContentHelper.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 using Microsoft.Xna.Framework.Content;
 using Microsoft.Xna.Framework.Graphics;
diff --git a/src/SMAPI/IInputHelper.cs b/src/SMAPI/IInputHelper.cs
index 2b907b0d..b7ed0838 100644
--- a/src/SMAPI/IInputHelper.cs
+++ b/src/SMAPI/IInputHelper.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using StardewModdingAPI.Utilities;
 
 namespace StardewModdingAPI
diff --git a/src/SMAPI/IMod.cs b/src/SMAPI/IMod.cs
index 44ef32c9..0de4961e 100644
--- a/src/SMAPI/IMod.cs
+++ b/src/SMAPI/IMod.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 namespace StardewModdingAPI
 {
     /// <summary>The implementation for a Stardew Valley mod.</summary>
diff --git a/src/SMAPI/IModContentHelper.cs b/src/SMAPI/IModContentHelper.cs
index e3431365..815d6848 100644
--- a/src/SMAPI/IModContentHelper.cs
+++ b/src/SMAPI/IModContentHelper.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 using Microsoft.Xna.Framework.Content;
 using Microsoft.Xna.Framework.Graphics;
diff --git a/src/SMAPI/IModHelper.cs b/src/SMAPI/IModHelper.cs
index 15e4ed8d..5e4246aa 100644
--- a/src/SMAPI/IModHelper.cs
+++ b/src/SMAPI/IModHelper.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 using StardewModdingAPI.Events;
 
diff --git a/src/SMAPI/IModInfo.cs b/src/SMAPI/IModInfo.cs
index 3c85d454..2788e4fc 100644
--- a/src/SMAPI/IModInfo.cs
+++ b/src/SMAPI/IModInfo.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 namespace StardewModdingAPI
 {
     /// <summary>Metadata for a loaded mod.</summary>
diff --git a/src/SMAPI/IModLinked.cs b/src/SMAPI/IModLinked.cs
index 172ee30c..cf08c9c5 100644
--- a/src/SMAPI/IModLinked.cs
+++ b/src/SMAPI/IModLinked.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 namespace StardewModdingAPI
 {
     /// <summary>An instance linked to a mod.</summary>
diff --git a/src/SMAPI/IModRegistry.cs b/src/SMAPI/IModRegistry.cs
index 10b3121e..9cab08a1 100644
--- a/src/SMAPI/IModRegistry.cs
+++ b/src/SMAPI/IModRegistry.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System.Collections.Generic;
 
 namespace StardewModdingAPI
diff --git a/src/SMAPI/IMonitor.cs b/src/SMAPI/IMonitor.cs
index c400a211..535f56e3 100644
--- a/src/SMAPI/IMonitor.cs
+++ b/src/SMAPI/IMonitor.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 namespace StardewModdingAPI
 {
     /// <summary>Encapsulates monitoring and logging for a given module.</summary>
diff --git a/src/SMAPI/IMultiplayerHelper.cs b/src/SMAPI/IMultiplayerHelper.cs
index 4067a676..77a0f3f4 100644
--- a/src/SMAPI/IMultiplayerHelper.cs
+++ b/src/SMAPI/IMultiplayerHelper.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 using System.Collections.Generic;
 using StardewValley;
diff --git a/src/SMAPI/IMultiplayerPeer.cs b/src/SMAPI/IMultiplayerPeer.cs
index 47084174..e487f100 100644
--- a/src/SMAPI/IMultiplayerPeer.cs
+++ b/src/SMAPI/IMultiplayerPeer.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System.Collections.Generic;
 
 namespace StardewModdingAPI
diff --git a/src/SMAPI/IMultiplayerPeerMod.cs b/src/SMAPI/IMultiplayerPeerMod.cs
index 005408b1..81978bef 100644
--- a/src/SMAPI/IMultiplayerPeerMod.cs
+++ b/src/SMAPI/IMultiplayerPeerMod.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 namespace StardewModdingAPI
 {
     /// <summary>Metadata about a mod installed by a connected player.</summary>
diff --git a/src/SMAPI/IReflectedField.cs b/src/SMAPI/IReflectedField.cs
index 7ff61f29..94dbe6a3 100644
--- a/src/SMAPI/IReflectedField.cs
+++ b/src/SMAPI/IReflectedField.cs
@@ -1,4 +1,6 @@
-using System.Reflection;
+#nullable disable
+
+using System.Reflection;
 
 namespace StardewModdingAPI
 {
diff --git a/src/SMAPI/IReflectedMethod.cs b/src/SMAPI/IReflectedMethod.cs
index 646e7301..78e66cb1 100644
--- a/src/SMAPI/IReflectedMethod.cs
+++ b/src/SMAPI/IReflectedMethod.cs
@@ -1,4 +1,6 @@
-using System.Reflection;
+#nullable disable
+
+using System.Reflection;
 
 namespace StardewModdingAPI
 {
diff --git a/src/SMAPI/IReflectedProperty.cs b/src/SMAPI/IReflectedProperty.cs
index 73ad9f30..edbf0b21 100644
--- a/src/SMAPI/IReflectedProperty.cs
+++ b/src/SMAPI/IReflectedProperty.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System.Reflection;
 
 namespace StardewModdingAPI
diff --git a/src/SMAPI/IReflectionHelper.cs b/src/SMAPI/IReflectionHelper.cs
index a2b9eb32..bf7270cf 100644
--- a/src/SMAPI/IReflectionHelper.cs
+++ b/src/SMAPI/IReflectionHelper.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 
 namespace StardewModdingAPI
diff --git a/src/SMAPI/ITranslationHelper.cs b/src/SMAPI/ITranslationHelper.cs
index b30d9b14..3c297731 100644
--- a/src/SMAPI/ITranslationHelper.cs
+++ b/src/SMAPI/ITranslationHelper.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System.Collections.Generic;
 using StardewValley;
 
diff --git a/src/SMAPI/Metadata/CoreAssetPropagator.cs b/src/SMAPI/Metadata/CoreAssetPropagator.cs
index 159e19fd..b7cec72c 100644
--- a/src/SMAPI/Metadata/CoreAssetPropagator.cs
+++ b/src/SMAPI/Metadata/CoreAssetPropagator.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
diff --git a/src/SMAPI/Metadata/InstructionMetadata.cs b/src/SMAPI/Metadata/InstructionMetadata.cs
index 367372b2..5617fd13 100644
--- a/src/SMAPI/Metadata/InstructionMetadata.cs
+++ b/src/SMAPI/Metadata/InstructionMetadata.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System.Collections.Generic;
 using Microsoft.Xna.Framework.Graphics;
 using StardewModdingAPI.Events;
diff --git a/src/SMAPI/Mod.cs b/src/SMAPI/Mod.cs
index 9af55cd4..2b3750d5 100644
--- a/src/SMAPI/Mod.cs
+++ b/src/SMAPI/Mod.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 
 namespace StardewModdingAPI
diff --git a/src/SMAPI/Patches/Game1Patcher.cs b/src/SMAPI/Patches/Game1Patcher.cs
index 173a2055..c5d98e9e 100644
--- a/src/SMAPI/Patches/Game1Patcher.cs
+++ b/src/SMAPI/Patches/Game1Patcher.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 using System.Diagnostics.CodeAnalysis;
 using HarmonyLib;
diff --git a/src/SMAPI/Patches/TitleMenuPatcher.cs b/src/SMAPI/Patches/TitleMenuPatcher.cs
index b4320ce0..56e5597c 100644
--- a/src/SMAPI/Patches/TitleMenuPatcher.cs
+++ b/src/SMAPI/Patches/TitleMenuPatcher.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 using System.Diagnostics.CodeAnalysis;
 using HarmonyLib;
diff --git a/src/SMAPI/Program.cs b/src/SMAPI/Program.cs
index 1039cc9a..a8664160 100644
--- a/src/SMAPI/Program.cs
+++ b/src/SMAPI/Program.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 using System.Collections.Generic;
 using System.IO;
diff --git a/src/SMAPI/SemanticVersion.cs b/src/SMAPI/SemanticVersion.cs
index ae616419..4e484633 100644
--- a/src/SMAPI/SemanticVersion.cs
+++ b/src/SMAPI/SemanticVersion.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 using Newtonsoft.Json;
 
diff --git a/src/SMAPI/Translation.cs b/src/SMAPI/Translation.cs
index 5ab432f0..ef98a00f 100644
--- a/src/SMAPI/Translation.cs
+++ b/src/SMAPI/Translation.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 using System.Collections;
 using System.Collections.Generic;
diff --git a/src/SMAPI/Utilities/CaseInsensitivePathCache.cs b/src/SMAPI/Utilities/CaseInsensitivePathCache.cs
index 1d947b53..4596fdce 100644
--- a/src/SMAPI/Utilities/CaseInsensitivePathCache.cs
+++ b/src/SMAPI/Utilities/CaseInsensitivePathCache.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 using System.Collections.Generic;
 using System.IO;
diff --git a/src/SMAPI/Utilities/Keybind.cs b/src/SMAPI/Utilities/Keybind.cs
index 7aefe686..7b1acf1d 100644
--- a/src/SMAPI/Utilities/Keybind.cs
+++ b/src/SMAPI/Utilities/Keybind.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 using System.Collections.Generic;
 using System.Linq;
diff --git a/src/SMAPI/Utilities/KeybindList.cs b/src/SMAPI/Utilities/KeybindList.cs
index f24976f7..7b2c396b 100644
--- a/src/SMAPI/Utilities/KeybindList.cs
+++ b/src/SMAPI/Utilities/KeybindList.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 using System.Collections.Generic;
 using System.Linq;
diff --git a/src/SMAPI/Utilities/PathUtilities.cs b/src/SMAPI/Utilities/PathUtilities.cs
index 541b163c..e8ab9645 100644
--- a/src/SMAPI/Utilities/PathUtilities.cs
+++ b/src/SMAPI/Utilities/PathUtilities.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System.Diagnostics.Contracts;
 using ToolkitPathUtilities = StardewModdingAPI.Toolkit.Utilities.PathUtilities;
 
diff --git a/src/SMAPI/Utilities/PerScreen.cs b/src/SMAPI/Utilities/PerScreen.cs
index 6b7153ac..afe3ba91 100644
--- a/src/SMAPI/Utilities/PerScreen.cs
+++ b/src/SMAPI/Utilities/PerScreen.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 using System.Collections.Generic;
 using System.Linq;
diff --git a/src/SMAPI/Utilities/SDate.cs b/src/SMAPI/Utilities/SDate.cs
index e10a59f8..b10bc3da 100644
--- a/src/SMAPI/Utilities/SDate.cs
+++ b/src/SMAPI/Utilities/SDate.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 using System.Linq;
 using Newtonsoft.Json;
-- 
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/Context.cs                                                 | 2 --
 src/SMAPI/Events/AssetReadyEventArgs.cs                              | 2 --
 src/SMAPI/Events/AssetsInvalidatedEventArgs.cs                       | 2 --
 src/SMAPI/Events/BuildingListChangedEventArgs.cs                     | 2 --
 src/SMAPI/Events/ButtonPressedEventArgs.cs                           | 2 --
 src/SMAPI/Events/ButtonReleasedEventArgs.cs                          | 2 --
 src/SMAPI/Events/ButtonsChangedEventArgs.cs                          | 2 --
 src/SMAPI/Events/ChestInventoryChangedEventArgs.cs                   | 2 --
 src/SMAPI/Events/CursorMovedEventArgs.cs                             | 2 --
 src/SMAPI/Events/DebrisListChangedEventArgs.cs                       | 2 --
 src/SMAPI/Events/FurnitureListChangedEventArgs.cs                    | 2 --
 src/SMAPI/Events/IContentEvents.cs                                   | 2 --
 src/SMAPI/Events/IDisplayEvents.cs                                   | 2 --
 src/SMAPI/Events/IGameLoopEvents.cs                                  | 2 --
 src/SMAPI/Events/IInputEvents.cs                                     | 2 --
 src/SMAPI/Events/IModEvents.cs                                       | 2 --
 src/SMAPI/Events/IMultiplayerEvents.cs                               | 2 --
 src/SMAPI/Events/IPlayerEvents.cs                                    | 2 --
 src/SMAPI/Events/ISpecialisedEvents.cs                               | 2 --
 src/SMAPI/Events/IWorldEvents.cs                                     | 2 --
 src/SMAPI/Events/InventoryChangedEventArgs.cs                        | 2 --
 src/SMAPI/Events/ItemStackSizeChange.cs                              | 2 --
 src/SMAPI/Events/LargeTerrainFeatureListChangedEventArgs.cs          | 2 --
 src/SMAPI/Events/LevelChangedEventArgs.cs                            | 2 --
 src/SMAPI/Events/LocaleChangedEventArgs.cs                           | 2 --
 src/SMAPI/Events/LocationListChangedEventArgs.cs                     | 2 --
 src/SMAPI/Events/NpcListChangedEventArgs.cs                          | 2 --
 src/SMAPI/Events/ObjectListChangedEventArgs.cs                       | 2 --
 src/SMAPI/Events/PeerConnectedEventArgs.cs                           | 2 --
 src/SMAPI/Events/PeerContextReceivedEventArgs.cs                     | 2 --
 src/SMAPI/Events/PeerDisconnectedEventArgs.cs                        | 2 --
 src/SMAPI/Events/RenderedActiveMenuEventArgs.cs                      | 2 --
 src/SMAPI/Events/RenderedEventArgs.cs                                | 2 --
 src/SMAPI/Events/RenderedHudEventArgs.cs                             | 2 --
 src/SMAPI/Events/RenderedWorldEventArgs.cs                           | 2 --
 src/SMAPI/Events/RenderingActiveMenuEventArgs.cs                     | 2 --
 src/SMAPI/Events/RenderingEventArgs.cs                               | 2 --
 src/SMAPI/Events/RenderingHudEventArgs.cs                            | 2 --
 src/SMAPI/Events/RenderingWorldEventArgs.cs                          | 2 --
 src/SMAPI/Events/TerrainFeatureListChangedEventArgs.cs               | 2 --
 src/SMAPI/Events/WarpedEventArgs.cs                                  | 2 --
 src/SMAPI/Framework/Commands/IInternalCommand.cs                     | 2 --
 src/SMAPI/Framework/Commands/ReloadI18nCommand.cs                    | 2 --
 src/SMAPI/Framework/Content/AssetOperationGroup.cs                   | 2 --
 src/SMAPI/Framework/Content/TilesheetReference.cs                    | 2 --
 src/SMAPI/Framework/DeprecationWarning.cs                            | 2 --
 src/SMAPI/Framework/Events/EventManager.cs                           | 2 --
 src/SMAPI/Framework/Events/IManagedEvent.cs                          | 2 --
 src/SMAPI/Framework/Events/ModContentEvents.cs                       | 2 --
 src/SMAPI/Framework/Events/ModDisplayEvents.cs                       | 2 --
 src/SMAPI/Framework/Events/ModEvents.cs                              | 2 --
 src/SMAPI/Framework/Events/ModEventsBase.cs                          | 2 --
 src/SMAPI/Framework/Events/ModGameLoopEvents.cs                      | 2 --
 src/SMAPI/Framework/Events/ModInputEvents.cs                         | 2 --
 src/SMAPI/Framework/Events/ModMultiplayerEvents.cs                   | 2 --
 src/SMAPI/Framework/Events/ModPlayerEvents.cs                        | 2 --
 src/SMAPI/Framework/Events/ModSpecialisedEvents.cs                   | 2 --
 src/SMAPI/Framework/Events/ModWorldEvents.cs                         | 2 --
 src/SMAPI/Framework/Exceptions/SAssemblyLoadFailedException.cs       | 2 --
 src/SMAPI/Framework/Input/IInputStateBuilder.cs                      | 2 --
 src/SMAPI/Framework/Input/KeyboardStateBuilder.cs                    | 4 +---
 src/SMAPI/Framework/Input/MouseStateBuilder.cs                       | 2 --
 src/SMAPI/Framework/ModHelpers/BaseHelper.cs                         | 2 --
 src/SMAPI/Framework/ModHelpers/ContentPackHelper.cs                  | 2 --
 src/SMAPI/Framework/ModHelpers/InputHelper.cs                        | 2 --
 src/SMAPI/Framework/ModHelpers/ModHelper.cs                          | 2 --
 src/SMAPI/Framework/ModHelpers/TranslationHelper.cs                  | 2 --
 src/SMAPI/Framework/ModLinked.cs                                     | 2 --
 src/SMAPI/Framework/ModLoading/AssemblyLoadStatus.cs                 | 2 --
 src/SMAPI/Framework/ModLoading/IInstructionHandler.cs                | 2 --
 src/SMAPI/Framework/ModLoading/IncompatibleInstructionException.cs   | 2 --
 src/SMAPI/Framework/ModLoading/PlatformAssemblyMap.cs                | 2 --
 src/SMAPI/Framework/ModLoading/RewriteFacades/SpriteBatchFacade.cs   | 5 ++---
 .../Framework/ModLoading/Rewriters/ArchitectureAssemblyRewriter.cs   | 2 --
 src/SMAPI/Framework/ModLoading/Symbols/SymbolReader.cs               | 2 --
 src/SMAPI/Framework/ModLoading/Symbols/SymbolWriterProvider.cs       | 2 --
 src/SMAPI/Framework/Monitor.cs                                       | 2 --
 src/SMAPI/Framework/Networking/SGalaxyNetClient.cs                   | 2 --
 src/SMAPI/Framework/Networking/SGalaxyNetServer.cs                   | 2 --
 src/SMAPI/Framework/Networking/SLidgrenClient.cs                     | 2 --
 src/SMAPI/Framework/Networking/SLidgrenServer.cs                     | 2 --
 src/SMAPI/Framework/Reflection/InterfaceProxyFactory.cs              | 2 --
 src/SMAPI/Framework/SChatBox.cs                                      | 2 --
 src/SMAPI/Framework/SGameRunner.cs                                   | 4 +---
 src/SMAPI/Framework/Singleton.cs                                     | 2 --
 .../Framework/StateTracking/FieldWatchers/BaseDisposableWatcher.cs   | 2 --
 .../Framework/StateTracking/FieldWatchers/ComparableListWatcher.cs   | 2 --
 .../StateTracking/FieldWatchers/ImmutableCollectionWatcher.cs        | 2 --
 .../Framework/StateTracking/FieldWatchers/NetCollectionWatcher.cs    | 2 --
 src/SMAPI/Framework/StateTracking/FieldWatchers/NetListWatcher.cs    | 2 --
 src/SMAPI/Framework/StateTracking/FieldWatchers/NetValueWatcher.cs   | 2 --
 src/SMAPI/Framework/StateTracking/ICollectionWatcher.cs              | 2 --
 src/SMAPI/Framework/StateTracking/IDictionaryWatcher.cs              | 2 --
 src/SMAPI/Framework/StateTracking/IValueWatcher.cs                   | 2 --
 src/SMAPI/Framework/StateTracking/IWatcher.cs                        | 2 --
 src/SMAPI/Framework/Utilities/ContextHash.cs                         | 2 --
 src/SMAPI/GamePlatform.cs                                            | 2 --
 src/SMAPI/IAssetDataForDictionary.cs                                 | 2 --
 src/SMAPI/IAssetDataForImage.cs                                      | 2 --
 src/SMAPI/IAssetDataForMap.cs                                        | 2 --
 src/SMAPI/IAssetEditor.cs                                            | 2 --
 src/SMAPI/IAssetLoader.cs                                            | 2 --
 src/SMAPI/ICommandHelper.cs                                          | 2 --
 src/SMAPI/IContentPackHelper.cs                                      | 2 --
 src/SMAPI/ICursorPosition.cs                                         | 2 --
 src/SMAPI/IInputHelper.cs                                            | 2 --
 src/SMAPI/IModHelper.cs                                              | 2 --
 src/SMAPI/IModInfo.cs                                                | 2 --
 src/SMAPI/IModLinked.cs                                              | 2 --
 src/SMAPI/IMonitor.cs                                                | 2 --
 src/SMAPI/IMultiplayerPeerMod.cs                                     | 2 --
 src/SMAPI/ITranslationHelper.cs                                      | 4 +---
 112 files changed, 5 insertions(+), 228 deletions(-)

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

diff --git a/src/SMAPI/Context.cs b/src/SMAPI/Context.cs
index e906375b..aa4ecf35 100644
--- a/src/SMAPI/Context.cs
+++ b/src/SMAPI/Context.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 using System.Collections.Generic;
 using StardewModdingAPI.Enums;
 using StardewModdingAPI.Events;
diff --git a/src/SMAPI/Events/AssetReadyEventArgs.cs b/src/SMAPI/Events/AssetReadyEventArgs.cs
index 19e5a9df..2c308f18 100644
--- a/src/SMAPI/Events/AssetReadyEventArgs.cs
+++ b/src/SMAPI/Events/AssetReadyEventArgs.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 using System;
 
 namespace StardewModdingAPI.Events
diff --git a/src/SMAPI/Events/AssetsInvalidatedEventArgs.cs b/src/SMAPI/Events/AssetsInvalidatedEventArgs.cs
index bd0df598..614cdf49 100644
--- a/src/SMAPI/Events/AssetsInvalidatedEventArgs.cs
+++ b/src/SMAPI/Events/AssetsInvalidatedEventArgs.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 using System;
 using System.Collections.Generic;
 using System.Collections.Immutable;
diff --git a/src/SMAPI/Events/BuildingListChangedEventArgs.cs b/src/SMAPI/Events/BuildingListChangedEventArgs.cs
index ba9574cc..74f37710 100644
--- a/src/SMAPI/Events/BuildingListChangedEventArgs.cs
+++ b/src/SMAPI/Events/BuildingListChangedEventArgs.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 using System;
 using System.Collections.Generic;
 using System.Linq;
diff --git a/src/SMAPI/Events/ButtonPressedEventArgs.cs b/src/SMAPI/Events/ButtonPressedEventArgs.cs
index 94684513..1b30fd23 100644
--- a/src/SMAPI/Events/ButtonPressedEventArgs.cs
+++ b/src/SMAPI/Events/ButtonPressedEventArgs.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 using System;
 using StardewModdingAPI.Framework.Input;
 
diff --git a/src/SMAPI/Events/ButtonReleasedEventArgs.cs b/src/SMAPI/Events/ButtonReleasedEventArgs.cs
index 6ff3727d..40ec1cc1 100644
--- a/src/SMAPI/Events/ButtonReleasedEventArgs.cs
+++ b/src/SMAPI/Events/ButtonReleasedEventArgs.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 using System;
 using StardewModdingAPI.Framework.Input;
 
diff --git a/src/SMAPI/Events/ButtonsChangedEventArgs.cs b/src/SMAPI/Events/ButtonsChangedEventArgs.cs
index c63d34e6..a5e87735 100644
--- a/src/SMAPI/Events/ButtonsChangedEventArgs.cs
+++ b/src/SMAPI/Events/ButtonsChangedEventArgs.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 using System;
 using System.Collections.Generic;
 using System.Linq;
diff --git a/src/SMAPI/Events/ChestInventoryChangedEventArgs.cs b/src/SMAPI/Events/ChestInventoryChangedEventArgs.cs
index bc8ac0c0..4b4c4210 100644
--- a/src/SMAPI/Events/ChestInventoryChangedEventArgs.cs
+++ b/src/SMAPI/Events/ChestInventoryChangedEventArgs.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 using System;
 using System.Collections.Generic;
 using StardewValley;
diff --git a/src/SMAPI/Events/CursorMovedEventArgs.cs b/src/SMAPI/Events/CursorMovedEventArgs.cs
index f3e7513b..43ff90ce 100644
--- a/src/SMAPI/Events/CursorMovedEventArgs.cs
+++ b/src/SMAPI/Events/CursorMovedEventArgs.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 using System;
 
 namespace StardewModdingAPI.Events
diff --git a/src/SMAPI/Events/DebrisListChangedEventArgs.cs b/src/SMAPI/Events/DebrisListChangedEventArgs.cs
index 56b1f30a..61b7590a 100644
--- a/src/SMAPI/Events/DebrisListChangedEventArgs.cs
+++ b/src/SMAPI/Events/DebrisListChangedEventArgs.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 using System;
 using System.Collections.Generic;
 using System.Linq;
diff --git a/src/SMAPI/Events/FurnitureListChangedEventArgs.cs b/src/SMAPI/Events/FurnitureListChangedEventArgs.cs
index cda1b6cc..683f4620 100644
--- a/src/SMAPI/Events/FurnitureListChangedEventArgs.cs
+++ b/src/SMAPI/Events/FurnitureListChangedEventArgs.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 using System;
 using System.Collections.Generic;
 using System.Linq;
diff --git a/src/SMAPI/Events/IContentEvents.cs b/src/SMAPI/Events/IContentEvents.cs
index 109f9753..d537db70 100644
--- a/src/SMAPI/Events/IContentEvents.cs
+++ b/src/SMAPI/Events/IContentEvents.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 using System;
 
 namespace StardewModdingAPI.Events
diff --git a/src/SMAPI/Events/IDisplayEvents.cs b/src/SMAPI/Events/IDisplayEvents.cs
index b8b89120..dbf8d90f 100644
--- a/src/SMAPI/Events/IDisplayEvents.cs
+++ b/src/SMAPI/Events/IDisplayEvents.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 using System;
 using StardewValley;
 
diff --git a/src/SMAPI/Events/IGameLoopEvents.cs b/src/SMAPI/Events/IGameLoopEvents.cs
index 52bac3f8..6855737b 100644
--- a/src/SMAPI/Events/IGameLoopEvents.cs
+++ b/src/SMAPI/Events/IGameLoopEvents.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 using System;
 
 namespace StardewModdingAPI.Events
diff --git a/src/SMAPI/Events/IInputEvents.cs b/src/SMAPI/Events/IInputEvents.cs
index 01ceb224..081c40c0 100644
--- a/src/SMAPI/Events/IInputEvents.cs
+++ b/src/SMAPI/Events/IInputEvents.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 using System;
 
 namespace StardewModdingAPI.Events
diff --git a/src/SMAPI/Events/IModEvents.cs b/src/SMAPI/Events/IModEvents.cs
index a1aacbce..2603961b 100644
--- a/src/SMAPI/Events/IModEvents.cs
+++ b/src/SMAPI/Events/IModEvents.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 namespace StardewModdingAPI.Events
 {
     /// <summary>Manages access to events raised by SMAPI.</summary>
diff --git a/src/SMAPI/Events/IMultiplayerEvents.cs b/src/SMAPI/Events/IMultiplayerEvents.cs
index c50eaf04..af9b5f17 100644
--- a/src/SMAPI/Events/IMultiplayerEvents.cs
+++ b/src/SMAPI/Events/IMultiplayerEvents.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 using System;
 
 namespace StardewModdingAPI.Events
diff --git a/src/SMAPI/Events/IPlayerEvents.cs b/src/SMAPI/Events/IPlayerEvents.cs
index 9d18bfad..81e17b1a 100644
--- a/src/SMAPI/Events/IPlayerEvents.cs
+++ b/src/SMAPI/Events/IPlayerEvents.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 using System;
 
 namespace StardewModdingAPI.Events
diff --git a/src/SMAPI/Events/ISpecialisedEvents.cs b/src/SMAPI/Events/ISpecialisedEvents.cs
index 0ec5bf54..bf70956d 100644
--- a/src/SMAPI/Events/ISpecialisedEvents.cs
+++ b/src/SMAPI/Events/ISpecialisedEvents.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 using System;
 
 namespace StardewModdingAPI.Events
diff --git a/src/SMAPI/Events/IWorldEvents.cs b/src/SMAPI/Events/IWorldEvents.cs
index 785dfa8f..c023e1f0 100644
--- a/src/SMAPI/Events/IWorldEvents.cs
+++ b/src/SMAPI/Events/IWorldEvents.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 using System;
 
 namespace StardewModdingAPI.Events
diff --git a/src/SMAPI/Events/InventoryChangedEventArgs.cs b/src/SMAPI/Events/InventoryChangedEventArgs.cs
index 58c0ff8f..40cd4128 100644
--- a/src/SMAPI/Events/InventoryChangedEventArgs.cs
+++ b/src/SMAPI/Events/InventoryChangedEventArgs.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 using System;
 using System.Collections.Generic;
 using StardewValley;
diff --git a/src/SMAPI/Events/ItemStackSizeChange.cs b/src/SMAPI/Events/ItemStackSizeChange.cs
index 5d0986aa..35369be2 100644
--- a/src/SMAPI/Events/ItemStackSizeChange.cs
+++ b/src/SMAPI/Events/ItemStackSizeChange.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 using StardewValley;
 
 namespace StardewModdingAPI.Events
diff --git a/src/SMAPI/Events/LargeTerrainFeatureListChangedEventArgs.cs b/src/SMAPI/Events/LargeTerrainFeatureListChangedEventArgs.cs
index aedb0e46..59d79f0f 100644
--- a/src/SMAPI/Events/LargeTerrainFeatureListChangedEventArgs.cs
+++ b/src/SMAPI/Events/LargeTerrainFeatureListChangedEventArgs.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 using System;
 using System.Collections.Generic;
 using System.Linq;
diff --git a/src/SMAPI/Events/LevelChangedEventArgs.cs b/src/SMAPI/Events/LevelChangedEventArgs.cs
index 3beb9fd5..c7303603 100644
--- a/src/SMAPI/Events/LevelChangedEventArgs.cs
+++ b/src/SMAPI/Events/LevelChangedEventArgs.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 using System;
 using StardewModdingAPI.Enums;
 using StardewValley;
diff --git a/src/SMAPI/Events/LocaleChangedEventArgs.cs b/src/SMAPI/Events/LocaleChangedEventArgs.cs
index 015e7ec8..09d3f6e5 100644
--- a/src/SMAPI/Events/LocaleChangedEventArgs.cs
+++ b/src/SMAPI/Events/LocaleChangedEventArgs.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 using System;
 using LanguageCode = StardewValley.LocalizedContentManager.LanguageCode;
 
diff --git a/src/SMAPI/Events/LocationListChangedEventArgs.cs b/src/SMAPI/Events/LocationListChangedEventArgs.cs
index 055463dd..1ebb3e2d 100644
--- a/src/SMAPI/Events/LocationListChangedEventArgs.cs
+++ b/src/SMAPI/Events/LocationListChangedEventArgs.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 using System;
 using System.Collections.Generic;
 using System.Linq;
diff --git a/src/SMAPI/Events/NpcListChangedEventArgs.cs b/src/SMAPI/Events/NpcListChangedEventArgs.cs
index fb6dc1c5..3a37f1e7 100644
--- a/src/SMAPI/Events/NpcListChangedEventArgs.cs
+++ b/src/SMAPI/Events/NpcListChangedEventArgs.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 using System;
 using System.Collections.Generic;
 using System.Linq;
diff --git a/src/SMAPI/Events/ObjectListChangedEventArgs.cs b/src/SMAPI/Events/ObjectListChangedEventArgs.cs
index b1a636aa..b21d2867 100644
--- a/src/SMAPI/Events/ObjectListChangedEventArgs.cs
+++ b/src/SMAPI/Events/ObjectListChangedEventArgs.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 using System;
 using System.Collections.Generic;
 using System.Linq;
diff --git a/src/SMAPI/Events/PeerConnectedEventArgs.cs b/src/SMAPI/Events/PeerConnectedEventArgs.cs
index 3d11a3b5..bfaa2bd3 100644
--- a/src/SMAPI/Events/PeerConnectedEventArgs.cs
+++ b/src/SMAPI/Events/PeerConnectedEventArgs.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 using System;
 
 namespace StardewModdingAPI.Events
diff --git a/src/SMAPI/Events/PeerContextReceivedEventArgs.cs b/src/SMAPI/Events/PeerContextReceivedEventArgs.cs
index 35a4b20d..151a295c 100644
--- a/src/SMAPI/Events/PeerContextReceivedEventArgs.cs
+++ b/src/SMAPI/Events/PeerContextReceivedEventArgs.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 using System;
 
 namespace StardewModdingAPI.Events
diff --git a/src/SMAPI/Events/PeerDisconnectedEventArgs.cs b/src/SMAPI/Events/PeerDisconnectedEventArgs.cs
index 0675b8fe..8517988a 100644
--- a/src/SMAPI/Events/PeerDisconnectedEventArgs.cs
+++ b/src/SMAPI/Events/PeerDisconnectedEventArgs.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 using System;
 
 namespace StardewModdingAPI.Events
diff --git a/src/SMAPI/Events/RenderedActiveMenuEventArgs.cs b/src/SMAPI/Events/RenderedActiveMenuEventArgs.cs
index 3da0b4b4..efd4163b 100644
--- a/src/SMAPI/Events/RenderedActiveMenuEventArgs.cs
+++ b/src/SMAPI/Events/RenderedActiveMenuEventArgs.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 using System;
 using Microsoft.Xna.Framework.Graphics;
 using StardewValley;
diff --git a/src/SMAPI/Events/RenderedEventArgs.cs b/src/SMAPI/Events/RenderedEventArgs.cs
index e8beaaac..d6341b19 100644
--- a/src/SMAPI/Events/RenderedEventArgs.cs
+++ b/src/SMAPI/Events/RenderedEventArgs.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 using System;
 using Microsoft.Xna.Framework.Graphics;
 using StardewValley;
diff --git a/src/SMAPI/Events/RenderedHudEventArgs.cs b/src/SMAPI/Events/RenderedHudEventArgs.cs
index b25ecd4c..46e89013 100644
--- a/src/SMAPI/Events/RenderedHudEventArgs.cs
+++ b/src/SMAPI/Events/RenderedHudEventArgs.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 using System;
 using Microsoft.Xna.Framework.Graphics;
 using StardewValley;
diff --git a/src/SMAPI/Events/RenderedWorldEventArgs.cs b/src/SMAPI/Events/RenderedWorldEventArgs.cs
index a99d6ab3..56145381 100644
--- a/src/SMAPI/Events/RenderedWorldEventArgs.cs
+++ b/src/SMAPI/Events/RenderedWorldEventArgs.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 using System;
 using Microsoft.Xna.Framework.Graphics;
 using StardewValley;
diff --git a/src/SMAPI/Events/RenderingActiveMenuEventArgs.cs b/src/SMAPI/Events/RenderingActiveMenuEventArgs.cs
index 3e3f3258..103f56df 100644
--- a/src/SMAPI/Events/RenderingActiveMenuEventArgs.cs
+++ b/src/SMAPI/Events/RenderingActiveMenuEventArgs.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 using System;
 using Microsoft.Xna.Framework.Graphics;
 using StardewValley;
diff --git a/src/SMAPI/Events/RenderingEventArgs.cs b/src/SMAPI/Events/RenderingEventArgs.cs
index 8f6b3557..5acbef09 100644
--- a/src/SMAPI/Events/RenderingEventArgs.cs
+++ b/src/SMAPI/Events/RenderingEventArgs.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 using System;
 using Microsoft.Xna.Framework.Graphics;
 using StardewValley;
diff --git a/src/SMAPI/Events/RenderingHudEventArgs.cs b/src/SMAPI/Events/RenderingHudEventArgs.cs
index 87269b90..84c96ecd 100644
--- a/src/SMAPI/Events/RenderingHudEventArgs.cs
+++ b/src/SMAPI/Events/RenderingHudEventArgs.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 using System;
 using Microsoft.Xna.Framework.Graphics;
 using StardewValley;
diff --git a/src/SMAPI/Events/RenderingWorldEventArgs.cs b/src/SMAPI/Events/RenderingWorldEventArgs.cs
index 2fc9964f..d0d44789 100644
--- a/src/SMAPI/Events/RenderingWorldEventArgs.cs
+++ b/src/SMAPI/Events/RenderingWorldEventArgs.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 using System;
 using Microsoft.Xna.Framework.Graphics;
 using StardewValley;
diff --git a/src/SMAPI/Events/TerrainFeatureListChangedEventArgs.cs b/src/SMAPI/Events/TerrainFeatureListChangedEventArgs.cs
index 77a73102..cdf1e6dc 100644
--- a/src/SMAPI/Events/TerrainFeatureListChangedEventArgs.cs
+++ b/src/SMAPI/Events/TerrainFeatureListChangedEventArgs.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 using System;
 using System.Collections.Generic;
 using System.Linq;
diff --git a/src/SMAPI/Events/WarpedEventArgs.cs b/src/SMAPI/Events/WarpedEventArgs.cs
index 92a8ea77..9afe4a4e 100644
--- a/src/SMAPI/Events/WarpedEventArgs.cs
+++ b/src/SMAPI/Events/WarpedEventArgs.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 using System;
 using StardewValley;
 
diff --git a/src/SMAPI/Framework/Commands/IInternalCommand.cs b/src/SMAPI/Framework/Commands/IInternalCommand.cs
index 32e3e9f1..abf105b6 100644
--- a/src/SMAPI/Framework/Commands/IInternalCommand.cs
+++ b/src/SMAPI/Framework/Commands/IInternalCommand.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 namespace StardewModdingAPI.Framework.Commands
 {
     /// <summary>A core SMAPI console command.</summary>
diff --git a/src/SMAPI/Framework/Commands/ReloadI18nCommand.cs b/src/SMAPI/Framework/Commands/ReloadI18nCommand.cs
index 2043b35e..12328bb6 100644
--- a/src/SMAPI/Framework/Commands/ReloadI18nCommand.cs
+++ b/src/SMAPI/Framework/Commands/ReloadI18nCommand.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 using System;
 
 namespace StardewModdingAPI.Framework.Commands
diff --git a/src/SMAPI/Framework/Content/AssetOperationGroup.cs b/src/SMAPI/Framework/Content/AssetOperationGroup.cs
index e3c3f92c..a2fcb722 100644
--- a/src/SMAPI/Framework/Content/AssetOperationGroup.cs
+++ b/src/SMAPI/Framework/Content/AssetOperationGroup.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 namespace StardewModdingAPI.Framework.Content
 {
     /// <summary>A set of operations to apply to an asset for a given <see cref="IAssetEditor"/> or <see cref="IAssetLoader"/> implementation.</summary>
diff --git a/src/SMAPI/Framework/Content/TilesheetReference.cs b/src/SMAPI/Framework/Content/TilesheetReference.cs
index cdc4bc62..0339b802 100644
--- a/src/SMAPI/Framework/Content/TilesheetReference.cs
+++ b/src/SMAPI/Framework/Content/TilesheetReference.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 using xTile.Dimensions;
 
 namespace StardewModdingAPI.Framework.Content
diff --git a/src/SMAPI/Framework/DeprecationWarning.cs b/src/SMAPI/Framework/DeprecationWarning.cs
index f155358b..5201b06c 100644
--- a/src/SMAPI/Framework/DeprecationWarning.cs
+++ b/src/SMAPI/Framework/DeprecationWarning.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 namespace StardewModdingAPI.Framework
 {
     /// <summary>A deprecation warning for a mod.</summary>
diff --git a/src/SMAPI/Framework/Events/EventManager.cs b/src/SMAPI/Framework/Events/EventManager.cs
index c977e73d..41540047 100644
--- a/src/SMAPI/Framework/Events/EventManager.cs
+++ b/src/SMAPI/Framework/Events/EventManager.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 using StardewModdingAPI.Events;
 
 namespace StardewModdingAPI.Framework.Events
diff --git a/src/SMAPI/Framework/Events/IManagedEvent.cs b/src/SMAPI/Framework/Events/IManagedEvent.cs
index 57277576..e4e3ca08 100644
--- a/src/SMAPI/Framework/Events/IManagedEvent.cs
+++ b/src/SMAPI/Framework/Events/IManagedEvent.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 namespace StardewModdingAPI.Framework.Events
 {
     /// <summary>Metadata for an event raised by SMAPI.</summary>
diff --git a/src/SMAPI/Framework/Events/ModContentEvents.cs b/src/SMAPI/Framework/Events/ModContentEvents.cs
index f198b793..beb96031 100644
--- a/src/SMAPI/Framework/Events/ModContentEvents.cs
+++ b/src/SMAPI/Framework/Events/ModContentEvents.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 using System;
 using StardewModdingAPI.Events;
 
diff --git a/src/SMAPI/Framework/Events/ModDisplayEvents.cs b/src/SMAPI/Framework/Events/ModDisplayEvents.cs
index b2110cce..48f55324 100644
--- a/src/SMAPI/Framework/Events/ModDisplayEvents.cs
+++ b/src/SMAPI/Framework/Events/ModDisplayEvents.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 using System;
 using StardewModdingAPI.Events;
 
diff --git a/src/SMAPI/Framework/Events/ModEvents.cs b/src/SMAPI/Framework/Events/ModEvents.cs
index e8f8885d..1fb3482c 100644
--- a/src/SMAPI/Framework/Events/ModEvents.cs
+++ b/src/SMAPI/Framework/Events/ModEvents.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 using StardewModdingAPI.Events;
 
 namespace StardewModdingAPI.Framework.Events
diff --git a/src/SMAPI/Framework/Events/ModEventsBase.cs b/src/SMAPI/Framework/Events/ModEventsBase.cs
index 295caa0d..77708fc1 100644
--- a/src/SMAPI/Framework/Events/ModEventsBase.cs
+++ b/src/SMAPI/Framework/Events/ModEventsBase.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 namespace StardewModdingAPI.Framework.Events
 {
     /// <summary>An internal base class for event API classes.</summary>
diff --git a/src/SMAPI/Framework/Events/ModGameLoopEvents.cs b/src/SMAPI/Framework/Events/ModGameLoopEvents.cs
index 51803daf..5f0db369 100644
--- a/src/SMAPI/Framework/Events/ModGameLoopEvents.cs
+++ b/src/SMAPI/Framework/Events/ModGameLoopEvents.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 using System;
 using StardewModdingAPI.Events;
 
diff --git a/src/SMAPI/Framework/Events/ModInputEvents.cs b/src/SMAPI/Framework/Events/ModInputEvents.cs
index 6af79c59..40edf806 100644
--- a/src/SMAPI/Framework/Events/ModInputEvents.cs
+++ b/src/SMAPI/Framework/Events/ModInputEvents.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 using System;
 using StardewModdingAPI.Events;
 
diff --git a/src/SMAPI/Framework/Events/ModMultiplayerEvents.cs b/src/SMAPI/Framework/Events/ModMultiplayerEvents.cs
index 7d3ce510..b90f64fa 100644
--- a/src/SMAPI/Framework/Events/ModMultiplayerEvents.cs
+++ b/src/SMAPI/Framework/Events/ModMultiplayerEvents.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 using System;
 using StardewModdingAPI.Events;
 
diff --git a/src/SMAPI/Framework/Events/ModPlayerEvents.cs b/src/SMAPI/Framework/Events/ModPlayerEvents.cs
index dac8f05b..b2d89e9a 100644
--- a/src/SMAPI/Framework/Events/ModPlayerEvents.cs
+++ b/src/SMAPI/Framework/Events/ModPlayerEvents.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 using System;
 using StardewModdingAPI.Events;
 
diff --git a/src/SMAPI/Framework/Events/ModSpecialisedEvents.cs b/src/SMAPI/Framework/Events/ModSpecialisedEvents.cs
index 4b438034..7980208b 100644
--- a/src/SMAPI/Framework/Events/ModSpecialisedEvents.cs
+++ b/src/SMAPI/Framework/Events/ModSpecialisedEvents.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 using System;
 using StardewModdingAPI.Events;
 
diff --git a/src/SMAPI/Framework/Events/ModWorldEvents.cs b/src/SMAPI/Framework/Events/ModWorldEvents.cs
index 614945c7..a7b7d799 100644
--- a/src/SMAPI/Framework/Events/ModWorldEvents.cs
+++ b/src/SMAPI/Framework/Events/ModWorldEvents.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 using System;
 using StardewModdingAPI.Events;
 
diff --git a/src/SMAPI/Framework/Exceptions/SAssemblyLoadFailedException.cs b/src/SMAPI/Framework/Exceptions/SAssemblyLoadFailedException.cs
index 4e03a687..ec9279f1 100644
--- a/src/SMAPI/Framework/Exceptions/SAssemblyLoadFailedException.cs
+++ b/src/SMAPI/Framework/Exceptions/SAssemblyLoadFailedException.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 using System;
 
 namespace StardewModdingAPI.Framework.Exceptions
diff --git a/src/SMAPI/Framework/Input/IInputStateBuilder.cs b/src/SMAPI/Framework/Input/IInputStateBuilder.cs
index 3fb62686..28d62439 100644
--- a/src/SMAPI/Framework/Input/IInputStateBuilder.cs
+++ b/src/SMAPI/Framework/Input/IInputStateBuilder.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 using System.Collections.Generic;
 
 namespace StardewModdingAPI.Framework.Input
diff --git a/src/SMAPI/Framework/Input/KeyboardStateBuilder.cs b/src/SMAPI/Framework/Input/KeyboardStateBuilder.cs
index 81ca0ebb..f66fbd07 100644
--- a/src/SMAPI/Framework/Input/KeyboardStateBuilder.cs
+++ b/src/SMAPI/Framework/Input/KeyboardStateBuilder.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 using System.Collections.Generic;
 using System.Linq;
 using Microsoft.Xna.Framework.Input;
@@ -29,7 +27,7 @@ namespace StardewModdingAPI.Framework.Input
             this.State = state;
 
             this.PressedButtons.Clear();
-            foreach (var button in state.GetPressedKeys())
+            foreach (Keys button in state.GetPressedKeys())
                 this.PressedButtons.Add(button);
         }
 
diff --git a/src/SMAPI/Framework/Input/MouseStateBuilder.cs b/src/SMAPI/Framework/Input/MouseStateBuilder.cs
index 85b38d32..c2a0891b 100644
--- a/src/SMAPI/Framework/Input/MouseStateBuilder.cs
+++ b/src/SMAPI/Framework/Input/MouseStateBuilder.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 using System.Collections.Generic;
 using Microsoft.Xna.Framework.Input;
 
diff --git a/src/SMAPI/Framework/ModHelpers/BaseHelper.cs b/src/SMAPI/Framework/ModHelpers/BaseHelper.cs
index 1cd1a6b3..5a3d4bed 100644
--- a/src/SMAPI/Framework/ModHelpers/BaseHelper.cs
+++ b/src/SMAPI/Framework/ModHelpers/BaseHelper.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 namespace StardewModdingAPI.Framework.ModHelpers
 {
     /// <summary>The common base class for mod helpers.</summary>
diff --git a/src/SMAPI/Framework/ModHelpers/ContentPackHelper.cs b/src/SMAPI/Framework/ModHelpers/ContentPackHelper.cs
index 336214e2..d39abc7d 100644
--- a/src/SMAPI/Framework/ModHelpers/ContentPackHelper.cs
+++ b/src/SMAPI/Framework/ModHelpers/ContentPackHelper.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 using System;
 using System.Collections.Generic;
 using System.IO;
diff --git a/src/SMAPI/Framework/ModHelpers/InputHelper.cs b/src/SMAPI/Framework/ModHelpers/InputHelper.cs
index 29f80d87..88caf4c3 100644
--- a/src/SMAPI/Framework/ModHelpers/InputHelper.cs
+++ b/src/SMAPI/Framework/ModHelpers/InputHelper.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 using System;
 using StardewModdingAPI.Framework.Input;
 using StardewModdingAPI.Utilities;
diff --git a/src/SMAPI/Framework/ModHelpers/ModHelper.cs b/src/SMAPI/Framework/ModHelpers/ModHelper.cs
index 3cfe52bf..e1529a75 100644
--- a/src/SMAPI/Framework/ModHelpers/ModHelper.cs
+++ b/src/SMAPI/Framework/ModHelpers/ModHelper.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 using System;
 using System.IO;
 using StardewModdingAPI.Events;
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;
 
diff --git a/src/SMAPI/Framework/ModLinked.cs b/src/SMAPI/Framework/ModLinked.cs
index 5a3e38ca..8cfe6f5f 100644
--- a/src/SMAPI/Framework/ModLinked.cs
+++ b/src/SMAPI/Framework/ModLinked.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 namespace StardewModdingAPI.Framework
 {
     /// <summary>A generic tuple which links something to a mod.</summary>
diff --git a/src/SMAPI/Framework/ModLoading/AssemblyLoadStatus.cs b/src/SMAPI/Framework/ModLoading/AssemblyLoadStatus.cs
index d2d5d83b..11be19fc 100644
--- a/src/SMAPI/Framework/ModLoading/AssemblyLoadStatus.cs
+++ b/src/SMAPI/Framework/ModLoading/AssemblyLoadStatus.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 namespace StardewModdingAPI.Framework.ModLoading
 {
     /// <summary>Indicates the result of an assembly load.</summary>
diff --git a/src/SMAPI/Framework/ModLoading/IInstructionHandler.cs b/src/SMAPI/Framework/ModLoading/IInstructionHandler.cs
index 126504e3..d41732f8 100644
--- a/src/SMAPI/Framework/ModLoading/IInstructionHandler.cs
+++ b/src/SMAPI/Framework/ModLoading/IInstructionHandler.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 using System;
 using System.Collections.Generic;
 using Mono.Cecil;
diff --git a/src/SMAPI/Framework/ModLoading/IncompatibleInstructionException.cs b/src/SMAPI/Framework/ModLoading/IncompatibleInstructionException.cs
index 29406f2a..1f9add30 100644
--- a/src/SMAPI/Framework/ModLoading/IncompatibleInstructionException.cs
+++ b/src/SMAPI/Framework/ModLoading/IncompatibleInstructionException.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 using System;
 
 namespace StardewModdingAPI.Framework.ModLoading
diff --git a/src/SMAPI/Framework/ModLoading/PlatformAssemblyMap.cs b/src/SMAPI/Framework/ModLoading/PlatformAssemblyMap.cs
index 0898f095..d4366294 100644
--- a/src/SMAPI/Framework/ModLoading/PlatformAssemblyMap.cs
+++ b/src/SMAPI/Framework/ModLoading/PlatformAssemblyMap.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 using System;
 using System.Collections.Generic;
 using System.Linq;
diff --git a/src/SMAPI/Framework/ModLoading/RewriteFacades/SpriteBatchFacade.cs b/src/SMAPI/Framework/ModLoading/RewriteFacades/SpriteBatchFacade.cs
index 20a30f8f..67569424 100644
--- a/src/SMAPI/Framework/ModLoading/RewriteFacades/SpriteBatchFacade.cs
+++ b/src/SMAPI/Framework/ModLoading/RewriteFacades/SpriteBatchFacade.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 using System.Diagnostics.CodeAnalysis;
 using Microsoft.Xna.Framework;
 using Microsoft.Xna.Framework.Graphics;
@@ -20,7 +18,8 @@ namespace StardewModdingAPI.Framework.ModLoading.RewriteFacades
         ** Public methods
         *********/
         /// <summary>Construct an instance.</summary>
-        public SpriteBatchFacade(GraphicsDevice graphicsDevice) : base(graphicsDevice) { }
+        public SpriteBatchFacade(GraphicsDevice graphicsDevice)
+            : base(graphicsDevice) { }
 
 
         /****
diff --git a/src/SMAPI/Framework/ModLoading/Rewriters/ArchitectureAssemblyRewriter.cs b/src/SMAPI/Framework/ModLoading/Rewriters/ArchitectureAssemblyRewriter.cs
index 4985d72a..cc830216 100644
--- a/src/SMAPI/Framework/ModLoading/Rewriters/ArchitectureAssemblyRewriter.cs
+++ b/src/SMAPI/Framework/ModLoading/Rewriters/ArchitectureAssemblyRewriter.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 using Mono.Cecil;
 using StardewModdingAPI.Framework.ModLoading.Framework;
 
diff --git a/src/SMAPI/Framework/ModLoading/Symbols/SymbolReader.cs b/src/SMAPI/Framework/ModLoading/Symbols/SymbolReader.cs
index 55b7e0c8..2171895d 100644
--- a/src/SMAPI/Framework/ModLoading/Symbols/SymbolReader.cs
+++ b/src/SMAPI/Framework/ModLoading/Symbols/SymbolReader.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 using System.IO;
 using Mono.Cecil;
 using Mono.Cecil.Cil;
diff --git a/src/SMAPI/Framework/ModLoading/Symbols/SymbolWriterProvider.cs b/src/SMAPI/Framework/ModLoading/Symbols/SymbolWriterProvider.cs
index c2ac4cd6..8f7e05d1 100644
--- a/src/SMAPI/Framework/ModLoading/Symbols/SymbolWriterProvider.cs
+++ b/src/SMAPI/Framework/ModLoading/Symbols/SymbolWriterProvider.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 using System.IO;
 using Mono.Cecil;
 using Mono.Cecil.Cil;
diff --git a/src/SMAPI/Framework/Monitor.cs b/src/SMAPI/Framework/Monitor.cs
index de145d1d..6b53daff 100644
--- a/src/SMAPI/Framework/Monitor.cs
+++ b/src/SMAPI/Framework/Monitor.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 using System;
 using System.Collections.Generic;
 using System.Linq;
diff --git a/src/SMAPI/Framework/Networking/SGalaxyNetClient.cs b/src/SMAPI/Framework/Networking/SGalaxyNetClient.cs
index 8e19b4a7..01095c66 100644
--- a/src/SMAPI/Framework/Networking/SGalaxyNetClient.cs
+++ b/src/SMAPI/Framework/Networking/SGalaxyNetClient.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 using System;
 using Galaxy.Api;
 using StardewValley.Network;
diff --git a/src/SMAPI/Framework/Networking/SGalaxyNetServer.cs b/src/SMAPI/Framework/Networking/SGalaxyNetServer.cs
index 07a004a2..71e11576 100644
--- a/src/SMAPI/Framework/Networking/SGalaxyNetServer.cs
+++ b/src/SMAPI/Framework/Networking/SGalaxyNetServer.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 using System;
 using System.Diagnostics.CodeAnalysis;
 using System.IO;
diff --git a/src/SMAPI/Framework/Networking/SLidgrenClient.cs b/src/SMAPI/Framework/Networking/SLidgrenClient.cs
index ecf18cbd..39876744 100644
--- a/src/SMAPI/Framework/Networking/SLidgrenClient.cs
+++ b/src/SMAPI/Framework/Networking/SLidgrenClient.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 using System;
 using StardewValley.Network;
 
diff --git a/src/SMAPI/Framework/Networking/SLidgrenServer.cs b/src/SMAPI/Framework/Networking/SLidgrenServer.cs
index c0b247c8..ff871e64 100644
--- a/src/SMAPI/Framework/Networking/SLidgrenServer.cs
+++ b/src/SMAPI/Framework/Networking/SLidgrenServer.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 using System;
 using System.Diagnostics.CodeAnalysis;
 using System.IO;
diff --git a/src/SMAPI/Framework/Reflection/InterfaceProxyFactory.cs b/src/SMAPI/Framework/Reflection/InterfaceProxyFactory.cs
index 4c49e219..40adde8e 100644
--- a/src/SMAPI/Framework/Reflection/InterfaceProxyFactory.cs
+++ b/src/SMAPI/Framework/Reflection/InterfaceProxyFactory.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 using System.Reflection;
 using System.Reflection.Emit;
 using Nanoray.Pintail;
diff --git a/src/SMAPI/Framework/SChatBox.cs b/src/SMAPI/Framework/SChatBox.cs
index d6286c12..e000d1cd 100644
--- a/src/SMAPI/Framework/SChatBox.cs
+++ b/src/SMAPI/Framework/SChatBox.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 using StardewValley;
 using StardewValley.Menus;
 
diff --git a/src/SMAPI/Framework/SGameRunner.cs b/src/SMAPI/Framework/SGameRunner.cs
index dae314af..213fe561 100644
--- a/src/SMAPI/Framework/SGameRunner.cs
+++ b/src/SMAPI/Framework/SGameRunner.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -150,7 +148,7 @@ namespace StardewModdingAPI.Framework
         /// <summary>Update metadata when a split screen is added or removed.</summary>
         private void UpdateForSplitScreenChanges()
         {
-            HashSet<int> oldScreenIds = new HashSet<int>(Context.ActiveScreenIds);
+            HashSet<int> oldScreenIds = new(Context.ActiveScreenIds);
 
             // track active screens
             Context.ActiveScreenIds.Clear();
diff --git a/src/SMAPI/Framework/Singleton.cs b/src/SMAPI/Framework/Singleton.cs
index da16c48e..1bf318c4 100644
--- a/src/SMAPI/Framework/Singleton.cs
+++ b/src/SMAPI/Framework/Singleton.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 namespace StardewModdingAPI.Framework
 {
     /// <summary>Provides singleton instances of a given type.</summary>
diff --git a/src/SMAPI/Framework/StateTracking/FieldWatchers/BaseDisposableWatcher.cs b/src/SMAPI/Framework/StateTracking/FieldWatchers/BaseDisposableWatcher.cs
index 03bf84d9..60006c51 100644
--- a/src/SMAPI/Framework/StateTracking/FieldWatchers/BaseDisposableWatcher.cs
+++ b/src/SMAPI/Framework/StateTracking/FieldWatchers/BaseDisposableWatcher.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 using System;
 
 namespace StardewModdingAPI.Framework.StateTracking.FieldWatchers
diff --git a/src/SMAPI/Framework/StateTracking/FieldWatchers/ComparableListWatcher.cs b/src/SMAPI/Framework/StateTracking/FieldWatchers/ComparableListWatcher.cs
index 52e1dbad..256370ce 100644
--- a/src/SMAPI/Framework/StateTracking/FieldWatchers/ComparableListWatcher.cs
+++ b/src/SMAPI/Framework/StateTracking/FieldWatchers/ComparableListWatcher.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 using System.Collections.Generic;
 using System.Linq;
 
diff --git a/src/SMAPI/Framework/StateTracking/FieldWatchers/ImmutableCollectionWatcher.cs b/src/SMAPI/Framework/StateTracking/FieldWatchers/ImmutableCollectionWatcher.cs
index 94ce0c8e..84340fbf 100644
--- a/src/SMAPI/Framework/StateTracking/FieldWatchers/ImmutableCollectionWatcher.cs
+++ b/src/SMAPI/Framework/StateTracking/FieldWatchers/ImmutableCollectionWatcher.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 using System;
 using System.Collections.Generic;
 
diff --git a/src/SMAPI/Framework/StateTracking/FieldWatchers/NetCollectionWatcher.cs b/src/SMAPI/Framework/StateTracking/FieldWatchers/NetCollectionWatcher.cs
index e662c433..676c9fb4 100644
--- a/src/SMAPI/Framework/StateTracking/FieldWatchers/NetCollectionWatcher.cs
+++ b/src/SMAPI/Framework/StateTracking/FieldWatchers/NetCollectionWatcher.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 using System.Collections.Generic;
 using Netcode;
 
diff --git a/src/SMAPI/Framework/StateTracking/FieldWatchers/NetListWatcher.cs b/src/SMAPI/Framework/StateTracking/FieldWatchers/NetListWatcher.cs
index a97e754c..0b4d3030 100644
--- a/src/SMAPI/Framework/StateTracking/FieldWatchers/NetListWatcher.cs
+++ b/src/SMAPI/Framework/StateTracking/FieldWatchers/NetListWatcher.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 using System.Collections.Generic;
 using Netcode;
 using StardewModdingAPI.Framework.StateTracking.Comparers;
diff --git a/src/SMAPI/Framework/StateTracking/FieldWatchers/NetValueWatcher.cs b/src/SMAPI/Framework/StateTracking/FieldWatchers/NetValueWatcher.cs
index 26641750..48d5d681 100644
--- a/src/SMAPI/Framework/StateTracking/FieldWatchers/NetValueWatcher.cs
+++ b/src/SMAPI/Framework/StateTracking/FieldWatchers/NetValueWatcher.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 using Netcode;
 
 namespace StardewModdingAPI.Framework.StateTracking.FieldWatchers
diff --git a/src/SMAPI/Framework/StateTracking/ICollectionWatcher.cs b/src/SMAPI/Framework/StateTracking/ICollectionWatcher.cs
index 74c9313b..7a7759e3 100644
--- a/src/SMAPI/Framework/StateTracking/ICollectionWatcher.cs
+++ b/src/SMAPI/Framework/StateTracking/ICollectionWatcher.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 using System.Collections.Generic;
 
 namespace StardewModdingAPI.Framework.StateTracking
diff --git a/src/SMAPI/Framework/StateTracking/IDictionaryWatcher.cs b/src/SMAPI/Framework/StateTracking/IDictionaryWatcher.cs
index 81fb7460..691ed377 100644
--- a/src/SMAPI/Framework/StateTracking/IDictionaryWatcher.cs
+++ b/src/SMAPI/Framework/StateTracking/IDictionaryWatcher.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 using System.Collections.Generic;
 
 namespace StardewModdingAPI.Framework.StateTracking
diff --git a/src/SMAPI/Framework/StateTracking/IValueWatcher.cs b/src/SMAPI/Framework/StateTracking/IValueWatcher.cs
index 7d46053c..4afca972 100644
--- a/src/SMAPI/Framework/StateTracking/IValueWatcher.cs
+++ b/src/SMAPI/Framework/StateTracking/IValueWatcher.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 namespace StardewModdingAPI.Framework.StateTracking
 {
     /// <summary>A watcher which tracks changes to a value.</summary>
diff --git a/src/SMAPI/Framework/StateTracking/IWatcher.cs b/src/SMAPI/Framework/StateTracking/IWatcher.cs
index 3603b6f8..8c7fa51c 100644
--- a/src/SMAPI/Framework/StateTracking/IWatcher.cs
+++ b/src/SMAPI/Framework/StateTracking/IWatcher.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 using System;
 
 namespace StardewModdingAPI.Framework.StateTracking
diff --git a/src/SMAPI/Framework/Utilities/ContextHash.cs b/src/SMAPI/Framework/Utilities/ContextHash.cs
index 46b9099e..6c0fdc90 100644
--- a/src/SMAPI/Framework/Utilities/ContextHash.cs
+++ b/src/SMAPI/Framework/Utilities/ContextHash.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 using System;
 using System.Collections.Generic;
 
diff --git a/src/SMAPI/GamePlatform.cs b/src/SMAPI/GamePlatform.cs
index 8013faa9..cce5ed8d 100644
--- a/src/SMAPI/GamePlatform.cs
+++ b/src/SMAPI/GamePlatform.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 using StardewModdingAPI.Toolkit.Utilities;
 
 namespace StardewModdingAPI
diff --git a/src/SMAPI/IAssetDataForDictionary.cs b/src/SMAPI/IAssetDataForDictionary.cs
index 82ba25cb..1136316f 100644
--- a/src/SMAPI/IAssetDataForDictionary.cs
+++ b/src/SMAPI/IAssetDataForDictionary.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 using System.Collections.Generic;
 
 namespace StardewModdingAPI
diff --git a/src/SMAPI/IAssetDataForImage.cs b/src/SMAPI/IAssetDataForImage.cs
index 1416592e..6f8a4719 100644
--- a/src/SMAPI/IAssetDataForImage.cs
+++ b/src/SMAPI/IAssetDataForImage.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 using System;
 using Microsoft.Xna.Framework;
 using Microsoft.Xna.Framework.Graphics;
diff --git a/src/SMAPI/IAssetDataForMap.cs b/src/SMAPI/IAssetDataForMap.cs
index 0b637baf..19bdf3b2 100644
--- a/src/SMAPI/IAssetDataForMap.cs
+++ b/src/SMAPI/IAssetDataForMap.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 using Microsoft.Xna.Framework;
 using xTile;
 
diff --git a/src/SMAPI/IAssetEditor.cs b/src/SMAPI/IAssetEditor.cs
index f3d91bd0..9f22ed83 100644
--- a/src/SMAPI/IAssetEditor.cs
+++ b/src/SMAPI/IAssetEditor.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 using System;
 using StardewModdingAPI.Events;
 
diff --git a/src/SMAPI/IAssetLoader.cs b/src/SMAPI/IAssetLoader.cs
index 0d52a481..96b98793 100644
--- a/src/SMAPI/IAssetLoader.cs
+++ b/src/SMAPI/IAssetLoader.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 using System;
 using StardewModdingAPI.Events;
 
diff --git a/src/SMAPI/ICommandHelper.cs b/src/SMAPI/ICommandHelper.cs
index a0c524d6..9f1c345c 100644
--- a/src/SMAPI/ICommandHelper.cs
+++ b/src/SMAPI/ICommandHelper.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 using System;
 
 namespace StardewModdingAPI
diff --git a/src/SMAPI/IContentPackHelper.cs b/src/SMAPI/IContentPackHelper.cs
index 5464df22..c48a4f86 100644
--- a/src/SMAPI/IContentPackHelper.cs
+++ b/src/SMAPI/IContentPackHelper.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 using System.Collections.Generic;
 
 namespace StardewModdingAPI
diff --git a/src/SMAPI/ICursorPosition.cs b/src/SMAPI/ICursorPosition.cs
index da6cbb62..99c1b84d 100644
--- a/src/SMAPI/ICursorPosition.cs
+++ b/src/SMAPI/ICursorPosition.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 using System;
 using Microsoft.Xna.Framework;
 using StardewValley;
diff --git a/src/SMAPI/IInputHelper.cs b/src/SMAPI/IInputHelper.cs
index b7ed0838..2b907b0d 100644
--- a/src/SMAPI/IInputHelper.cs
+++ b/src/SMAPI/IInputHelper.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 using StardewModdingAPI.Utilities;
 
 namespace StardewModdingAPI
diff --git a/src/SMAPI/IModHelper.cs b/src/SMAPI/IModHelper.cs
index 5e4246aa..15e4ed8d 100644
--- a/src/SMAPI/IModHelper.cs
+++ b/src/SMAPI/IModHelper.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 using System;
 using StardewModdingAPI.Events;
 
diff --git a/src/SMAPI/IModInfo.cs b/src/SMAPI/IModInfo.cs
index 2788e4fc..3c85d454 100644
--- a/src/SMAPI/IModInfo.cs
+++ b/src/SMAPI/IModInfo.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 namespace StardewModdingAPI
 {
     /// <summary>Metadata for a loaded mod.</summary>
diff --git a/src/SMAPI/IModLinked.cs b/src/SMAPI/IModLinked.cs
index cf08c9c5..172ee30c 100644
--- a/src/SMAPI/IModLinked.cs
+++ b/src/SMAPI/IModLinked.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 namespace StardewModdingAPI
 {
     /// <summary>An instance linked to a mod.</summary>
diff --git a/src/SMAPI/IMonitor.cs b/src/SMAPI/IMonitor.cs
index 535f56e3..c400a211 100644
--- a/src/SMAPI/IMonitor.cs
+++ b/src/SMAPI/IMonitor.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 namespace StardewModdingAPI
 {
     /// <summary>Encapsulates monitoring and logging for a given module.</summary>
diff --git a/src/SMAPI/IMultiplayerPeerMod.cs b/src/SMAPI/IMultiplayerPeerMod.cs
index 81978bef..005408b1 100644
--- a/src/SMAPI/IMultiplayerPeerMod.cs
+++ b/src/SMAPI/IMultiplayerPeerMod.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 namespace StardewModdingAPI
 {
     /// <summary>Metadata about a mod installed by a connected player.</summary>
diff --git a/src/SMAPI/ITranslationHelper.cs b/src/SMAPI/ITranslationHelper.cs
index 3c297731..32199910 100644
--- a/src/SMAPI/ITranslationHelper.cs
+++ b/src/SMAPI/ITranslationHelper.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 using System.Collections.Generic;
 using StardewValley;
 
@@ -11,7 +9,7 @@ namespace StardewModdingAPI
         /*********
         ** Accessors
         *********/
-        /// <summary>The current locale.</summary>
+        /// <summary>The current locale code like <c>fr-FR</c>, or an empty string for English.</summary>
         string Locale { get; }
 
         /// <summary>The game's current language code.</summary>
-- 
cgit 


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

---
 src/SMAPI.Tests/Core/AssetNameTests.cs             |  2 +-
 src/SMAPI.Tests/Core/TranslationTests.cs           |  4 +-
 .../Framework/ModData/ModDataRecord.cs             |  2 +-
 src/SMAPI/Constants.cs                             | 26 +++++-----
 src/SMAPI/Events/AssetRequestedEventArgs.cs        | 14 +++---
 src/SMAPI/Events/MenuChangedEventArgs.cs           | 16 +++----
 src/SMAPI/Framework/Command.cs                     |  6 +--
 .../Framework/Commands/HarmonySummaryCommand.cs    | 20 ++++----
 src/SMAPI/Framework/Content/AssetData.cs           |  7 ++-
 .../Framework/Content/AssetDataForDictionary.cs    |  4 +-
 src/SMAPI/Framework/Content/AssetDataForImage.cs   |  4 +-
 src/SMAPI/Framework/Content/AssetDataForObject.cs  |  4 +-
 src/SMAPI/Framework/Content/AssetEditOperation.cs  |  6 +--
 src/SMAPI/Framework/Content/AssetInfo.cs           | 12 ++---
 .../Framework/Content/AssetInterceptorChange.cs    |  7 ++-
 src/SMAPI/Framework/Content/AssetLoadOperation.cs  |  6 +--
 src/SMAPI/Framework/ContentCoordinator.cs          | 35 +++++++-------
 .../ContentManagers/GameContentManager.cs          | 34 +++++++------
 .../GameContentManagerForAssetPropagation.cs       |  4 +-
 .../Framework/ContentManagers/IContentManager.cs   | 13 ++---
 src/SMAPI/Framework/ContentPack.cs                 |  9 ++--
 src/SMAPI/Framework/CursorPosition.cs              |  4 +-
 src/SMAPI/Framework/Events/ManagedEvent.cs         |  8 ++--
 src/SMAPI/Framework/Events/ManagedEventHandler.cs  |  4 +-
 .../Framework/Exceptions/SContentLoadException.cs  |  4 +-
 src/SMAPI/Framework/GameVersion.cs                 | 10 ++--
 src/SMAPI/Framework/IModMetadata.cs                | 26 +++++-----
 src/SMAPI/Framework/Logging/LogFileManager.cs      |  4 +-
 src/SMAPI/Framework/ModHelpers/ContentHelper.cs    |  9 ++--
 src/SMAPI/Framework/ModHelpers/DataHelper.cs       | 28 ++++++-----
 .../Framework/ModHelpers/GameContentHelper.cs      |  8 ++--
 src/SMAPI/Framework/ModHelpers/ModContentHelper.cs |  6 +--
 .../Framework/ModHelpers/ModRegistryHelper.cs      | 13 +++--
 .../Framework/ModHelpers/MultiplayerHelper.cs      |  8 ++--
 src/SMAPI/Framework/ModHelpers/ReflectionHelper.cs | 26 +++++-----
 .../ModLoading/AssemblyDefinitionResolver.cs       |  8 ++--
 .../Framework/ModLoading/Finders/EventFinder.cs    |  4 +-
 .../Framework/ModLoading/Finders/FieldFinder.cs    |  4 +-
 .../Framework/ModLoading/Finders/MethodFinder.cs   |  4 +-
 .../Framework/ModLoading/Finders/PropertyFinder.cs |  4 +-
 .../ReferenceToMemberWithUnexpectedTypeFinder.cs   | 15 +++---
 .../Finders/ReferenceToMissingMemberFinder.cs      | 13 +++--
 .../ModLoading/Finders/TypeAssemblyFinder.cs       |  6 +--
 .../Framework/ModLoading/Finders/TypeFinder.cs     |  8 ++--
 .../ModLoading/Framework/BaseInstructionHandler.cs |  4 +-
 .../ModLoading/Framework/RecursiveRewriter.cs      | 25 +++++-----
 .../ModLoading/Framework/RewriteHelper.cs          | 10 ++--
 .../ModLoading/InvalidModStateException.cs         |  4 +-
 src/SMAPI/Framework/ModLoading/ModMetadata.cs      | 38 ++++++++-------
 .../ModLoading/RewriteFacades/AccessToolsFacade.cs |  6 +--
 .../RewriteFacades/HarmonyInstanceFacade.cs        |  9 ++--
 .../RewriteFacades/HarmonyMethodFacade.cs          |  6 +--
 .../ModLoading/Rewriters/HarmonyRewriter.cs        | 16 +++----
 .../ModLoading/Rewriters/HeuristicFieldRewriter.cs | 19 ++++----
 .../Rewriters/HeuristicMethodRewriter.cs           | 15 +++---
 .../ModLoading/Rewriters/MethodParentRewriter.cs   | 13 +++--
 .../ModLoading/Rewriters/TypeReferenceRewriter.cs  |  6 +--
 .../ModLoading/Symbols/SymbolReaderProvider.cs     |  6 +--
 .../Framework/ModLoading/TypeReferenceComparer.cs  | 14 +++---
 src/SMAPI/Framework/ModRegistry.cs                 | 16 +++----
 src/SMAPI/Framework/Reflection/ReflectedField.cs   | 16 +++----
 src/SMAPI/Framework/Reflection/ReflectedMethod.cs  | 18 ++++---
 .../Framework/Reflection/ReflectedProperty.cs      | 18 ++++---
 src/SMAPI/Framework/Rendering/SDisplayDevice.cs    |  8 ++--
 src/SMAPI/Framework/Rendering/SXnaDisplayDevice.cs |  4 +-
 src/SMAPI/Framework/SGame.cs                       | 27 +++++------
 src/SMAPI/Framework/SModHooks.cs                   |  4 +-
 src/SMAPI/Framework/SnapshotDiff.cs                |  6 +--
 src/SMAPI/Framework/SnapshotItemListDiff.cs        |  5 +-
 src/SMAPI/Framework/SnapshotListDiff.cs            |  4 +-
 src/SMAPI/Framework/StateTracking/ChestTracker.cs  |  5 +-
 .../StateTracking/Comparers/EquatableComparer.cs   |  4 +-
 .../Comparers/GenericEqualsComparer.cs             |  4 +-
 .../Comparers/ObjectReferenceComparer.cs           |  4 +-
 .../FieldWatchers/NetDictionaryWatcher.cs          |  3 +-
 .../FieldWatchers/ObservableCollectionWatcher.cs   |  8 ++--
 .../StateTracking/FieldWatchers/WatcherFactory.cs  | 15 +++---
 .../Framework/StateTracking/LocationTracker.cs     | 14 +++---
 .../StateTracking/Snapshots/LocationSnapshot.cs    |  4 +-
 .../StateTracking/Snapshots/WatcherSnapshot.cs     |  6 +--
 .../Snapshots/WorldLocationsSnapshot.cs            |  4 +-
 .../StateTracking/WorldLocationsTracker.cs         | 23 ++++-----
 src/SMAPI/Framework/Translator.cs                  | 20 ++++----
 .../Framework/Utilities/TickCacheDictionary.cs     |  5 +-
 src/SMAPI/Framework/WatcherCore.cs                 |  4 +-
 src/SMAPI/IAssetData.cs                            |  3 +-
 src/SMAPI/IAssetInfo.cs                            |  4 +-
 src/SMAPI/IAssetName.cs                            | 12 ++---
 src/SMAPI/IContentHelper.cs                        | 14 +++---
 src/SMAPI/IContentPack.cs                          | 11 +++--
 src/SMAPI/IDataHelper.cs                           | 20 ++++----
 src/SMAPI/IGameContentHelper.cs                    | 14 +++---
 src/SMAPI/IMod.cs                                  |  4 +-
 src/SMAPI/IModContentHelper.cs                     |  8 ++--
 src/SMAPI/IModRegistry.cs                          |  9 ++--
 src/SMAPI/IMultiplayerHelper.cs                    |  6 +--
 src/SMAPI/IMultiplayerPeer.cs                      | 10 ++--
 src/SMAPI/IReflectedField.cs                       |  6 +--
 src/SMAPI/IReflectedMethod.cs                      |  6 +--
 src/SMAPI/IReflectedProperty.cs                    |  6 +--
 src/SMAPI/IReflectionHelper.cs                     | 30 ++++++++----
 src/SMAPI/Metadata/InstructionMetadata.cs          | 24 +++++-----
 src/SMAPI/Mod.cs                                   | 12 ++---
 src/SMAPI/Patches/Game1Patcher.cs                  |  6 +--
 src/SMAPI/Patches/TitleMenuPatcher.cs              |  4 +-
 src/SMAPI/Program.cs                               | 22 ++++-----
 src/SMAPI/Translation.cs                           | 30 ++++++------
 src/SMAPI/Utilities/CaseInsensitivePathCache.cs    |  4 +-
 src/SMAPI/Utilities/Keybind.cs                     |  5 +-
 src/SMAPI/Utilities/KeybindList.cs                 | 11 ++---
 src/SMAPI/Utilities/SDate.cs                       | 55 ++++++++++------------
 111 files changed, 558 insertions(+), 677 deletions(-)

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

diff --git a/src/SMAPI.Tests/Core/AssetNameTests.cs b/src/SMAPI.Tests/Core/AssetNameTests.cs
index 8018442c..a1712726 100644
--- a/src/SMAPI.Tests/Core/AssetNameTests.cs
+++ b/src/SMAPI.Tests/Core/AssetNameTests.cs
@@ -56,7 +56,7 @@ namespace SMAPI.Tests.Core
         public void Constructor_NullOrWhitespace(string? name)
         {
             // act
-            ArgumentException exception = Assert.Throws<ArgumentException>(() => _ = AssetName.Parse(name!, null))!;
+            ArgumentException exception = Assert.Throws<ArgumentException>(() => _ = AssetName.Parse(name!, _ => null))!;
 
             // assert
             exception.ParamName.Should().Be("rawName");
diff --git a/src/SMAPI.Tests/Core/TranslationTests.cs b/src/SMAPI.Tests/Core/TranslationTests.cs
index a65bf772..ced1525a 100644
--- a/src/SMAPI.Tests/Core/TranslationTests.cs
+++ b/src/SMAPI.Tests/Core/TranslationTests.cs
@@ -134,9 +134,9 @@ namespace SMAPI.Tests.Core
 
             // assert
             if (translation.HasValue())
-                Assert.AreEqual(text, (string)translation, "The translation returned an unexpected value given a valid input.");
+                Assert.AreEqual(text, (string?)translation, "The translation returned an unexpected value given a valid input.");
             else
-                Assert.AreEqual(this.GetPlaceholderText("key"), (string)translation, "The translation returned an unexpected value given a null or empty input.");
+                Assert.AreEqual(this.GetPlaceholderText("key"), (string?)translation, "The translation returned an unexpected value given a null or empty input.");
         }
 
         [Test(Description = "Assert that the translation returns the expected text given a use-placeholder setting.")]
diff --git a/src/SMAPI.Toolkit/Framework/ModData/ModDataRecord.cs b/src/SMAPI.Toolkit/Framework/ModData/ModDataRecord.cs
index e9ece387..ab0e4377 100644
--- a/src/SMAPI.Toolkit/Framework/ModData/ModDataRecord.cs
+++ b/src/SMAPI.Toolkit/Framework/ModData/ModDataRecord.cs
@@ -80,7 +80,7 @@ namespace StardewModdingAPI.Toolkit.Framework.ModData
 
         /// <summary>Get a parsed representation of the <see cref="ModDataRecord.Fields"/> which match a given manifest.</summary>
         /// <param name="manifest">The manifest to match.</param>
-        public ModDataRecordVersionedFields GetVersionedFields(IManifest manifest)
+        public ModDataRecordVersionedFields GetVersionedFields(IManifest? manifest)
         {
             ModDataRecordVersionedFields parsed = new(this);
             foreach (ModDataField field in this.Fields.Where(field => field.IsMatch(manifest)))
diff --git a/src/SMAPI/Constants.cs b/src/SMAPI/Constants.cs
index 2d9ab666..fd2b813a 100644
--- a/src/SMAPI/Constants.cs
+++ b/src/SMAPI/Constants.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 using System;
 using System.Collections.Generic;
 using System.IO;
@@ -33,7 +31,7 @@ namespace StardewModdingAPI
         ** Accessors
         *********/
         /// <summary>The path to the game folder.</summary>
-        public static string GamePath { get; } = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location);
+        public static string GamePath { get; } = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location)!;
 
         /// <summary>The absolute path to the folder containing SMAPI's internal files.</summary>
         public static readonly string InternalFilesPath = Path.Combine(EarlyConstants.GamePath, "smapi-internal");
@@ -69,8 +67,8 @@ namespace StardewModdingAPI
         /// <summary>The minimum supported version of Stardew Valley.</summary>
         public static ISemanticVersion MinimumGameVersion { get; } = new GameVersion("1.5.6");
 
-        /// <summary>The maximum supported version of Stardew Valley.</summary>
-        public static ISemanticVersion MaximumGameVersion { get; } = null;
+        /// <summary>The maximum supported version of Stardew Valley, if any.</summary>
+        public static ISemanticVersion? MaximumGameVersion { get; } = null;
 
         /// <summary>The target game platform.</summary>
         public static GamePlatform TargetPlatform { get; } = EarlyConstants.Platform;
@@ -111,10 +109,10 @@ namespace StardewModdingAPI
         public static string SavesPath { get; } = Path.Combine(Constants.DataPath, "Saves");
 
         /// <summary>The name of the current save folder (if save info is available, regardless of whether the save file exists yet).</summary>
-        public static string SaveFolderName => Constants.GetSaveFolderName();
+        public static string? SaveFolderName => Constants.GetSaveFolderName();
 
         /// <summary>The absolute path to the current save folder (if save info is available and the save file exists).</summary>
-        public static string CurrentSavePath => Constants.GetSaveFolderPathIfExists();
+        public static string? CurrentSavePath => Constants.GetSaveFolderPathIfExists();
 
         /****
         ** Internal
@@ -164,7 +162,7 @@ namespace StardewModdingAPI
         internal static string DefaultModsPath { get; } = Path.Combine(Constants.GamePath, "Mods");
 
         /// <summary>The actual full path to search for mods.</summary>
-        internal static string ModsPath { get; set; }
+        internal static string ModsPath { get; set; } = null!; // initialized early during SMAPI startup
 
         /// <summary>The game's current semantic version.</summary>
         internal static ISemanticVersion GameVersion { get; } = new GameVersion(Game1.version);
@@ -179,7 +177,7 @@ namespace StardewModdingAPI
         /// <summary>Get the SMAPI version to recommend for an older game version, if any.</summary>
         /// <param name="version">The game version to search.</param>
         /// <returns>Returns the compatible SMAPI version, or <c>null</c> if none was found.</returns>
-        internal static ISemanticVersion GetCompatibleApiVersion(ISemanticVersion version)
+        internal static ISemanticVersion? GetCompatibleApiVersion(ISemanticVersion version)
         {
             // This covers all officially supported public game updates. It might seem like version
             // ranges would be better, but the given SMAPI versions may not be compatible with
@@ -337,22 +335,22 @@ namespace StardewModdingAPI
         }
 
         /// <summary>Get the name of the save folder, if any.</summary>
-        private static string GetSaveFolderName()
+        private static string? GetSaveFolderName()
         {
             return Constants.GetSaveFolder()?.Name;
         }
 
         /// <summary>Get the absolute path to the current save folder, if any.</summary>
-        private static string GetSaveFolderPathIfExists()
+        private static string? GetSaveFolderPathIfExists()
         {
-            DirectoryInfo saveFolder = Constants.GetSaveFolder();
+            DirectoryInfo? saveFolder = Constants.GetSaveFolder();
             return saveFolder?.Exists == true
                 ? saveFolder.FullName
                 : null;
         }
 
         /// <summary>Get the current save folder, if any.</summary>
-        private static DirectoryInfo GetSaveFolder()
+        private static DirectoryInfo? GetSaveFolder()
         {
             // save not available
             if (Context.LoadStage == LoadStage.None)
@@ -365,7 +363,7 @@ namespace StardewModdingAPI
                 : Game1.uniqueIDForThisGame;
 
             // get best match (accounting for rare case where folder name isn't sanitized)
-            DirectoryInfo folder = null;
+            DirectoryInfo? folder = null;
             foreach (string saveName in new[] { rawSaveName, new string(rawSaveName.Where(char.IsLetterOrDigit).ToArray()) })
             {
                 try
diff --git a/src/SMAPI/Events/AssetRequestedEventArgs.cs b/src/SMAPI/Events/AssetRequestedEventArgs.cs
index 3c51c95d..3bcf83b9 100644
--- a/src/SMAPI/Events/AssetRequestedEventArgs.cs
+++ b/src/SMAPI/Events/AssetRequestedEventArgs.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 using System;
 using System.Collections.Generic;
 using Microsoft.Xna.Framework.Graphics;
@@ -19,7 +17,7 @@ namespace StardewModdingAPI.Events
         private readonly IModMetadata Mod;
 
         /// <summary>Get the mod metadata for a content pack, if it's a valid content pack for the mod.</summary>
-        private readonly Func<IModMetadata, string, string, IModMetadata> GetOnBehalfOf;
+        private readonly Func<IModMetadata, string?, string, IModMetadata?> GetOnBehalfOf;
 
 
         /*********
@@ -51,7 +49,7 @@ namespace StardewModdingAPI.Events
         /// <param name="dataType">The requested data type.</param>
         /// <param name="nameWithoutLocale">The <paramref name="name"/> with any locale codes stripped.</param>
         /// <param name="getOnBehalfOf">Get the mod metadata for a content pack, if it's a valid content pack for the mod.</param>
-        internal AssetRequestedEventArgs(IModMetadata mod, IAssetName name, IAssetName nameWithoutLocale, Type dataType, Func<IModMetadata, string, string, IModMetadata> getOnBehalfOf)
+        internal AssetRequestedEventArgs(IModMetadata mod, IAssetName name, IAssetName nameWithoutLocale, Type dataType, Func<IModMetadata, string?, string, IModMetadata?> getOnBehalfOf)
         {
             this.Mod = mod;
             this.Name = name;
@@ -71,7 +69,7 @@ namespace StardewModdingAPI.Events
         ///   <item>Each asset can logically only have one initial instance. If multiple loads apply at the same time, SMAPI will use the <paramref name="priority"/> parameter to decide what happens. If you're making changes to the existing asset instead of replacing it, you should use <see cref="Edit"/> instead to avoid those limitations and improve mod compatibility.</item>
         /// </list>
         /// </remarks>
-        public void LoadFrom(Func<object> load, AssetLoadPriority priority, string onBehalfOf = null)
+        public void LoadFrom(Func<object> load, AssetLoadPriority priority, string? onBehalfOf = null)
         {
             this.LoadOperations.Add(
                 new AssetLoadOperation(
@@ -95,13 +93,15 @@ namespace StardewModdingAPI.Events
         /// </list>
         /// </remarks>
         public void LoadFromModFile<TAsset>(string relativePath, AssetLoadPriority priority)
+            where TAsset : notnull
         {
             this.LoadOperations.Add(
                 new AssetLoadOperation(
                     mod: this.Mod,
                     priority: priority,
                     onBehalfOf: null,
-                    _ => this.Mod.Mod.Helper.ModContent.Load<TAsset>(relativePath))
+                    _ => this.Mod.Mod!.Helper.ModContent.Load<TAsset>(relativePath)
+                )
             );
         }
 
@@ -116,7 +116,7 @@ namespace StardewModdingAPI.Events
         ///   <item>You can apply any number of edits to the asset. Each edit will be applied on top of the previous one (i.e. it'll see the merged asset from all previous edits as its input).</item>
         /// </list>
         /// </remarks>
-        public void Edit(Action<IAssetData> apply, AssetEditPriority priority = AssetEditPriority.Default, string onBehalfOf = null)
+        public void Edit(Action<IAssetData> apply, AssetEditPriority priority = AssetEditPriority.Default, string? onBehalfOf = null)
         {
             this.EditOperations.Add(
                 new AssetEditOperation(
diff --git a/src/SMAPI/Events/MenuChangedEventArgs.cs b/src/SMAPI/Events/MenuChangedEventArgs.cs
index 362accec..c37fd216 100644
--- a/src/SMAPI/Events/MenuChangedEventArgs.cs
+++ b/src/SMAPI/Events/MenuChangedEventArgs.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 using System;
 using StardewValley.Menus;
 
@@ -11,20 +9,20 @@ namespace StardewModdingAPI.Events
         /*********
         ** Accessors
         *********/
-        /// <summary>The previous menu.</summary>
-        public IClickableMenu OldMenu { get; }
+        /// <summary>The previous menu, if any.</summary>
+        public IClickableMenu? OldMenu { get; }
 
-        /// <summary>The current menu.</summary>
-        public IClickableMenu NewMenu { get; }
+        /// <summary>The current menu, if any.</summary>
+        public IClickableMenu? NewMenu { get; }
 
 
         /*********
         ** Public methods
         *********/
         /// <summary>Construct an instance.</summary>
-        /// <param name="oldMenu">The previous menu.</param>
-        /// <param name="newMenu">The current menu.</param>
-        internal MenuChangedEventArgs(IClickableMenu oldMenu, IClickableMenu newMenu)
+        /// <param name="oldMenu">The previous menu, if any.</param>
+        /// <param name="newMenu">The current menu, if any.</param>
+        internal MenuChangedEventArgs(IClickableMenu? oldMenu, IClickableMenu? newMenu)
         {
             this.OldMenu = oldMenu;
             this.NewMenu = newMenu;
diff --git a/src/SMAPI/Framework/Command.cs b/src/SMAPI/Framework/Command.cs
index 776ba238..dca1dd09 100644
--- a/src/SMAPI/Framework/Command.cs
+++ b/src/SMAPI/Framework/Command.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 using System;
 
 namespace StardewModdingAPI.Framework
@@ -11,7 +9,7 @@ namespace StardewModdingAPI.Framework
         ** Accessor
         *********/
         /// <summary>The mod that registered the command (or <c>null</c> if registered by SMAPI).</summary>
-        public IModMetadata Mod { get; }
+        public IModMetadata? Mod { get; }
 
         /// <summary>The command name, which the user must type to trigger it.</summary>
         public string Name { get; }
@@ -31,7 +29,7 @@ namespace StardewModdingAPI.Framework
         /// <param name="name">The command name, which the user must type to trigger it.</param>
         /// <param name="documentation">The human-readable documentation shown when the player runs the built-in 'help' command.</param>
         /// <param name="callback">The method to invoke when the command is triggered. This method is passed the command name and arguments submitted by the user.</param>
-        public Command(IModMetadata mod, string name, string documentation, Action<string, string[]> callback)
+        public Command(IModMetadata? mod, string name, string documentation, Action<string, string[]> callback)
         {
             this.Mod = mod;
             this.Name = name;
diff --git a/src/SMAPI/Framework/Commands/HarmonySummaryCommand.cs b/src/SMAPI/Framework/Commands/HarmonySummaryCommand.cs
index fcfa928e..6dc6f131 100644
--- a/src/SMAPI/Framework/Commands/HarmonySummaryCommand.cs
+++ b/src/SMAPI/Framework/Commands/HarmonySummaryCommand.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -73,9 +71,9 @@ namespace StardewModdingAPI.Framework.Commands
         private IEnumerable<SearchResult> FilterPatches(string[] searchTerms)
         {
             bool hasSearch = searchTerms.Any();
-            bool IsMatch(string target) => !hasSearch || searchTerms.Any(search => target != null && target.IndexOf(search, StringComparison.OrdinalIgnoreCase) > -1);
+            bool IsMatch(string? target) => !hasSearch || searchTerms.Any(search => target != null && target.IndexOf(search, StringComparison.OrdinalIgnoreCase) > -1);
 
-            foreach (var patch in this.GetAllPatches())
+            foreach (SearchResult patch in this.GetAllPatches())
             {
                 // matches entire patch
                 if (IsMatch(patch.MethodDescription))
@@ -85,10 +83,10 @@ namespace StardewModdingAPI.Framework.Commands
                 }
 
                 // matches individual patchers
-                foreach (var pair in patch.PatchTypesByOwner.ToArray())
+                foreach ((string patcherId, ISet<PatchType> patchTypes) in patch.PatchTypesByOwner.ToArray())
                 {
-                    if (!IsMatch(pair.Key) && !pair.Value.Any(type => IsMatch(type.ToString())))
-                        patch.PatchTypesByOwner.Remove(pair.Key);
+                    if (!IsMatch(patcherId) && !patchTypes.Any(type => IsMatch(type.ToString())))
+                        patch.PatchTypesByOwner.Remove(patcherId);
                 }
 
                 if (patch.PatchTypesByOwner.Any())
@@ -114,13 +112,13 @@ namespace StardewModdingAPI.Framework.Commands
 
                 // get patch types by owner
                 var typesByOwner = new Dictionary<string, ISet<PatchType>>();
-                foreach (var group in patchGroups)
+                foreach ((PatchType type, IReadOnlyCollection<Patch> patches) in patchGroups)
                 {
-                    foreach (var patch in group.Value)
+                    foreach (Patch patch in patches)
                     {
-                        if (!typesByOwner.TryGetValue(patch.owner, out ISet<PatchType> patchTypes))
+                        if (!typesByOwner.TryGetValue(patch.owner, out ISet<PatchType>? patchTypes))
                             typesByOwner[patch.owner] = patchTypes = new HashSet<PatchType>();
-                        patchTypes.Add(group.Key);
+                        patchTypes.Add(type);
                     }
                 }
 
diff --git a/src/SMAPI/Framework/Content/AssetData.cs b/src/SMAPI/Framework/Content/AssetData.cs
index be4a7ce6..0367e999 100644
--- a/src/SMAPI/Framework/Content/AssetData.cs
+++ b/src/SMAPI/Framework/Content/AssetData.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 using System;
 
 namespace StardewModdingAPI.Framework.Content
@@ -7,12 +5,13 @@ namespace StardewModdingAPI.Framework.Content
     /// <summary>Base implementation for a content helper which encapsulates access and changes to content being read from a data file.</summary>
     /// <typeparam name="TValue">The interface value type.</typeparam>
     internal class AssetData<TValue> : AssetInfo, IAssetData<TValue>
+        where TValue : notnull
     {
         /*********
         ** Fields
         *********/
         /// <summary>A callback to invoke when the data is replaced (if any).</summary>
-        private readonly Action<TValue> OnDataReplaced;
+        private readonly Action<TValue>? OnDataReplaced;
 
 
         /*********
@@ -31,7 +30,7 @@ namespace StardewModdingAPI.Framework.Content
         /// <param name="data">The content data being read.</param>
         /// <param name="getNormalizedPath">Normalizes an asset key to match the cache key.</param>
         /// <param name="onDataReplaced">A callback to invoke when the data is replaced (if any).</param>
-        public AssetData(string locale, IAssetName assetName, TValue data, Func<string, string> getNormalizedPath, Action<TValue> onDataReplaced)
+        public AssetData(string? locale, IAssetName assetName, TValue data, Func<string, string> getNormalizedPath, Action<TValue>? onDataReplaced)
             : base(locale, assetName, data.GetType(), getNormalizedPath)
         {
             this.Data = data;
diff --git a/src/SMAPI/Framework/Content/AssetDataForDictionary.cs b/src/SMAPI/Framework/Content/AssetDataForDictionary.cs
index 06dbe259..d9bfa7bf 100644
--- a/src/SMAPI/Framework/Content/AssetDataForDictionary.cs
+++ b/src/SMAPI/Framework/Content/AssetDataForDictionary.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 using System;
 using System.Collections.Generic;
 
@@ -17,7 +15,7 @@ namespace StardewModdingAPI.Framework.Content
         /// <param name="data">The content data being read.</param>
         /// <param name="getNormalizedPath">Normalizes an asset key to match the cache key.</param>
         /// <param name="onDataReplaced">A callback to invoke when the data is replaced (if any).</param>
-        public AssetDataForDictionary(string locale, IAssetName assetName, IDictionary<TKey, TValue> data, Func<string, string> getNormalizedPath, Action<IDictionary<TKey, TValue>> onDataReplaced)
+        public AssetDataForDictionary(string? locale, IAssetName assetName, IDictionary<TKey, TValue> data, Func<string, string> getNormalizedPath, Action<IDictionary<TKey, TValue>> onDataReplaced)
             : base(locale, assetName, data, getNormalizedPath, onDataReplaced) { }
     }
 }
diff --git a/src/SMAPI/Framework/Content/AssetDataForImage.cs b/src/SMAPI/Framework/Content/AssetDataForImage.cs
index 8e59cd27..97729c95 100644
--- a/src/SMAPI/Framework/Content/AssetDataForImage.cs
+++ b/src/SMAPI/Framework/Content/AssetDataForImage.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 using System;
 using Microsoft.Xna.Framework;
 using Microsoft.Xna.Framework.Graphics;
@@ -27,7 +25,7 @@ namespace StardewModdingAPI.Framework.Content
         /// <param name="data">The content data being read.</param>
         /// <param name="getNormalizedPath">Normalizes an asset key to match the cache key.</param>
         /// <param name="onDataReplaced">A callback to invoke when the data is replaced (if any).</param>
-        public AssetDataForImage(string locale, IAssetName assetName, Texture2D data, Func<string, string> getNormalizedPath, Action<Texture2D> onDataReplaced)
+        public AssetDataForImage(string? locale, IAssetName assetName, Texture2D data, Func<string, string> getNormalizedPath, Action<Texture2D> onDataReplaced)
             : base(locale, assetName, data, getNormalizedPath, onDataReplaced) { }
 
         /// <inheritdoc />
diff --git a/src/SMAPI/Framework/Content/AssetDataForObject.cs b/src/SMAPI/Framework/Content/AssetDataForObject.cs
index bb3966b9..e508ca30 100644
--- a/src/SMAPI/Framework/Content/AssetDataForObject.cs
+++ b/src/SMAPI/Framework/Content/AssetDataForObject.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 using System;
 using System.Collections.Generic;
 using Microsoft.Xna.Framework.Graphics;
@@ -27,7 +25,7 @@ namespace StardewModdingAPI.Framework.Content
         /// <param name="data">The content data being read.</param>
         /// <param name="getNormalizedPath">Normalizes an asset key to match the cache key.</param>
         /// <param name="reflection">Simplifies access to private code.</param>
-        public AssetDataForObject(string locale, IAssetName assetName, object data, Func<string, string> getNormalizedPath, Reflector reflection)
+        public AssetDataForObject(string? locale, IAssetName assetName, object data, Func<string, string> getNormalizedPath, Reflector reflection)
             : base(locale, assetName, data, getNormalizedPath, onDataReplaced: null)
         {
             this.Reflection = reflection;
diff --git a/src/SMAPI/Framework/Content/AssetEditOperation.cs b/src/SMAPI/Framework/Content/AssetEditOperation.cs
index 1b7d0c93..464948b0 100644
--- a/src/SMAPI/Framework/Content/AssetEditOperation.cs
+++ b/src/SMAPI/Framework/Content/AssetEditOperation.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 using System;
 using StardewModdingAPI.Events;
 
@@ -18,7 +16,7 @@ namespace StardewModdingAPI.Framework.Content
         public AssetEditPriority Priority { get; }
 
         /// <summary>The content pack on whose behalf the edit is being applied, if any.</summary>
-        public IModMetadata OnBehalfOf { get; }
+        public IModMetadata? OnBehalfOf { get; }
 
         /// <summary>Apply the edit to an asset.</summary>
         public Action<IAssetData> ApplyEdit { get; }
@@ -32,7 +30,7 @@ namespace StardewModdingAPI.Framework.Content
         /// <param name="priority">If there are multiple edits that apply to the same asset, the priority with which this one should be applied.</param>
         /// <param name="onBehalfOf">The content pack on whose behalf the edit is being applied, if any.</param>
         /// <param name="applyEdit">Apply the edit to an asset.</param>
-        public AssetEditOperation(IModMetadata mod, AssetEditPriority priority, IModMetadata onBehalfOf, Action<IAssetData> applyEdit)
+        public AssetEditOperation(IModMetadata mod, AssetEditPriority priority, IModMetadata? onBehalfOf, Action<IAssetData> applyEdit)
         {
             this.Mod = mod;
             this.Priority = priority;
diff --git a/src/SMAPI/Framework/Content/AssetInfo.cs b/src/SMAPI/Framework/Content/AssetInfo.cs
index 51dcc61f..0f0e9bf3 100644
--- a/src/SMAPI/Framework/Content/AssetInfo.cs
+++ b/src/SMAPI/Framework/Content/AssetInfo.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 using System;
 using System.Collections.Generic;
 using Microsoft.Xna.Framework.Graphics;
@@ -19,7 +17,7 @@ namespace StardewModdingAPI.Framework.Content
         ** Accessors
         *********/
         /// <inheritdoc />
-        public string Locale { get; }
+        public string? Locale { get; }
 
         /// <inheritdoc />
         public IAssetName Name { get; }
@@ -28,7 +26,7 @@ namespace StardewModdingAPI.Framework.Content
         public IAssetName NameWithoutLocale { get; }
 
         /// <inheritdoc />
-        [Obsolete($"Use {nameof(Name)} or {nameof(NameWithoutLocale)} instead. This property will be removed in SMAPI 4.0.0.")]
+        [Obsolete($"Use {nameof(AssetInfo.Name)} or {nameof(AssetInfo.NameWithoutLocale)} instead. This property will be removed in SMAPI 4.0.0.")]
         public string AssetName
         {
             get
@@ -56,7 +54,7 @@ namespace StardewModdingAPI.Framework.Content
         /// <param name="assetName">The asset name being read.</param>
         /// <param name="type">The content type being read.</param>
         /// <param name="getNormalizedPath">Normalizes an asset key to match the cache key.</param>
-        public AssetInfo(string locale, IAssetName assetName, Type type, Func<string, string> getNormalizedPath)
+        public AssetInfo(string? locale, IAssetName assetName, Type type, Func<string, string> getNormalizedPath)
         {
             this.Locale = locale;
             this.Name = assetName;
@@ -66,7 +64,7 @@ namespace StardewModdingAPI.Framework.Content
         }
 
         /// <inheritdoc />
-        [Obsolete($"Use {nameof(Name)}.{nameof(IAssetName.IsEquivalentTo)} or {nameof(NameWithoutLocale)}.{nameof(IAssetName.IsEquivalentTo)} instead. This method will be removed in SMAPI 4.0.0.")]
+        [Obsolete($"Use {nameof(Name)}.{nameof(IAssetName.IsEquivalentTo)} or {nameof(AssetInfo.NameWithoutLocale)}.{nameof(IAssetName.IsEquivalentTo)} instead. This method will be removed in SMAPI 4.0.0.")]
         public bool AssetNameEquals(string path)
         {
             SCore.DeprecationManager.Warn(
@@ -106,7 +104,7 @@ namespace StardewModdingAPI.Framework.Content
                 return "string";
 
             // default
-            return type.FullName;
+            return type.FullName!;
         }
     }
 }
diff --git a/src/SMAPI/Framework/Content/AssetInterceptorChange.cs b/src/SMAPI/Framework/Content/AssetInterceptorChange.cs
index 7f53db9b..fc8199e8 100644
--- a/src/SMAPI/Framework/Content/AssetInterceptorChange.cs
+++ b/src/SMAPI/Framework/Content/AssetInterceptorChange.cs
@@ -1,9 +1,8 @@
-#nullable disable
-
 using System;
 using System.Reflection;
 using StardewModdingAPI.Internal;
 
+#pragma warning disable CS0618 // obsolete asset interceptors deliberately supported here
 namespace StardewModdingAPI.Framework.Content
 {
     /// <summary>A wrapper for <see cref="IAssetEditor"/> and <see cref="IAssetLoader"/> for internal cache invalidation.</summary>
@@ -46,11 +45,11 @@ namespace StardewModdingAPI.Framework.Content
         /// <param name="asset">Basic metadata about the asset being loaded.</param>
         public bool CanIntercept(IAssetInfo asset)
         {
-            MethodInfo canIntercept = this.GetType().GetMethod(nameof(this.CanInterceptImpl), BindingFlags.Instance | BindingFlags.NonPublic);
+            MethodInfo? canIntercept = this.GetType().GetMethod(nameof(this.CanInterceptImpl), BindingFlags.Instance | BindingFlags.NonPublic);
             if (canIntercept == null)
                 throw new InvalidOperationException($"SMAPI couldn't access the {nameof(AssetInterceptorChange)}.{nameof(this.CanInterceptImpl)} implementation.");
 
-            return (bool)canIntercept.MakeGenericMethod(asset.DataType).Invoke(this, new object[] { asset });
+            return (bool)canIntercept.MakeGenericMethod(asset.DataType).Invoke(this, new object[] { asset })!;
         }
 
 
diff --git a/src/SMAPI/Framework/Content/AssetLoadOperation.cs b/src/SMAPI/Framework/Content/AssetLoadOperation.cs
index 73e60e24..b6cdec27 100644
--- a/src/SMAPI/Framework/Content/AssetLoadOperation.cs
+++ b/src/SMAPI/Framework/Content/AssetLoadOperation.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 using System;
 using StardewModdingAPI.Events;
 
@@ -15,7 +13,7 @@ namespace StardewModdingAPI.Framework.Content
         public IModMetadata Mod { get; }
 
         /// <summary>The content pack on whose behalf the asset is being loaded, if any.</summary>
-        public IModMetadata OnBehalfOf { get; }
+        public IModMetadata? OnBehalfOf { get; }
 
         /// <summary>If there are multiple loads that apply to the same asset, the priority with which this one should be applied.</summary>
         public AssetLoadPriority Priority { get; }
@@ -32,7 +30,7 @@ namespace StardewModdingAPI.Framework.Content
         /// <param name="priority">If there are multiple loads that apply to the same asset, the priority with which this one should be applied.</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, AssetLoadPriority priority, IModMetadata onBehalfOf, Func<IAssetInfo, object> getData)
+        public AssetLoadOperation(IModMetadata mod, AssetLoadPriority priority, IModMetadata? onBehalfOf, Func<IAssetInfo, object> getData)
         {
             this.Mod = mod;
             this.Priority = priority;
diff --git a/src/SMAPI/Framework/ContentCoordinator.cs b/src/SMAPI/Framework/ContentCoordinator.cs
index 4e48b08c..92452224 100644
--- a/src/SMAPI/Framework/ContentCoordinator.cs
+++ b/src/SMAPI/Framework/ContentCoordinator.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 using System;
 using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
@@ -71,7 +69,7 @@ namespace StardewModdingAPI.Framework
         private readonly ReaderWriterLockSlim ContentManagerLock = new();
 
         /// <summary>A cache of ordered tilesheet IDs used by vanilla maps.</summary>
-        private readonly Dictionary<string, TilesheetReference[]> VanillaTilesheets = new(StringComparer.OrdinalIgnoreCase);
+        private readonly Dictionary<string, TilesheetReference[]?> VanillaTilesheets = new(StringComparer.OrdinalIgnoreCase);
 
         /// <summary>An unmodified content manager which doesn't intercept assets, used to compare asset data.</summary>
         private readonly LocalizedContentManager VanillaContentManager;
@@ -230,7 +228,7 @@ namespace StardewModdingAPI.Framework
         public void OnAdditionalLanguagesInitialized()
         {
             // update locale cache for custom languages, and load it now (since languages added later won't work)
-            var customLanguages = this.MainContentManager.Load<List<ModLanguage>>("Data/AdditionalLanguages");
+            var customLanguages = this.MainContentManager.Load<List<ModLanguage?>>("Data/AdditionalLanguages");
             this.LocaleCodes = new Lazy<Dictionary<string, LocalizedContentManager.LanguageCode>>(() => this.GetLocaleCodes(customLanguages));
             _ = this.LocaleCodes.Value;
         }
@@ -303,7 +301,7 @@ namespace StardewModdingAPI.Framework
         /// <param name="contentManagerID">The unique name for the content manager which should load this asset.</param>
         /// <param name="relativePath">The asset name within the mod folder.</param>
         /// <returns>Returns whether the asset was parsed successfully.</returns>
-        public bool TryParseManagedAssetKey(string key, out string contentManagerID, out IAssetName relativePath)
+        public bool TryParseManagedAssetKey(string key, [NotNullWhen(true)] out string? contentManagerID, [NotNullWhen(true)] out IAssetName? relativePath)
         {
             contentManagerID = null;
             relativePath = null;
@@ -333,9 +331,10 @@ namespace StardewModdingAPI.Framework
         /// <param name="contentManagerID">The unique name for the content manager which should load this asset.</param>
         /// <param name="assetName">The asset name within the mod folder.</param>
         public bool DoesManagedAssetExist<T>(string contentManagerID, IAssetName assetName)
+            where T : notnull
         {
             // get content manager
-            IContentManager contentManager = this.ContentManagerLock.InReadLock(() =>
+            IContentManager? contentManager = this.ContentManagerLock.InReadLock(() =>
                 this.ContentManagers.FirstOrDefault(p => p.IsNamespaced && p.Name == contentManagerID)
             );
             if (contentManager == null)
@@ -350,9 +349,10 @@ namespace StardewModdingAPI.Framework
         /// <param name="contentManagerID">The unique name for the content manager which should load this asset.</param>
         /// <param name="relativePath">The asset name within the mod folder.</param>
         public T LoadManagedAsset<T>(string contentManagerID, IAssetName relativePath)
+            where T : notnull
         {
             // get content manager
-            IContentManager contentManager = this.ContentManagerLock.InReadLock(() =>
+            IContentManager? contentManager = this.ContentManagerLock.InReadLock(() =>
                 this.ContentManagers.FirstOrDefault(p => p.IsNamespaced && p.Name == contentManagerID)
             );
             if (contentManager == null)
@@ -461,6 +461,7 @@ namespace StardewModdingAPI.Framework
         /// <typeparam name="T">The asset type.</typeparam>
         /// <param name="info">The asset info to load or edit.</param>
         public IEnumerable<AssetOperationGroup> GetAssetOperations<T>(IAssetInfo info)
+            where T : notnull
         {
             return this.AssetOperationsByKey.GetOrSet(
                 info.Name,
@@ -491,7 +492,7 @@ namespace StardewModdingAPI.Framework
         {
             rootPath = PathUtilities.NormalizePath(rootPath);
 
-            if (!this.CaseInsensitivePathCaches.TryGetValue(rootPath, out CaseInsensitivePathCache cache))
+            if (!this.CaseInsensitivePathCaches.TryGetValue(rootPath, out CaseInsensitivePathCache? cache))
                 this.CaseInsensitivePathCaches[rootPath] = cache = new CaseInsensitivePathCache(rootPath);
 
             return cache;
@@ -501,9 +502,9 @@ namespace StardewModdingAPI.Framework
         /// <param name="assetName">The asset path relative to the loader root directory, not including the <c>.xnb</c> extension.</param>
         public TilesheetReference[] GetVanillaTilesheetIds(string assetName)
         {
-            if (!this.VanillaTilesheets.TryGetValue(assetName, out TilesheetReference[] tilesheets))
+            if (!this.VanillaTilesheets.TryGetValue(assetName, out TilesheetReference[]? tilesheets))
             {
-                tilesheets = this.TryLoadVanillaAsset(assetName, out Map map)
+                tilesheets = this.TryLoadVanillaAsset(assetName, out Map? map)
                     ? map.TileSheets.Select((sheet, index) => new TilesheetReference(index, sheet.Id, sheet.ImageSource, sheet.SheetSize, sheet.TileSize)).ToArray()
                     : null;
 
@@ -516,7 +517,7 @@ namespace StardewModdingAPI.Framework
 
         /// <summary>Get the locale code which corresponds to a language enum (e.g. <c>fr-FR</c> given <see cref="LocalizedContentManager.LanguageCode.fr"/>).</summary>
         /// <param name="language">The language enum to search.</param>
-        public string GetLocaleCode(LocalizedContentManager.LanguageCode language)
+        public string? GetLocaleCode(LocalizedContentManager.LanguageCode language)
         {
             if (language == LocalizedContentManager.LanguageCode.mod && LocalizedContentManager.CurrentModLanguage == null)
                 return null;
@@ -535,7 +536,7 @@ namespace StardewModdingAPI.Framework
             foreach (IContentManager contentManager in this.ContentManagers)
                 contentManager.Dispose();
             this.ContentManagers.Clear();
-            this.MainContentManager = null;
+            this.MainContentManager = null!; // instance no longer usable
 
             this.ContentManagerLock.Dispose();
         }
@@ -560,7 +561,8 @@ namespace StardewModdingAPI.Framework
         /// <typeparam name="T">The type of asset to load.</typeparam>
         /// <param name="assetName">The asset path relative to the loader root directory, not including the <c>.xnb</c> extension.</param>
         /// <param name="asset">The loaded asset data.</param>
-        private bool TryLoadVanillaAsset<T>(string assetName, out T asset)
+        private bool TryLoadVanillaAsset<T>(string assetName, [NotNullWhen(true)] out T? asset)
+            where T : notnull
         {
             try
             {
@@ -576,12 +578,12 @@ namespace StardewModdingAPI.Framework
 
         /// <summary>Get the language enums (like <see cref="LocalizedContentManager.LanguageCode.ja"/>) indexed by locale code (like <c>ja-JP</c>).</summary>
         /// <param name="customLanguages">The custom languages to add to the lookup.</param>
-        private Dictionary<string, LocalizedContentManager.LanguageCode> GetLocaleCodes(IEnumerable<ModLanguage> customLanguages)
+        private Dictionary<string, LocalizedContentManager.LanguageCode> GetLocaleCodes(IEnumerable<ModLanguage?> customLanguages)
         {
             var map = new Dictionary<string, LocalizedContentManager.LanguageCode>(StringComparer.OrdinalIgnoreCase);
 
             // custom languages
-            foreach (ModLanguage language in customLanguages)
+            foreach (ModLanguage? language in customLanguages)
             {
                 if (!string.IsNullOrWhiteSpace(language?.LanguageCode))
                     map[language.LanguageCode] = LocalizedContentManager.LanguageCode.mod;
@@ -590,7 +592,7 @@ namespace StardewModdingAPI.Framework
             // vanilla languages (override custom language if they conflict)
             foreach (LocalizedContentManager.LanguageCode code in Enum.GetValues(typeof(LocalizedContentManager.LanguageCode)))
             {
-                string locale = this.GetLocaleCode(code);
+                string? locale = this.GetLocaleCode(code);
                 if (locale != null)
                     map[locale] = code;
             }
@@ -602,6 +604,7 @@ namespace StardewModdingAPI.Framework
         /// <typeparam name="T">The asset type.</typeparam>
         /// <param name="info">The asset info to load or edit.</param>
         private IEnumerable<AssetOperationGroup> GetAssetOperationsWithoutCache<T>(IAssetInfo info)
+            where T : notnull
         {
             IAssetInfo legacyInfo = this.GetLegacyAssetInfo(info);
 
diff --git a/src/SMAPI/Framework/ContentManagers/GameContentManager.cs b/src/SMAPI/Framework/ContentManagers/GameContentManager.cs
index e494559d..6469fea4 100644
--- a/src/SMAPI/Framework/ContentManagers/GameContentManager.cs
+++ b/src/SMAPI/Framework/ContentManagers/GameContentManager.cs
@@ -1,7 +1,6 @@
-#nullable disable
-
 using System;
 using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
 using System.Globalization;
 using System.IO;
 using System.Linq;
@@ -70,7 +69,7 @@ namespace StardewModdingAPI.Framework.ContentManagers
                 return true;
 
             // managed asset
-            if (this.Coordinator.TryParseManagedAssetKey(assetName.Name, out string contentManagerID, out IAssetName relativePath))
+            if (this.Coordinator.TryParseManagedAssetKey(assetName.Name, out string? contentManagerID, out IAssetName? relativePath))
                 return this.Coordinator.DoesManagedAssetExist<T>(contentManagerID, relativePath);
 
             // custom asset from a loader
@@ -78,7 +77,7 @@ namespace StardewModdingAPI.Framework.ContentManagers
             IAssetInfo info = new AssetInfo(locale, assetName, typeof(T), this.AssertAndNormalizeAssetName);
             AssetLoadOperation[] loaders = this.GetLoaders<object>(info).ToArray();
 
-            if (!this.AssertMaxOneRequiredLoader(info, loaders, out string error))
+            if (!this.AssertMaxOneRequiredLoader(info, loaders, out string? error))
             {
                 this.Monitor.Log(error, LogLevel.Warn);
                 return false;
@@ -102,7 +101,7 @@ namespace StardewModdingAPI.Framework.ContentManagers
                 return this.RawLoad<T>(assetName, useCache: true);
 
             // get managed asset
-            if (this.Coordinator.TryParseManagedAssetKey(assetName.Name, out string contentManagerID, out IAssetName relativePath))
+            if (this.Coordinator.TryParseManagedAssetKey(assetName.Name, out string? contentManagerID, out IAssetName? relativePath))
             {
                 T managedAsset = this.Coordinator.LoadManagedAsset<T>(contentManagerID, relativePath);
                 this.TrackAsset(assetName, managedAsset, useCache);
@@ -151,14 +150,15 @@ namespace StardewModdingAPI.Framework.ContentManagers
         /// <summary>Load the initial asset from the registered loaders.</summary>
         /// <param name="info">The basic asset metadata.</param>
         /// <returns>Returns the loaded asset metadata, or <c>null</c> if no loader matched.</returns>
-        private IAssetData ApplyLoader<T>(IAssetInfo info)
+        private IAssetData? ApplyLoader<T>(IAssetInfo info)
+            where T : notnull
         {
             // find matching loader
-            AssetLoadOperation loader;
+            AssetLoadOperation? loader;
             {
                 AssetLoadOperation[] loaders = this.GetLoaders<T>(info).OrderByDescending(p => p.Priority).ToArray();
 
-                if (!this.AssertMaxOneRequiredLoader(info, loaders, out string error))
+                if (!this.AssertMaxOneRequiredLoader(info, loaders, out string? error))
                 {
                     this.Monitor.Log(error, LogLevel.Warn);
                     return null;
@@ -196,20 +196,21 @@ namespace StardewModdingAPI.Framework.ContentManagers
         /// <param name="info">The basic asset metadata.</param>
         /// <param name="asset">The loaded asset.</param>
         private IAssetData ApplyEditors<T>(IAssetInfo info, IAssetData asset)
+            where T : notnull
         {
             IAssetData GetNewData(object data) => new AssetDataForObject(info, data, this.AssertAndNormalizeAssetName, this.Reflection);
 
             // special case: if the asset was loaded with a more general type like 'object', call editors with the actual type instead.
             {
                 Type actualType = asset.Data.GetType();
-                Type actualOpenType = actualType.IsGenericType ? actualType.GetGenericTypeDefinition() : null;
+                Type? actualOpenType = actualType.IsGenericType ? actualType.GetGenericTypeDefinition() : null;
 
                 if (typeof(T) != actualType && (actualOpenType == typeof(Dictionary<,>) || actualOpenType == typeof(List<>) || actualType == typeof(Texture2D) || actualType == typeof(Map)))
                 {
                     return (IAssetData)this.GetType()
                         .GetMethod(nameof(this.ApplyEditors), BindingFlags.NonPublic | BindingFlags.Instance)!
                         .MakeGenericMethod(actualType)
-                        .Invoke(this, new object[] { info, asset });
+                        .Invoke(this, new object[] { info, asset })!;
                 }
             }
 
@@ -232,6 +233,7 @@ namespace StardewModdingAPI.Framework.ContentManagers
                 }
 
                 // validate edit
+                // ReSharper disable once ConditionIsAlwaysTrueOrFalse -- it's only guaranteed non-null after this method
                 if (asset.Data == null)
                 {
                     mod.LogAsMod($"Mod incorrectly set asset '{info.Name}'{this.GetOnBehalfOfLabel(editor.OnBehalfOf)} to a null value; ignoring override.", LogLevel.Warn);
@@ -252,6 +254,7 @@ namespace StardewModdingAPI.Framework.ContentManagers
         /// <typeparam name="T">The asset type.</typeparam>
         /// <param name="info">The basic asset metadata.</param>
         private IEnumerable<AssetLoadOperation> GetLoaders<T>(IAssetInfo info)
+            where T : notnull
         {
             return this.Coordinator
                 .GetAssetOperations<T>(info)
@@ -262,6 +265,7 @@ namespace StardewModdingAPI.Framework.ContentManagers
         /// <typeparam name="T">The asset type.</typeparam>
         /// <param name="info">The basic asset metadata.</param>
         private IEnumerable<AssetEditOperation> GetEditors<T>(IAssetInfo info)
+            where T : notnull
         {
             return this.Coordinator
                 .GetAssetOperations<T>(info)
@@ -273,7 +277,7 @@ namespace StardewModdingAPI.Framework.ContentManagers
         /// <param name="loaders">The asset loaders to apply.</param>
         /// <param name="error">The error message to show to the user, if the method returns false.</param>
         /// <returns>Returns true if only one loader will apply, else false.</returns>
-        private bool AssertMaxOneRequiredLoader(IAssetInfo info, AssetLoadOperation[] loaders, out string error)
+        private bool AssertMaxOneRequiredLoader(IAssetInfo info, AssetLoadOperation[] loaders, [NotNullWhen(false)] out string? error)
         {
             AssetLoadOperation[] required = loaders.Where(p => p.Priority == AssetLoadPriority.Exclusive).ToArray();
             if (required.Length <= 1)
@@ -299,7 +303,8 @@ namespace StardewModdingAPI.Framework.ContentManagers
         /// <param name="onBehalfOf">The content pack on whose behalf the action is being performed.</param>
         /// <param name="parenthetical">whether to format the label as a parenthetical shown after the mod name like <c> (for the 'X' content pack)</c>, instead of a standalone label like <c>the 'X' content pack</c>.</param>
         /// <returns>Returns the on-behalf-of label if applicable, else <c>null</c>.</returns>
-        private string GetOnBehalfOfLabel(IModMetadata onBehalfOf, bool parenthetical = true)
+        [return: NotNullIfNotNull("onBehalfOf")]
+        private string? GetOnBehalfOfLabel(IModMetadata? onBehalfOf, bool parenthetical = true)
         {
             if (onBehalfOf == null)
                 return null;
@@ -315,7 +320,8 @@ namespace StardewModdingAPI.Framework.ContentManagers
         /// <param name="data">The loaded asset data.</param>
         /// <param name="loader">The loader which loaded the asset.</param>
         /// <returns>Returns whether the asset passed validation checks (after any fixes were applied).</returns>
-        private bool TryFixAndValidateLoadedAsset<T>(IAssetInfo info, T data, AssetLoadOperation loader)
+        private bool TryFixAndValidateLoadedAsset<T>(IAssetInfo info, [NotNullWhen(true)] T? data, AssetLoadOperation loader)
+            where T : notnull
         {
             IModMetadata mod = loader.Mod;
 
@@ -335,7 +341,7 @@ namespace StardewModdingAPI.Framework.ContentManagers
                     // add missing tilesheet
                     if (loadedMap.GetTileSheet(vanillaSheet.Id) == null)
                     {
-                        mod.Monitor.LogOnce("SMAPI fixed maps loaded by this mod to prevent errors. See the log file for details.", LogLevel.Warn);
+                        mod.Monitor!.LogOnce("SMAPI fixed maps loaded by this mod to prevent errors. See the log file for details.", LogLevel.Warn);
                         this.Monitor.Log($"Fixed broken map replacement: {mod.DisplayName} loaded '{info.Name}' without a required tilesheet (id: {vanillaSheet.Id}, source: {vanillaSheet.ImageSource}).");
 
                         loadedMap.AddTileSheet(new TileSheet(vanillaSheet.Id, loadedMap, vanillaSheet.ImageSource, vanillaSheet.SheetSize, vanillaSheet.TileSize));
diff --git a/src/SMAPI/Framework/ContentManagers/GameContentManagerForAssetPropagation.cs b/src/SMAPI/Framework/ContentManagers/GameContentManagerForAssetPropagation.cs
index 46d5d24e..1b0e1016 100644
--- a/src/SMAPI/Framework/ContentManagers/GameContentManagerForAssetPropagation.cs
+++ b/src/SMAPI/Framework/ContentManagers/GameContentManagerForAssetPropagation.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 using System;
 using System.Globalization;
 using Microsoft.Xna.Framework.Graphics;
@@ -39,7 +37,7 @@ namespace StardewModdingAPI.Framework.ContentManagers
 
         /// <summary>Get whether a texture was loaded by this content manager.</summary>
         /// <param name="texture">The texture to check.</param>
-        public bool IsResponsibleFor(Texture2D texture)
+        public bool IsResponsibleFor(Texture2D? texture)
         {
             return
                 texture?.Tag is string tag
diff --git a/src/SMAPI/Framework/ContentManagers/IContentManager.cs b/src/SMAPI/Framework/ContentManagers/IContentManager.cs
index c8b2ae64..ac67cad5 100644
--- a/src/SMAPI/Framework/ContentManagers/IContentManager.cs
+++ b/src/SMAPI/Framework/ContentManagers/IContentManager.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 using System;
 using System.Collections.Generic;
 using Microsoft.Xna.Framework.Content;
@@ -33,25 +31,28 @@ namespace StardewModdingAPI.Framework.ContentManagers
         /// <summary>Get whether an asset exists and can be loaded.</summary>
         /// <typeparam name="T">The expected asset type.</typeparam>
         /// <param name="assetName">The normalized asset name.</param>
-        bool DoesAssetExist<T>(IAssetName assetName);
+        bool DoesAssetExist<T>(IAssetName assetName)
+            where T: notnull;
 
         /// <summary>Load an asset through the content pipeline, using a localized variant of the <paramref name="assetName"/> if available.</summary>
         /// <typeparam name="T">The type of asset to load.</typeparam>
         /// <param name="assetName">The asset name relative to the loader root directory.</param>
         /// <param name="language">The language for which to load the asset.</param>
         /// <param name="useCache">Whether to read/write the loaded asset to the asset cache.</param>
-        T LoadLocalized<T>(IAssetName assetName, LocalizedContentManager.LanguageCode language, bool useCache);
+        T LoadLocalized<T>(IAssetName assetName, LocalizedContentManager.LanguageCode language, bool useCache)
+            where T : notnull;
 
         /// <summary>Load an asset through the content pipeline, using the exact asset name without checking for localized variants.</summary>
         /// <typeparam name="T">The type of asset to load.</typeparam>
         /// <param name="assetName">The asset name relative to the loader root directory.</param>
         /// <param name="useCache">Whether to read/write the loaded asset to the asset cache.</param>
-        T LoadExact<T>(IAssetName assetName, bool useCache);
+        T LoadExact<T>(IAssetName assetName, bool useCache)
+            where T : notnull;
 
         /// <summary>Assert that the given key has a valid format and return a normalized form consistent with the underlying cache.</summary>
         /// <param name="assetName">The asset key to check.</param>
         /// <exception cref="SContentLoadException">The asset key is empty or contains invalid characters.</exception>
-        string AssertAndNormalizeAssetName(string assetName);
+        string AssertAndNormalizeAssetName(string? assetName);
 
         /// <summary>Get the current content locale.</summary>
         string GetLocale();
diff --git a/src/SMAPI/Framework/ContentPack.cs b/src/SMAPI/Framework/ContentPack.cs
index 2d33a22e..2cfd5cce 100644
--- a/src/SMAPI/Framework/ContentPack.cs
+++ b/src/SMAPI/Framework/ContentPack.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 using System;
 using System.IO;
 using StardewModdingAPI.Framework.ModHelpers;
@@ -69,12 +67,12 @@ namespace StardewModdingAPI.Framework
         }
 
         /// <inheritdoc />
-        public TModel ReadJsonFile<TModel>(string path) where TModel : class
+        public TModel? ReadJsonFile<TModel>(string path) where TModel : class
         {
             path = PathUtilities.NormalizePath(path);
 
             FileInfo file = this.GetFile(path);
-            return file.Exists && this.JsonHelper.ReadJsonFileIfExists(file.FullName, out TModel model)
+            return file.Exists && this.JsonHelper.ReadJsonFileIfExists(file.FullName, out TModel? model)
                 ? model
                 : null;
         }
@@ -93,6 +91,7 @@ namespace StardewModdingAPI.Framework
         /// <inheritdoc />
         [Obsolete]
         public T LoadAsset<T>(string key)
+            where T : notnull
         {
             return this.ModContent.Load<T>(key);
         }
@@ -101,7 +100,7 @@ namespace StardewModdingAPI.Framework
         [Obsolete]
         public string GetActualAssetKey(string key)
         {
-            return this.ModContent.GetInternalAssetName(key)?.Name;
+            return this.ModContent.GetInternalAssetName(key).Name;
         }
 
 
diff --git a/src/SMAPI/Framework/CursorPosition.cs b/src/SMAPI/Framework/CursorPosition.cs
index 8f36a554..24084830 100644
--- a/src/SMAPI/Framework/CursorPosition.cs
+++ b/src/SMAPI/Framework/CursorPosition.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 using Microsoft.Xna.Framework;
 using StardewValley;
 
@@ -41,7 +39,7 @@ namespace StardewModdingAPI.Framework
         }
 
         /// <inheritdoc />
-        public bool Equals(ICursorPosition other)
+        public bool Equals(ICursorPosition? other)
         {
             return other != null && this.AbsolutePixels == other.AbsolutePixels;
         }
diff --git a/src/SMAPI/Framework/Events/ManagedEvent.cs b/src/SMAPI/Framework/Events/ManagedEvent.cs
index 8fa31165..4b8a770d 100644
--- a/src/SMAPI/Framework/Events/ManagedEvent.cs
+++ b/src/SMAPI/Framework/Events/ManagedEvent.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -23,7 +21,7 @@ namespace StardewModdingAPI.Framework.Events
         private readonly List<ManagedEventHandler<TEventArgs>> Handlers = new();
 
         /// <summary>A cached snapshot of <see cref="Handlers"/>, or <c>null</c> to rebuild it next raise.</summary>
-        private ManagedEventHandler<TEventArgs>[] CachedHandlers = Array.Empty<ManagedEventHandler<TEventArgs>>();
+        private ManagedEventHandler<TEventArgs>[]? CachedHandlers = Array.Empty<ManagedEventHandler<TEventArgs>>();
 
         /// <summary>The total number of event handlers registered for this events, regardless of whether they're still registered.</summary>
         private int RegistrationIndex;
@@ -100,7 +98,7 @@ namespace StardewModdingAPI.Framework.Events
         /// <summary>Raise the event and notify all handlers.</summary>
         /// <param name="args">The event arguments to pass.</param>
         /// <param name="match">A lambda which returns true if the event should be raised for the given mod.</param>
-        public void Raise(TEventArgs args, Func<IModMetadata, bool> match = null)
+        public void Raise(TEventArgs args, Func<IModMetadata, bool>? match = null)
         {
             this.Raise((_, invoke) => invoke(args), match);
         }
@@ -108,7 +106,7 @@ namespace StardewModdingAPI.Framework.Events
         /// <summary>Raise the event and notify all handlers.</summary>
         /// <param name="invoke">Invoke an event handler. This receives the mod which registered the handler, and should invoke the callback with the event arguments to pass it.</param>
         /// <param name="match">A lambda which returns true if the event should be raised for the given mod.</param>
-        public void Raise(Action<IModMetadata, Action<TEventArgs>> invoke, Func<IModMetadata, bool> match = null)
+        public void Raise(Action<IModMetadata, Action<TEventArgs>> invoke, Func<IModMetadata, bool>? match = null)
         {
             // skip if no handlers
             if (this.Handlers.Count == 0)
diff --git a/src/SMAPI/Framework/Events/ManagedEventHandler.cs b/src/SMAPI/Framework/Events/ManagedEventHandler.cs
index f31bc04d..d32acdb9 100644
--- a/src/SMAPI/Framework/Events/ManagedEventHandler.cs
+++ b/src/SMAPI/Framework/Events/ManagedEventHandler.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 using System;
 using StardewModdingAPI.Events;
 
@@ -42,7 +40,7 @@ namespace StardewModdingAPI.Framework.Events
         }
 
         /// <inheritdoc />
-        public int CompareTo(object obj)
+        public int CompareTo(object? obj)
         {
             if (obj is not ManagedEventHandler<TEventArgs> other)
                 throw new ArgumentException("Can't compare to an unrelated object type.");
diff --git a/src/SMAPI/Framework/Exceptions/SContentLoadException.cs b/src/SMAPI/Framework/Exceptions/SContentLoadException.cs
index c21a6b0e..be1fe748 100644
--- a/src/SMAPI/Framework/Exceptions/SContentLoadException.cs
+++ b/src/SMAPI/Framework/Exceptions/SContentLoadException.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 using System;
 using Microsoft.Xna.Framework.Content;
 
@@ -14,7 +12,7 @@ namespace StardewModdingAPI.Framework.Exceptions
         /// <summary>Construct an instance.</summary>
         /// <param name="message">The error message.</param>
         /// <param name="ex">The underlying exception, if any.</param>
-        public SContentLoadException(string message, Exception ex = null)
+        public SContentLoadException(string message, Exception? ex = null)
             : base(message, ex) { }
     }
 }
diff --git a/src/SMAPI/Framework/GameVersion.cs b/src/SMAPI/Framework/GameVersion.cs
index aa91d8f3..542c1345 100644
--- a/src/SMAPI/Framework/GameVersion.cs
+++ b/src/SMAPI/Framework/GameVersion.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 using System;
 using System.Collections.Generic;
 
@@ -55,7 +53,7 @@ namespace StardewModdingAPI.Framework
         private static string GetSemanticVersionString(string gameVersion)
         {
             // mapped version
-            return GameVersion.VersionMap.TryGetValue(gameVersion, out string semanticVersion)
+            return GameVersion.VersionMap.TryGetValue(gameVersion, out string? semanticVersion)
                 ? semanticVersion
                 : gameVersion;
         }
@@ -64,10 +62,10 @@ namespace StardewModdingAPI.Framework
         /// <param name="semanticVersion">The semantic version string.</param>
         private static string GetGameVersionString(string semanticVersion)
         {
-            foreach (var mapping in GameVersion.VersionMap)
+            foreach ((string gameVersion, string equivalentSemanticVersion) in GameVersion.VersionMap)
             {
-                if (mapping.Value.Equals(semanticVersion, StringComparison.OrdinalIgnoreCase))
-                    return mapping.Key;
+                if (equivalentSemanticVersion.Equals(semanticVersion, StringComparison.OrdinalIgnoreCase))
+                    return gameVersion;
             }
 
             return semanticVersion;
diff --git a/src/SMAPI/Framework/IModMetadata.cs b/src/SMAPI/Framework/IModMetadata.cs
index 800b198a..7cee20b9 100644
--- a/src/SMAPI/Framework/IModMetadata.cs
+++ b/src/SMAPI/Framework/IModMetadata.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 using System;
 using System.Collections.Generic;
 using StardewModdingAPI.Framework.ModHelpers;
@@ -29,7 +27,7 @@ namespace StardewModdingAPI.Framework
         string RelativeDirectoryPath { get; }
 
         /// <summary>Metadata about the mod from SMAPI's internal data (if any).</summary>
-        ModDataRecordVersionedFields DataRecord { get; }
+        ModDataRecordVersionedFields? DataRecord { get; }
 
         /// <summary>The metadata resolution status.</summary>
         ModMetadataStatus Status { get; }
@@ -41,31 +39,31 @@ namespace StardewModdingAPI.Framework
         ModWarning Warnings { get; }
 
         /// <summary>The reason the metadata is invalid, if any.</summary>
-        string Error { get; }
+        string? Error { get; }
 
         /// <summary>A detailed technical message for <see cref="Error"/>, if any.</summary>
-        public string ErrorDetails { get; }
+        string? ErrorDetails { get; }
 
         /// <summary>Whether the mod folder should be ignored. This is <c>true</c> if it was found within a folder whose name starts with a dot.</summary>
         bool IsIgnored { get; }
 
         /// <summary>The mod instance (if loaded and <see cref="IModInfo.IsContentPack"/> is false).</summary>
-        IMod Mod { get; }
+        IMod? Mod { get; }
 
         /// <summary>The content pack instance (if loaded and <see cref="IModInfo.IsContentPack"/> is true).</summary>
-        IContentPack ContentPack { get; }
+        IContentPack? ContentPack { get; }
 
         /// <summary>The translations for this mod (if loaded).</summary>
-        TranslationHelper Translations { get; }
+        TranslationHelper? Translations { get; }
 
         /// <summary>Writes messages to the console and log file as this mod.</summary>
-        IMonitor Monitor { get; }
+        IMonitor? Monitor { get; }
 
         /// <summary>The mod-provided API (if any).</summary>
-        object Api { get; }
+        object? Api { get; }
 
         /// <summary>The update-check metadata for this mod (if any).</summary>
-        ModEntryModel UpdateCheckData { get; }
+        ModEntryModel? UpdateCheckData { get; }
 
         /// <summary>The fake content packs created by this mod, if any.</summary>
         ISet<WeakReference<ContentPack>> FakeContentPacks { get; }
@@ -84,7 +82,7 @@ namespace StardewModdingAPI.Framework
         /// <param name="error">The reason the metadata is invalid, if any.</param>
         /// <param name="errorDetails">A detailed technical message, if any.</param>
         /// <returns>Return the instance for chaining.</returns>
-        IModMetadata SetStatus(ModMetadataStatus status, ModFailReason reason, string error, string errorDetails = null);
+        IModMetadata SetStatus(ModMetadataStatus status, ModFailReason reason, string? error, string? errorDetails = null);
 
         /// <summary>Set a warning flag for the mod.</summary>
         /// <param name="warning">The warning to set.</param>
@@ -103,7 +101,7 @@ namespace StardewModdingAPI.Framework
 
         /// <summary>Set the mod-provided API instance.</summary>
         /// <param name="api">The mod-provided API.</param>
-        IModMetadata SetApi(object api);
+        IModMetadata SetApi(object? api);
 
         /// <summary>Set the update-check metadata for this mod.</summary>
         /// <param name="data">The update-check metadata.</param>
@@ -117,7 +115,7 @@ namespace StardewModdingAPI.Framework
 
         /// <summary>Whether the mod has the given ID.</summary>
         /// <param name="id">The mod ID to check.</param>
-        bool HasID(string id);
+        bool HasID(string? id);
 
         /// <summary>Get the defined update keys.</summary>
         /// <param name="validOnly">Only return valid update keys.</param>
diff --git a/src/SMAPI/Framework/Logging/LogFileManager.cs b/src/SMAPI/Framework/Logging/LogFileManager.cs
index 0b6f9ad2..b396091a 100644
--- a/src/SMAPI/Framework/Logging/LogFileManager.cs
+++ b/src/SMAPI/Framework/Logging/LogFileManager.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 using System;
 using System.IO;
 
@@ -32,7 +30,7 @@ namespace StardewModdingAPI.Framework.Logging
             this.Path = path;
 
             // create log directory if needed
-            string logDir = System.IO.Path.GetDirectoryName(path);
+            string? logDir = System.IO.Path.GetDirectoryName(path);
             if (logDir == null)
                 throw new ArgumentException($"The log path '{path}' is not valid.");
             Directory.CreateDirectory(logDir);
diff --git a/src/SMAPI/Framework/ModHelpers/ContentHelper.cs b/src/SMAPI/Framework/ModHelpers/ContentHelper.cs
index 12ef0439..b610b395 100644
--- a/src/SMAPI/Framework/ModHelpers/ContentHelper.cs
+++ b/src/SMAPI/Framework/ModHelpers/ContentHelper.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
@@ -114,6 +112,7 @@ namespace StardewModdingAPI.Framework.ModHelpers
 
         /// <inheritdoc />
         public T Load<T>(string key, ContentSource source = ContentSource.ModFolder)
+            where T : notnull
         {
             IAssetName assetName = this.ContentCore.ParseAssetName(key, allowLocales: source == ContentSource.GameContent);
 
@@ -140,7 +139,7 @@ namespace StardewModdingAPI.Framework.ModHelpers
 
         /// <inheritdoc />
         [Pure]
-        public string NormalizeAssetName(string assetName)
+        public string NormalizeAssetName(string? assetName)
         {
             return this.ModContentManager.AssertAndNormalizeAssetName(assetName);
         }
@@ -171,6 +170,7 @@ namespace StardewModdingAPI.Framework.ModHelpers
 
         /// <inheritdoc />
         public bool InvalidateCache<T>()
+            where T : notnull
         {
             this.Monitor.Log($"Requested cache invalidation for all assets of type {typeof(T)}. This is an expensive operation and should be avoided if possible.");
             return this.ContentCore.InvalidateCache((_, _, type) => typeof(T).IsAssignableFrom(type)).Any();
@@ -184,7 +184,8 @@ namespace StardewModdingAPI.Framework.ModHelpers
         }
 
         /// <inheritdoc />
-        public IAssetData GetPatchHelper<T>(T data, string assetName = null)
+        public IAssetData GetPatchHelper<T>(T data, string? assetName = null)
+            where T : notnull
         {
             if (data == null)
                 throw new ArgumentNullException(nameof(data), "Can't get a patch helper for a null value.");
diff --git a/src/SMAPI/Framework/ModHelpers/DataHelper.cs b/src/SMAPI/Framework/ModHelpers/DataHelper.cs
index 86a34ee8..92b3b398 100644
--- a/src/SMAPI/Framework/ModHelpers/DataHelper.cs
+++ b/src/SMAPI/Framework/ModHelpers/DataHelper.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 using System;
 using System.Collections.Generic;
 using System.IO;
@@ -42,19 +40,21 @@ namespace StardewModdingAPI.Framework.ModHelpers
         ** JSON file
         ****/
         /// <inheritdoc />
-        public TModel ReadJsonFile<TModel>(string path) where TModel : class
+        public TModel? ReadJsonFile<TModel>(string path)
+            where TModel : class
         {
             if (!PathUtilities.IsSafeRelativePath(path))
                 throw new InvalidOperationException($"You must call {nameof(IModHelper.Data)}.{nameof(this.ReadJsonFile)} with a relative path.");
 
             path = Path.Combine(this.ModFolderPath, PathUtilities.NormalizePath(path));
-            return this.JsonHelper.ReadJsonFileIfExists(path, out TModel data)
+            return this.JsonHelper.ReadJsonFileIfExists(path, out TModel? data)
                 ? data
                 : null;
         }
 
         /// <inheritdoc />
-        public void WriteJsonFile<TModel>(string path, TModel data) where TModel : class
+        public void WriteJsonFile<TModel>(string path, TModel? data)
+            where TModel : class
         {
             if (!PathUtilities.IsSafeRelativePath(path))
                 throw new InvalidOperationException($"You must call {nameof(IMod.Helper)}.{nameof(IModHelper.Data)}.{nameof(this.WriteJsonFile)} with a relative path (without directory climbing).");
@@ -71,7 +71,8 @@ namespace StardewModdingAPI.Framework.ModHelpers
         ** Save file
         ****/
         /// <inheritdoc />
-        public TModel ReadSaveData<TModel>(string key) where TModel : class
+        public TModel? ReadSaveData<TModel>(string key)
+            where TModel : class
         {
             if (Context.LoadStage == LoadStage.None)
                 throw new InvalidOperationException($"Can't use {nameof(IMod.Helper)}.{nameof(IModHelper.Data)}.{nameof(this.ReadSaveData)} when a save file isn't loaded.");
@@ -82,14 +83,15 @@ namespace StardewModdingAPI.Framework.ModHelpers
             string internalKey = this.GetSaveFileKey(key);
             foreach (IDictionary<string, string> dataField in this.GetDataFields(Context.LoadStage))
             {
-                if (dataField.TryGetValue(internalKey, out string value))
+                if (dataField.TryGetValue(internalKey, out string? value))
                     return this.JsonHelper.Deserialize<TModel>(value);
             }
             return null;
         }
 
         /// <inheritdoc />
-        public void WriteSaveData<TModel>(string key, TModel model) where TModel : class
+        public void WriteSaveData<TModel>(string key, TModel? model)
+            where TModel : class
         {
             if (Context.LoadStage == LoadStage.None)
                 throw new InvalidOperationException($"Can't use {nameof(IMod.Helper)}.{nameof(IModHelper.Data)}.{nameof(this.WriteSaveData)} when a save file isn't loaded.");
@@ -97,7 +99,7 @@ namespace StardewModdingAPI.Framework.ModHelpers
                 throw new InvalidOperationException($"Can't use {nameof(IMod.Helper)}.{nameof(IModHelper.Data)}.{nameof(this.WriteSaveData)} when connected to a remote host. (Save files are stored on the main player's computer.)");
 
             string internalKey = this.GetSaveFileKey(key);
-            string data = model != null
+            string? data = model != null
                 ? this.JsonHelper.Serialize(model, Formatting.None)
                 : null;
 
@@ -114,16 +116,18 @@ namespace StardewModdingAPI.Framework.ModHelpers
         ** Global app data
         ****/
         /// <inheritdoc />
-        public TModel ReadGlobalData<TModel>(string key) where TModel : class
+        public TModel? ReadGlobalData<TModel>(string key)
+            where TModel : class
         {
             string path = this.GetGlobalDataPath(key);
-            return this.JsonHelper.ReadJsonFileIfExists(path, out TModel data)
+            return this.JsonHelper.ReadJsonFileIfExists(path, out TModel? data)
                 ? data
                 : null;
         }
 
         /// <inheritdoc />
-        public void WriteGlobalData<TModel>(string key, TModel data) where TModel : class
+        public void WriteGlobalData<TModel>(string key, TModel? data)
+            where TModel : class
         {
             string path = this.GetGlobalDataPath(key);
             if (data != null)
diff --git a/src/SMAPI/Framework/ModHelpers/GameContentHelper.cs b/src/SMAPI/Framework/ModHelpers/GameContentHelper.cs
index 6d0c2f5f..4c1cde02 100644
--- a/src/SMAPI/Framework/ModHelpers/GameContentHelper.cs
+++ b/src/SMAPI/Framework/ModHelpers/GameContentHelper.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 using System;
 using System.Linq;
 using StardewModdingAPI.Framework.Content;
@@ -71,6 +69,7 @@ namespace StardewModdingAPI.Framework.ModHelpers
 
         /// <inheritdoc />
         public T Load<T>(string key)
+            where T : notnull
         {
             IAssetName assetName = this.ContentCore.ParseAssetName(key, allowLocales: true);
             return this.Load<T>(assetName);
@@ -78,6 +77,7 @@ namespace StardewModdingAPI.Framework.ModHelpers
 
         /// <inheritdoc />
         public T Load<T>(IAssetName assetName)
+            where T : notnull
         {
             try
             {
@@ -105,6 +105,7 @@ namespace StardewModdingAPI.Framework.ModHelpers
 
         /// <inheritdoc />
         public bool InvalidateCache<T>()
+            where T : notnull
         {
             this.Monitor.Log($"Requested cache invalidation for all assets of type {typeof(T)}. This is an expensive operation and should be avoided if possible.");
             return this.ContentCore.InvalidateCache((_, _, type) => typeof(T).IsAssignableFrom(type)).Any();
@@ -118,7 +119,8 @@ namespace StardewModdingAPI.Framework.ModHelpers
         }
 
         /// <inheritdoc />
-        public IAssetData GetPatchHelper<T>(T data, string assetName = null)
+        public IAssetData GetPatchHelper<T>(T data, string? assetName = null)
+            where T : notnull
         {
             if (data == null)
                 throw new ArgumentNullException(nameof(data), "Can't get a patch helper for a null value.");
diff --git a/src/SMAPI/Framework/ModHelpers/ModContentHelper.cs b/src/SMAPI/Framework/ModHelpers/ModContentHelper.cs
index b149ed82..fc47f269 100644
--- a/src/SMAPI/Framework/ModHelpers/ModContentHelper.cs
+++ b/src/SMAPI/Framework/ModHelpers/ModContentHelper.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 using System;
 using Microsoft.Xna.Framework.Content;
 using StardewModdingAPI.Framework.Content;
@@ -57,6 +55,7 @@ namespace StardewModdingAPI.Framework.ModHelpers
 
         /// <inheritdoc />
         public T Load<T>(string relativePath)
+            where T : notnull
         {
             relativePath = this.RelativePathCache.GetAssetName(relativePath);
 
@@ -80,7 +79,8 @@ namespace StardewModdingAPI.Framework.ModHelpers
         }
 
         /// <inheritdoc />
-        public IAssetData GetPatchHelper<T>(T data, string relativePath = null)
+        public IAssetData GetPatchHelper<T>(T data, string? relativePath = null)
+            where T : notnull
         {
             if (data == null)
                 throw new ArgumentNullException(nameof(data), "Can't get a patch helper for a null value.");
diff --git a/src/SMAPI/Framework/ModHelpers/ModRegistryHelper.cs b/src/SMAPI/Framework/ModHelpers/ModRegistryHelper.cs
index e277e6fa..84899610 100644
--- a/src/SMAPI/Framework/ModHelpers/ModRegistryHelper.cs
+++ b/src/SMAPI/Framework/ModHelpers/ModRegistryHelper.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 using System.Collections.Generic;
 using StardewModdingAPI.Framework.Reflection;
 
@@ -47,7 +45,7 @@ namespace StardewModdingAPI.Framework.ModHelpers
         }
 
         /// <inheritdoc />
-        public IModInfo Get(string uniqueID)
+        public IModInfo? Get(string uniqueID)
         {
             return this.Registry.Get(uniqueID);
         }
@@ -59,7 +57,7 @@ namespace StardewModdingAPI.Framework.ModHelpers
         }
 
         /// <inheritdoc />
-        public object GetApi(string uniqueID)
+        public object? GetApi(string uniqueID)
         {
             // validate ready
             if (!this.Registry.AreAllModsInitialized)
@@ -69,17 +67,18 @@ namespace StardewModdingAPI.Framework.ModHelpers
             }
 
             // get raw API
-            IModMetadata mod = this.Registry.Get(uniqueID);
+            IModMetadata? mod = this.Registry.Get(uniqueID);
             if (mod?.Api != null && this.AccessedModApis.Add(mod.Manifest.UniqueID))
                 this.Monitor.Log($"Accessed mod-provided API for {mod.DisplayName}.");
             return mod?.Api;
         }
 
         /// <inheritdoc />
-        public TInterface GetApi<TInterface>(string uniqueID) where TInterface : class
+        public TInterface? GetApi<TInterface>(string uniqueID)
+            where TInterface : class
         {
             // get raw API
-            object api = this.GetApi(uniqueID);
+            object? api = this.GetApi(uniqueID);
             if (api == null)
                 return null;
 
diff --git a/src/SMAPI/Framework/ModHelpers/MultiplayerHelper.cs b/src/SMAPI/Framework/ModHelpers/MultiplayerHelper.cs
index 96b074e2..a419327e 100644
--- a/src/SMAPI/Framework/ModHelpers/MultiplayerHelper.cs
+++ b/src/SMAPI/Framework/ModHelpers/MultiplayerHelper.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 using System.Collections.Generic;
 using StardewModdingAPI.Framework.Networking;
 using StardewValley;
@@ -41,9 +39,9 @@ namespace StardewModdingAPI.Framework.ModHelpers
         }
 
         /// <inheritdoc />
-        public IMultiplayerPeer GetConnectedPlayer(long id)
+        public IMultiplayerPeer? GetConnectedPlayer(long id)
         {
-            return this.Multiplayer.Peers.TryGetValue(id, out MultiplayerPeer peer)
+            return this.Multiplayer.Peers.TryGetValue(id, out MultiplayerPeer? peer)
                 ? peer
                 : null;
         }
@@ -55,7 +53,7 @@ namespace StardewModdingAPI.Framework.ModHelpers
         }
 
         /// <inheritdoc />
-        public void SendMessage<TMessage>(TMessage message, string messageType, string[] modIDs = null, long[] playerIDs = null)
+        public void SendMessage<TMessage>(TMessage message, string messageType, string[]? modIDs = null, long[]? playerIDs = null)
         {
             this.Multiplayer.BroadcastModMessage(
                 message: message,
diff --git a/src/SMAPI/Framework/ModHelpers/ReflectionHelper.cs b/src/SMAPI/Framework/ModHelpers/ReflectionHelper.cs
index 24cbd01c..af018c87 100644
--- a/src/SMAPI/Framework/ModHelpers/ReflectionHelper.cs
+++ b/src/SMAPI/Framework/ModHelpers/ReflectionHelper.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 using System;
 using System.Reflection;
 using StardewModdingAPI.Framework.Reflection;
@@ -39,7 +37,7 @@ namespace StardewModdingAPI.Framework.ModHelpers
         {
             return this.AssertAccessAllowed(
                 this.Reflector.GetField<TValue>(obj, name, required)
-            );
+            )!;
         }
 
         /// <inheritdoc />
@@ -47,7 +45,7 @@ namespace StardewModdingAPI.Framework.ModHelpers
         {
             return this.AssertAccessAllowed(
                 this.Reflector.GetField<TValue>(type, name, required)
-            );
+            )!;
         }
 
         /// <inheritdoc />
@@ -55,7 +53,7 @@ namespace StardewModdingAPI.Framework.ModHelpers
         {
             return this.AssertAccessAllowed(
                 this.Reflector.GetProperty<TValue>(obj, name, required)
-            );
+            )!;
         }
 
         /// <inheritdoc />
@@ -63,7 +61,7 @@ namespace StardewModdingAPI.Framework.ModHelpers
         {
             return this.AssertAccessAllowed(
                 this.Reflector.GetProperty<TValue>(type, name, required)
-            );
+            )!;
         }
 
         /// <inheritdoc />
@@ -71,7 +69,7 @@ namespace StardewModdingAPI.Framework.ModHelpers
         {
             return this.AssertAccessAllowed(
                 this.Reflector.GetMethod(obj, name, required)
-            );
+            )!;
         }
 
         /// <inheritdoc />
@@ -79,7 +77,7 @@ namespace StardewModdingAPI.Framework.ModHelpers
         {
             return this.AssertAccessAllowed(
                 this.Reflector.GetMethod(type, name, required)
-            );
+            )!;
         }
 
 
@@ -90,7 +88,7 @@ namespace StardewModdingAPI.Framework.ModHelpers
         /// <typeparam name="T">The field value type.</typeparam>
         /// <param name="field">The field being accessed.</param>
         /// <returns>Returns the same field instance for convenience.</returns>
-        private IReflectedField<T> AssertAccessAllowed<T>(IReflectedField<T> field)
+        private IReflectedField<T>? AssertAccessAllowed<T>(IReflectedField<T>? field)
         {
             this.AssertAccessAllowed(field?.FieldInfo);
             return field;
@@ -100,7 +98,7 @@ namespace StardewModdingAPI.Framework.ModHelpers
         /// <typeparam name="T">The property value type.</typeparam>
         /// <param name="property">The property being accessed.</param>
         /// <returns>Returns the same property instance for convenience.</returns>
-        private IReflectedProperty<T> AssertAccessAllowed<T>(IReflectedProperty<T> property)
+        private IReflectedProperty<T>? AssertAccessAllowed<T>(IReflectedProperty<T>? property)
         {
             this.AssertAccessAllowed(property?.PropertyInfo.GetMethod?.GetBaseDefinition());
             this.AssertAccessAllowed(property?.PropertyInfo.SetMethod?.GetBaseDefinition());
@@ -110,7 +108,7 @@ namespace StardewModdingAPI.Framework.ModHelpers
         /// <summary>Assert that mods can use the reflection helper to access the given member.</summary>
         /// <param name="method">The method being accessed.</param>
         /// <returns>Returns the same method instance for convenience.</returns>
-        private IReflectedMethod AssertAccessAllowed(IReflectedMethod method)
+        private IReflectedMethod? AssertAccessAllowed(IReflectedMethod? method)
         {
             this.AssertAccessAllowed(method?.MethodInfo.GetBaseDefinition());
             return method;
@@ -118,18 +116,18 @@ namespace StardewModdingAPI.Framework.ModHelpers
 
         /// <summary>Assert that mods can use the reflection helper to access the given member.</summary>
         /// <param name="member">The member being accessed.</param>
-        private void AssertAccessAllowed(MemberInfo member)
+        private void AssertAccessAllowed(MemberInfo? member)
         {
             if (member == null)
                 return;
 
             // get type which defines the member
-            Type declaringType = member.DeclaringType;
+            Type? declaringType = member.DeclaringType;
             if (declaringType == null)
                 throw new InvalidOperationException($"Can't validate access to {member.MemberType} {member.Name} because it has no declaring type."); // should never happen
 
             // validate access
-            string rootNamespace = typeof(Program).Namespace;
+            string? rootNamespace = typeof(Program).Namespace;
             if (declaringType.Namespace == rootNamespace || declaringType.Namespace?.StartsWith(rootNamespace + ".") == true)
                 throw new InvalidOperationException($"SMAPI blocked access by {this.ModName} to its internals through the reflection API. Accessing the SMAPI internals is strongly discouraged since they're subject to change, which means the mod can break without warning. (Detected access to {declaringType.FullName}.{member.Name}.)");
         }
diff --git a/src/SMAPI/Framework/ModLoading/AssemblyDefinitionResolver.cs b/src/SMAPI/Framework/ModLoading/AssemblyDefinitionResolver.cs
index 1d4ddf72..b3378ad1 100644
--- a/src/SMAPI/Framework/ModLoading/AssemblyDefinitionResolver.cs
+++ b/src/SMAPI/Framework/ModLoading/AssemblyDefinitionResolver.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 using System.Collections.Generic;
 using Mono.Cecil;
 
@@ -38,6 +36,7 @@ namespace StardewModdingAPI.Framework.ModLoading
 
         /// <summary>Resolve an assembly reference.</summary>
         /// <param name="name">The assembly name.</param>
+        /// <exception cref="AssemblyResolutionException">The assembly can't be resolved.</exception>
         public override AssemblyDefinition Resolve(AssemblyNameReference name)
         {
             return this.ResolveName(name.Name) ?? base.Resolve(name);
@@ -46,6 +45,7 @@ namespace StardewModdingAPI.Framework.ModLoading
         /// <summary>Resolve an assembly reference.</summary>
         /// <param name="name">The assembly name.</param>
         /// <param name="parameters">The assembly reader parameters.</param>
+        /// <exception cref="AssemblyResolutionException">The assembly can't be resolved.</exception>
         public override AssemblyDefinition Resolve(AssemblyNameReference name, ReaderParameters parameters)
         {
             return this.ResolveName(name.Name) ?? base.Resolve(name, parameters);
@@ -57,9 +57,9 @@ namespace StardewModdingAPI.Framework.ModLoading
         *********/
         /// <summary>Resolve a known assembly definition based on its short or full name.</summary>
         /// <param name="name">The assembly's short or full name.</param>
-        private AssemblyDefinition ResolveName(string name)
+        private AssemblyDefinition? ResolveName(string name)
         {
-            return this.Lookup.TryGetValue(name, out AssemblyDefinition match)
+            return this.Lookup.TryGetValue(name, out AssemblyDefinition? match)
                 ? match
                 : null;
         }
diff --git a/src/SMAPI/Framework/ModLoading/Finders/EventFinder.cs b/src/SMAPI/Framework/ModLoading/Finders/EventFinder.cs
index 7c94beb7..f5d449c5 100644
--- a/src/SMAPI/Framework/ModLoading/Finders/EventFinder.cs
+++ b/src/SMAPI/Framework/ModLoading/Finders/EventFinder.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 using System.Collections.Generic;
 using System.Linq;
 using Mono.Cecil;
@@ -57,7 +55,7 @@ namespace StardewModdingAPI.Framework.ModLoading.Finders
         {
             if (this.MethodNames.Any())
             {
-                MethodReference methodRef = RewriteHelper.AsMethodReference(instruction);
+                MethodReference? methodRef = RewriteHelper.AsMethodReference(instruction);
                 if (methodRef != null && methodRef.DeclaringType.FullName == this.FullTypeName && this.MethodNames.Contains(methodRef.Name))
                 {
                     string eventName = methodRef.Name.Split(new[] { '_' }, 2)[1];
diff --git a/src/SMAPI/Framework/ModLoading/Finders/FieldFinder.cs b/src/SMAPI/Framework/ModLoading/Finders/FieldFinder.cs
index 96b4098a..7fe4abec 100644
--- a/src/SMAPI/Framework/ModLoading/Finders/FieldFinder.cs
+++ b/src/SMAPI/Framework/ModLoading/Finders/FieldFinder.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 using System.Collections.Generic;
 using System.Linq;
 using Mono.Cecil;
@@ -51,7 +49,7 @@ namespace StardewModdingAPI.Framework.ModLoading.Finders
         {
             if (this.FieldNames.Any())
             {
-                FieldReference fieldRef = RewriteHelper.AsFieldReference(instruction);
+                FieldReference? fieldRef = RewriteHelper.AsFieldReference(instruction);
                 if (fieldRef != null && fieldRef.DeclaringType.FullName == this.FullTypeName && this.FieldNames.Contains(fieldRef.Name))
                 {
                     this.FieldNames.Remove(fieldRef.Name);
diff --git a/src/SMAPI/Framework/ModLoading/Finders/MethodFinder.cs b/src/SMAPI/Framework/ModLoading/Finders/MethodFinder.cs
index 7d3c1fd7..e8fdc8c7 100644
--- a/src/SMAPI/Framework/ModLoading/Finders/MethodFinder.cs
+++ b/src/SMAPI/Framework/ModLoading/Finders/MethodFinder.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 using Mono.Cecil;
 using Mono.Cecil.Cil;
 using StardewModdingAPI.Framework.ModLoading.Framework;
@@ -54,7 +52,7 @@ namespace StardewModdingAPI.Framework.ModLoading.Finders
         /// <param name="instruction">The IL instruction.</param>
         protected bool IsMatch(Instruction instruction)
         {
-            MethodReference methodRef = RewriteHelper.AsMethodReference(instruction);
+            MethodReference? methodRef = RewriteHelper.AsMethodReference(instruction);
             return
                 methodRef != null
                 && methodRef.DeclaringType.FullName == this.FullTypeName
diff --git a/src/SMAPI/Framework/ModLoading/Finders/PropertyFinder.cs b/src/SMAPI/Framework/ModLoading/Finders/PropertyFinder.cs
index b2f2e193..2af76f55 100644
--- a/src/SMAPI/Framework/ModLoading/Finders/PropertyFinder.cs
+++ b/src/SMAPI/Framework/ModLoading/Finders/PropertyFinder.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 using Mono.Cecil;
 using Mono.Cecil.Cil;
 using StardewModdingAPI.Framework.ModLoading.Framework;
@@ -54,7 +52,7 @@ namespace StardewModdingAPI.Framework.ModLoading.Finders
         /// <param name="instruction">The IL instruction.</param>
         protected bool IsMatch(Instruction instruction)
         {
-            MethodReference methodRef = RewriteHelper.AsMethodReference(instruction);
+            MethodReference? methodRef = RewriteHelper.AsMethodReference(instruction);
             return
                 methodRef != null
                 && methodRef.DeclaringType.FullName == this.FullTypeName
diff --git a/src/SMAPI/Framework/ModLoading/Finders/ReferenceToMemberWithUnexpectedTypeFinder.cs b/src/SMAPI/Framework/ModLoading/Finders/ReferenceToMemberWithUnexpectedTypeFinder.cs
index 81f90498..f34542c3 100644
--- a/src/SMAPI/Framework/ModLoading/Finders/ReferenceToMemberWithUnexpectedTypeFinder.cs
+++ b/src/SMAPI/Framework/ModLoading/Finders/ReferenceToMemberWithUnexpectedTypeFinder.cs
@@ -1,6 +1,5 @@
-#nullable disable
-
 using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using Mono.Cecil;
 using Mono.Cecil.Cil;
@@ -34,11 +33,11 @@ namespace StardewModdingAPI.Framework.ModLoading.Finders
         public override bool Handle(ModuleDefinition module, ILProcessor cil, Instruction instruction)
         {
             // field reference
-            FieldReference fieldRef = RewriteHelper.AsFieldReference(instruction);
+            FieldReference? fieldRef = RewriteHelper.AsFieldReference(instruction);
             if (fieldRef != null && this.ShouldValidate(fieldRef.DeclaringType))
             {
                 // get target field
-                FieldDefinition targetField = fieldRef.DeclaringType.Resolve()?.Fields.FirstOrDefault(p => p.Name == fieldRef.Name);
+                FieldDefinition? targetField = fieldRef.DeclaringType.Resolve()?.Fields.FirstOrDefault(p => p.Name == fieldRef.Name);
                 if (targetField == null)
                     return false;
 
@@ -51,16 +50,16 @@ namespace StardewModdingAPI.Framework.ModLoading.Finders
             }
 
             // method reference
-            MethodReference methodReference = RewriteHelper.AsMethodReference(instruction);
+            MethodReference? methodReference = RewriteHelper.AsMethodReference(instruction);
             if (methodReference != null && !this.IsUnsupported(methodReference) && this.ShouldValidate(methodReference.DeclaringType))
             {
                 // get potential targets
-                MethodDefinition[] candidateMethods = methodReference.DeclaringType.Resolve()?.Methods.Where(found => found.Name == methodReference.Name).ToArray();
+                MethodDefinition[]? candidateMethods = methodReference.DeclaringType.Resolve()?.Methods.Where(found => found.Name == methodReference.Name).ToArray();
                 if (candidateMethods == null || !candidateMethods.Any())
                     return false;
 
                 // compare return types
-                MethodDefinition methodDef = methodReference.Resolve();
+                MethodDefinition? methodDef = methodReference.Resolve();
                 if (methodDef == null)
                     return false; // validated by ReferenceToMissingMemberFinder
 
@@ -80,7 +79,7 @@ namespace StardewModdingAPI.Framework.ModLoading.Finders
         *********/
         /// <summary>Whether references to the given type should be validated.</summary>
         /// <param name="type">The type reference.</param>
-        private bool ShouldValidate(TypeReference type)
+        private bool ShouldValidate([NotNullWhen(true)] TypeReference? type)
         {
             return type != null && this.ValidateReferencesToAssemblies.Contains(type.Scope.Name);
         }
diff --git a/src/SMAPI/Framework/ModLoading/Finders/ReferenceToMissingMemberFinder.cs b/src/SMAPI/Framework/ModLoading/Finders/ReferenceToMissingMemberFinder.cs
index 001d1986..fae7fb12 100644
--- a/src/SMAPI/Framework/ModLoading/Finders/ReferenceToMissingMemberFinder.cs
+++ b/src/SMAPI/Framework/ModLoading/Finders/ReferenceToMissingMemberFinder.cs
@@ -1,6 +1,5 @@
-#nullable disable
-
 using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
 using Mono.Cecil;
 using Mono.Cecil.Cil;
 using StardewModdingAPI.Framework.ModLoading.Framework;
@@ -33,10 +32,10 @@ namespace StardewModdingAPI.Framework.ModLoading.Finders
         public override bool Handle(ModuleDefinition module, ILProcessor cil, Instruction instruction)
         {
             // field reference
-            FieldReference fieldRef = RewriteHelper.AsFieldReference(instruction);
+            FieldReference? fieldRef = RewriteHelper.AsFieldReference(instruction);
             if (fieldRef != null && this.ShouldValidate(fieldRef.DeclaringType))
             {
-                FieldDefinition target = fieldRef.Resolve();
+                FieldDefinition? target = fieldRef.Resolve();
                 if (target == null || target.HasConstant)
                 {
                     this.MarkFlag(InstructionHandleResult.NotCompatible, $"reference to {fieldRef.DeclaringType.FullName}.{fieldRef.Name} (no such field)");
@@ -45,10 +44,10 @@ namespace StardewModdingAPI.Framework.ModLoading.Finders
             }
 
             // method reference
-            MethodReference methodRef = RewriteHelper.AsMethodReference(instruction);
+            MethodReference? methodRef = RewriteHelper.AsMethodReference(instruction);
             if (methodRef != null && this.ShouldValidate(methodRef.DeclaringType) && !this.IsUnsupported(methodRef))
             {
-                MethodDefinition target = methodRef.Resolve();
+                MethodDefinition? target = methodRef.Resolve();
                 if (target == null)
                 {
                     string phrase;
@@ -73,7 +72,7 @@ namespace StardewModdingAPI.Framework.ModLoading.Finders
         *********/
         /// <summary>Whether references to the given type should be validated.</summary>
         /// <param name="type">The type reference.</param>
-        private bool ShouldValidate(TypeReference type)
+        private bool ShouldValidate([NotNullWhen(true)] TypeReference? type)
         {
             return type != null && this.ValidateReferencesToAssemblies.Contains(type.Scope.Name);
         }
diff --git a/src/SMAPI/Framework/ModLoading/Finders/TypeAssemblyFinder.cs b/src/SMAPI/Framework/ModLoading/Finders/TypeAssemblyFinder.cs
index 4c589ed8..17acbf9a 100644
--- a/src/SMAPI/Framework/ModLoading/Finders/TypeAssemblyFinder.cs
+++ b/src/SMAPI/Framework/ModLoading/Finders/TypeAssemblyFinder.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 using System;
 using Mono.Cecil;
 using StardewModdingAPI.Framework.ModLoading.Framework;
@@ -19,7 +17,7 @@ namespace StardewModdingAPI.Framework.ModLoading.Finders
         private readonly InstructionHandleResult Result;
 
         /// <summary>Get whether a matched type should be ignored.</summary>
-        private readonly Func<TypeReference, bool> ShouldIgnore;
+        private readonly Func<TypeReference, bool>? ShouldIgnore;
 
 
         /*********
@@ -29,7 +27,7 @@ namespace StardewModdingAPI.Framework.ModLoading.Finders
         /// <param name="assemblyName">The full assembly name to which to find references.</param>
         /// <param name="result">The result to return for matching instructions.</param>
         /// <param name="shouldIgnore">Get whether a matched type should be ignored.</param>
-        public TypeAssemblyFinder(string assemblyName, InstructionHandleResult result, Func<TypeReference, bool> shouldIgnore = null)
+        public TypeAssemblyFinder(string assemblyName, InstructionHandleResult result, Func<TypeReference, bool>? shouldIgnore = null)
             : base(defaultPhrase: $"{assemblyName} assembly")
         {
             this.AssemblyName = assemblyName;
diff --git a/src/SMAPI/Framework/ModLoading/Finders/TypeFinder.cs b/src/SMAPI/Framework/ModLoading/Finders/TypeFinder.cs
index 04a5b970..77762f41 100644
--- a/src/SMAPI/Framework/ModLoading/Finders/TypeFinder.cs
+++ b/src/SMAPI/Framework/ModLoading/Finders/TypeFinder.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 using System;
 using System.Collections.Generic;
 using Mono.Cecil;
@@ -20,7 +18,7 @@ namespace StardewModdingAPI.Framework.ModLoading.Finders
         private readonly InstructionHandleResult Result;
 
         /// <summary>Get whether a matched type should be ignored.</summary>
-        private readonly Func<TypeReference, bool> ShouldIgnore;
+        private readonly Func<TypeReference, bool>? ShouldIgnore;
 
 
         /*********
@@ -30,7 +28,7 @@ namespace StardewModdingAPI.Framework.ModLoading.Finders
         /// <param name="fullTypeNames">The full type names to match.</param>
         /// <param name="result">The result to return for matching instructions.</param>
         /// <param name="shouldIgnore">Get whether a matched type should be ignored.</param>
-        public TypeFinder(string[] fullTypeNames, InstructionHandleResult result, Func<TypeReference, bool> shouldIgnore = null)
+        public TypeFinder(string[] fullTypeNames, InstructionHandleResult result, Func<TypeReference, bool>? shouldIgnore = null)
             : base(defaultPhrase: $"{string.Join(", ", fullTypeNames)} type{(fullTypeNames.Length != 1 ? "s" : "")}") // default phrase should never be used
         {
             this.FullTypeNames = new HashSet<string>(fullTypeNames);
@@ -42,7 +40,7 @@ namespace StardewModdingAPI.Framework.ModLoading.Finders
         /// <param name="fullTypeName">The full type name to match.</param>
         /// <param name="result">The result to return for matching instructions.</param>
         /// <param name="shouldIgnore">Get whether a matched type should be ignored.</param>
-        public TypeFinder(string fullTypeName, InstructionHandleResult result, Func<TypeReference, bool> shouldIgnore = null)
+        public TypeFinder(string fullTypeName, InstructionHandleResult result, Func<TypeReference, bool>? shouldIgnore = null)
             : this(new[] { fullTypeName }, result, shouldIgnore) { }
 
         /// <inheritdoc />
diff --git a/src/SMAPI/Framework/ModLoading/Framework/BaseInstructionHandler.cs b/src/SMAPI/Framework/ModLoading/Framework/BaseInstructionHandler.cs
index bea786cd..865bf076 100644
--- a/src/SMAPI/Framework/ModLoading/Framework/BaseInstructionHandler.cs
+++ b/src/SMAPI/Framework/ModLoading/Framework/BaseInstructionHandler.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 using System;
 using System.Collections.Generic;
 using Mono.Cecil;
@@ -59,7 +57,7 @@ namespace StardewModdingAPI.Framework.ModLoading.Framework
         /// <param name="flag">The result flag to set.</param>
         /// <param name="resultMessage">The result message to add.</param>
         /// <returns>Returns true for convenience.</returns>
-        protected bool MarkFlag(InstructionHandleResult flag, string resultMessage = null)
+        protected bool MarkFlag(InstructionHandleResult flag, string? resultMessage = null)
         {
             this.Flags.Add(flag);
             if (resultMessage != null)
diff --git a/src/SMAPI/Framework/ModLoading/Framework/RecursiveRewriter.cs b/src/SMAPI/Framework/ModLoading/Framework/RecursiveRewriter.cs
index 09ff78f7..55369602 100644
--- a/src/SMAPI/Framework/ModLoading/Framework/RecursiveRewriter.cs
+++ b/src/SMAPI/Framework/ModLoading/Framework/RecursiveRewriter.cs
@@ -1,7 +1,6 @@
-#nullable disable
-
 using System;
 using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using Mono.Cecil;
 using Mono.Cecil.Cil;
@@ -10,6 +9,7 @@ using Mono.Collections.Generic;
 namespace StardewModdingAPI.Framework.ModLoading.Framework
 {
     /// <summary>Handles recursively rewriting loaded assembly code.</summary>
+    [SuppressMessage("ReSharper", "AccessToModifiedClosure", Justification = "Rewrite callbacks are invoked immediately.")]
     internal class RecursiveRewriter
     {
         /*********
@@ -77,7 +77,7 @@ namespace StardewModdingAPI.Framework.ModLoading.Framework
             {
                 changed |= this.RewriteModuleImpl(this.Module);
 
-                foreach (var type in types)
+                foreach (TypeDefinition type in types)
                     changed |= this.RewriteTypeDefinition(type);
             }
             catch (Exception ex)
@@ -129,9 +129,10 @@ namespace StardewModdingAPI.Framework.ModLoading.Framework
                     ILProcessor cil = method.Body.GetILProcessor();
                     Collection<Instruction> instructions = cil.Body.Instructions;
                     bool addedInstructions = false;
+                    // ReSharper disable once ForCanBeConvertedToForeach -- deliberate to allow changing the collection
                     for (int i = 0; i < instructions.Count; i++)
                     {
-                        var instruction = instructions[i];
+                        Instruction instruction = instructions[i];
                         if (instruction.OpCode.Code == Code.Nop)
                             continue;
 
@@ -174,7 +175,7 @@ namespace StardewModdingAPI.Framework.ModLoading.Framework
             bool rewritten = false;
 
             // field reference
-            FieldReference fieldRef = RewriteHelper.AsFieldReference(instruction);
+            FieldReference? fieldRef = RewriteHelper.AsFieldReference(instruction);
             if (fieldRef != null)
             {
                 rewritten |= this.RewriteTypeReference(fieldRef.DeclaringType, newType => fieldRef.DeclaringType = newType);
@@ -182,7 +183,7 @@ namespace StardewModdingAPI.Framework.ModLoading.Framework
             }
 
             // method reference
-            MethodReference methodRef = RewriteHelper.AsMethodReference(instruction);
+            MethodReference? methodRef = RewriteHelper.AsMethodReference(instruction);
             if (methodRef != null)
                 this.RewriteMethodReference(methodRef);
 
@@ -212,7 +213,7 @@ namespace StardewModdingAPI.Framework.ModLoading.Framework
             });
             rewritten |= this.RewriteTypeReference(methodRef.ReturnType, newType => methodRef.ReturnType = newType);
 
-            foreach (var parameter in methodRef.Parameters)
+            foreach (ParameterDefinition parameter in methodRef.Parameters)
                 rewritten |= this.RewriteTypeReference(parameter.ParameterType, newType => parameter.ParameterType = newType);
 
             if (methodRef is GenericInstanceMethod genericRef)
@@ -264,7 +265,7 @@ namespace StardewModdingAPI.Framework.ModLoading.Framework
                 bool curChanged = false;
 
                 // attribute type
-                TypeReference newAttrType = null;
+                TypeReference? newAttrType = null;
                 rewritten |= this.RewriteTypeReference(attribute.AttributeType, newType =>
                 {
                     newAttrType = newType;
@@ -289,9 +290,9 @@ namespace StardewModdingAPI.Framework.ModLoading.Framework
                 if (curChanged)
                 {
                     // get constructor
-                    MethodDefinition constructor = (newAttrType ?? attribute.AttributeType)
+                    MethodDefinition? constructor = (newAttrType ?? attribute.AttributeType)
                         .Resolve()
-                        .Methods
+                        ?.Methods
                         .Where(method => method.IsConstructor)
                         .FirstOrDefault(ctor => RewriteHelper.HasMatchingSignature(ctor, attribute.Constructor));
                     if (constructor == null)
@@ -301,9 +302,9 @@ namespace StardewModdingAPI.Framework.ModLoading.Framework
                     var newAttr = new CustomAttribute(this.Module.ImportReference(constructor));
                     for (int i = 0; i < argTypes.Length; i++)
                         newAttr.ConstructorArguments.Add(new CustomAttributeArgument(argTypes[i], attribute.ConstructorArguments[i].Value));
-                    foreach (var prop in attribute.Properties)
+                    foreach (CustomAttributeNamedArgument prop in attribute.Properties)
                         newAttr.Properties.Add(new CustomAttributeNamedArgument(prop.Name, prop.Argument));
-                    foreach (var field in attribute.Fields)
+                    foreach (CustomAttributeNamedArgument field in attribute.Fields)
                         newAttr.Fields.Add(new CustomAttributeNamedArgument(field.Name, field.Argument));
 
                     // swap attribute
diff --git a/src/SMAPI/Framework/ModLoading/Framework/RewriteHelper.cs b/src/SMAPI/Framework/ModLoading/Framework/RewriteHelper.cs
index 8f47fbdd..15f71251 100644
--- a/src/SMAPI/Framework/ModLoading/Framework/RewriteHelper.cs
+++ b/src/SMAPI/Framework/ModLoading/Framework/RewriteHelper.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 using System;
 using System.Linq;
 using System.Reflection;
@@ -23,7 +21,7 @@ namespace StardewModdingAPI.Framework.ModLoading.Framework
         *********/
         /// <summary>Get the field reference from an instruction if it matches.</summary>
         /// <param name="instruction">The IL instruction.</param>
-        public static FieldReference AsFieldReference(Instruction instruction)
+        public static FieldReference? AsFieldReference(Instruction instruction)
         {
             return instruction.OpCode == OpCodes.Ldfld || instruction.OpCode == OpCodes.Ldsfld || instruction.OpCode == OpCodes.Stfld || instruction.OpCode == OpCodes.Stsfld
                 ? (FieldReference)instruction.Operand
@@ -32,7 +30,7 @@ namespace StardewModdingAPI.Framework.ModLoading.Framework
 
         /// <summary>Get the method reference from an instruction if it matches.</summary>
         /// <param name="instruction">The IL instruction.</param>
-        public static MethodReference AsMethodReference(Instruction instruction)
+        public static MethodReference? AsMethodReference(Instruction instruction)
         {
             return instruction.OpCode == OpCodes.Call || instruction.OpCode == OpCodes.Callvirt || instruction.OpCode == OpCodes.Newobj
                 ? (MethodReference)instruction.Operand
@@ -42,7 +40,7 @@ namespace StardewModdingAPI.Framework.ModLoading.Framework
         /// <summary>Get the CIL instruction to load a value onto the stack.</summary>
         /// <param name="rawValue">The constant value to inject.</param>
         /// <returns>Returns the instruction, or <c>null</c> if the value type isn't supported.</returns>
-        public static Instruction GetLoadValueInstruction(object rawValue)
+        public static Instruction? GetLoadValueInstruction(object? rawValue)
         {
             return rawValue switch
             {
@@ -151,7 +149,7 @@ namespace StardewModdingAPI.Framework.ModLoading.Framework
         /// <param name="typeA">The type ID to compare.</param>
         /// <param name="typeB">The other type ID to compare.</param>
         /// <returns>true if the type IDs look like the same type, false if not.</returns>
-        public static bool LooksLikeSameType(TypeReference typeA, TypeReference typeB)
+        public static bool LooksLikeSameType(TypeReference? typeA, TypeReference? typeB)
         {
             return RewriteHelper.TypeDefinitionComparer.Equals(typeA, typeB);
         }
diff --git a/src/SMAPI/Framework/ModLoading/InvalidModStateException.cs b/src/SMAPI/Framework/ModLoading/InvalidModStateException.cs
index 9dca9bc4..b53a9886 100644
--- a/src/SMAPI/Framework/ModLoading/InvalidModStateException.cs
+++ b/src/SMAPI/Framework/ModLoading/InvalidModStateException.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 using System;
 
 namespace StardewModdingAPI.Framework.ModLoading
@@ -10,7 +8,7 @@ namespace StardewModdingAPI.Framework.ModLoading
         /// <summary>Construct an instance.</summary>
         /// <param name="message">The error message.</param>
         /// <param name="ex">The underlying exception, if any.</param>
-        public InvalidModStateException(string message, Exception ex = null)
+        public InvalidModStateException(string message, Exception? ex = null)
             : base(message, ex) { }
     }
 }
diff --git a/src/SMAPI/Framework/ModLoading/ModMetadata.cs b/src/SMAPI/Framework/ModLoading/ModMetadata.cs
index 0e698bfd..fe54634b 100644
--- a/src/SMAPI/Framework/ModLoading/ModMetadata.cs
+++ b/src/SMAPI/Framework/ModLoading/ModMetadata.cs
@@ -1,7 +1,6 @@
-#nullable disable
-
 using System;
 using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
 using System.IO;
 using System.Linq;
 using StardewModdingAPI.Framework.ModHelpers;
@@ -44,7 +43,7 @@ namespace StardewModdingAPI.Framework.ModLoading
         public IManifest Manifest { get; }
 
         /// <inheritdoc />
-        public ModDataRecordVersionedFields DataRecord { get; }
+        public ModDataRecordVersionedFields? DataRecord { get; }
 
         /// <inheritdoc />
         public ModMetadataStatus Status { get; private set; }
@@ -56,33 +55,35 @@ namespace StardewModdingAPI.Framework.ModLoading
         public ModWarning Warnings => this.ActualWarnings & ~(this.DataRecord?.DataRecord.SuppressWarnings ?? ModWarning.None);
 
         /// <inheritdoc />
-        public string Error { get; private set; }
+        public string? Error { get; private set; }
 
         /// <inheritdoc />
-        public string ErrorDetails { get; private set; }
+        public string? ErrorDetails { get; private set; }
 
         /// <inheritdoc />
         public bool IsIgnored { get; }
 
         /// <inheritdoc />
-        public IMod Mod { get; private set; }
+        public IMod? Mod { get; private set; }
 
         /// <inheritdoc />
-        public IContentPack ContentPack { get; private set; }
+        public IContentPack? ContentPack { get; private set; }
 
         /// <inheritdoc />
-        public TranslationHelper Translations { get; private set; }
+        public TranslationHelper? Translations { get; private set; }
 
         /// <inheritdoc />
-        public IMonitor Monitor { get; private set; }
+        public IMonitor? Monitor { get; private set; }
 
         /// <inheritdoc />
-        public object Api { get; private set; }
+        public object? Api { get; private set; }
 
         /// <inheritdoc />
-        public ModEntryModel UpdateCheckData { get; private set; }
+        public ModEntryModel? UpdateCheckData { get; private set; }
 
         /// <inheritdoc />
+        [MemberNotNullWhen(true, nameof(ModMetadata.ContentPack))]
+        [SuppressMessage("ReSharper", "ConstantConditionalAccessQualifier", Justification = "The manifest may be null for broken mods while loading.")]
         public bool IsContentPack => this.Manifest?.ContentPackFor != null;
 
         /// <summary>The fake content packs created by this mod, if any.</summary>
@@ -99,13 +100,13 @@ namespace StardewModdingAPI.Framework.ModLoading
         /// <param name="manifest">The mod manifest.</param>
         /// <param name="dataRecord">Metadata about the mod from SMAPI's internal data (if any).</param>
         /// <param name="isIgnored">Whether the mod folder should be ignored. This should be <c>true</c> if it was found within a folder whose name starts with a dot.</param>
-        public ModMetadata(string displayName, string directoryPath, string rootPath, IManifest manifest, ModDataRecordVersionedFields dataRecord, bool isIgnored)
+        public ModMetadata(string displayName, string directoryPath, string rootPath, IManifest? manifest, ModDataRecordVersionedFields? dataRecord, bool isIgnored)
         {
             this.DisplayName = displayName;
             this.DirectoryPath = directoryPath;
             this.RootPath = rootPath;
             this.RelativeDirectoryPath = PathUtilities.GetRelativePath(this.RootPath, this.DirectoryPath);
-            this.Manifest = manifest;
+            this.Manifest = manifest!; // manifest may be null in low-level SMAPI code, but won't be null once it's received by mods via IModInfo
             this.DataRecord = dataRecord;
             this.IsIgnored = isIgnored;
 
@@ -121,7 +122,7 @@ namespace StardewModdingAPI.Framework.ModLoading
         }
 
         /// <inheritdoc />
-        public IModMetadata SetStatus(ModMetadataStatus status, ModFailReason reason, string error, string errorDetails = null)
+        public IModMetadata SetStatus(ModMetadataStatus status, ModFailReason reason, string? error, string? errorDetails = null)
         {
             this.Status = status;
             this.FailReason = reason;
@@ -162,7 +163,7 @@ namespace StardewModdingAPI.Framework.ModLoading
         }
 
         /// <inheritdoc />
-        public IModMetadata SetApi(object api)
+        public IModMetadata SetApi(object? api)
         {
             this.Api = api;
             return this;
@@ -176,6 +177,7 @@ namespace StardewModdingAPI.Framework.ModLoading
         }
 
         /// <inheritdoc />
+        [MemberNotNullWhen(true, nameof(IModInfo.Manifest))]
         public bool HasManifest()
         {
             return this.Manifest != null;
@@ -190,7 +192,7 @@ namespace StardewModdingAPI.Framework.ModLoading
         }
 
         /// <inheritdoc />
-        public bool HasID(string id)
+        public bool HasID(string? id)
         {
             return
                 this.HasID()
@@ -245,7 +247,7 @@ namespace StardewModdingAPI.Framework.ModLoading
         /// <inheritdoc />
         public string GetRelativePathWithRoot()
         {
-            string rootFolderName = Path.GetFileName(this.RootPath) ?? "";
+            string rootFolderName = Path.GetFileName(this.RootPath);
             return Path.Combine(rootFolderName, this.RelativeDirectoryPath);
         }
 
@@ -254,7 +256,7 @@ namespace StardewModdingAPI.Framework.ModLoading
         {
             foreach (var reference in this.FakeContentPacks.ToArray())
             {
-                if (!reference.TryGetTarget(out ContentPack pack))
+                if (!reference.TryGetTarget(out ContentPack? pack))
                 {
                     this.FakeContentPacks.Remove(reference);
                     continue;
diff --git a/src/SMAPI/Framework/ModLoading/RewriteFacades/AccessToolsFacade.cs b/src/SMAPI/Framework/ModLoading/RewriteFacades/AccessToolsFacade.cs
index c05005b8..afe38bfd 100644
--- a/src/SMAPI/Framework/ModLoading/RewriteFacades/AccessToolsFacade.cs
+++ b/src/SMAPI/Framework/ModLoading/RewriteFacades/AccessToolsFacade.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 using System;
 using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
@@ -19,7 +17,7 @@ namespace StardewModdingAPI.Framework.ModLoading.RewriteFacades
         /*********
         ** Public methods
         *********/
-        public static ConstructorInfo DeclaredConstructor(Type type, Type[] parameters = null)
+        public static ConstructorInfo DeclaredConstructor(Type type, Type[]? parameters = null)
         {
             // Harmony 1.x matched both static and instance constructors
             return
@@ -27,7 +25,7 @@ namespace StardewModdingAPI.Framework.ModLoading.RewriteFacades
                 ?? AccessTools.DeclaredConstructor(type, parameters, searchForStatic: true);
         }
 
-        public static ConstructorInfo Constructor(Type type, Type[] parameters = null)
+        public static ConstructorInfo Constructor(Type type, Type[]? parameters = null)
         {
             // Harmony 1.x matched both static and instance constructors
             return
diff --git a/src/SMAPI/Framework/ModLoading/RewriteFacades/HarmonyInstanceFacade.cs b/src/SMAPI/Framework/ModLoading/RewriteFacades/HarmonyInstanceFacade.cs
index fea8c100..9c8ba2b0 100644
--- a/src/SMAPI/Framework/ModLoading/RewriteFacades/HarmonyInstanceFacade.cs
+++ b/src/SMAPI/Framework/ModLoading/RewriteFacades/HarmonyInstanceFacade.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 using System;
 using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
@@ -30,7 +28,8 @@ namespace StardewModdingAPI.Framework.ModLoading.RewriteFacades
             return new Harmony(id);
         }
 
-        public DynamicMethod Patch(MethodBase original, HarmonyMethod prefix = null, HarmonyMethod postfix = null, HarmonyMethod transpiler = null)
+        [SuppressMessage("ReSharper", "ConditionIsAlwaysTrueOrFalse", Justification = "If the user passes a null original method, we let it fail in the underlying Harmony instance instead of handling it here.")]
+        public DynamicMethod Patch(MethodBase original, HarmonyMethod? prefix = null, HarmonyMethod? postfix = null, HarmonyMethod? transpiler = null)
         {
             // In Harmony 1.x you could target a virtual method that's not implemented by the
             // target type, but in Harmony 2.0 you need to target the concrete implementation.
@@ -60,7 +59,7 @@ namespace StardewModdingAPI.Framework.ModLoading.RewriteFacades
         /// <param name="prefix">The prefix method, if any.</param>
         /// <param name="postfix">The postfix method, if any.</param>
         /// <param name="transpiler">The transpiler method, if any.</param>
-        private string GetPatchTypesLabel(HarmonyMethod prefix = null, HarmonyMethod postfix = null, HarmonyMethod transpiler = null)
+        private string GetPatchTypesLabel(HarmonyMethod? prefix = null, HarmonyMethod? postfix = null, HarmonyMethod? transpiler = null)
         {
             var patchTypes = new List<string>();
 
@@ -76,7 +75,7 @@ namespace StardewModdingAPI.Framework.ModLoading.RewriteFacades
 
         /// <summary>Get a human-readable label for the method being patched.</summary>
         /// <param name="method">The method being patched.</param>
-        private string GetMethodLabel(MethodBase method)
+        private string GetMethodLabel(MethodBase? method)
         {
             return method != null
                 ? $"method {method.DeclaringType?.FullName}.{method.Name}"
diff --git a/src/SMAPI/Framework/ModLoading/RewriteFacades/HarmonyMethodFacade.cs b/src/SMAPI/Framework/ModLoading/RewriteFacades/HarmonyMethodFacade.cs
index 93124591..2b1ca54b 100644
--- a/src/SMAPI/Framework/ModLoading/RewriteFacades/HarmonyMethodFacade.cs
+++ b/src/SMAPI/Framework/ModLoading/RewriteFacades/HarmonyMethodFacade.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 using System;
 using System.Diagnostics.CodeAnalysis;
 using System.Reflection;
@@ -23,7 +21,7 @@ namespace StardewModdingAPI.Framework.ModLoading.RewriteFacades
             this.ImportMethodImpl(method);
         }
 
-        public HarmonyMethodFacade(Type type, string name, Type[] parameters = null)
+        public HarmonyMethodFacade(Type type, string name, Type[]? parameters = null)
         {
             this.ImportMethodImpl(AccessTools.Method(type, name, parameters));
         }
@@ -40,7 +38,7 @@ namespace StardewModdingAPI.Framework.ModLoading.RewriteFacades
             // internal code still handles null fine. For backwards compatibility, this bypasses
             // the new restriction when the mod hasn't been updated for Harmony 2.0 yet.
 
-            MethodInfo importMethod = typeof(HarmonyMethod).GetMethod("ImportMethod", BindingFlags.Instance | BindingFlags.NonPublic);
+            MethodInfo? importMethod = typeof(HarmonyMethod).GetMethod("ImportMethod", BindingFlags.Instance | BindingFlags.NonPublic);
             if (importMethod == null)
                 throw new InvalidOperationException("Can't find 'HarmonyMethod.ImportMethod' method");
             importMethod.Invoke(this, new object[] { methodInfo });
diff --git a/src/SMAPI/Framework/ModLoading/Rewriters/HarmonyRewriter.cs b/src/SMAPI/Framework/ModLoading/Rewriters/HarmonyRewriter.cs
index 92397c58..aea490c8 100644
--- a/src/SMAPI/Framework/ModLoading/Rewriters/HarmonyRewriter.cs
+++ b/src/SMAPI/Framework/ModLoading/Rewriters/HarmonyRewriter.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 using System;
 using HarmonyLib;
 using Mono.Cecil;
@@ -59,7 +57,7 @@ namespace StardewModdingAPI.Framework.ModLoading.Rewriters
             if (this.ShouldRewrite)
             {
                 // rewrite Harmony 1.x methods to Harmony 2.0
-                MethodReference methodRef = RewriteHelper.AsMethodReference(instruction);
+                MethodReference? methodRef = RewriteHelper.AsMethodReference(instruction);
                 if (this.TryRewriteMethodsToFacade(module, methodRef))
                 {
                     this.OnChanged();
@@ -67,7 +65,7 @@ namespace StardewModdingAPI.Framework.ModLoading.Rewriters
                 }
 
                 // rewrite renamed fields
-                FieldReference fieldRef = RewriteHelper.AsFieldReference(instruction);
+                FieldReference? fieldRef = RewriteHelper.AsFieldReference(instruction);
                 if (fieldRef != null)
                 {
                     if (fieldRef.DeclaringType.FullName == "HarmonyLib.HarmonyMethod" && fieldRef.Name == "prioritiy")
@@ -95,13 +93,13 @@ namespace StardewModdingAPI.Framework.ModLoading.Rewriters
         /// <summary>Rewrite methods to use Harmony facades if needed.</summary>
         /// <param name="module">The assembly module containing the method reference.</param>
         /// <param name="methodRef">The method reference to map.</param>
-        private bool TryRewriteMethodsToFacade(ModuleDefinition module, MethodReference methodRef)
+        private bool TryRewriteMethodsToFacade(ModuleDefinition module, MethodReference? methodRef)
         {
             if (!this.ReplacedTypes)
                 return false; // not Harmony (or already using Harmony 2.0)
 
             // get facade type
-            Type toType = methodRef?.DeclaringType.FullName switch
+            Type? toType = methodRef?.DeclaringType.FullName switch
             {
                 "HarmonyLib.Harmony" => typeof(HarmonyInstanceFacade),
                 "HarmonyLib.AccessTools" => typeof(AccessToolsFacade),
@@ -112,9 +110,9 @@ namespace StardewModdingAPI.Framework.ModLoading.Rewriters
                 return false;
 
             // map if there's a matching method
-            if (RewriteHelper.HasMatchingSignature(toType, methodRef))
+            if (RewriteHelper.HasMatchingSignature(toType, methodRef!))
             {
-                methodRef.DeclaringType = module.ImportReference(toType);
+                methodRef!.DeclaringType = module.ImportReference(toType);
                 return true;
             }
 
@@ -139,7 +137,7 @@ namespace StardewModdingAPI.Framework.ModLoading.Rewriters
         {
             string fullName = type.FullName.Replace("Harmony.", "HarmonyLib.");
             string targetName = typeof(Harmony).AssemblyQualifiedName!.Replace(typeof(Harmony).FullName!, fullName);
-            return Type.GetType(targetName, throwOnError: true);
+            return Type.GetType(targetName, throwOnError: true)!;
         }
     }
 }
diff --git a/src/SMAPI/Framework/ModLoading/Rewriters/HeuristicFieldRewriter.cs b/src/SMAPI/Framework/ModLoading/Rewriters/HeuristicFieldRewriter.cs
index fc06e779..9c6a3980 100644
--- a/src/SMAPI/Framework/ModLoading/Rewriters/HeuristicFieldRewriter.cs
+++ b/src/SMAPI/Framework/ModLoading/Rewriters/HeuristicFieldRewriter.cs
@@ -1,6 +1,5 @@
-#nullable disable
-
 using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using Mono.Cecil;
 using Mono.Cecil.Cil;
@@ -33,17 +32,17 @@ namespace StardewModdingAPI.Framework.ModLoading.Rewriters
         public override bool Handle(ModuleDefinition module, ILProcessor cil, Instruction instruction)
         {
             // get field ref
-            FieldReference fieldRef = RewriteHelper.AsFieldReference(instruction);
+            FieldReference? fieldRef = RewriteHelper.AsFieldReference(instruction);
             if (fieldRef == null || !this.ShouldValidate(fieldRef.DeclaringType))
                 return false;
 
             // skip if not broken
-            FieldDefinition fieldDefinition = fieldRef.Resolve();
+            FieldDefinition? fieldDefinition = fieldRef.Resolve();
             if (fieldDefinition?.HasConstant == false)
                 return false;
 
             // rewrite if possible
-            TypeDefinition declaringType = fieldRef.DeclaringType.Resolve();
+            TypeDefinition? declaringType = fieldRef.DeclaringType.Resolve();
             bool isRead = instruction.OpCode == OpCodes.Ldsfld || instruction.OpCode == OpCodes.Ldfld;
             return
                 this.TryRewriteToProperty(module, instruction, fieldRef, declaringType, isRead)
@@ -56,7 +55,7 @@ namespace StardewModdingAPI.Framework.ModLoading.Rewriters
         *********/
         /// <summary>Whether references to the given type should be validated.</summary>
         /// <param name="type">The type reference.</param>
-        private bool ShouldValidate(TypeReference type)
+        private bool ShouldValidate([NotNullWhen(true)] TypeReference? type)
         {
             return type != null && this.RewriteReferencesToAssemblies.Contains(type.Scope.Name);
         }
@@ -70,8 +69,8 @@ namespace StardewModdingAPI.Framework.ModLoading.Rewriters
         private bool TryRewriteToProperty(ModuleDefinition module, Instruction instruction, FieldReference fieldRef, TypeDefinition declaringType, bool isRead)
         {
             // get equivalent property
-            PropertyDefinition property = declaringType?.Properties.FirstOrDefault(p => p.Name == fieldRef.Name);
-            MethodDefinition method = isRead ? property?.GetMethod : property?.SetMethod;
+            PropertyDefinition? property = declaringType?.Properties.FirstOrDefault(p => p.Name == fieldRef.Name);
+            MethodDefinition? method = isRead ? property?.GetMethod : property?.SetMethod;
             if (method == null)
                 return false;
 
@@ -86,14 +85,14 @@ namespace StardewModdingAPI.Framework.ModLoading.Rewriters
         /// <summary>Try rewriting the field into a matching const field.</summary>
         /// <param name="instruction">The CIL instruction to rewrite.</param>
         /// <param name="field">The field definition.</param>
-        private bool TryRewriteToConstField(Instruction instruction, FieldDefinition field)
+        private bool TryRewriteToConstField(Instruction instruction, FieldDefinition? field)
         {
             // must have been a static field read, and the new field must be const
             if (instruction.OpCode != OpCodes.Ldsfld || field?.HasConstant != true)
                 return false;
 
             // get opcode for value type
-            Instruction loadInstruction = RewriteHelper.GetLoadValueInstruction(field.Constant);
+            Instruction? loadInstruction = RewriteHelper.GetLoadValueInstruction(field.Constant);
             if (loadInstruction == null)
                 return false;
 
diff --git a/src/SMAPI/Framework/ModLoading/Rewriters/HeuristicMethodRewriter.cs b/src/SMAPI/Framework/ModLoading/Rewriters/HeuristicMethodRewriter.cs
index 4860072c..601ecbbc 100644
--- a/src/SMAPI/Framework/ModLoading/Rewriters/HeuristicMethodRewriter.cs
+++ b/src/SMAPI/Framework/ModLoading/Rewriters/HeuristicMethodRewriter.cs
@@ -1,6 +1,5 @@
-#nullable disable
-
 using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using Mono.Cecil;
 using Mono.Cecil.Cil;
@@ -33,7 +32,7 @@ namespace StardewModdingAPI.Framework.ModLoading.Rewriters
         public override bool Handle(ModuleDefinition module, ILProcessor cil, Instruction instruction)
         {
             // get method ref
-            MethodReference methodRef = RewriteHelper.AsMethodReference(instruction);
+            MethodReference? methodRef = RewriteHelper.AsMethodReference(instruction);
             if (methodRef == null || !this.ShouldValidate(methodRef.DeclaringType))
                 return false;
 
@@ -42,13 +41,13 @@ namespace StardewModdingAPI.Framework.ModLoading.Rewriters
                 return false;
 
             // get type
-            var type = methodRef.DeclaringType.Resolve();
+            TypeDefinition? type = methodRef.DeclaringType.Resolve();
             if (type == null)
                 return false;
 
             // get method definition
-            MethodDefinition method = null;
-            foreach (var match in type.Methods.Where(p => p.Name == methodRef.Name))
+            MethodDefinition? method = null;
+            foreach (MethodDefinition match in type.Methods.Where(p => p.Name == methodRef.Name))
             {
                 // reference matches initial parameters of definition
                 if (methodRef.Parameters.Count >= match.Parameters.Count || !this.InitialParametersMatch(methodRef, match))
@@ -72,7 +71,7 @@ namespace StardewModdingAPI.Framework.ModLoading.Rewriters
                 return false; // SMAPI needs to load the value onto the stack before the method call, but the optional parameter type wasn't recognized
 
             // rewrite method reference
-            foreach (Instruction loadInstruction in loadInstructions)
+            foreach (Instruction? loadInstruction in loadInstructions)
                 cil.InsertBefore(instruction, loadInstruction);
             instruction.Operand = module.ImportReference(method);
 
@@ -86,7 +85,7 @@ namespace StardewModdingAPI.Framework.ModLoading.Rewriters
         *********/
         /// <summary>Whether references to the given type should be validated.</summary>
         /// <param name="type">The type reference.</param>
-        private bool ShouldValidate(TypeReference type)
+        private bool ShouldValidate([NotNullWhen(true)] TypeReference? type)
         {
             return type != null && this.RewriteReferencesToAssemblies.Contains(type.Scope.Name);
         }
diff --git a/src/SMAPI/Framework/ModLoading/Rewriters/MethodParentRewriter.cs b/src/SMAPI/Framework/ModLoading/Rewriters/MethodParentRewriter.cs
index 00daf337..2e2f6316 100644
--- a/src/SMAPI/Framework/ModLoading/Rewriters/MethodParentRewriter.cs
+++ b/src/SMAPI/Framework/ModLoading/Rewriters/MethodParentRewriter.cs
@@ -1,6 +1,5 @@
-#nullable disable
-
 using System;
+using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using Mono.Cecil;
 using Mono.Cecil.Cil;
@@ -28,7 +27,7 @@ namespace StardewModdingAPI.Framework.ModLoading.Rewriters
         /// <param name="fromType">The type whose methods to remap.</param>
         /// <param name="toType">The type with methods to map to.</param>
         /// <param name="nounPhrase">A brief noun phrase indicating what the instruction finder matches (or <c>null</c> to generate one).</param>
-        public MethodParentRewriter(string fromType, Type toType, string nounPhrase = null)
+        public MethodParentRewriter(string fromType, Type toType, string? nounPhrase = null)
             : base(nounPhrase ?? $"{fromType.Split('.').Last()} methods")
         {
             this.FromType = fromType;
@@ -39,14 +38,14 @@ namespace StardewModdingAPI.Framework.ModLoading.Rewriters
         /// <param name="fromType">The type whose methods to remap.</param>
         /// <param name="toType">The type with methods to map to.</param>
         /// <param name="nounPhrase">A brief noun phrase indicating what the instruction finder matches (or <c>null</c> to generate one).</param>
-        public MethodParentRewriter(Type fromType, Type toType, string nounPhrase = null)
-            : this(fromType.FullName, toType, nounPhrase) { }
+        public MethodParentRewriter(Type fromType, Type toType, string? nounPhrase = null)
+            : this(fromType.FullName!, toType, nounPhrase) { }
 
         /// <inheritdoc />
         public override bool Handle(ModuleDefinition module, ILProcessor cil, Instruction instruction)
         {
             // get method ref
-            MethodReference methodRef = RewriteHelper.AsMethodReference(instruction);
+            MethodReference? methodRef = RewriteHelper.AsMethodReference(instruction);
             if (!this.IsMatch(methodRef))
                 return false;
 
@@ -61,7 +60,7 @@ namespace StardewModdingAPI.Framework.ModLoading.Rewriters
         *********/
         /// <summary>Get whether a CIL instruction matches.</summary>
         /// <param name="methodRef">The method reference.</param>
-        private bool IsMatch(MethodReference methodRef)
+        private bool IsMatch([NotNullWhen(true)] MethodReference? methodRef)
         {
             return
                 methodRef != null
diff --git a/src/SMAPI/Framework/ModLoading/Rewriters/TypeReferenceRewriter.cs b/src/SMAPI/Framework/ModLoading/Rewriters/TypeReferenceRewriter.cs
index bdc4c4f3..a81cb5be 100644
--- a/src/SMAPI/Framework/ModLoading/Rewriters/TypeReferenceRewriter.cs
+++ b/src/SMAPI/Framework/ModLoading/Rewriters/TypeReferenceRewriter.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 using System;
 using Mono.Cecil;
 using StardewModdingAPI.Framework.ModLoading.Framework;
@@ -19,7 +17,7 @@ namespace StardewModdingAPI.Framework.ModLoading.Rewriters
         private readonly Type ToType;
 
         /// <summary>Get whether a matched type should be ignored.</summary>
-        private readonly Func<TypeReference, bool> ShouldIgnore;
+        private readonly Func<TypeReference, bool>? ShouldIgnore;
 
 
         /*********
@@ -29,7 +27,7 @@ namespace StardewModdingAPI.Framework.ModLoading.Rewriters
         /// <param name="fromTypeFullName">The full type name to which to find references.</param>
         /// <param name="toType">The new type to reference.</param>
         /// <param name="shouldIgnore">Get whether a matched type should be ignored.</param>
-        public TypeReferenceRewriter(string fromTypeFullName, Type toType, Func<TypeReference, bool> shouldIgnore = null)
+        public TypeReferenceRewriter(string fromTypeFullName, Type toType, Func<TypeReference, bool>? shouldIgnore = null)
             : base($"{fromTypeFullName} type")
         {
             this.FromTypeName = fromTypeFullName;
diff --git a/src/SMAPI/Framework/ModLoading/Symbols/SymbolReaderProvider.cs b/src/SMAPI/Framework/ModLoading/Symbols/SymbolReaderProvider.cs
index 4af7c1e7..0d3aff9f 100644
--- a/src/SMAPI/Framework/ModLoading/Symbols/SymbolReaderProvider.cs
+++ b/src/SMAPI/Framework/ModLoading/Symbols/SymbolReaderProvider.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 using System;
 using System.Collections.Generic;
 using System.IO;
@@ -38,7 +36,7 @@ namespace StardewModdingAPI.Framework.ModLoading.Symbols
         /// <param name="fileName">The assembly file name.</param>
         public ISymbolReader GetSymbolReader(ModuleDefinition module, string fileName)
         {
-            return this.SymbolsByAssemblyPath.TryGetValue(module.Name, out Stream symbolData)
+            return this.SymbolsByAssemblyPath.TryGetValue(module.Name, out Stream? symbolData)
                 ? new SymbolReader(module, symbolData)
                 : this.BaseProvider.GetSymbolReader(module, fileName);
         }
@@ -48,7 +46,7 @@ namespace StardewModdingAPI.Framework.ModLoading.Symbols
         /// <param name="symbolStream">The loaded symbol file stream.</param>
         public ISymbolReader GetSymbolReader(ModuleDefinition module, Stream symbolStream)
         {
-            return this.SymbolsByAssemblyPath.TryGetValue(module.Name, out Stream symbolData)
+            return this.SymbolsByAssemblyPath.TryGetValue(module.Name, out Stream? symbolData)
                 ? new SymbolReader(module, symbolData)
                 : this.BaseProvider.GetSymbolReader(module, symbolStream);
         }
diff --git a/src/SMAPI/Framework/ModLoading/TypeReferenceComparer.cs b/src/SMAPI/Framework/ModLoading/TypeReferenceComparer.cs
index 248c29fc..d81d763e 100644
--- a/src/SMAPI/Framework/ModLoading/TypeReferenceComparer.cs
+++ b/src/SMAPI/Framework/ModLoading/TypeReferenceComparer.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -18,7 +16,7 @@ namespace StardewModdingAPI.Framework.ModLoading
     /// <c>TKey</c> in the above example). If all components are equal after substitution, and the
     /// tokens can all be mapped to the same generic type, the types are considered equal.
     /// </remarks>
-    internal class TypeReferenceComparer : IEqualityComparer<TypeReference>
+    internal class TypeReferenceComparer : IEqualityComparer<TypeReference?>
     {
         /*********
         ** Public methods
@@ -26,7 +24,7 @@ namespace StardewModdingAPI.Framework.ModLoading
         /// <summary>Get whether the specified objects are equal.</summary>
         /// <param name="a">The first object to compare.</param>
         /// <param name="b">The second object to compare.</param>
-        public bool Equals(TypeReference a, TypeReference b)
+        public bool Equals(TypeReference? a, TypeReference? b)
         {
             if (a == null || b == null)
                 return a == b;
@@ -54,7 +52,7 @@ namespace StardewModdingAPI.Framework.ModLoading
         /// <param name="typeB">The second type to compare.</param>
         private bool HeuristicallyEquals(TypeReference typeA, TypeReference typeB)
         {
-            bool HeuristicallyEquals(string typeNameA, string typeNameB, IDictionary<string, string> tokenMap)
+            bool HeuristicallyEqualsImpl(string typeNameA, string typeNameB, IDictionary<string, string> tokenMap)
             {
                 // analyze type names
                 bool hasTokensA = typeNameA.Contains("!");
@@ -82,14 +80,14 @@ namespace StardewModdingAPI.Framework.ModLoading
 
                 for (int i = 0; i < symbolsA.Length; i++)
                 {
-                    if (!HeuristicallyEquals(symbolsA[i], symbolsB[i], tokenMap))
+                    if (!HeuristicallyEqualsImpl(symbolsA[i], symbolsB[i], tokenMap))
                         return false;
                 }
 
                 return true;
             }
 
-            return HeuristicallyEquals(typeA.FullName, typeB.FullName, new Dictionary<string, string>());
+            return HeuristicallyEqualsImpl(typeA.FullName, typeB.FullName, new Dictionary<string, string>());
         }
 
         /// <summary>Map a generic type placeholder (like <c>!0</c>) to its actual type.</summary>
@@ -99,7 +97,7 @@ namespace StardewModdingAPI.Framework.ModLoading
         /// <returns>Returns the previously-mapped type if applicable, else the <paramref name="type"/>.</returns>
         private string MapPlaceholder(string placeholder, string type, IDictionary<string, string> map)
         {
-            if (map.TryGetValue(placeholder, out string result))
+            if (map.TryGetValue(placeholder, out string? result))
                 return result;
 
             map[placeholder] = type;
diff --git a/src/SMAPI/Framework/ModRegistry.cs b/src/SMAPI/Framework/ModRegistry.cs
index cae38637..de16a780 100644
--- a/src/SMAPI/Framework/ModRegistry.cs
+++ b/src/SMAPI/Framework/ModRegistry.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
@@ -42,7 +40,7 @@ namespace StardewModdingAPI.Framework
         /// <param name="modAssembly">The mod assembly.</param>
         public void TrackAssemblies(IModMetadata metadata, Assembly modAssembly)
         {
-            this.ModNamesByAssembly[modAssembly.FullName] = metadata;
+            this.ModNamesByAssembly[modAssembly.FullName!] = metadata;
         }
 
         /// <summary>Get metadata for all loaded mods.</summary>
@@ -62,7 +60,7 @@ namespace StardewModdingAPI.Framework
         /// <summary>Get metadata for a loaded mod.</summary>
         /// <param name="uniqueID">The mod's unique ID.</param>
         /// <returns>Returns the matching mod's metadata, or <c>null</c> if not found.</returns>
-        public IModMetadata Get(string uniqueID)
+        public IModMetadata? Get(string uniqueID)
         {
             // normalize search ID
             if (string.IsNullOrWhiteSpace(uniqueID))
@@ -76,14 +74,14 @@ namespace StardewModdingAPI.Framework
         /// <summary>Get the mod metadata from one of its assemblies.</summary>
         /// <param name="type">The type to check.</param>
         /// <returns>Returns the mod name, or <c>null</c> if the type isn't part of a known mod.</returns>
-        public IModMetadata GetFrom(Type type)
+        public IModMetadata? GetFrom(Type? type)
         {
             // null
             if (type == null)
                 return null;
 
             // known type
-            string assemblyName = type.Assembly.FullName;
+            string assemblyName = type.Assembly.FullName!;
             if (this.ModNamesByAssembly.ContainsKey(assemblyName))
                 return this.ModNamesByAssembly[assemblyName];
 
@@ -93,7 +91,7 @@ namespace StardewModdingAPI.Framework
 
         /// <summary>Get the friendly name for the closest assembly registered as a source of deprecation warnings.</summary>
         /// <returns>Returns the source name, or <c>null</c> if no registered assemblies were found.</returns>
-        public IModMetadata GetFromStack()
+        public IModMetadata? GetFromStack()
         {
             // get stack frames
             StackTrace stack = new();
@@ -102,8 +100,8 @@ namespace StardewModdingAPI.Framework
             // search stack for a source assembly
             foreach (StackFrame frame in frames)
             {
-                MethodBase method = frame.GetMethod();
-                IModMetadata mod = this.GetFrom(method.ReflectedType);
+                MethodBase? method = frame.GetMethod();
+                IModMetadata? mod = this.GetFrom(method?.ReflectedType);
                 if (mod != null)
                     return mod;
             }
diff --git a/src/SMAPI/Framework/Reflection/ReflectedField.cs b/src/SMAPI/Framework/Reflection/ReflectedField.cs
index 921876b9..197a246e 100644
--- a/src/SMAPI/Framework/Reflection/ReflectedField.cs
+++ b/src/SMAPI/Framework/Reflection/ReflectedField.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 using System;
 using System.Reflection;
 
@@ -15,8 +13,8 @@ namespace StardewModdingAPI.Framework.Reflection
         /// <summary>The type that has the field.</summary>
         private readonly Type ParentType;
 
-        /// <summary>The object that has the instance field (if applicable).</summary>
-        private readonly object Parent;
+        /// <summary>The object that has the instance field, or <c>null</c> for a static field.</summary>
+        private readonly object? Parent;
 
         /// <summary>The display name shown in error messages.</summary>
         private string DisplayName => $"{this.ParentType.FullName}::{this.FieldInfo.Name}";
@@ -34,12 +32,12 @@ namespace StardewModdingAPI.Framework.Reflection
         *********/
         /// <summary>Construct an instance.</summary>
         /// <param name="parentType">The type that has the field.</param>
-        /// <param name="obj">The object that has the instance field (if applicable).</param>
+        /// <param name="obj">The object that has the instance field, or <c>null</c> for a static field.</param>
         /// <param name="field">The reflection metadata.</param>
         /// <param name="isStatic">Whether the field is static.</param>
         /// <exception cref="ArgumentNullException">The <paramref name="parentType"/> or <paramref name="field"/> is null.</exception>
         /// <exception cref="ArgumentException">The <paramref name="obj"/> is null for a non-static field, or not null for a static field.</exception>
-        public ReflectedField(Type parentType, object obj, FieldInfo field, bool isStatic)
+        public ReflectedField(Type parentType, object? obj, FieldInfo field, bool isStatic)
         {
             // validate
             if (parentType == null)
@@ -58,11 +56,11 @@ namespace StardewModdingAPI.Framework.Reflection
         }
 
         /// <inheritdoc />
-        public TValue GetValue()
+        public TValue? GetValue()
         {
             try
             {
-                return (TValue)this.FieldInfo.GetValue(this.Parent);
+                return (TValue?)this.FieldInfo.GetValue(this.Parent);
             }
             catch (InvalidCastException)
             {
@@ -75,7 +73,7 @@ namespace StardewModdingAPI.Framework.Reflection
         }
 
         /// <inheritdoc />
-        public void SetValue(TValue value)
+        public void SetValue(TValue? value)
         {
             try
             {
diff --git a/src/SMAPI/Framework/Reflection/ReflectedMethod.cs b/src/SMAPI/Framework/Reflection/ReflectedMethod.cs
index 50f89b40..c245e843 100644
--- a/src/SMAPI/Framework/Reflection/ReflectedMethod.cs
+++ b/src/SMAPI/Framework/Reflection/ReflectedMethod.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 using System;
 using System.Reflection;
 
@@ -14,8 +12,8 @@ namespace StardewModdingAPI.Framework.Reflection
         /// <summary>The type that has the method.</summary>
         private readonly Type ParentType;
 
-        /// <summary>The object that has the instance method (if applicable).</summary>
-        private readonly object Parent;
+        /// <summary>The object that has the instance method, or <c>null</c> for a static method.</summary>
+        private readonly object? Parent;
 
         /// <summary>The display name shown in error messages.</summary>
         private string DisplayName => $"{this.ParentType.FullName}::{this.MethodInfo.Name}";
@@ -33,12 +31,12 @@ namespace StardewModdingAPI.Framework.Reflection
         *********/
         /// <summary>Construct an instance.</summary>
         /// <param name="parentType">The type that has the method.</param>
-        /// <param name="obj">The object that has the instance method(if applicable).</param>
+        /// <param name="obj">The object that has the instance method, or <c>null</c> for a static method.</param>
         /// <param name="method">The reflection metadata.</param>
         /// <param name="isStatic">Whether the method is static.</param>
         /// <exception cref="ArgumentNullException">The <paramref name="parentType"/> or <paramref name="method"/> is null.</exception>
         /// <exception cref="ArgumentException">The <paramref name="obj"/> is null for a non-static method, or not null for a static method.</exception>
-        public ReflectedMethod(Type parentType, object obj, MethodInfo method, bool isStatic)
+        public ReflectedMethod(Type parentType, object? obj, MethodInfo method, bool isStatic)
         {
             // validate
             if (parentType == null)
@@ -57,10 +55,10 @@ namespace StardewModdingAPI.Framework.Reflection
         }
 
         /// <inheritdoc />
-        public TValue Invoke<TValue>(params object[] arguments)
+        public TValue? Invoke<TValue>(params object?[] arguments)
         {
             // invoke method
-            object result;
+            object? result;
             try
             {
                 result = this.MethodInfo.Invoke(this.Parent, arguments);
@@ -77,7 +75,7 @@ namespace StardewModdingAPI.Framework.Reflection
             // cast return value
             try
             {
-                return (TValue)result;
+                return (TValue?)result;
             }
             catch (InvalidCastException)
             {
@@ -86,7 +84,7 @@ namespace StardewModdingAPI.Framework.Reflection
         }
 
         /// <inheritdoc />
-        public void Invoke(params object[] arguments)
+        public void Invoke(params object?[] arguments)
         {
             // invoke method
             try
diff --git a/src/SMAPI/Framework/Reflection/ReflectedProperty.cs b/src/SMAPI/Framework/Reflection/ReflectedProperty.cs
index a6d8c75c..638953a3 100644
--- a/src/SMAPI/Framework/Reflection/ReflectedProperty.cs
+++ b/src/SMAPI/Framework/Reflection/ReflectedProperty.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 using System;
 using System.Reflection;
 
@@ -16,10 +14,10 @@ namespace StardewModdingAPI.Framework.Reflection
         private readonly string DisplayName;
 
         /// <summary>The underlying property getter.</summary>
-        private readonly Func<TValue> GetMethod;
+        private readonly Func<TValue?>? GetMethod;
 
         /// <summary>The underlying property setter.</summary>
-        private readonly Action<TValue> SetMethod;
+        private readonly Action<TValue?>? SetMethod;
 
 
         /*********
@@ -34,12 +32,12 @@ namespace StardewModdingAPI.Framework.Reflection
         *********/
         /// <summary>Construct an instance.</summary>
         /// <param name="parentType">The type that has the property.</param>
-        /// <param name="obj">The object that has the instance property (if applicable).</param>
+        /// <param name="obj">The object that has the instance property, or <c>null</c> for a static property.</param>
         /// <param name="property">The reflection metadata.</param>
         /// <param name="isStatic">Whether the property is static.</param>
         /// <exception cref="ArgumentNullException">The <paramref name="parentType"/> or <paramref name="property"/> is null.</exception>
         /// <exception cref="ArgumentException">The <paramref name="obj"/> is null for a non-static property, or not null for a static property.</exception>
-        public ReflectedProperty(Type parentType, object obj, PropertyInfo property, bool isStatic)
+        public ReflectedProperty(Type parentType, object? obj, PropertyInfo property, bool isStatic)
         {
             // validate input
             if (parentType == null)
@@ -58,13 +56,13 @@ namespace StardewModdingAPI.Framework.Reflection
             this.PropertyInfo = property;
 
             if (this.PropertyInfo.GetMethod != null)
-                this.GetMethod = (Func<TValue>)Delegate.CreateDelegate(typeof(Func<TValue>), obj, this.PropertyInfo.GetMethod);
+                this.GetMethod = (Func<TValue?>)Delegate.CreateDelegate(typeof(Func<TValue?>), obj, this.PropertyInfo.GetMethod);
             if (this.PropertyInfo.SetMethod != null)
-                this.SetMethod = (Action<TValue>)Delegate.CreateDelegate(typeof(Action<TValue>), obj, this.PropertyInfo.SetMethod);
+                this.SetMethod = (Action<TValue?>)Delegate.CreateDelegate(typeof(Action<TValue?>), obj, this.PropertyInfo.SetMethod);
         }
 
         /// <inheritdoc />
-        public TValue GetValue()
+        public TValue? GetValue()
         {
             if (this.GetMethod == null)
                 throw new InvalidOperationException($"The {this.DisplayName} property has no get method.");
@@ -84,7 +82,7 @@ namespace StardewModdingAPI.Framework.Reflection
         }
 
         /// <inheritdoc />
-        public void SetValue(TValue value)
+        public void SetValue(TValue? value)
         {
             if (this.SetMethod == null)
                 throw new InvalidOperationException($"The {this.DisplayName} property has no set method.");
diff --git a/src/SMAPI/Framework/Rendering/SDisplayDevice.cs b/src/SMAPI/Framework/Rendering/SDisplayDevice.cs
index 8718bcb1..37996b0f 100644
--- a/src/SMAPI/Framework/Rendering/SDisplayDevice.cs
+++ b/src/SMAPI/Framework/Rendering/SDisplayDevice.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 using System;
 using Microsoft.Xna.Framework;
 using Microsoft.Xna.Framework.Content;
@@ -27,7 +25,7 @@ namespace StardewModdingAPI.Framework.Rendering
         /// <param name="tile">The tile to draw.</param>
         /// <param name="location">The tile position to draw.</param>
         /// <param name="layerDepth">The layer depth at which to draw.</param>
-        public override void DrawTile(Tile tile, Location location, float layerDepth)
+        public override void DrawTile(Tile? tile, Location location, float layerDepth)
         {
             // identical to XnaDisplayDevice
             if (tile == null)
@@ -58,7 +56,7 @@ namespace StardewModdingAPI.Framework.Rendering
         /// <param name="tile">The tile being drawn.</param>
         private SpriteEffects GetSpriteEffects(Tile tile)
         {
-            return tile.Properties.TryGetValue("@Flip", out PropertyValue propertyValue) && int.TryParse(propertyValue, out int value)
+            return tile.Properties.TryGetValue("@Flip", out PropertyValue? propertyValue) && int.TryParse(propertyValue, out int value)
                 ? (SpriteEffects)value
                 : SpriteEffects.None;
         }
@@ -67,7 +65,7 @@ namespace StardewModdingAPI.Framework.Rendering
         /// <param name="tile">The tile being drawn.</param>
         private float GetRotation(Tile tile)
         {
-            if (!tile.Properties.TryGetValue("@Rotation", out PropertyValue propertyValue) || !int.TryParse(propertyValue, out int value))
+            if (!tile.Properties.TryGetValue("@Rotation", out PropertyValue? propertyValue) || !int.TryParse(propertyValue, out int value))
                 return 0;
 
             value %= 360;
diff --git a/src/SMAPI/Framework/Rendering/SXnaDisplayDevice.cs b/src/SMAPI/Framework/Rendering/SXnaDisplayDevice.cs
index 21edaedd..94b13378 100644
--- a/src/SMAPI/Framework/Rendering/SXnaDisplayDevice.cs
+++ b/src/SMAPI/Framework/Rendering/SXnaDisplayDevice.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 using System;
 using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
@@ -91,7 +89,7 @@ namespace StardewModdingAPI.Framework.Rendering
         /// <param name="tile">The tile to draw.</param>
         /// <param name="location">The tile position to draw.</param>
         /// <param name="layerDepth">The layer depth at which to draw.</param>
-        public virtual void DrawTile(Tile tile, Location location, float layerDepth)
+        public virtual void DrawTile(Tile? tile, Location location, float layerDepth)
         {
             if (tile == null)
                 return;
diff --git a/src/SMAPI/Framework/SGame.cs b/src/SMAPI/Framework/SGame.cs
index 7ca89eec..4fa7fe7b 100644
--- a/src/SMAPI/Framework/SGame.cs
+++ b/src/SMAPI/Framework/SGame.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 using System;
 using System.Collections.ObjectModel;
 using System.Diagnostics.CodeAnalysis;
@@ -48,10 +46,10 @@ namespace StardewModdingAPI.Framework
         private readonly Action<string> ExitGameImmediately;
 
         /// <summary>The initial override for <see cref="Input"/>. This value is null after initialization.</summary>
-        private SInputState InitialInput;
+        private SInputState? InitialInput;
 
         /// <summary>The initial override for <see cref="Multiplayer"/>. This value is null after initialization.</summary>
-        private SMultiplayer InitialMultiplayer;
+        private SMultiplayer? InitialMultiplayer;
 
         /// <summary>Raised when the instance is updating its state (roughly 60 times per second).</summary>
         private readonly Action<SGame, GameTime, Action> OnUpdating;
@@ -70,7 +68,7 @@ namespace StardewModdingAPI.Framework
         public Task NewDayTask => Game1._newDayTask;
 
         /// <summary>Monitors the entire game state for changes.</summary>
-        public WatcherCore Watchers { get; private set; }
+        public WatcherCore Watchers { get; private set; } = null!; // initialized on first update tick
 
         /// <summary>A snapshot of the current <see cref="Watchers"/> state.</summary>
         public WatcherSnapshot WatcherSnapshot { get; } = new();
@@ -94,7 +92,7 @@ namespace StardewModdingAPI.Framework
         /// <summary>Construct a content manager to read game content files.</summary>
         /// <remarks>This must be static because the game accesses it before the <see cref="SGame"/> constructor is called.</remarks>
         [NonInstancedStatic]
-        public static Func<IServiceProvider, string, LocalizedContentManager> CreateContentManagerImpl;
+        public static Func<IServiceProvider, string, LocalizedContentManager>? CreateContentManagerImpl;
 
 
         /*********
@@ -138,11 +136,10 @@ namespace StardewModdingAPI.Framework
         /// <remarks>This is intended for use by <see cref="Keybind"/> and shouldn't be used directly in most cases.</remarks>
         internal static SButtonState GetInputState(SButton button)
         {
-            SInputState input = Game1.input as SInputState;
-            if (input == null)
+            if (Game1.input is not SInputState inputHandler)
                 throw new InvalidOperationException("SMAPI's input state is not in a ready state yet.");
 
-            return input.GetState(button);
+            return inputHandler.GetState(button);
         }
 
         /// <inheritdoc />
@@ -172,13 +169,11 @@ namespace StardewModdingAPI.Framework
         {
             base.Initialize();
 
-            // The game resets public static fields after the class is constructed (see
-            // GameRunner.SetInstanceDefaults), so SMAPI needs to re-override them here.
+            // The game resets public static fields after the class is constructed (see GameRunner.SetInstanceDefaults), so SMAPI needs to re-override them here.
             Game1.input = this.InitialInput;
             Game1.multiplayer = this.InitialMultiplayer;
 
-            // The Initial* fields should no longer be used after this point, since mods may
-            // further override them after initialization.
+            // The Initial* fields should no longer be used after this point, since mods may further override them after initialization.
             this.InitialInput = null;
             this.InitialMultiplayer = null;
         }
@@ -251,6 +246,7 @@ namespace StardewModdingAPI.Framework
             Context.IsInDrawLoop = false;
         }
 
+#nullable disable
         /// <summary>Replicate the game's draw logic with some changes for SMAPI.</summary>
         /// <param name="gameTime">A snapshot of the game timing state.</param>
         /// <param name="target_screen">The render target, if any.</param>
@@ -258,6 +254,7 @@ namespace StardewModdingAPI.Framework
         [SuppressMessage("ReSharper", "CompareOfFloatsByEqualityOperator", Justification = "copied from game code as-is")]
         [SuppressMessage("ReSharper", "InconsistentNaming", Justification = "copied from game code as-is")]
         [SuppressMessage("ReSharper", "LocalVariableHidesMember", Justification = "copied from game code as-is")]
+        [SuppressMessage("ReSharper", "MergeIntoPattern", Justification = "copied from game code as-is")]
         [SuppressMessage("ReSharper", "PossibleLossOfFraction", Justification = "copied from game code as-is")]
         [SuppressMessage("ReSharper", "RedundantArgumentDefaultValue", Justification = "copied from game code as-is")]
         [SuppressMessage("ReSharper", "RedundantBaseQualifier", Justification = "copied from game code as-is")]
@@ -265,8 +262,9 @@ namespace StardewModdingAPI.Framework
         [SuppressMessage("ReSharper", "RedundantExplicitNullableCreation", Justification = "copied from game code as-is")]
         [SuppressMessage("ReSharper", "RedundantTypeArgumentsOfMethod", Justification = "copied from game code as-is")]
         [SuppressMessage("ReSharper", "IdentifierTypo", Justification = "copied from game code as-is")]
-        [SuppressMessage("SMAPI.CommonErrors", "AvoidNetField", Justification = "copied from game code as-is")]
+        [SuppressMessage("ReSharper", "MergeIntoPattern", Justification = "copied from game code as-is")]
         [SuppressMessage("SMAPI.CommonErrors", "AvoidImplicitNetFieldCast", Justification = "copied from game code as-is")]
+        [SuppressMessage("SMAPI.CommonErrors", "AvoidNetField", Justification = "copied from game code as-is")]
         private void DrawImpl(GameTime gameTime, RenderTarget2D target_screen)
         {
             var events = this.Events;
@@ -952,5 +950,6 @@ namespace StardewModdingAPI.Framework
             this.drawOverlays(Game1.spriteBatch);
             Game1.PopUIMode();
         }
+#nullable enable
     }
 }
diff --git a/src/SMAPI/Framework/SModHooks.cs b/src/SMAPI/Framework/SModHooks.cs
index 7941e102..a7736c8b 100644
--- a/src/SMAPI/Framework/SModHooks.cs
+++ b/src/SMAPI/Framework/SModHooks.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 using System;
 using System.Threading.Tasks;
 using StardewValley;
@@ -35,7 +33,7 @@ namespace StardewModdingAPI.Framework
         /// <param name="action">The vanilla <see cref="Game1.newDayAfterFade"/> logic.</param>
         public override void OnGame1_NewDayAfterFade(Action action)
         {
-            this.BeforeNewDayAfterFade?.Invoke();
+            this.BeforeNewDayAfterFade();
             action();
         }
 
diff --git a/src/SMAPI/Framework/SnapshotDiff.cs b/src/SMAPI/Framework/SnapshotDiff.cs
index eb2aebe1..d659d2b4 100644
--- a/src/SMAPI/Framework/SnapshotDiff.cs
+++ b/src/SMAPI/Framework/SnapshotDiff.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 using StardewModdingAPI.Framework.StateTracking;
 
 namespace StardewModdingAPI.Framework
@@ -15,10 +13,10 @@ namespace StardewModdingAPI.Framework
         public bool IsChanged { get; private set; }
 
         /// <summary>The previous value.</summary>
-        public T Old { get; private set; }
+        public T? Old { get; private set; }
 
         /// <summary>The current value.</summary>
-        public T New { get; private set; }
+        public T? New { get; private set; }
 
 
         /*********
diff --git a/src/SMAPI/Framework/SnapshotItemListDiff.cs b/src/SMAPI/Framework/SnapshotItemListDiff.cs
index 97942783..76060db2 100644
--- a/src/SMAPI/Framework/SnapshotItemListDiff.cs
+++ b/src/SMAPI/Framework/SnapshotItemListDiff.cs
@@ -1,6 +1,5 @@
-#nullable disable
-
 using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using StardewModdingAPI.Events;
 using StardewValley;
@@ -48,7 +47,7 @@ namespace StardewModdingAPI.Framework
         /// <param name="stackSizes">The items with their previous stack sizes.</param>
         /// <param name="changes">The inventory changes, or <c>null</c> if nothing changed.</param>
         /// <returns>Returns whether anything changed.</returns>
-        public static bool TryGetChanges(ISet<Item> added, ISet<Item> removed, IDictionary<Item, int> stackSizes, out SnapshotItemListDiff changes)
+        public static bool TryGetChanges(ISet<Item> added, ISet<Item> removed, IDictionary<Item, int> stackSizes, [NotNullWhen(true)] out SnapshotItemListDiff? changes)
         {
             KeyValuePair<Item, int>[] sizesChanged = stackSizes.Where(p => p.Key.Stack != p.Value).ToArray();
             if (sizesChanged.Any() || added.Any() || removed.Any())
diff --git a/src/SMAPI/Framework/SnapshotListDiff.cs b/src/SMAPI/Framework/SnapshotListDiff.cs
index 1d585c15..90066af1 100644
--- a/src/SMAPI/Framework/SnapshotListDiff.cs
+++ b/src/SMAPI/Framework/SnapshotListDiff.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 using System.Collections.Generic;
 using StardewModdingAPI.Framework.StateTracking;
 
@@ -39,7 +37,7 @@ namespace StardewModdingAPI.Framework
         /// <param name="isChanged">Whether the value changed since the last update.</param>
         /// <param name="removed">The removed values.</param>
         /// <param name="added">The added values.</param>
-        public void Update(bool isChanged, IEnumerable<T> removed, IEnumerable<T> added)
+        public void Update(bool isChanged, IEnumerable<T>? removed, IEnumerable<T>? added)
         {
             this.IsChanged = isChanged;
 
diff --git a/src/SMAPI/Framework/StateTracking/ChestTracker.cs b/src/SMAPI/Framework/StateTracking/ChestTracker.cs
index 28335200..c33a7498 100644
--- a/src/SMAPI/Framework/StateTracking/ChestTracker.cs
+++ b/src/SMAPI/Framework/StateTracking/ChestTracker.cs
@@ -1,7 +1,6 @@
-#nullable disable
-
 using System;
 using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using StardewModdingAPI.Framework.StateTracking.Comparers;
 using StardewModdingAPI.Framework.StateTracking.FieldWatchers;
@@ -86,7 +85,7 @@ namespace StardewModdingAPI.Framework.StateTracking
         /// <summary>Get the inventory changes since the last update, if anything changed.</summary>
         /// <param name="changes">The inventory changes, or <c>null</c> if nothing changed.</param>
         /// <returns>Returns whether anything changed.</returns>
-        public bool TryGetInventoryChanges(out SnapshotItemListDiff changes)
+        public bool TryGetInventoryChanges([NotNullWhen(true)] out SnapshotItemListDiff? changes)
         {
             return SnapshotItemListDiff.TryGetChanges(added: this.Added, removed: this.Removed, stackSizes: this.StackSizes, out changes);
         }
diff --git a/src/SMAPI/Framework/StateTracking/Comparers/EquatableComparer.cs b/src/SMAPI/Framework/StateTracking/Comparers/EquatableComparer.cs
index 987e1820..9d8559b4 100644
--- a/src/SMAPI/Framework/StateTracking/Comparers/EquatableComparer.cs
+++ b/src/SMAPI/Framework/StateTracking/Comparers/EquatableComparer.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 using System;
 using System.Collections.Generic;
 using System.Runtime.CompilerServices;
@@ -17,7 +15,7 @@ namespace StardewModdingAPI.Framework.StateTracking.Comparers
         /// <returns>true if the specified objects are equal; otherwise, false.</returns>
         /// <param name="x">The first object to compare.</param>
         /// <param name="y">The second object to compare.</param>
-        public bool Equals(T x, T y)
+        public bool Equals(T? x, T? y)
         {
             if (x == null)
                 return y == null;
diff --git a/src/SMAPI/Framework/StateTracking/Comparers/GenericEqualsComparer.cs b/src/SMAPI/Framework/StateTracking/Comparers/GenericEqualsComparer.cs
index f6b04583..41b17e10 100644
--- a/src/SMAPI/Framework/StateTracking/Comparers/GenericEqualsComparer.cs
+++ b/src/SMAPI/Framework/StateTracking/Comparers/GenericEqualsComparer.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 using System.Collections.Generic;
 using System.Runtime.CompilerServices;
 
@@ -16,7 +14,7 @@ namespace StardewModdingAPI.Framework.StateTracking.Comparers
         /// <returns>true if the specified objects are equal; otherwise, false.</returns>
         /// <param name="x">The first object to compare.</param>
         /// <param name="y">The second object to compare.</param>
-        public bool Equals(T x, T y)
+        public bool Equals(T? x, T? y)
         {
             if (x == null)
                 return y == null;
diff --git a/src/SMAPI/Framework/StateTracking/Comparers/ObjectReferenceComparer.cs b/src/SMAPI/Framework/StateTracking/Comparers/ObjectReferenceComparer.cs
index 8d3a7eb9..e6ece854 100644
--- a/src/SMAPI/Framework/StateTracking/Comparers/ObjectReferenceComparer.cs
+++ b/src/SMAPI/Framework/StateTracking/Comparers/ObjectReferenceComparer.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 using System.Collections.Generic;
 using System.Runtime.CompilerServices;
 
@@ -16,7 +14,7 @@ namespace StardewModdingAPI.Framework.StateTracking.Comparers
         /// <returns>true if the specified objects are equal; otherwise, false.</returns>
         /// <param name="x">The first object to compare.</param>
         /// <param name="y">The second object to compare.</param>
-        public bool Equals(T x, T y)
+        public bool Equals(T? x, T? y)
         {
             return object.ReferenceEquals(x, y);
         }
diff --git a/src/SMAPI/Framework/StateTracking/FieldWatchers/NetDictionaryWatcher.cs b/src/SMAPI/Framework/StateTracking/FieldWatchers/NetDictionaryWatcher.cs
index 0d7f2ad2..f55e4cea 100644
--- a/src/SMAPI/Framework/StateTracking/FieldWatchers/NetDictionaryWatcher.cs
+++ b/src/SMAPI/Framework/StateTracking/FieldWatchers/NetDictionaryWatcher.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 using System.Collections.Generic;
 using Netcode;
 
@@ -12,6 +10,7 @@ namespace StardewModdingAPI.Framework.StateTracking.FieldWatchers
     /// <typeparam name="TSerialDict">The serializable dictionary type that can store the keys and values.</typeparam>
     /// <typeparam name="TSelf">The net field instance type.</typeparam>
     internal class NetDictionaryWatcher<TKey, TValue, TField, TSerialDict, TSelf> : BaseDisposableWatcher, IDictionaryWatcher<TKey, TValue>
+        where TKey : notnull
         where TField : class, INetObject<INetSerializable>, new()
         where TSerialDict : IDictionary<TKey, TValue>, new()
         where TSelf : NetDictionary<TKey, TValue, TField, TSerialDict, TSelf>
diff --git a/src/SMAPI/Framework/StateTracking/FieldWatchers/ObservableCollectionWatcher.cs b/src/SMAPI/Framework/StateTracking/FieldWatchers/ObservableCollectionWatcher.cs
index 82e5387e..97aedca8 100644
--- a/src/SMAPI/Framework/StateTracking/FieldWatchers/ObservableCollectionWatcher.cs
+++ b/src/SMAPI/Framework/StateTracking/FieldWatchers/ObservableCollectionWatcher.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Collections.Specialized;
@@ -81,7 +79,7 @@ namespace StardewModdingAPI.Framework.StateTracking.FieldWatchers
         /// <summary>A callback invoked when an entry is added or removed from the collection.</summary>
         /// <param name="sender">The event sender.</param>
         /// <param name="e">The event arguments.</param>
-        private void OnCollectionChanged(object sender, NotifyCollectionChangedEventArgs e)
+        private void OnCollectionChanged(object? sender, NotifyCollectionChangedEventArgs e)
         {
             if (e.Action == NotifyCollectionChangedAction.Reset)
             {
@@ -90,8 +88,8 @@ namespace StardewModdingAPI.Framework.StateTracking.FieldWatchers
             }
             else
             {
-                TValue[] added = e.NewItems?.Cast<TValue>().ToArray();
-                TValue[] removed = e.OldItems?.Cast<TValue>().ToArray();
+                TValue[]? added = e.NewItems?.Cast<TValue>().ToArray();
+                TValue[]? removed = e.OldItems?.Cast<TValue>().ToArray();
 
                 if (removed != null)
                 {
diff --git a/src/SMAPI/Framework/StateTracking/FieldWatchers/WatcherFactory.cs b/src/SMAPI/Framework/StateTracking/FieldWatchers/WatcherFactory.cs
index 0b99914c..c4a4d0b9 100644
--- a/src/SMAPI/Framework/StateTracking/FieldWatchers/WatcherFactory.cs
+++ b/src/SMAPI/Framework/StateTracking/FieldWatchers/WatcherFactory.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
@@ -20,7 +18,8 @@ namespace StardewModdingAPI.Framework.StateTracking.FieldWatchers
         /// <summary>Get a watcher which compares values using their <see cref="object.Equals(object)"/> method. This method should only be used when <see cref="ForEquatable{T}"/> won't work, since this doesn't validate whether they're comparable.</summary>
         /// <typeparam name="T">The value type.</typeparam>
         /// <param name="getValue">Get the current value.</param>
-        public static IValueWatcher<T> ForGenericEquality<T>(Func<T> getValue) where T : struct
+        public static IValueWatcher<T> ForGenericEquality<T>(Func<T> getValue)
+            where T : struct
         {
             return new ComparableWatcher<T>(getValue, new GenericEqualsComparer<T>());
         }
@@ -28,7 +27,8 @@ namespace StardewModdingAPI.Framework.StateTracking.FieldWatchers
         /// <summary>Get a watcher for an <see cref="IEquatable{T}"/> value.</summary>
         /// <typeparam name="T">The value type.</typeparam>
         /// <param name="getValue">Get the current value.</param>
-        public static IValueWatcher<T> ForEquatable<T>(Func<T> getValue) where T : IEquatable<T>
+        public static IValueWatcher<T> ForEquatable<T>(Func<T> getValue)
+            where T : IEquatable<T>
         {
             return new ComparableWatcher<T>(getValue, new EquatableComparer<T>());
         }
@@ -79,7 +79,8 @@ namespace StardewModdingAPI.Framework.StateTracking.FieldWatchers
         /// <summary>Get a watcher for a net collection.</summary>
         /// <typeparam name="T">The value type.</typeparam>
         /// <param name="collection">The net collection.</param>
-        public static ICollectionWatcher<T> ForNetCollection<T>(NetCollection<T> collection) where T : class, INetObject<INetSerializable>
+        public static ICollectionWatcher<T> ForNetCollection<T>(NetCollection<T> collection)
+            where T : class, INetObject<INetSerializable>
         {
             return new NetCollectionWatcher<T>(collection);
         }
@@ -87,7 +88,8 @@ namespace StardewModdingAPI.Framework.StateTracking.FieldWatchers
         /// <summary>Get a watcher for a net list.</summary>
         /// <typeparam name="T">The value type.</typeparam>
         /// <param name="collection">The net list.</param>
-        public static ICollectionWatcher<T> ForNetList<T>(NetList<T, NetRef<T>> collection) where T : class, INetObject<INetSerializable>
+        public static ICollectionWatcher<T> ForNetList<T>(NetList<T, NetRef<T>> collection)
+            where T : class, INetObject<INetSerializable>
         {
             return new NetListWatcher<T>(collection);
         }
@@ -100,6 +102,7 @@ namespace StardewModdingAPI.Framework.StateTracking.FieldWatchers
         /// <typeparam name="TSelf">The net field instance type.</typeparam>
         /// <param name="field">The net field.</param>
         public static NetDictionaryWatcher<TKey, TValue, TField, TSerialDict, TSelf> ForNetDictionary<TKey, TValue, TField, TSerialDict, TSelf>(NetDictionary<TKey, TValue, TField, TSerialDict, TSelf> field)
+            where TKey : notnull
             where TField : class, INetObject<INetSerializable>, new()
             where TSerialDict : IDictionary<TKey, TValue>, new()
             where TSelf : NetDictionary<TKey, TValue, TField, TSerialDict, TSelf>
diff --git a/src/SMAPI/Framework/StateTracking/LocationTracker.cs b/src/SMAPI/Framework/StateTracking/LocationTracker.cs
index 9c2ff7f0..ff72a19b 100644
--- a/src/SMAPI/Framework/StateTracking/LocationTracker.cs
+++ b/src/SMAPI/Framework/StateTracking/LocationTracker.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -132,20 +130,20 @@ namespace StardewModdingAPI.Framework.StateTracking
         private void UpdateChestWatcherList(IEnumerable<KeyValuePair<Vector2, SObject>> added, IEnumerable<KeyValuePair<Vector2, SObject>> removed)
         {
             // remove unused watchers
-            foreach (KeyValuePair<Vector2, SObject> pair in removed)
+            foreach ((Vector2 tile, SObject? obj) in removed)
             {
-                if (pair.Value is Chest && this.ChestWatchers.TryGetValue(pair.Key, out ChestTracker watcher))
+                if (obj is Chest && this.ChestWatchers.TryGetValue(tile, out ChestTracker? watcher))
                 {
                     watcher.Dispose();
-                    this.ChestWatchers.Remove(pair.Key);
+                    this.ChestWatchers.Remove(tile);
                 }
             }
 
             // add new watchers
-            foreach (KeyValuePair<Vector2, SObject> pair in added)
+            foreach ((Vector2 tile, SObject? obj) in added)
             {
-                if (pair.Value is Chest chest && !this.ChestWatchers.ContainsKey(pair.Key))
-                    this.ChestWatchers.Add(pair.Key, new ChestTracker(chest));
+                if (obj is Chest chest && !this.ChestWatchers.ContainsKey(tile))
+                    this.ChestWatchers.Add(tile, new ChestTracker(chest));
             }
         }
     }
diff --git a/src/SMAPI/Framework/StateTracking/Snapshots/LocationSnapshot.cs b/src/SMAPI/Framework/StateTracking/Snapshots/LocationSnapshot.cs
index 3d13f92b..0d0469d7 100644
--- a/src/SMAPI/Framework/StateTracking/Snapshots/LocationSnapshot.cs
+++ b/src/SMAPI/Framework/StateTracking/Snapshots/LocationSnapshot.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 using System.Collections.Generic;
 using Microsoft.Xna.Framework;
 using StardewValley;
@@ -70,7 +68,7 @@ namespace StardewModdingAPI.Framework.StateTracking.Snapshots
             this.ChestItems.Clear();
             foreach (ChestTracker tracker in watcher.ChestWatchers.Values)
             {
-                if (tracker.TryGetInventoryChanges(out SnapshotItemListDiff changes))
+                if (tracker.TryGetInventoryChanges(out SnapshotItemListDiff? changes))
                     this.ChestItems[tracker.Chest] = changes;
             }
         }
diff --git a/src/SMAPI/Framework/StateTracking/Snapshots/WatcherSnapshot.cs b/src/SMAPI/Framework/StateTracking/Snapshots/WatcherSnapshot.cs
index 1d43ef26..27a891de 100644
--- a/src/SMAPI/Framework/StateTracking/Snapshots/WatcherSnapshot.cs
+++ b/src/SMAPI/Framework/StateTracking/Snapshots/WatcherSnapshot.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 using Microsoft.Xna.Framework;
 using StardewValley;
 using StardewValley.Menus;
@@ -16,7 +14,7 @@ namespace StardewModdingAPI.Framework.StateTracking.Snapshots
         public SnapshotDiff<Point> WindowSize { get; } = new();
 
         /// <summary>Tracks changes to the current player.</summary>
-        public PlayerSnapshot CurrentPlayer { get; private set; }
+        public PlayerSnapshot? CurrentPlayer { get; private set; }
 
         /// <summary>Tracks changes to the time of day (in 24-hour military format).</summary>
         public SnapshotDiff<int> Time { get; } = new();
@@ -56,7 +54,7 @@ namespace StardewModdingAPI.Framework.StateTracking.Snapshots
             // update snapshots
             this.WindowSize.Update(watchers.WindowSizeWatcher);
             this.Locale.Update(watchers.LocaleWatcher);
-            this.CurrentPlayer?.Update(watchers.CurrentPlayerTracker);
+            this.CurrentPlayer?.Update(watchers.CurrentPlayerTracker!);
             this.Time.Update(watchers.TimeWatcher);
             this.SaveID.Update(watchers.SaveIdWatcher);
             this.Locations.Update(watchers.LocationsWatcher);
diff --git a/src/SMAPI/Framework/StateTracking/Snapshots/WorldLocationsSnapshot.cs b/src/SMAPI/Framework/StateTracking/Snapshots/WorldLocationsSnapshot.cs
index 88aac0df..59f94942 100644
--- a/src/SMAPI/Framework/StateTracking/Snapshots/WorldLocationsSnapshot.cs
+++ b/src/SMAPI/Framework/StateTracking/Snapshots/WorldLocationsSnapshot.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 using System.Collections.Generic;
 using System.Linq;
 using StardewModdingAPI.Framework.StateTracking.Comparers;
@@ -44,7 +42,7 @@ namespace StardewModdingAPI.Framework.StateTracking.Snapshots
             // update locations
             foreach (LocationTracker locationWatcher in watcher.Locations)
             {
-                if (!this.LocationsDict.TryGetValue(locationWatcher.Location, out LocationSnapshot snapshot))
+                if (!this.LocationsDict.TryGetValue(locationWatcher.Location, out LocationSnapshot? snapshot))
                     this.LocationsDict[locationWatcher.Location] = snapshot = new LocationSnapshot(locationWatcher.Location);
 
                 snapshot.Update(locationWatcher);
diff --git a/src/SMAPI/Framework/StateTracking/WorldLocationsTracker.cs b/src/SMAPI/Framework/StateTracking/WorldLocationsTracker.cs
index ab02d7d5..817a6011 100644
--- a/src/SMAPI/Framework/StateTracking/WorldLocationsTracker.cs
+++ b/src/SMAPI/Framework/StateTracking/WorldLocationsTracker.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Linq;
@@ -27,10 +25,10 @@ namespace StardewModdingAPI.Framework.StateTracking
         private readonly ICollectionWatcher<GameLocation> VolcanoLocationListWatcher;
 
         /// <summary>A lookup of the tracked locations.</summary>
-        private IDictionary<GameLocation, LocationTracker> LocationDict { get; } = new Dictionary<GameLocation, LocationTracker>(new ObjectReferenceComparer<GameLocation>());
+        private Dictionary<GameLocation, LocationTracker> LocationDict { get; } = new(new ObjectReferenceComparer<GameLocation>());
 
         /// <summary>A lookup of registered buildings and their indoor location.</summary>
-        private readonly IDictionary<Building, GameLocation> BuildingIndoors = new Dictionary<Building, GameLocation>(new ObjectReferenceComparer<Building>());
+        private readonly Dictionary<Building, GameLocation?> BuildingIndoors = new(new ObjectReferenceComparer<Building>());
 
 
         /*********
@@ -101,10 +99,9 @@ namespace StardewModdingAPI.Framework.StateTracking
             }
 
             // detect building interiors changed (e.g. construction completed)
-            foreach (KeyValuePair<Building, GameLocation> pair in this.BuildingIndoors.Where(p => !object.Equals(p.Key.indoors.Value, p.Value)))
+            foreach ((Building building, GameLocation? oldIndoors) in this.BuildingIndoors.Where(p => !object.Equals(p.Key.indoors.Value, p.Value)))
             {
-                GameLocation oldIndoors = pair.Value;
-                GameLocation newIndoors = pair.Key.indoors.Value;
+                GameLocation? newIndoors = building.indoors.Value;
 
                 if (oldIndoors != null)
                     this.Added.Add(oldIndoors);
@@ -189,19 +186,19 @@ namespace StardewModdingAPI.Framework.StateTracking
         ****/
         /// <summary>Add the given building.</summary>
         /// <param name="building">The building to add.</param>
-        public void Add(Building building)
+        public void Add(Building? building)
         {
             if (building == null)
                 return;
 
-            GameLocation indoors = building.indoors.Value;
+            GameLocation? indoors = building.indoors.Value;
             this.BuildingIndoors[building] = indoors;
             this.Add(indoors);
         }
 
         /// <summary>Add the given location.</summary>
         /// <param name="location">The location to add.</param>
-        public void Add(GameLocation location)
+        public void Add(GameLocation? location)
         {
             if (location == null)
                 return;
@@ -220,7 +217,7 @@ namespace StardewModdingAPI.Framework.StateTracking
 
         /// <summary>Remove the given building.</summary>
         /// <param name="building">The building to remove.</param>
-        public void Remove(Building building)
+        public void Remove(Building? building)
         {
             if (building == null)
                 return;
@@ -231,12 +228,12 @@ namespace StardewModdingAPI.Framework.StateTracking
 
         /// <summary>Remove the given location.</summary>
         /// <param name="location">The location to remove.</param>
-        public void Remove(GameLocation location)
+        public void Remove(GameLocation? location)
         {
             if (location == null)
                 return;
 
-            if (this.LocationDict.TryGetValue(location, out LocationTracker watcher))
+            if (this.LocationDict.TryGetValue(location, out LocationTracker? watcher))
             {
                 // track change
                 this.Removed.Add(location);
diff --git a/src/SMAPI/Framework/Translator.cs b/src/SMAPI/Framework/Translator.cs
index 144b043c..794e3cde 100644
--- a/src/SMAPI/Framework/Translator.cs
+++ b/src/SMAPI/Framework/Translator.cs
@@ -1,7 +1,6 @@
-#nullable disable
-
 using System;
 using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using StardewValley;
 
@@ -23,7 +22,7 @@ namespace StardewModdingAPI.Framework
         /*********
         ** Accessors
         *********/
-        /// <summary>The current locale.</summary>
+        /// <summary>The current locale code like <c>fr-FR</c>, or an empty string for English.</summary>
         public string Locale { get; private set; }
 
         /// <summary>The game's current language code.</summary>
@@ -39,9 +38,10 @@ namespace StardewModdingAPI.Framework
             this.SetLocale(string.Empty, LocalizedContentManager.LanguageCode.en);
         }
 
-        /// <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>
+        [MemberNotNull(nameof(Translator.ForLocale), nameof(Translator.Locale))]
         public void SetLocale(string locale, LocalizedContentManager.LanguageCode localeEnum)
         {
             this.Locale = locale.ToLower().Trim();
@@ -50,7 +50,7 @@ namespace StardewModdingAPI.Framework
             this.ForLocale = new Dictionary<string, Translation>(StringComparer.OrdinalIgnoreCase);
             foreach (string key in this.GetAllKeysRaw())
             {
-                string text = this.GetRaw(key, locale, withFallback: true);
+                string? text = this.GetRaw(key, locale, withFallback: true);
                 this.ForLocale.Add(key, new Translation(this.Locale, key, text));
             }
         }
@@ -65,7 +65,7 @@ namespace StardewModdingAPI.Framework
         /// <param name="key">The translation key.</param>
         public Translation Get(string key)
         {
-            this.ForLocale.TryGetValue(key, out Translation translation);
+            this.ForLocale.TryGetValue(key, out Translation? translation);
             return translation ?? new Translation(this.Locale, key, null);
         }
 
@@ -87,7 +87,7 @@ namespace StardewModdingAPI.Framework
             foreach (var localeSet in this.All)
             {
                 string locale = localeSet.Key;
-                string text = this.GetRaw(key, locale, withFallback);
+                string? text = this.GetRaw(key, locale, withFallback);
 
                 if (text != null)
                     translations[locale] = new Translation(locale, key, text);
@@ -128,13 +128,13 @@ namespace StardewModdingAPI.Framework
         /// <param name="key">The translation key.</param>
         /// <param name="locale">The locale to get.</param>
         /// <param name="withFallback">Whether to add duplicate translations for locale fallback. For example, if a translation is defined in <c>default.json</c> but not <c>fr.json</c>, setting this to true will add a <c>fr</c> entry which duplicates the default text.</param>
-        private string GetRaw(string key, string locale, bool withFallback)
+        private string? GetRaw(string key, string locale, bool withFallback)
         {
             foreach (string next in this.GetRelevantLocales(locale))
             {
-                string translation = null;
+                string? translation = null;
                 bool hasTranslation =
-                    this.All.TryGetValue(next, out IDictionary<string, string> translations)
+                    this.All.TryGetValue(next, out IDictionary<string, string>? translations)
                     && translations.TryGetValue(key, out translation);
 
                 if (hasTranslation)
diff --git a/src/SMAPI/Framework/Utilities/TickCacheDictionary.cs b/src/SMAPI/Framework/Utilities/TickCacheDictionary.cs
index 94ce0069..20d206e2 100644
--- a/src/SMAPI/Framework/Utilities/TickCacheDictionary.cs
+++ b/src/SMAPI/Framework/Utilities/TickCacheDictionary.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 using System;
 using System.Collections.Generic;
 
@@ -9,6 +7,7 @@ namespace StardewModdingAPI.Framework.Utilities
     /// <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
@@ -36,7 +35,7 @@ namespace StardewModdingAPI.Framework.Utilities
             }
 
             // fetch value
-            if (!this.Cache.TryGetValue(cacheKey, out TValue cached))
+            if (!this.Cache.TryGetValue(cacheKey, out TValue? cached))
                 this.Cache[cacheKey] = cached = get();
             return cached;
         }
diff --git a/src/SMAPI/Framework/WatcherCore.cs b/src/SMAPI/Framework/WatcherCore.cs
index bd8d3367..5e20ac7b 100644
--- a/src/SMAPI/Framework/WatcherCore.cs
+++ b/src/SMAPI/Framework/WatcherCore.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using Microsoft.Xna.Framework;
@@ -29,7 +27,7 @@ namespace StardewModdingAPI.Framework
         public readonly IValueWatcher<Point> WindowSizeWatcher;
 
         /// <summary>Tracks changes to the current player.</summary>
-        public PlayerTracker CurrentPlayerTracker;
+        public PlayerTracker? CurrentPlayerTracker;
 
         /// <summary>Tracks changes to the time of day (in 24-hour military format).</summary>
         public readonly IValueWatcher<int> TimeWatcher;
diff --git a/src/SMAPI/IAssetData.cs b/src/SMAPI/IAssetData.cs
index f07340e4..1ec09d87 100644
--- a/src/SMAPI/IAssetData.cs
+++ b/src/SMAPI/IAssetData.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 using System;
 
 namespace StardewModdingAPI
@@ -7,6 +5,7 @@ namespace StardewModdingAPI
     /// <summary>Generic metadata and methods for a content asset being loaded.</summary>
     /// <typeparam name="TValue">The expected data type.</typeparam>
     public interface IAssetData<TValue> : IAssetInfo
+        where TValue : notnull
     {
         /*********
         ** Accessors
diff --git a/src/SMAPI/IAssetInfo.cs b/src/SMAPI/IAssetInfo.cs
index 5b4ac479..4d651a72 100644
--- a/src/SMAPI/IAssetInfo.cs
+++ b/src/SMAPI/IAssetInfo.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 using System;
 
 namespace StardewModdingAPI
@@ -11,7 +9,7 @@ namespace StardewModdingAPI
         ** Accessors
         *********/
         /// <summary>The content's locale code, if the content is localized.</summary>
-        string Locale { get; }
+        string? Locale { get; }
 
         /// <summary>The asset name being read.</summary>
         /// <remarks>NOTE: when reading this field from an <see cref="IAssetLoader"/> or <see cref="IAssetEditor"/> implementation, it's always equivalent to <see cref="NameWithoutLocale"/> for backwards compatibility.</remarks>
diff --git a/src/SMAPI/IAssetName.cs b/src/SMAPI/IAssetName.cs
index 22f5c6b7..71b6ed6b 100644
--- a/src/SMAPI/IAssetName.cs
+++ b/src/SMAPI/IAssetName.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 using System;
 using StardewValley;
 
@@ -18,7 +16,7 @@ namespace StardewModdingAPI
         string BaseName { get; }
 
         /// <summary>The locale code specified in the <see cref="Name"/>, if it's a valid code recognized by the game content.</summary>
-        string LocaleCode { get; }
+        string? LocaleCode { get; }
 
         /// <summary>The language code matching the <see cref="LocaleCode"/>, if applicable.</summary>
         LocalizedContentManager.LanguageCode? LanguageCode { get; }
@@ -30,23 +28,23 @@ namespace StardewModdingAPI
         /// <summary>Get whether the given asset name is equivalent, ignoring capitalization and formatting.</summary>
         /// <param name="assetName">The asset name to compare this instance to.</param>
         /// <param name="useBaseName">Whether to compare the given name with the <see cref="BaseName"/> (if true) or <see cref="Name"/> (if false). This has no effect on any locale included in the given <paramref name="assetName"/>.</param>
-        bool IsEquivalentTo(string assetName, bool useBaseName = false);
+        bool IsEquivalentTo(string? assetName, bool useBaseName = false);
 
         /// <summary>Get whether the given asset name is equivalent, ignoring capitalization and formatting.</summary>
         /// <param name="assetName">The asset name to compare this instance to.</param>
         /// <param name="useBaseName">Whether to compare the given name with the <see cref="BaseName"/> (if true) or <see cref="Name"/> (if false).</param>
-        bool IsEquivalentTo(IAssetName assetName, bool useBaseName = false);
+        bool IsEquivalentTo(IAssetName? assetName, bool useBaseName = false);
 
         /// <summary>Get whether the asset name starts with the given value, ignoring capitalization and formatting. This can be used with a trailing slash to test for an asset folder, like <c>Data/</c>.</summary>
         /// <param name="prefix">The prefix to match.</param>
         /// <param name="allowPartialWord">Whether to match if the prefix occurs mid-word, so <c>Data/AchievementsToIgnore</c> matches prefix <c>Data/Achievements</c>. If this is false, the prefix only matches if the asset name starts with the prefix followed by a non-alphanumeric character (including <c>.</c>, <c>/</c>, or <c>\\</c>) or the end of string.</param>
         /// <param name="allowSubfolder">Whether to match the prefix if there's a subfolder path after it, so <c>Data/Achievements/Example</c> matches prefix <c>Data/Achievements</c>. If this is false, the prefix only matches if the asset name has no <c>/</c> or <c>\\</c> characters after the prefix.</param>
-        bool StartsWith(string prefix, bool allowPartialWord = true, bool allowSubfolder = true);
+        bool StartsWith(string? prefix, bool allowPartialWord = true, bool allowSubfolder = true);
 
         /// <summary>Get whether the asset is directly within the given asset path.</summary>
         /// <remarks>For example, <c>Characters/Dialogue/Abigail</c> is directly under <c>Characters/Dialogue</c> but not <c>Characters</c> or <c>Characters/Dialogue/Ab</c>. To allow sub-paths, use <see cref="StartsWith"/> instead.</remarks>
         /// <param name="assetFolder">The asset path to check. This doesn't need a trailing slash.</param>
-        bool IsDirectlyUnderPath(string assetFolder);
+        bool IsDirectlyUnderPath(string? assetFolder);
 
         /// <summary>Get an asset name representing the <see cref="BaseName"/> without locale.</summary>
         internal IAssetName GetBaseAssetName();
diff --git a/src/SMAPI/IContentHelper.cs b/src/SMAPI/IContentHelper.cs
index 0ad209ab..2cd0c1fc 100644
--- a/src/SMAPI/IContentHelper.cs
+++ b/src/SMAPI/IContentHelper.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 using System;
 using System.Collections.Generic;
 using System.Diagnostics.Contracts;
@@ -42,12 +40,14 @@ namespace StardewModdingAPI
         /// <param name="source">Where to search for a matching content asset.</param>
         /// <exception cref="ArgumentException">The <paramref name="key"/> is empty or contains invalid characters.</exception>
         /// <exception cref="ContentLoadException">The content asset couldn't be loaded (e.g. because it doesn't exist).</exception>
-        T Load<T>(string key, ContentSource source = ContentSource.ModFolder);
+        T Load<T>(string key, ContentSource source = ContentSource.ModFolder)
+            where T : notnull;
 
         /// <summary>Normalize an asset name so it's consistent with those generated by the game. This is mainly useful for string comparisons like <see cref="string.StartsWith(string)"/> on generated asset names, and isn't necessary when passing asset names into other content helper methods.</summary>
         /// <param name="assetName">The asset key.</param>
+        /// <exception cref="ContentLoadException">The asset key is empty or contains invalid characters.</exception>
         [Pure]
-        string NormalizeAssetName(string assetName);
+        string NormalizeAssetName(string? assetName);
 
         /// <summary>Get the underlying key in the game's content cache for an asset. This can be used to load custom map tilesheets, but should be avoided when you can use the content API instead. This does not validate whether the asset exists.</summary>
         /// <param name="key">The asset key to fetch (if the <paramref name="source"/> is <see cref="ContentSource.GameContent"/>), or the local path to a content file relative to the mod folder.</param>
@@ -64,7 +64,8 @@ namespace StardewModdingAPI
         /// <summary>Remove all assets of the given type from the cache so they're reloaded on the next request. <b>This can be a very expensive operation and should only be used in very specific cases.</b> This will reload core game assets if needed, but references to the former assets will still show the previous content.</summary>
         /// <typeparam name="T">The asset type to remove from the cache.</typeparam>
         /// <returns>Returns whether any assets were invalidated.</returns>
-        bool InvalidateCache<T>();
+        bool InvalidateCache<T>()
+            where T : notnull;
 
         /// <summary>Remove matching assets from the content cache so they're reloaded on the next request. This will reload core game assets if needed, but references to the former asset will still show the previous content.</summary>
         /// <param name="predicate">A predicate matching the assets to invalidate.</param>
@@ -75,6 +76,7 @@ namespace StardewModdingAPI
         /// <typeparam name="T">The data type.</typeparam>
         /// <param name="data">The asset data.</param>
         /// <param name="assetName">The asset name. This is only used for tracking purposes and has no effect on the patch helper.</param>
-        IAssetData GetPatchHelper<T>(T data, string assetName = null);
+        IAssetData GetPatchHelper<T>(T data, string? assetName = null)
+            where T : notnull;
     }
 }
diff --git a/src/SMAPI/IContentPack.cs b/src/SMAPI/IContentPack.cs
index f853e2b4..1215fe0b 100644
--- a/src/SMAPI/IContentPack.cs
+++ b/src/SMAPI/IContentPack.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 using System;
 using Microsoft.Xna.Framework.Content;
 using Microsoft.Xna.Framework.Graphics;
@@ -38,14 +36,16 @@ namespace StardewModdingAPI
         /// <param name="path">The relative file path within the content pack (case-insensitive).</param>
         /// <returns>Returns the deserialized model, or <c>null</c> if the file doesn't exist or is empty.</returns>
         /// <exception cref="InvalidOperationException">The <paramref name="path"/> is not relative or contains directory climbing (../).</exception>
-        TModel ReadJsonFile<TModel>(string path) where TModel : class;
+        TModel? ReadJsonFile<TModel>(string path)
+            where TModel : class;
 
         /// <summary>Save data to a JSON file in the content pack'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 relative file path within the content pack (case-insensitive).</param>
         /// <param name="data">The arbitrary data to save.</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;
+        void WriteJsonFile<TModel>(string path, TModel data)
+            where TModel : class;
 
         /// <summary>Load content from the content pack folder (if not already cached), and return it. When loading a <c>.png</c> file, this must be called outside the game's draw loop.</summary>
         /// <typeparam name="T">The expected data type. The main supported types are <see cref="Map"/>, <see cref="Texture2D"/>, and dictionaries; other types may be supported by the game's content pipeline.</typeparam>
@@ -53,7 +53,8 @@ namespace StardewModdingAPI
         /// <exception cref="ArgumentException">The <paramref name="key"/> is empty or contains invalid characters.</exception>
         /// <exception cref="ContentLoadException">The content asset couldn't be loaded (e.g. because it doesn't exist).</exception>
         [Obsolete($"Use {nameof(IContentPack.ModContent)}.{nameof(IModContentHelper.Load)} instead. This method will be removed in SMAPI 4.0.0.")]
-        T LoadAsset<T>(string key);
+        T LoadAsset<T>(string key)
+            where T : notnull;
 
         /// <summary>Get the underlying key in the game's content cache for an asset. This can be used to load custom map tilesheets, but should be avoided when you can use the content API instead. This does not validate whether the asset exists.</summary>
         /// <param name="key">The relative file path within the content pack (case-insensitive).</param>
diff --git a/src/SMAPI/IDataHelper.cs b/src/SMAPI/IDataHelper.cs
index 4c96367b..7ddf851e 100644
--- a/src/SMAPI/IDataHelper.cs
+++ b/src/SMAPI/IDataHelper.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 using System;
 
 namespace StardewModdingAPI
@@ -18,14 +16,16 @@ namespace StardewModdingAPI
         /// <param name="path">The file path relative to the mod folder.</param>
         /// <returns>Returns the deserialized model, or <c>null</c> if the file doesn't exist or is empty.</returns>
         /// <exception cref="InvalidOperationException">The <paramref name="path"/> is not relative or contains directory climbing (../).</exception>
-        TModel ReadJsonFile<TModel>(string path) where TModel : class;
+        TModel? ReadJsonFile<TModel>(string path)
+            where TModel : class;
 
         /// <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, 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;
+        void WriteJsonFile<TModel>(string path, TModel? data)
+            where TModel : class;
 
         /****
         ** Save file
@@ -35,14 +35,16 @@ namespace StardewModdingAPI
         /// <param name="key">The unique key identifying the data.</param>
         /// <returns>Returns the parsed data, or <c>null</c> if the entry doesn't exist or is empty.</returns>
         /// <exception cref="InvalidOperationException">The player hasn't loaded a save file yet or isn't the main player.</exception>
-        TModel ReadSaveData<TModel>(string key) where TModel : class;
+        TModel? ReadSaveData<TModel>(string key)
+            where TModel : class;
 
         /// <summary>Save arbitrary data to the current save slot. This is only possible if a save has been loaded, and the data will be lost if the player exits without saving the current day.</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="key">The unique key identifying the data.</param>
         /// <param name="data">The arbitrary data to save, or <c>null</c> to remove the entry.</param>
         /// <exception cref="InvalidOperationException">The player hasn't loaded a save file yet or isn't the main player.</exception>
-        void WriteSaveData<TModel>(string key, TModel data) where TModel : class;
+        void WriteSaveData<TModel>(string key, TModel? data)
+            where TModel : class;
 
 
         /****
@@ -52,12 +54,14 @@ namespace StardewModdingAPI
         /// <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="key">The unique key identifying the data.</param>
         /// <returns>Returns the parsed data, or <c>null</c> if the entry doesn't exist or is empty.</returns>
-        TModel ReadGlobalData<TModel>(string key) where TModel : class;
+        TModel? ReadGlobalData<TModel>(string key)
+            where TModel : class;
 
         /// <summary>Save arbitrary data to the local computer, synchronised by GOG/Steam if applicable.</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="key">The unique key identifying the data.</param>
         /// <param name="data">The arbitrary data to save, or <c>null</c> to delete the file.</param>
-        void WriteGlobalData<TModel>(string key, TModel data) where TModel : class;
+        void WriteGlobalData<TModel>(string key, TModel? data)
+            where TModel : class;
     }
 }
diff --git a/src/SMAPI/IGameContentHelper.cs b/src/SMAPI/IGameContentHelper.cs
index 4b967993..d40d0c82 100644
--- a/src/SMAPI/IGameContentHelper.cs
+++ b/src/SMAPI/IGameContentHelper.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 using System;
 using Microsoft.Xna.Framework.Content;
 using Microsoft.Xna.Framework.Graphics;
@@ -35,14 +33,16 @@ namespace StardewModdingAPI
         /// <param name="assetName">The asset name to load.</param>
         /// <exception cref="ArgumentException">The <paramref name="assetName"/> is empty or contains invalid characters.</exception>
         /// <exception cref="ContentLoadException">The content asset couldn't be loaded (e.g. because it doesn't exist).</exception>
-        T Load<T>(string assetName);
+        T Load<T>(string assetName)
+            where T : notnull;
 
         /// <summary>Load content from the game folder or mod folder (if not already cached), and return it. When loading a <c>.png</c> file, this must be called outside the game's draw loop.</summary>
         /// <typeparam name="T">The expected data type. The main supported types are <see cref="Map"/>, <see cref="Texture2D"/>, dictionaries, and lists; other types may be supported by the game's content pipeline.</typeparam>
         /// <param name="assetName">The asset name to load.</param>
         /// <exception cref="ArgumentException">The <paramref name="assetName"/> is empty or contains invalid characters.</exception>
         /// <exception cref="ContentLoadException">The content asset couldn't be loaded (e.g. because it doesn't exist).</exception>
-        T Load<T>(IAssetName assetName);
+        T Load<T>(IAssetName assetName)
+            where T : notnull;
 
         /// <summary>Remove an asset from the content cache so it's reloaded on the next request. This will reload core game assets if needed, but references to the former asset will still show the previous content.</summary>
         /// <param name="assetName">The asset key to invalidate in the content folder.</param>
@@ -59,7 +59,8 @@ namespace StardewModdingAPI
         /// <summary>Remove all assets of the given type from the cache so they're reloaded on the next request. <b>This can be a very expensive operation and should only be used in very specific cases.</b> This will reload core game assets if needed, but references to the former assets will still show the previous content.</summary>
         /// <typeparam name="T">The asset type to remove from the cache.</typeparam>
         /// <returns>Returns whether any assets were invalidated.</returns>
-        bool InvalidateCache<T>();
+        bool InvalidateCache<T>()
+            where T : notnull;
 
         /// <summary>Remove matching assets from the content cache so they're reloaded on the next request. This will reload core game assets if needed, but references to the former asset will still show the previous content.</summary>
         /// <param name="predicate">A predicate matching the assets to invalidate.</param>
@@ -70,6 +71,7 @@ namespace StardewModdingAPI
         /// <typeparam name="T">The data type.</typeparam>
         /// <param name="data">The asset data.</param>
         /// <param name="assetName">The asset name. This is only used for tracking purposes and has no effect on the patch helper.</param>
-        IAssetData GetPatchHelper<T>(T data, string assetName = null);
+        IAssetData GetPatchHelper<T>(T data, string? assetName = null)
+            where T : notnull;
     }
 }
diff --git a/src/SMAPI/IMod.cs b/src/SMAPI/IMod.cs
index 0de4961e..b81ba0e3 100644
--- a/src/SMAPI/IMod.cs
+++ b/src/SMAPI/IMod.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 namespace StardewModdingAPI
 {
     /// <summary>The implementation for a Stardew Valley mod.</summary>
@@ -26,6 +24,6 @@ namespace StardewModdingAPI
         void Entry(IModHelper helper);
 
         /// <summary>Get an API that other mods can access. This is always called after <see cref="Entry"/>.</summary>
-        object GetApi();
+        object? GetApi();
     }
 }
diff --git a/src/SMAPI/IModContentHelper.cs b/src/SMAPI/IModContentHelper.cs
index 815d6848..f1f6ce94 100644
--- a/src/SMAPI/IModContentHelper.cs
+++ b/src/SMAPI/IModContentHelper.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 using System;
 using Microsoft.Xna.Framework.Content;
 using Microsoft.Xna.Framework.Graphics;
@@ -18,7 +16,8 @@ namespace StardewModdingAPI
         /// <param name="relativePath">The local path to a content file relative to the mod folder.</param>
         /// <exception cref="ArgumentException">The <paramref name="relativePath"/> is empty or contains invalid characters.</exception>
         /// <exception cref="ContentLoadException">The content asset couldn't be loaded (e.g. because it doesn't exist).</exception>
-        T Load<T>(string relativePath);
+        T Load<T>(string relativePath)
+            where T : notnull;
 
         /// <summary>Get the internal asset name which allows loading a mod file through any of the game's content managers. This can be used when passing asset names directly to the game (e.g. for map tilesheets), but should be avoided if you can use <see cref="Load{T}"/> instead. This does not validate whether the asset exists.</summary>
         /// <param name="relativePath">The local path to a content file relative to the mod folder.</param>
@@ -29,6 +28,7 @@ namespace StardewModdingAPI
         /// <typeparam name="T">The data type.</typeparam>
         /// <param name="data">The asset data.</param>
         /// <param name="relativePath">The local path to the content file being edited relative to the mod folder. This is only used for tracking purposes and has no effect on the patch helper.</param>
-        IAssetData GetPatchHelper<T>(T data, string relativePath = null);
+        IAssetData GetPatchHelper<T>(T data, string? relativePath = null)
+            where T : notnull;
     }
 }
diff --git a/src/SMAPI/IModRegistry.cs b/src/SMAPI/IModRegistry.cs
index 9cab08a1..cf60bc29 100644
--- a/src/SMAPI/IModRegistry.cs
+++ b/src/SMAPI/IModRegistry.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 using System.Collections.Generic;
 
 namespace StardewModdingAPI
@@ -13,7 +11,7 @@ namespace StardewModdingAPI
         /// <summary>Get metadata for a loaded mod.</summary>
         /// <param name="uniqueID">The mod's unique ID.</param>
         /// <returns>Returns the matching mod's metadata, or <c>null</c> if not found.</returns>
-        IModInfo Get(string uniqueID);
+        IModInfo? Get(string uniqueID);
 
         /// <summary>Get whether a mod has been loaded.</summary>
         /// <param name="uniqueID">The mod's unique ID.</param>
@@ -21,11 +19,12 @@ namespace StardewModdingAPI
 
         /// <summary>Get the API provided by a mod, or <c>null</c> if it has none. This signature requires using the <see cref="IModHelper.Reflection"/> API to access the API's properties and methods.</summary>
         /// <param name="uniqueID">The mod's unique ID.</param>
-        object GetApi(string uniqueID);
+        object? GetApi(string uniqueID);
 
         /// <summary>Get the API provided by a mod, mapped to a given interface which specifies the expected properties and methods. If the mod has no API or it's not compatible with the given interface, get <c>null</c>.</summary>
         /// <typeparam name="TInterface">The interface which matches the properties and methods you intend to access.</typeparam>
         /// <param name="uniqueID">The mod's unique ID.</param>
-        TInterface GetApi<TInterface>(string uniqueID) where TInterface : class;
+        TInterface? GetApi<TInterface>(string uniqueID)
+            where TInterface : class;
     }
 }
diff --git a/src/SMAPI/IMultiplayerHelper.cs b/src/SMAPI/IMultiplayerHelper.cs
index 77a0f3f4..bb851410 100644
--- a/src/SMAPI/IMultiplayerHelper.cs
+++ b/src/SMAPI/IMultiplayerHelper.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 using System;
 using System.Collections.Generic;
 using StardewValley;
@@ -18,7 +16,7 @@ namespace StardewModdingAPI
         /// <summary>Get a connected player.</summary>
         /// <param name="id">The player's unique ID.</param>
         /// <returns>Returns the connected player, or <c>null</c> if no such player is connected.</returns>
-        IMultiplayerPeer GetConnectedPlayer(long id);
+        IMultiplayerPeer? GetConnectedPlayer(long id);
 
         /// <summary>Get all connected players.</summary>
         IEnumerable<IMultiplayerPeer> GetConnectedPlayers();
@@ -30,6 +28,6 @@ namespace StardewModdingAPI
         /// <param name="modIDs">The mod IDs which should receive the message on the destination computers, or <c>null</c> for all mods. Specifying mod IDs is recommended to improve performance, unless it's a general-purpose broadcast.</param>
         /// <param name="playerIDs">The <see cref="Farmer.UniqueMultiplayerID" /> values for the players who should receive the message, or <c>null</c> for all players. If you don't need to broadcast to all players, specifying player IDs is recommended to reduce latency.</param>
         /// <exception cref="ArgumentNullException">The <paramref name="message"/> or <paramref name="messageType" /> is null.</exception>
-        void SendMessage<TMessage>(TMessage message, string messageType, string[] modIDs = null, long[] playerIDs = null);
+        void SendMessage<TMessage>(TMessage message, string messageType, string[]? modIDs = null, long[]? playerIDs = null);
     }
 }
diff --git a/src/SMAPI/IMultiplayerPeer.cs b/src/SMAPI/IMultiplayerPeer.cs
index e487f100..8b0062b5 100644
--- a/src/SMAPI/IMultiplayerPeer.cs
+++ b/src/SMAPI/IMultiplayerPeer.cs
@@ -1,6 +1,5 @@
-#nullable disable
-
 using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
 
 namespace StardewModdingAPI
 {
@@ -20,6 +19,7 @@ namespace StardewModdingAPI
         bool IsSplitScreen { get; }
 
         /// <summary>Whether the player has SMAPI installed.</summary>
+        [MemberNotNullWhen(true, nameof(IMultiplayerPeer.Platform), nameof(IMultiplayerPeer.GameVersion), nameof(IMultiplayerPeer.ApiVersion), nameof(IMultiplayerPeer.Mods))]
         bool HasSmapi { get; }
 
         /// <summary>The player's screen ID, if applicable.</summary>
@@ -30,10 +30,10 @@ namespace StardewModdingAPI
         GamePlatform? Platform { get; }
 
         /// <summary>The installed version of Stardew Valley, if <see cref="HasSmapi"/> is true.</summary>
-        ISemanticVersion GameVersion { get; }
+        ISemanticVersion? GameVersion { get; }
 
         /// <summary>The installed version of SMAPI, if <see cref="HasSmapi"/> is true.</summary>
-        ISemanticVersion ApiVersion { get; }
+        ISemanticVersion? ApiVersion { get; }
 
         /// <summary>The installed mods, if <see cref="HasSmapi"/> is true.</summary>
         IEnumerable<IMultiplayerPeerMod> Mods { get; }
@@ -45,6 +45,6 @@ namespace StardewModdingAPI
         /// <summary>Get metadata for a mod installed by the player.</summary>
         /// <param name="id">The unique mod ID.</param>
         /// <returns>Returns the mod info, or <c>null</c> if the player doesn't have that mod.</returns>
-        IMultiplayerPeerMod GetMod(string id);
+        IMultiplayerPeerMod? GetMod(string? id);
     }
 }
diff --git a/src/SMAPI/IReflectedField.cs b/src/SMAPI/IReflectedField.cs
index 94dbe6a3..5a24b3dc 100644
--- a/src/SMAPI/IReflectedField.cs
+++ b/src/SMAPI/IReflectedField.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 using System.Reflection;
 
 namespace StardewModdingAPI
@@ -19,10 +17,10 @@ namespace StardewModdingAPI
         ** Public methods
         *********/
         /// <summary>Get the field value.</summary>
-        TValue GetValue();
+        TValue? GetValue();
 
         /// <summary>Set the field value.</summary>
         //// <param name="value">The value to set.</param>
-        void SetValue(TValue value);
+        void SetValue(TValue? value);
     }
 }
diff --git a/src/SMAPI/IReflectedMethod.cs b/src/SMAPI/IReflectedMethod.cs
index 78e66cb1..6d87966a 100644
--- a/src/SMAPI/IReflectedMethod.cs
+++ b/src/SMAPI/IReflectedMethod.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 using System.Reflection;
 
 namespace StardewModdingAPI
@@ -20,10 +18,10 @@ namespace StardewModdingAPI
         /// <summary>Invoke the method.</summary>
         /// <typeparam name="TValue">The return type.</typeparam>
         /// <param name="arguments">The method arguments to pass in.</param>
-        TValue Invoke<TValue>(params object[] arguments);
+        TValue? Invoke<TValue>(params object?[] arguments);
 
         /// <summary>Invoke the method.</summary>
         /// <param name="arguments">The method arguments to pass in.</param>
-        void Invoke(params object[] arguments);
+        void Invoke(params object?[] arguments);
     }
 }
diff --git a/src/SMAPI/IReflectedProperty.cs b/src/SMAPI/IReflectedProperty.cs
index edbf0b21..ad55b9a1 100644
--- a/src/SMAPI/IReflectedProperty.cs
+++ b/src/SMAPI/IReflectedProperty.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 using System.Reflection;
 
 namespace StardewModdingAPI
@@ -19,10 +17,10 @@ namespace StardewModdingAPI
         ** Public methods
         *********/
         /// <summary>Get the property value.</summary>
-        TValue GetValue();
+        TValue? GetValue();
 
         /// <summary>Set the property value.</summary>
         //// <param name="value">The value to set.</param>
-        void SetValue(TValue value);
+        void SetValue(TValue? value);
     }
 }
diff --git a/src/SMAPI/IReflectionHelper.cs b/src/SMAPI/IReflectionHelper.cs
index bf7270cf..b8fb877f 100644
--- a/src/SMAPI/IReflectionHelper.cs
+++ b/src/SMAPI/IReflectionHelper.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 using System;
 
 namespace StardewModdingAPI
@@ -14,40 +12,52 @@ namespace StardewModdingAPI
         /// <typeparam name="TValue">The field type.</typeparam>
         /// <param name="obj">The object which has the field.</param>
         /// <param name="name">The field name.</param>
-        /// <param name="required">Whether to throw an exception if the field is not found.</param>
+        /// <param name="required">Whether to throw an exception if the field isn't found. <strong>Due to limitations with nullable reference types, setting this to <c>false</c> will still mark the return value non-nullable.</strong></param>
+        /// <returns>Returns the method wrapper, or <c>null</c> if <paramref name="required"/> is <c>false</c> and the field doesn't exist.</returns>
+        /// <exception cref="InvalidOperationException">The target field doesn't exist, and <paramref name="required"/> is true.</exception>
         IReflectedField<TValue> GetField<TValue>(object obj, string name, bool required = true);
 
         /// <summary>Get a static field.</summary>
         /// <typeparam name="TValue">The field type.</typeparam>
         /// <param name="type">The type which has the field.</param>
         /// <param name="name">The field name.</param>
-        /// <param name="required">Whether to throw an exception if the field is not found.</param>
+        /// <param name="required">Whether to throw an exception if the field isn't found. <strong>Due to limitations with nullable reference types, setting this to <c>false</c> will still mark the return value non-nullable.</strong></param>
+        /// <returns>Returns the method wrapper, or <c>null</c> if <paramref name="required"/> is <c>false</c> and the field doesn't exist.</returns>
+        /// <exception cref="InvalidOperationException">The target field doesn't exist, and <paramref name="required"/> is true.</exception>
         IReflectedField<TValue> GetField<TValue>(Type type, string name, bool required = true);
 
         /// <summary>Get an instance property.</summary>
         /// <typeparam name="TValue">The property type.</typeparam>
         /// <param name="obj">The object which has the property.</param>
         /// <param name="name">The property name.</param>
-        /// <param name="required">Whether to throw an exception if the property is not found.</param>
+        /// <param name="required">Whether to throw an exception if the property isn't found. <strong>Due to limitations with nullable reference types, setting this to <c>false</c> will still mark the return value non-nullable.</strong></param>
+        /// <returns>Returns the method wrapper, or <c>null</c> if <paramref name="required"/> is <c>false</c> and the property doesn't exist.</returns>
+        /// <exception cref="InvalidOperationException">The target property doesn't exist, and <paramref name="required"/> is true.</exception>
         IReflectedProperty<TValue> GetProperty<TValue>(object obj, string name, bool required = true);
 
         /// <summary>Get a static property.</summary>
         /// <typeparam name="TValue">The property type.</typeparam>
         /// <param name="type">The type which has the property.</param>
         /// <param name="name">The property name.</param>
-        /// <param name="required">Whether to throw an exception if the property is not found.</param>
+        /// <param name="required">Whether to throw an exception if the property isn't found. <strong>Due to limitations with nullable reference types, setting this to <c>false</c> will still mark the return value non-nullable.</strong></param>
+        /// <returns>Returns the method wrapper, or <c>null</c> if <paramref name="required"/> is <c>false</c> and the property doesn't exist.</returns>
+        /// <exception cref="InvalidOperationException">The target property doesn't exist, and <paramref name="required"/> is true.</exception>
         IReflectedProperty<TValue> GetProperty<TValue>(Type type, string name, bool required = true);
 
         /// <summary>Get an instance method.</summary>
         /// <param name="obj">The object which has the method.</param>
-        /// <param name="name">The field name.</param>
-        /// <param name="required">Whether to throw an exception if the field is not found.</param>
+        /// <param name="name">The method name.</param>
+        /// <param name="required">Whether to throw an exception if the method isn't found. <strong>Due to limitations with nullable reference types, setting this to <c>false</c> will still mark the return value non-nullable.</strong></param>
+        /// <returns>Returns the method wrapper, or <c>null</c> if <paramref name="required"/> is <c>false</c> and the method doesn't exist.</returns>
+        /// <exception cref="InvalidOperationException">The target method doesn't exist, and <paramref name="required"/> is true.</exception>
         IReflectedMethod GetMethod(object obj, string name, bool required = true);
 
         /// <summary>Get a static method.</summary>
         /// <param name="type">The type which has the method.</param>
-        /// <param name="name">The field name.</param>
-        /// <param name="required">Whether to throw an exception if the field is not found.</param>
+        /// <param name="name">The method name.</param>
+        /// <param name="required">Whether to throw an exception if the method isn't found. <strong>Due to limitations with nullable reference types, setting this to <c>false</c> will still mark the return value non-nullable.</strong></param>
+        /// <returns>Returns the method wrapper, or <c>null</c> if <paramref name="required"/> is <c>false</c> and the method doesn't exist.</returns>
+        /// <exception cref="InvalidOperationException">The target method doesn't exist, and <paramref name="required"/> is true.</exception>
         IReflectedMethod GetMethod(Type type, string name, bool required = true);
     }
 }
diff --git a/src/SMAPI/Metadata/InstructionMetadata.cs b/src/SMAPI/Metadata/InstructionMetadata.cs
index 5617fd13..9b56f963 100644
--- a/src/SMAPI/Metadata/InstructionMetadata.cs
+++ b/src/SMAPI/Metadata/InstructionMetadata.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 using System.Collections.Generic;
 using Microsoft.Xna.Framework.Graphics;
 using StardewModdingAPI.Events;
@@ -70,8 +68,8 @@ namespace StardewModdingAPI.Metadata
             ** detect code which may impact game stability
             ****/
             yield return new TypeFinder("System.Runtime.CompilerServices.CallSite", InstructionHandleResult.DetectedDynamic);
-            yield return new FieldFinder(typeof(SaveGame).FullName, new[] { nameof(SaveGame.serializer), nameof(SaveGame.farmerSerializer), nameof(SaveGame.locationSerializer) }, InstructionHandleResult.DetectedSaveSerializer);
-            yield return new EventFinder(typeof(ISpecializedEvents).FullName, new[] { nameof(ISpecializedEvents.UnvalidatedUpdateTicked), nameof(ISpecializedEvents.UnvalidatedUpdateTicking) }, InstructionHandleResult.DetectedUnvalidatedUpdateTick);
+            yield return new FieldFinder(typeof(SaveGame).FullName!, new[] { nameof(SaveGame.serializer), nameof(SaveGame.farmerSerializer), nameof(SaveGame.locationSerializer) }, InstructionHandleResult.DetectedSaveSerializer);
+            yield return new EventFinder(typeof(ISpecializedEvents).FullName!, new[] { nameof(ISpecializedEvents.UnvalidatedUpdateTicked), nameof(ISpecializedEvents.UnvalidatedUpdateTicking) }, InstructionHandleResult.DetectedUnvalidatedUpdateTick);
 
             /****
             ** detect paranoid issues
@@ -79,23 +77,23 @@ namespace StardewModdingAPI.Metadata
             if (paranoidMode)
             {
                 // filesystem access
-                yield return new TypeFinder(typeof(System.Console).FullName, InstructionHandleResult.DetectedConsoleAccess);
+                yield return new TypeFinder(typeof(System.Console).FullName!, InstructionHandleResult.DetectedConsoleAccess);
                 yield return new TypeFinder(
                     new[]
                     {
-                        typeof(System.IO.File).FullName,
-                        typeof(System.IO.FileStream).FullName,
-                        typeof(System.IO.FileInfo).FullName,
-                        typeof(System.IO.Directory).FullName,
-                        typeof(System.IO.DirectoryInfo).FullName,
-                        typeof(System.IO.DriveInfo).FullName,
-                        typeof(System.IO.FileSystemWatcher).FullName
+                        typeof(System.IO.File).FullName!,
+                        typeof(System.IO.FileStream).FullName!,
+                        typeof(System.IO.FileInfo).FullName!,
+                        typeof(System.IO.Directory).FullName!,
+                        typeof(System.IO.DirectoryInfo).FullName!,
+                        typeof(System.IO.DriveInfo).FullName!,
+                        typeof(System.IO.FileSystemWatcher).FullName!
                     },
                     InstructionHandleResult.DetectedFilesystemAccess
                 );
 
                 // shell access
-                yield return new TypeFinder(typeof(System.Diagnostics.Process).FullName, InstructionHandleResult.DetectedShellAccess);
+                yield return new TypeFinder(typeof(System.Diagnostics.Process).FullName!, InstructionHandleResult.DetectedShellAccess);
             }
         }
     }
diff --git a/src/SMAPI/Mod.cs b/src/SMAPI/Mod.cs
index 2b3750d5..cffe2998 100644
--- a/src/SMAPI/Mod.cs
+++ b/src/SMAPI/Mod.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 using System;
 
 namespace StardewModdingAPI
@@ -11,13 +9,13 @@ namespace StardewModdingAPI
         ** Accessors
         *********/
         /// <inheritdoc />
-        public IModHelper Helper { get; internal set; }
+        public IModHelper Helper { get; internal set; } = null!;
 
         /// <inheritdoc />
-        public IMonitor Monitor { get; internal set; }
+        public IMonitor Monitor { get; internal set; } = null!;
 
         /// <inheritdoc />
-        public IManifest ModManifest { get; internal set; }
+        public IManifest ModManifest { get; internal set; } = null!;
 
 
         /*********
@@ -27,7 +25,7 @@ namespace StardewModdingAPI
         public abstract void Entry(IModHelper helper);
 
         /// <inheritdoc />
-        public virtual object GetApi()
+        public virtual object? GetApi()
         {
             return null;
         }
@@ -35,7 +33,7 @@ namespace StardewModdingAPI
         /// <summary>Release or reset unmanaged resources.</summary>
         public void Dispose()
         {
-            (this.Helper as IDisposable)?.Dispose(); // deliberate do this outside overridable dispose method so mods don't accidentally suppress it
+            (this.Helper as IDisposable)?.Dispose(); // deliberately do this outside overridable dispose method so mods don't accidentally suppress it
             this.Dispose(true);
             GC.SuppressFinalize(this);
         }
diff --git a/src/SMAPI/Patches/Game1Patcher.cs b/src/SMAPI/Patches/Game1Patcher.cs
index c5d98e9e..8f806790 100644
--- a/src/SMAPI/Patches/Game1Patcher.cs
+++ b/src/SMAPI/Patches/Game1Patcher.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 using System;
 using System.Diagnostics.CodeAnalysis;
 using HarmonyLib;
@@ -22,10 +20,10 @@ namespace StardewModdingAPI.Patches
         ** Fields
         *********/
         /// <summary>Simplifies access to private code.</summary>
-        private static Reflector Reflection;
+        private static Reflector Reflection = null!; // initialized in constructor
 
         /// <summary>A callback to invoke when the load stage changes.</summary>
-        private static Action<LoadStage> OnStageChanged;
+        private static Action<LoadStage> OnStageChanged = null!; // initialized in constructor
 
         /// <summary>Whether the game is running running the code in <see cref="Game1.loadForNewGame"/>.</summary>
         private static bool IsInLoadForNewGame;
diff --git a/src/SMAPI/Patches/TitleMenuPatcher.cs b/src/SMAPI/Patches/TitleMenuPatcher.cs
index 56e5597c..18f1a830 100644
--- a/src/SMAPI/Patches/TitleMenuPatcher.cs
+++ b/src/SMAPI/Patches/TitleMenuPatcher.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 using System;
 using System.Diagnostics.CodeAnalysis;
 using HarmonyLib;
@@ -19,7 +17,7 @@ namespace StardewModdingAPI.Patches
         ** Fields
         *********/
         /// <summary>A callback to invoke when the load stage changes.</summary>
-        private static Action<LoadStage> OnStageChanged;
+        private static Action<LoadStage> OnStageChanged = null!; // initialized in constructor
 
 
         /*********
diff --git a/src/SMAPI/Program.cs b/src/SMAPI/Program.cs
index b2e213fe..a6861bca 100644
--- a/src/SMAPI/Program.cs
+++ b/src/SMAPI/Program.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 using System;
 using System.Collections.Generic;
 using System.IO;
@@ -22,7 +20,7 @@ namespace StardewModdingAPI
         private static readonly string DllSearchPath = EarlyConstants.InternalFilesPath;
 
         /// <summary>The assembly paths in the search folders indexed by assembly name.</summary>
-        private static Dictionary<string, string> AssemblyPathsByName;
+        private static Dictionary<string, string>? AssemblyPathsByName;
 
 
         /*********
@@ -61,7 +59,7 @@ namespace StardewModdingAPI
         /// <summary>Method called when assembly resolution fails, which may return a manually resolved assembly.</summary>
         /// <param name="sender">The event sender.</param>
         /// <param name="e">The event arguments.</param>
-        private static Assembly CurrentDomain_AssemblyResolve(object sender, ResolveEventArgs e)
+        private static Assembly? CurrentDomain_AssemblyResolve(object? sender, ResolveEventArgs e)
         {
             // cache assembly paths by name
             if (Program.AssemblyPathsByName == null)
@@ -74,7 +72,7 @@ namespace StardewModdingAPI
                     {
                         try
                         {
-                            string curName = AssemblyName.GetAssemblyName(dllPath).Name;
+                            string? curName = AssemblyName.GetAssemblyName(dllPath).Name;
                             if (curName != null)
                                 Program.AssemblyPathsByName[curName] = dllPath;
                         }
@@ -89,8 +87,8 @@ namespace StardewModdingAPI
             // resolve
             try
             {
-                string searchName = new AssemblyName(e.Name).Name;
-                return searchName != null && Program.AssemblyPathsByName.TryGetValue(searchName, out string assemblyPath)
+                string? searchName = new AssemblyName(e.Name).Name;
+                return searchName != null && Program.AssemblyPathsByName.TryGetValue(searchName, out string? assemblyPath)
                     ? Assembly.LoadFrom(assemblyPath)
                     : null;
             }
@@ -129,7 +127,7 @@ namespace StardewModdingAPI
             // min version
             if (Constants.GameVersion.IsOlderThan(Constants.MinimumGameVersion))
             {
-                ISemanticVersion suggestedApiVersion = Constants.GetCompatibleApiVersion(Constants.GameVersion);
+                ISemanticVersion? suggestedApiVersion = Constants.GetCompatibleApiVersion(Constants.GameVersion);
                 Program.PrintErrorAndExit(suggestedApiVersion != null
                     ? $"Oops! You're running Stardew Valley {Constants.GameVersion}, but the oldest supported version is {Constants.MinimumGameVersion}. You can install SMAPI {suggestedApiVersion} instead to fix this error, or update your game to the latest version."
                     : $"Oops! You're running Stardew Valley {Constants.GameVersion}, but the oldest supported version is {Constants.MinimumGameVersion}. Please update your game before using SMAPI."
@@ -152,7 +150,7 @@ namespace StardewModdingAPI
             foreach (var type in new[] { typeof(IManifest), typeof(Manifest) })
             {
                 AssemblyName assemblyName = type.Assembly.GetName();
-                ISemanticVersion assemblyVersion = new SemanticVersion(assemblyName.Version);
+                ISemanticVersion assemblyVersion = new SemanticVersion(assemblyName.Version!);
                 if (!assemblyVersion.Equals(smapiVersion))
                     Program.PrintErrorAndExit($"Oops! The 'smapi-internal/{assemblyName.Name}.dll' file is version {assemblyVersion} instead of the required {Constants.ApiVersion}. SMAPI doesn't seem to be installed correctly.");
             }
@@ -184,7 +182,7 @@ namespace StardewModdingAPI
             bool? developerMode = null;
             string modsPath;
             {
-                string rawModsPath = null;
+                string? rawModsPath = null;
 
                 // get mods path from command line args
                 int pathIndex = Array.LastIndexOf(args, "--mods-path") + 1;
@@ -202,7 +200,7 @@ namespace StardewModdingAPI
                     rawModsPath = Environment.GetEnvironmentVariable("SMAPI_MODS_PATH");
                 if (developerMode is null)
                 {
-                    string rawDeveloperMode = Environment.GetEnvironmentVariable("SMAPI_DEVELOPER_MODE");
+                    string? rawDeveloperMode = Environment.GetEnvironmentVariable("SMAPI_DEVELOPER_MODE");
                     if (rawDeveloperMode != null)
                         developerMode = bool.Parse(rawDeveloperMode);
                 }
@@ -221,7 +219,7 @@ namespace StardewModdingAPI
         /// <summary>Write an error directly to the console and exit.</summary>
         /// <param name="message">The error message to display.</param>
         /// <param name="technicalMessage">An additional message to log with technical details.</param>
-        private static void PrintErrorAndExit(string message, string technicalMessage = null)
+        private static void PrintErrorAndExit(string message, string? technicalMessage = null)
         {
             Console.ForegroundColor = ConsoleColor.Red;
             Console.WriteLine(message);
diff --git a/src/SMAPI/Translation.cs b/src/SMAPI/Translation.cs
index ef98a00f..2a0d2ce8 100644
--- a/src/SMAPI/Translation.cs
+++ b/src/SMAPI/Translation.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 using System;
 using System.Collections;
 using System.Collections.Generic;
@@ -17,14 +15,14 @@ namespace StardewModdingAPI
         /// <summary>The placeholder text when the translation is <c>null</c> or empty, where <c>{0}</c> is the translation key.</summary>
         internal const string PlaceholderText = "(no translation:{0})";
 
-        /// <summary>The locale for which the translation was fetched.</summary>
+        /// <summary>The locale for which the translation was fetched like <c>fr-FR</c>, or an empty string for English.</summary>
         private readonly string Locale;
 
         /// <summary>The underlying translation text.</summary>
-        private readonly string Text;
+        private readonly string? Text;
 
         /// <summary>The value to return if the translations is undefined.</summary>
-        private readonly string Placeholder;
+        private readonly string? Placeholder;
 
 
         /*********
@@ -41,12 +39,12 @@ namespace StardewModdingAPI
         /// <param name="locale">The locale for which the translation was fetched.</param>
         /// <param name="key">The translation key.</param>
         /// <param name="text">The underlying translation text.</param>
-        internal Translation(string locale, string key, string text)
+        internal Translation(string locale, string key, string? text)
             : this(locale, key, text, string.Format(Translation.PlaceholderText, key)) { }
 
         /// <summary>Replace the text if it's <c>null</c> or empty. If you set a <c>null</c> or empty value, the translation will show the fallback "no translation" placeholder (see <see cref="UsePlaceholder"/> if you want to disable that). Returns a new instance if changed.</summary>
         /// <param name="default">The default value.</param>
-        public Translation Default(string @default)
+        public Translation Default(string? @default)
         {
             return this.HasValue()
                 ? this
@@ -54,7 +52,7 @@ namespace StardewModdingAPI
         }
 
         /// <summary>Whether to return a "no translation" placeholder if the translation is <c>null</c> or empty. Returns a new instance.</summary>
-        /// <param name="use">Whether to return a placeholder.</param>
+        /// <param name="use">Whether to return a placeholder. <strong>Due to limitations with nullable reference types, setting this to <c>false</c> will still mark the text non-nullable.</strong></param>
         public Translation UsePlaceholder(bool use)
         {
             return new Translation(this.Locale, this.Key, this.Text, use ? string.Format(Translation.PlaceholderText, this.Key) : null);
@@ -63,20 +61,20 @@ namespace StardewModdingAPI
         /// <summary>Replace tokens in the text like <c>{{value}}</c> with the given values. Returns a new instance.</summary>
         /// <param name="tokens">An object containing token key/value pairs. This can be an anonymous object (like <c>new { value = 42, name = "Cranberries" }</c>), a dictionary, or a class instance.</param>
         /// <exception cref="ArgumentNullException">The <paramref name="tokens"/> argument is <c>null</c>.</exception>
-        public Translation Tokens(object tokens)
+        public Translation Tokens(object? tokens)
         {
             if (string.IsNullOrWhiteSpace(this.Text) || tokens == null)
                 return this;
 
             // get dictionary of tokens
-            IDictionary<string, string> tokenLookup = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);
+            Dictionary<string, string?> tokenLookup = new(StringComparer.OrdinalIgnoreCase);
             {
                 // from dictionary
                 if (tokens is IDictionary inputLookup)
                 {
                     foreach (DictionaryEntry entry in inputLookup)
                     {
-                        string key = entry.Key.ToString()?.Trim();
+                        string? key = entry.Key.ToString()?.Trim();
                         if (key != null)
                             tokenLookup[key] = entry.Value?.ToString();
                     }
@@ -97,7 +95,7 @@ namespace StardewModdingAPI
             string text = Regex.Replace(this.Text, @"{{([ \w\.\-]+)}}", match =>
             {
                 string key = match.Groups[1].Value.Trim();
-                return tokenLookup.TryGetValue(key, out string value)
+                return tokenLookup.TryGetValue(key, out string? value)
                     ? value
                     : match.Value;
             });
@@ -111,18 +109,20 @@ namespace StardewModdingAPI
         }
 
         /// <summary>Get the translation text. Calling this method isn't strictly necessary, since you can assign a <see cref="Translation"/> value directly to a string.</summary>
+        /// <remarks><strong>Limitation with nullable reference types: if there's no text and you disabled the fallback via <see cref="UsePlaceholder"/>, this will return null but the return value will still be marked non-nullable.</strong></remarks>
         public override string ToString()
         {
             return this.Placeholder != null && !this.HasValue()
                 ? this.Placeholder
-                : this.Text;
+                : this.Text!;
         }
 
         /// <summary>Get a string representation of the given translation.</summary>
         /// <param name="translation">The translation key.</param>
+        /// <remarks><strong>Limitation with nullable reference types: if there's no text and you disabled the fallback via <see cref="UsePlaceholder"/>, this will return null but the return value will still be marked non-nullable.</strong></remarks>
         public static implicit operator string(Translation translation)
         {
-            return translation?.ToString();
+            return translation.ToString();
         }
 
 
@@ -134,7 +134,7 @@ namespace StardewModdingAPI
         /// <param name="key">The translation key.</param>
         /// <param name="text">The underlying translation text.</param>
         /// <param name="placeholder">The value to return if the translations is undefined.</param>
-        private Translation(string locale, string key, string text, string placeholder)
+        private Translation(string locale, string key, string? text, string? placeholder)
         {
             this.Locale = locale;
             this.Key = key;
diff --git a/src/SMAPI/Utilities/CaseInsensitivePathCache.cs b/src/SMAPI/Utilities/CaseInsensitivePathCache.cs
index 4596fdce..2ac1b9f9 100644
--- a/src/SMAPI/Utilities/CaseInsensitivePathCache.cs
+++ b/src/SMAPI/Utilities/CaseInsensitivePathCache.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 using System;
 using System.Collections.Generic;
 using System.IO;
@@ -81,7 +79,7 @@ namespace StardewModdingAPI.Utilities
                 return relativePath;
 
             // already cached
-            if (this.RelativePathCache.Value.TryGetValue(relativePath, out string resolved))
+            if (this.RelativePathCache.Value.TryGetValue(relativePath, out string? resolved))
                 return resolved;
 
             // file exists but isn't cached for some reason
diff --git a/src/SMAPI/Utilities/Keybind.cs b/src/SMAPI/Utilities/Keybind.cs
index 7b1acf1d..3455ce77 100644
--- a/src/SMAPI/Utilities/Keybind.cs
+++ b/src/SMAPI/Utilities/Keybind.cs
@@ -1,7 +1,6 @@
-#nullable disable
-
 using System;
 using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using StardewModdingAPI.Framework;
 
@@ -44,7 +43,7 @@ namespace StardewModdingAPI.Utilities
         /// <param name="input">The keybind string. See remarks on <see cref="ToString"/> for format details.</param>
         /// <param name="parsed">The parsed keybind, if valid.</param>
         /// <param name="errors">The parse errors, if any.</param>
-        public static bool TryParse(string input, out Keybind parsed, out string[] errors)
+        public static bool TryParse(string input, [NotNullWhen(true)] out Keybind? parsed, out string[] errors)
         {
             // empty input
             if (string.IsNullOrWhiteSpace(input))
diff --git a/src/SMAPI/Utilities/KeybindList.cs b/src/SMAPI/Utilities/KeybindList.cs
index 7b2c396b..18eeb9fd 100644
--- a/src/SMAPI/Utilities/KeybindList.cs
+++ b/src/SMAPI/Utilities/KeybindList.cs
@@ -1,7 +1,6 @@
-#nullable disable
-
 using System;
 using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using StardewModdingAPI.Toolkit.Serialization;
 
@@ -42,7 +41,7 @@ namespace StardewModdingAPI.Utilities
         /// <exception cref="FormatException">The <paramref name="input"/> format is invalid.</exception>
         public static KeybindList Parse(string input)
         {
-            return KeybindList.TryParse(input, out KeybindList parsed, out string[] errors)
+            return KeybindList.TryParse(input, out KeybindList? parsed, out string[] errors)
                 ? parsed
                 : throw new SParseException($"Can't parse {nameof(Keybind)} from invalid value '{input}'.\n{string.Join("\n", errors)}");
         }
@@ -51,7 +50,7 @@ namespace StardewModdingAPI.Utilities
         /// <param name="input">The keybind string. See remarks on <see cref="ToString"/> for format details.</param>
         /// <param name="parsed">The parsed keybind list, if valid.</param>
         /// <param name="errors">The errors that occurred while parsing the input, if any.</param>
-        public static bool TryParse(string input, out KeybindList parsed, out string[] errors)
+        public static bool TryParse(string input, [NotNullWhen(true)] out KeybindList? parsed, out string[] errors)
         {
             // empty input
             if (string.IsNullOrWhiteSpace(input))
@@ -69,7 +68,7 @@ namespace StardewModdingAPI.Utilities
                 if (string.IsNullOrWhiteSpace(rawSet))
                     continue;
 
-                if (!Keybind.TryParse(rawSet, out Keybind keybind, out string[] curErrors))
+                if (!Keybind.TryParse(rawSet, out Keybind? keybind, out string[] curErrors))
                     rawErrors.AddRange(curErrors);
                 else
                     keybinds.Add(keybind);
@@ -151,7 +150,7 @@ namespace StardewModdingAPI.Utilities
         }
 
         /// <summary>Get the keybind which is currently down, if any. If there are multiple keybinds down, the first one is returned.</summary>
-        public Keybind GetKeybindCurrentlyDown()
+        public Keybind? GetKeybindCurrentlyDown()
         {
             return this.Keybinds.FirstOrDefault(p => p.GetState().IsDown());
         }
diff --git a/src/SMAPI/Utilities/SDate.cs b/src/SMAPI/Utilities/SDate.cs
index b10bc3da..1d4e4489 100644
--- a/src/SMAPI/Utilities/SDate.cs
+++ b/src/SMAPI/Utilities/SDate.cs
@@ -1,6 +1,5 @@
-#nullable disable
-
 using System;
+using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using Newtonsoft.Json;
 using StardewModdingAPI.Framework;
@@ -24,7 +23,7 @@ namespace StardewModdingAPI.Utilities
         private readonly int DaysInSeason = 28;
 
         /// <summary>The core SMAPI translations.</summary>
-        internal static Translator Translations;
+        internal static Translator? Translations;
 
 
         /*********
@@ -94,7 +93,8 @@ namespace StardewModdingAPI.Utilities
 
         /// <summary>Get a date from a game date instance.</summary>
         /// <param name="date">The world date.</param>
-        public static SDate From(WorldDate date)
+        [return: NotNullIfNotNull("date")]
+        public static SDate? From(WorldDate? date)
         {
             if (date == null)
                 return null;
@@ -170,14 +170,14 @@ namespace StardewModdingAPI.Utilities
         ****/
         /// <summary>Get whether this instance is equal to another.</summary>
         /// <param name="other">The other value to compare.</param>
-        public bool Equals(SDate other)
+        public bool Equals(SDate? other)
         {
             return this == other;
         }
 
         /// <summary>Get whether this instance is equal to another.</summary>
         /// <param name="obj">The other value to compare.</param>
-        public override bool Equals(object obj)
+        public override bool Equals(object? obj)
         {
             return obj is SDate other && this == other;
         }
@@ -195,7 +195,7 @@ namespace StardewModdingAPI.Utilities
         /// <param name="date">The base date to compare.</param>
         /// <param name="other">The other date to compare.</param>
         /// <returns>The equality of the dates</returns>
-        public static bool operator ==(SDate date, SDate other)
+        public static bool operator ==(SDate? date, SDate? other)
         {
             return date?.DaysSinceStart == other?.DaysSinceStart;
         }
@@ -203,7 +203,7 @@ namespace StardewModdingAPI.Utilities
         /// <summary>Get whether one date is not equal to another.</summary>
         /// <param name="date">The base date to compare.</param>
         /// <param name="other">The other date to compare.</param>
-        public static bool operator !=(SDate date, SDate other)
+        public static bool operator !=(SDate? date, SDate? other)
         {
             return date?.DaysSinceStart != other?.DaysSinceStart;
         }
@@ -211,7 +211,7 @@ namespace StardewModdingAPI.Utilities
         /// <summary>Get whether one date is more than another.</summary>
         /// <param name="date">The base date to compare.</param>
         /// <param name="other">The other date to compare.</param>
-        public static bool operator >(SDate date, SDate other)
+        public static bool operator >(SDate? date, SDate? other)
         {
             return date?.DaysSinceStart > other?.DaysSinceStart;
         }
@@ -219,7 +219,7 @@ namespace StardewModdingAPI.Utilities
         /// <summary>Get whether one date is more than or equal to another.</summary>
         /// <param name="date">The base date to compare.</param>
         /// <param name="other">The other date to compare.</param>
-        public static bool operator >=(SDate date, SDate other)
+        public static bool operator >=(SDate? date, SDate? other)
         {
             return date?.DaysSinceStart >= other?.DaysSinceStart;
         }
@@ -227,7 +227,7 @@ namespace StardewModdingAPI.Utilities
         /// <summary>Get whether one date is less than or equal to another.</summary>
         /// <param name="date">The base date to compare.</param>
         /// <param name="other">The other date to compare.</param>
-        public static bool operator <=(SDate date, SDate other)
+        public static bool operator <=(SDate? date, SDate? other)
         {
             return date?.DaysSinceStart <= other?.DaysSinceStart;
         }
@@ -235,7 +235,7 @@ namespace StardewModdingAPI.Utilities
         /// <summary>Get whether one date is less than another.</summary>
         /// <param name="date">The base date to compare.</param>
         /// <param name="other">The other date to compare.</param>
-        public static bool operator <(SDate date, SDate other)
+        public static bool operator <(SDate? date, SDate? other)
         {
             return date?.DaysSinceStart < other?.DaysSinceStart;
         }
@@ -250,9 +250,10 @@ namespace StardewModdingAPI.Utilities
         /// <param name="year">The year.</param>
         /// <param name="allowDayZero">Whether to allow 0 spring Y1 as a valid date.</param>
         /// <exception cref="ArgumentException">One of the arguments has an invalid value (like day 35).</exception>
+        [SuppressMessage("ReSharper", "ConstantConditionalAccessQualifier", Justification = "The nullability is validated in this constructor.")]
         private SDate(int day, string season, int year, bool allowDayZero)
         {
-            season = season?.Trim().ToLowerInvariant();
+            season = season?.Trim().ToLowerInvariant()!; // null-checked below
 
             // validate
             if (season == null)
@@ -288,25 +289,17 @@ namespace StardewModdingAPI.Utilities
         /// <param name="day">The day of month.</param>
         private DayOfWeek GetDayOfWeek(int day)
         {
-            switch (day % 7)
+            return (day % 7) switch
             {
-                case 0:
-                    return DayOfWeek.Sunday;
-                case 1:
-                    return DayOfWeek.Monday;
-                case 2:
-                    return DayOfWeek.Tuesday;
-                case 3:
-                    return DayOfWeek.Wednesday;
-                case 4:
-                    return DayOfWeek.Thursday;
-                case 5:
-                    return DayOfWeek.Friday;
-                case 6:
-                    return DayOfWeek.Saturday;
-                default:
-                    return 0;
-            }
+                0 => DayOfWeek.Sunday,
+                1 => DayOfWeek.Monday,
+                2 => DayOfWeek.Tuesday,
+                3 => DayOfWeek.Wednesday,
+                4 => DayOfWeek.Thursday,
+                5 => DayOfWeek.Friday,
+                6 => DayOfWeek.Saturday,
+                _ => 0
+            };
         }
 
         /// <summary>Get the number of days since the game began (starting at 1 for the first day of spring in Y1).</summary>
-- 
cgit 


From 4adf8611131a5d86b15f017a42a0366837d14528 Mon Sep 17 00:00:00 2001
From: Jesse Plamondon-Willard <Pathoschild@users.noreply.github.com>
Date: Wed, 13 Apr 2022 21:07:43 -0400
Subject: enable nullable annotations in the rest of SMAPI core (#837)

---
 src/SMAPI.Tests/Utilities/KeybindListTests.cs      |  10 +-
 src/SMAPI/Events/ModMessageReceivedEventArgs.cs    |   6 +-
 src/SMAPI/Framework/CommandManager.cs              |  34 ++--
 src/SMAPI/Framework/Commands/HelpCommand.cs        |   8 +-
 src/SMAPI/Framework/Content/AssetDataForMap.cs     |  23 ++-
 src/SMAPI/Framework/Content/AssetName.cs           |  21 +--
 src/SMAPI/Framework/Content/ContentCache.cs        |  11 +-
 .../ContentManagers/BaseContentManager.cs          |  21 ++-
 .../Framework/ContentManagers/ModContentManager.cs |  21 +--
 src/SMAPI/Framework/DeprecationManager.cs          |  25 ++-
 src/SMAPI/Framework/Input/GamePadStateBuilder.cs   |   9 +-
 src/SMAPI/Framework/Input/SInputState.cs           |   6 +-
 src/SMAPI/Framework/InternalExtensions.cs          |   9 +-
 .../Framework/Logging/InterceptingTextWriter.cs    |  24 ++-
 src/SMAPI/Framework/Logging/LogManager.cs          |  36 +++--
 src/SMAPI/Framework/ModHelpers/CommandHelper.cs    |   4 +-
 src/SMAPI/Framework/ModLoading/AssemblyLoader.cs   |  35 +++--
 .../Framework/ModLoading/AssemblyParseResult.cs    |  15 +-
 src/SMAPI/Framework/ModLoading/ModResolver.cs      |  75 +++++----
 .../ModLoading/Rewriters/FieldReplaceRewriter.cs   |  20 ++-
 src/SMAPI/Framework/Models/SConfig.cs              |  78 +++++++---
 src/SMAPI/Framework/Networking/ModMessageModel.cs  |  21 ++-
 src/SMAPI/Framework/Networking/MultiplayerPeer.cs  |  16 +-
 .../Framework/Networking/MultiplayerPeerMod.cs     |   5 +-
 .../Framework/Networking/RemoteContextModModel.cs  |  30 +++-
 .../Framework/Networking/RemoteContextModel.cs     |  33 +++-
 src/SMAPI/Framework/Reflection/CacheEntry.cs       |  12 +-
 src/SMAPI/Framework/Reflection/Reflector.cs        | 127 +++++++++------
 src/SMAPI/Framework/SCore.cs                       | 172 +++++++++++----------
 src/SMAPI/Framework/SMultiplayer.cs                |  89 ++++++-----
 .../Framework/Serialization/KeybindConverter.cs    |   4 +-
 .../FieldWatchers/ComparableWatcher.cs             |   5 +-
 src/SMAPI/Framework/StateTracking/PlayerTracker.cs |  16 +-
 .../StateTracking/Snapshots/PlayerSnapshot.cs      |  11 +-
 .../Framework/TemporaryHacks/MiniMonoModHotfix.cs  | 122 +++++++--------
 src/SMAPI/Metadata/CoreAssetPropagator.cs          |  47 +++---
 src/SMAPI/Translation.cs                           |   2 +-
 src/SMAPI/Utilities/KeybindList.cs                 |   2 +-
 src/SMAPI/Utilities/PerScreen.cs                   |  23 ++-
 39 files changed, 679 insertions(+), 549 deletions(-)

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

diff --git a/src/SMAPI.Tests/Utilities/KeybindListTests.cs b/src/SMAPI.Tests/Utilities/KeybindListTests.cs
index 060c93ed..c4c086de 100644
--- a/src/SMAPI.Tests/Utilities/KeybindListTests.cs
+++ b/src/SMAPI.Tests/Utilities/KeybindListTests.cs
@@ -21,12 +21,12 @@ namespace SMAPI.Tests.Utilities
         public void TryParse_SimpleValue(SButton button)
         {
             // act
-            bool success = KeybindList.TryParse($"{button}", out KeybindList parsed, out string[] errors);
+            bool success = KeybindList.TryParse($"{button}", out KeybindList? parsed, out string[] errors);
 
             // assert
             Assert.IsTrue(success, "Parsing unexpectedly failed.");
             Assert.IsNotNull(parsed, "The parsed result should not be null.");
-            Assert.AreEqual(parsed.ToString(), $"{button}");
+            Assert.AreEqual(parsed!.ToString(), $"{button}");
             Assert.IsNotNull(errors, message: "The errors should never be null.");
             Assert.IsEmpty(errors, message: "The input bindings incorrectly reported errors.");
         }
@@ -47,14 +47,14 @@ namespace SMAPI.Tests.Utilities
         public string TryParse_MultiValues(string? input)
         {
             // act
-            bool success = KeybindList.TryParse(input, out KeybindList parsed, out string[] errors);
+            bool success = KeybindList.TryParse(input, out KeybindList? parsed, out string[] errors);
 
             // assert
             Assert.IsTrue(success, "Parsing unexpectedly failed.");
             Assert.IsNotNull(parsed, "The parsed result should not be null.");
             Assert.IsNotNull(errors, message: "The errors should never be null.");
             Assert.IsEmpty(errors, message: "The input bindings incorrectly reported errors.");
-            return parsed.ToString();
+            return parsed!.ToString();
         }
 
         /// <summary>Assert invalid values are rejected.</summary>
@@ -67,7 +67,7 @@ namespace SMAPI.Tests.Utilities
         public void TryParse_InvalidValues(string input, string expectedError)
         {
             // act
-            bool success = KeybindList.TryParse(input, out KeybindList parsed, out string[] errors);
+            bool success = KeybindList.TryParse(input, out KeybindList? parsed, out string[] errors);
 
             // assert
             Assert.IsFalse(success, "Parsing unexpectedly succeeded.");
diff --git a/src/SMAPI/Events/ModMessageReceivedEventArgs.cs b/src/SMAPI/Events/ModMessageReceivedEventArgs.cs
index 671bdf38..84a27d18 100644
--- a/src/SMAPI/Events/ModMessageReceivedEventArgs.cs
+++ b/src/SMAPI/Events/ModMessageReceivedEventArgs.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 using System;
 using StardewModdingAPI.Framework.Networking;
 using StardewModdingAPI.Toolkit.Serialization;
@@ -47,8 +45,10 @@ namespace StardewModdingAPI.Events
         /// <summary>Read the message data into the given model type.</summary>
         /// <typeparam name="TModel">The message model type.</typeparam>
         public TModel ReadAs<TModel>()
+            where TModel : notnull
         {
-            return this.Message.Data.ToObject<TModel>(this.JsonHelper.GetSerializer());
+            return this.Message.Data.ToObject<TModel>(this.JsonHelper.GetSerializer())
+                ?? throw new InvalidOperationException($"Can't read empty mod message data as a {typeof(TModel).FullName} value.");
         }
     }
 }
diff --git a/src/SMAPI/Framework/CommandManager.cs b/src/SMAPI/Framework/CommandManager.cs
index 80c08f34..d3b9c8ee 100644
--- a/src/SMAPI/Framework/CommandManager.cs
+++ b/src/SMAPI/Framework/CommandManager.cs
@@ -1,7 +1,6 @@
-#nullable disable
-
 using System;
 using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using System.Text;
 using StardewModdingAPI.Framework.Commands;
@@ -39,9 +38,9 @@ namespace StardewModdingAPI.Framework
         /// <exception cref="ArgumentNullException">The <paramref name="name"/> or <paramref name="callback"/> is null or empty.</exception>
         /// <exception cref="FormatException">The <paramref name="name"/> is not a valid format.</exception>
         /// <exception cref="ArgumentException">There's already a command with that name.</exception>
-        public CommandManager Add(IModMetadata mod, string name, string documentation, Action<string, string[]> callback)
+        public CommandManager Add(IModMetadata? mod, string name, string documentation, Action<string, string[]> callback)
         {
-            name = this.GetNormalizedName(name);
+            name = this.GetNormalizedName(name)!; // null-checked below
 
             // validate format
             if (string.IsNullOrWhiteSpace(name))
@@ -72,10 +71,13 @@ namespace StardewModdingAPI.Framework
         /// <summary>Get a command by its unique name.</summary>
         /// <param name="name">The command name.</param>
         /// <returns>Returns the matching command, or <c>null</c> if not found.</returns>
-        public Command Get(string name)
+        public Command? Get(string? name)
         {
-            name = this.GetNormalizedName(name);
-            this.Commands.TryGetValue(name, out Command command);
+            name = this.GetNormalizedName(name)!;
+            if (string.IsNullOrWhiteSpace(name))
+                return null;
+
+            this.Commands.TryGetValue(name, out Command? command);
             return command;
         }
 
@@ -94,7 +96,7 @@ namespace StardewModdingAPI.Framework
         /// <param name="command">The command which can handle the input.</param>
         /// <param name="screenId">The screen ID on which to run the command.</param>
         /// <returns>Returns true if the input was successfully parsed and matched to a command; else false.</returns>
-        public bool TryParse(string input, out string name, out string[] args, out Command command, out int screenId)
+        public bool TryParse(string? input, [NotNullWhen(true)] out string? name, [NotNullWhen(true)] out string[]? args, [NotNullWhen(true)] out Command? command, out int screenId)
         {
             // ignore if blank
             if (string.IsNullOrWhiteSpace(input))
@@ -108,7 +110,7 @@ namespace StardewModdingAPI.Framework
 
             // parse input
             args = this.ParseArgs(input);
-            name = this.GetNormalizedName(args[0]);
+            name = this.GetNormalizedName(args[0])!;
             args = args.Skip(1).ToArray();
 
             // get screen ID argument
@@ -116,7 +118,7 @@ namespace StardewModdingAPI.Framework
             for (int i = 0; i < args.Length; i++)
             {
                 // consume arg & set screen ID
-                if (this.TryParseScreenId(args[i], out int rawScreenId, out string error))
+                if (this.TryParseScreenId(args[i], out int rawScreenId, out string? error))
                 {
                     args = args.Take(i).Concat(args.Skip(i + 1)).ToArray();
                     screenId = rawScreenId;
@@ -140,15 +142,15 @@ namespace StardewModdingAPI.Framework
         /// <param name="name">The command name.</param>
         /// <param name="arguments">The command arguments.</param>
         /// <returns>Returns whether a matching command was triggered.</returns>
-        public bool Trigger(string name, string[] arguments)
+        public bool Trigger(string? name, string[] arguments)
         {
             // get normalized name
-            name = this.GetNormalizedName(name);
-            if (name == null)
+            name = this.GetNormalizedName(name)!;
+            if (string.IsNullOrWhiteSpace(name))
                 return false;
 
             // get command
-            if (this.Commands.TryGetValue(name, out Command command))
+            if (this.Commands.TryGetValue(name, out Command? command))
             {
                 command.Callback.Invoke(name, arguments);
                 return true;
@@ -191,7 +193,7 @@ namespace StardewModdingAPI.Framework
         /// <param name="screen">The parsed screen ID, if any.</param>
         /// <param name="error">The error which indicates an invalid screen ID, if applicable.</param>
         /// <returns>Returns whether the screen ID was parsed successfully.</returns>
-        private bool TryParseScreenId(string arg, out int screen, out string error)
+        private bool TryParseScreenId(string arg, out int screen, out string? error)
         {
             screen = -1;
             error = null;
@@ -220,7 +222,7 @@ namespace StardewModdingAPI.Framework
 
         /// <summary>Get a normalized command name.</summary>
         /// <param name="name">The command name.</param>
-        private string GetNormalizedName(string name)
+        private string? GetNormalizedName(string? name)
         {
             name = name?.Trim().ToLower();
             return !string.IsNullOrWhiteSpace(name)
diff --git a/src/SMAPI/Framework/Commands/HelpCommand.cs b/src/SMAPI/Framework/Commands/HelpCommand.cs
index eb6c74f5..65dc3bce 100644
--- a/src/SMAPI/Framework/Commands/HelpCommand.cs
+++ b/src/SMAPI/Framework/Commands/HelpCommand.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 using System.Linq;
 
 namespace StardewModdingAPI.Framework.Commands
@@ -41,7 +39,7 @@ namespace StardewModdingAPI.Framework.Commands
         {
             if (args.Any())
             {
-                Command result = this.CommandManager.Get(args[0]);
+                Command? result = this.CommandManager.Get(args[0]);
                 if (result == null)
                     monitor.Log("There's no command with that name. Type 'help' by itself for more info.", LogLevel.Error);
                 else
@@ -63,10 +61,10 @@ namespace StardewModdingAPI.Framework.Commands
                     + "--------------\n"
                     + "The following commands are registered. For more info about a command, type 'help command_name'.\n\n";
 
-                IGrouping<string, string>[] groups = (from command in this.CommandManager.GetAll() orderby command.Mod?.DisplayName, command.Name group command.Name by command.Mod?.DisplayName).ToArray();
+                IGrouping<string, string>[] groups = (from command in this.CommandManager.GetAll() orderby command.Mod?.DisplayName, command.Name group command.Name by command.Mod?.DisplayName ?? "SMAPI").ToArray();
                 foreach (var group in groups)
                 {
-                    string modName = group.Key ?? "SMAPI";
+                    string modName = group.Key;
                     string[] commandNames = group.ToArray();
                     message += $"{modName}:\n  {string.Join("\n  ", commandNames)}\n\n";
                 }
diff --git a/src/SMAPI/Framework/Content/AssetDataForMap.cs b/src/SMAPI/Framework/Content/AssetDataForMap.cs
index 93148277..133dcc6c 100644
--- a/src/SMAPI/Framework/Content/AssetDataForMap.cs
+++ b/src/SMAPI/Framework/Content/AssetDataForMap.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -35,7 +33,7 @@ namespace StardewModdingAPI.Framework.Content
         /// <param name="getNormalizedPath">Normalizes an asset key to match the cache key.</param>
         /// <param name="onDataReplaced">A callback to invoke when the data is replaced (if any).</param>
         /// <param name="reflection">Simplifies access to private code.</param>
-        public AssetDataForMap(string locale, IAssetName assetName, Map data, Func<string, string> getNormalizedPath, Action<Map> onDataReplaced, Reflector reflection)
+        public AssetDataForMap(string? locale, IAssetName assetName, Map data, Func<string, string> getNormalizedPath, Action<Map> onDataReplaced, Reflector reflection)
             : base(locale, assetName, data, getNormalizedPath, onDataReplaced)
         {
             this.Reflection = reflection;
@@ -126,8 +124,7 @@ namespace StardewModdingAPI.Framework.Content
                     foreach (Layer sourceLayer in source.Layers)
                     {
                         // get layer
-                        Layer targetLayer = sourceToTargetLayers[sourceLayer];
-                        if (targetLayer == null)
+                        if (!sourceToTargetLayers.TryGetValue(sourceLayer, out Layer? targetLayer))
                         {
                             target.AddLayer(targetLayer = new Layer(sourceLayer.Id, target, target.Layers[0].LayerSize, Layer.m_tileSize));
                             sourceToTargetLayers[sourceLayer] = target.GetLayer(sourceLayer.Id);
@@ -137,11 +134,13 @@ namespace StardewModdingAPI.Framework.Content
                         targetLayer.Properties.CopyFrom(sourceLayer.Properties);
 
                         // create new tile
-                        Tile sourceTile = sourceLayer.Tiles[sourcePos.X, sourcePos.Y];
-                        Tile newTile = sourceTile != null
-                            ? this.CreateTile(sourceTile, targetLayer, tilesheetMap[sourceTile.TileSheet])
-                            : null;
-                        newTile?.Properties.CopyFrom(sourceTile.Properties);
+                        Tile? sourceTile = sourceLayer.Tiles[sourcePos.X, sourcePos.Y];
+                        Tile? newTile = null;
+                        if (sourceTile != null)
+                        {
+                            newTile = this.CreateTile(sourceTile, targetLayer, tilesheetMap[sourceTile.TileSheet]);
+                            newTile?.Properties.CopyFrom(sourceTile.Properties);
+                        }
 
                         // replace tile
                         if (newTile != null || replaceByLayer || replaceAll)
@@ -195,7 +194,7 @@ namespace StardewModdingAPI.Framework.Content
         /// <param name="sourceTile">The source tile to copy.</param>
         /// <param name="targetLayer">The target layer.</param>
         /// <param name="targetSheet">The target tilesheet.</param>
-        private Tile CreateTile(Tile sourceTile, Layer targetLayer, TileSheet targetSheet)
+        private Tile? CreateTile(Tile sourceTile, Layer targetLayer, TileSheet targetSheet)
         {
             switch (sourceTile)
             {
@@ -220,7 +219,7 @@ namespace StardewModdingAPI.Framework.Content
         }
         /// <summary>Normalize a map tilesheet path for comparison. This value should *not* be used as the actual tilesheet path.</summary>
         /// <param name="path">The path to normalize.</param>
-        private string NormalizeTilesheetPathForComparison(string path)
+        private string NormalizeTilesheetPathForComparison(string? path)
         {
             if (string.IsNullOrWhiteSpace(path))
                 return string.Empty;
diff --git a/src/SMAPI/Framework/Content/AssetName.cs b/src/SMAPI/Framework/Content/AssetName.cs
index 4d583d82..4c691b9a 100644
--- a/src/SMAPI/Framework/Content/AssetName.cs
+++ b/src/SMAPI/Framework/Content/AssetName.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 using System;
 using StardewModdingAPI.Toolkit.Utilities;
 using StardewValley;
@@ -26,7 +24,7 @@ namespace StardewModdingAPI.Framework.Content
         public string BaseName { get; }
 
         /// <inheritdoc />
-        public string LocaleCode { get; }
+        public string? LocaleCode { get; }
 
         /// <inheritdoc />
         public LocalizedContentManager.LanguageCode? LanguageCode { get; }
@@ -39,7 +37,7 @@ namespace StardewModdingAPI.Framework.Content
         /// <param name="baseName">The base asset name without the locale code.</param>
         /// <param name="localeCode">The locale code specified in the <see cref="Name"/>, if it's a valid code recognized by the game content.</param>
         /// <param name="languageCode">The language code matching the <see cref="LocaleCode"/>, if applicable.</param>
-        public AssetName(string baseName, string localeCode, LocalizedContentManager.LanguageCode? languageCode)
+        public AssetName(string baseName, string? localeCode, LocalizedContentManager.LanguageCode? languageCode)
         {
             // validate
             if (string.IsNullOrWhiteSpace(baseName))
@@ -69,7 +67,7 @@ namespace StardewModdingAPI.Framework.Content
                 throw new ArgumentException("The asset name can't be null or empty.", nameof(rawName));
 
             string baseName = rawName;
-            string localeCode = null;
+            string? localeCode = null;
             LocalizedContentManager.LanguageCode? languageCode = null;
 
             int lastPeriodIndex = rawName.LastIndexOf('.');
@@ -90,7 +88,7 @@ namespace StardewModdingAPI.Framework.Content
         }
 
         /// <inheritdoc />
-        public bool IsEquivalentTo(string assetName, bool useBaseName = false)
+        public bool IsEquivalentTo(string? assetName, bool useBaseName = false)
         {
             // empty asset key is never equivalent
             if (string.IsNullOrWhiteSpace(assetName))
@@ -103,7 +101,7 @@ namespace StardewModdingAPI.Framework.Content
         }
 
         /// <inheritdoc />
-        public bool IsEquivalentTo(IAssetName assetName, bool useBaseName = false)
+        public bool IsEquivalentTo(IAssetName? assetName, bool useBaseName = false)
         {
             if (useBaseName)
                 return this.BaseName.Equals(assetName?.BaseName, StringComparison.OrdinalIgnoreCase);
@@ -115,7 +113,7 @@ namespace StardewModdingAPI.Framework.Content
         }
 
         /// <inheritdoc />
-        public bool StartsWith(string prefix, bool allowPartialWord = true, bool allowSubfolder = true)
+        public bool StartsWith(string? prefix, bool allowPartialWord = true, bool allowSubfolder = true)
         {
             // asset keys never start with null
             if (prefix is null)
@@ -157,8 +155,11 @@ namespace StardewModdingAPI.Framework.Content
 
 
         /// <inheritdoc />
-        public bool IsDirectlyUnderPath(string assetFolder)
+        public bool IsDirectlyUnderPath(string? assetFolder)
         {
+            if (assetFolder is null)
+                return false;
+
             return this.StartsWith(assetFolder + "/", allowPartialWord: false, allowSubfolder: false);
         }
 
@@ -171,7 +172,7 @@ namespace StardewModdingAPI.Framework.Content
         }
 
         /// <inheritdoc />
-        public bool Equals(IAssetName other)
+        public bool Equals(IAssetName? other)
         {
             return other switch
             {
diff --git a/src/SMAPI/Framework/Content/ContentCache.cs b/src/SMAPI/Framework/Content/ContentCache.cs
index 4e620d28..d8862eb3 100644
--- a/src/SMAPI/Framework/Content/ContentCache.cs
+++ b/src/SMAPI/Framework/Content/ContentCache.cs
@@ -1,7 +1,6 @@
-#nullable disable
-
 using System;
 using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
 using System.Diagnostics.Contracts;
 using System.Linq;
 using StardewModdingAPI.Framework.Reflection;
@@ -46,7 +45,8 @@ namespace StardewModdingAPI.Framework.Content
         /// <param name="reflection">Simplifies access to private game code.</param>
         public ContentCache(LocalizedContentManager contentManager, Reflector reflection)
         {
-            this.Cache = reflection.GetField<Dictionary<string, object>>(contentManager, "loadedAssets").GetValue();
+            this.Cache = reflection.GetField<Dictionary<string, object>>(contentManager, "loadedAssets").GetValue()
+                ?? throw new InvalidOperationException("Can't initialize content cache: required field 'loadedAssets' is missing.");
         }
 
         /****
@@ -66,7 +66,8 @@ namespace StardewModdingAPI.Framework.Content
         /// <summary>Normalize path separators in an asset name.</summary>
         /// <param name="path">The file path to normalize.</param>
         [Pure]
-        public string NormalizePathSeparators(string path)
+        [return: NotNullIfNotNull("path")]
+        public string? NormalizePathSeparators(string? path)
         {
             return PathUtilities.NormalizeAssetName(path);
         }
@@ -93,7 +94,7 @@ namespace StardewModdingAPI.Framework.Content
         public bool Remove(string key, bool dispose)
         {
             // get entry
-            if (!this.Cache.TryGetValue(key, out object value))
+            if (!this.Cache.TryGetValue(key, out object? value))
                 return false;
 
             // dispose & remove entry
diff --git a/src/SMAPI/Framework/ContentManagers/BaseContentManager.cs b/src/SMAPI/Framework/ContentManagers/BaseContentManager.cs
index f1ccab48..5ae5313d 100644
--- a/src/SMAPI/Framework/ContentManagers/BaseContentManager.cs
+++ b/src/SMAPI/Framework/ContentManagers/BaseContentManager.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 using System;
 using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
@@ -99,11 +97,13 @@ namespace StardewModdingAPI.Framework.ContentManagers
             this.AggressiveMemoryOptimizations = aggressiveMemoryOptimizations;
 
             // get asset data
-            this.BaseDisposableReferences = reflection.GetField<List<IDisposable>>(this, "disposableAssets").GetValue();
+            this.BaseDisposableReferences = reflection.GetField<List<IDisposable>>(this, "disposableAssets").GetValue()
+                ?? throw new InvalidOperationException("Can't initialize content manager: the required 'disposableAssets' field wasn't found.");
         }
 
         /// <inheritdoc />
         public virtual bool DoesAssetExist<T>(IAssetName assetName)
+            where T : notnull
         {
             return this.Cache.ContainsKey(assetName.Name);
         }
@@ -131,6 +131,7 @@ namespace StardewModdingAPI.Framework.ContentManagers
 
         /// <inheritdoc />
         public T LoadLocalized<T>(IAssetName assetName, LanguageCode language, bool useCache)
+            where T : notnull
         {
             // ignore locale in English (or if disabled)
             if (!this.TryLocalizeKeys || language == LocalizedContentManager.LanguageCode.en)
@@ -172,11 +173,12 @@ namespace StardewModdingAPI.Framework.ContentManagers
         }
 
         /// <inheritdoc />
-        public abstract T LoadExact<T>(IAssetName assetName, bool useCache);
+        public abstract T LoadExact<T>(IAssetName assetName, bool useCache)
+            where T : notnull;
 
         /// <inheritdoc />
         [SuppressMessage("ReSharper", "ParameterOnlyUsedForPreconditionCheck.Local", Justification = "Parameter is only used for assertion checks by design.")]
-        public string AssertAndNormalizeAssetName(string assetName)
+        public string AssertAndNormalizeAssetName(string? assetName)
         {
             // NOTE: the game checks for ContentLoadException to handle invalid keys, so avoid
             // throwing other types like ArgumentException here.
@@ -253,7 +255,7 @@ namespace StardewModdingAPI.Framework.ContentManagers
             // dispose uncached assets
             foreach (WeakReference<IDisposable> reference in this.Disposables)
             {
-                if (reference.TryGetTarget(out IDisposable disposable))
+                if (reference.TryGetTarget(out IDisposable? disposable))
                 {
                     try
                     {
@@ -285,7 +287,8 @@ namespace StardewModdingAPI.Framework.ContentManagers
         *********/
         /// <summary>Apply initial normalization to a raw asset name before it's parsed.</summary>
         /// <param name="assetName">The asset name to normalize.</param>
-        private string PrenormalizeRawAssetName(string assetName)
+        [return: NotNullIfNotNull("assetName")]
+        private string? PrenormalizeRawAssetName(string? assetName)
         {
             // trim
             assetName = assetName?.Trim();
@@ -301,7 +304,8 @@ namespace StardewModdingAPI.Framework.ContentManagers
         /// <summary>Normalize path separators in a file path. For asset keys, see <see cref="AssertAndNormalizeAssetName"/> instead.</summary>
         /// <param name="path">The file path to normalize.</param>
         [Pure]
-        protected string NormalizePathSeparators(string path)
+        [return: NotNullIfNotNull("path")]
+        protected string? NormalizePathSeparators(string? path)
         {
             return this.Cache.NormalizePathSeparators(path);
         }
@@ -323,6 +327,7 @@ namespace StardewModdingAPI.Framework.ContentManagers
         /// <param name="value">The asset value.</param>
         /// <param name="useCache">Whether to save the asset to the asset cache.</param>
         protected virtual void TrackAsset<T>(IAssetName assetName, T value, bool useCache)
+            where T : notnull
         {
             // track asset key
             if (value is Texture2D texture)
diff --git a/src/SMAPI/Framework/ContentManagers/ModContentManager.cs b/src/SMAPI/Framework/ContentManagers/ModContentManager.cs
index 8051c296..f0f4bce9 100644
--- a/src/SMAPI/Framework/ContentManagers/ModContentManager.cs
+++ b/src/SMAPI/Framework/ContentManagers/ModContentManager.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 using System;
 using System.Globalization;
 using System.IO;
@@ -92,7 +90,7 @@ namespace StardewModdingAPI.Framework.ContentManagers
 
             // resolve managed asset key
             {
-                if (this.Coordinator.TryParseManagedAssetKey(assetName.Name, out string contentManagerID, out IAssetName relativePath))
+                if (this.Coordinator.TryParseManagedAssetKey(assetName.Name, out string? contentManagerID, out IAssetName? relativePath))
                 {
                     if (contentManagerID != this.Name)
                         throw this.GetLoadError(assetName, "can't load a different mod's managed asset key through this mod content manager.");
@@ -173,7 +171,7 @@ namespace StardewModdingAPI.Framework.ContentManagers
         /// <param name="file">The file to load.</param>
         private T LoadDataFile<T>(IAssetName assetName, FileInfo file)
         {
-            if (!this.JsonHelper.ReadJsonFileIfExists(file.FullName, out T asset))
+            if (!this.JsonHelper.ReadJsonFileIfExists(file.FullName, out T? asset))
                 throw this.GetLoadError(assetName, "the JSON file is invalid."); // should never happen since we check for file existence before calling this method
 
             return asset;
@@ -249,7 +247,7 @@ namespace StardewModdingAPI.Framework.ContentManagers
         /// <param name="assetName">The asset name that failed to load.</param>
         /// <param name="reasonPhrase">The reason the file couldn't be loaded.</param>
         /// <param name="exception">The underlying exception, if applicable.</param>
-        private SContentLoadException GetLoadError(IAssetName assetName, string reasonPhrase, Exception exception = null)
+        private SContentLoadException GetLoadError(IAssetName assetName, string reasonPhrase, Exception? exception = null)
         {
             return new($"Failed loading asset '{assetName}' from {this.Name}: {reasonPhrase}", exception);
         }
@@ -338,13 +336,16 @@ namespace StardewModdingAPI.Framework.ContentManagers
                 // load best match
                 try
                 {
-                    if (!this.TryGetTilesheetAssetName(relativeMapFolder, imageSource, out IAssetName assetName, out string error))
+                    if (!this.TryGetTilesheetAssetName(relativeMapFolder, imageSource, out IAssetName? assetName, out string? error))
                         throw new SContentLoadException($"{errorPrefix} {error}");
 
-                    if (!assetName.IsEquivalentTo(tilesheet.ImageSource))
-                        this.Monitor.VerboseLog($"   Mapped tilesheet '{tilesheet.ImageSource}' to '{assetName}'.");
+                    if (assetName is not null)
+                    {
+                        if (!assetName.IsEquivalentTo(tilesheet.ImageSource))
+                            this.Monitor.VerboseLog($"   Mapped tilesheet '{tilesheet.ImageSource}' to '{assetName}'.");
 
-                    tilesheet.ImageSource = assetName.Name;
+                        tilesheet.ImageSource = assetName.Name;
+                    }
                 }
                 catch (Exception ex) when (ex is not SContentLoadException)
                 {
@@ -360,7 +361,7 @@ namespace StardewModdingAPI.Framework.ContentManagers
         /// <param name="error">A message indicating why the file couldn't be loaded.</param>
         /// <returns>Returns whether the asset name was found.</returns>
         /// <remarks>See remarks on <see cref="FixTilesheetPaths"/>.</remarks>
-        private bool TryGetTilesheetAssetName(string modRelativeMapFolder, string relativePath, out IAssetName assetName, out string error)
+        private bool TryGetTilesheetAssetName(string modRelativeMapFolder, string relativePath, out IAssetName? assetName, out string? error)
         {
             assetName = null;
             error = null;
diff --git a/src/SMAPI/Framework/DeprecationManager.cs b/src/SMAPI/Framework/DeprecationManager.cs
index fe1b623f..44b0ba2f 100644
--- a/src/SMAPI/Framework/DeprecationManager.cs
+++ b/src/SMAPI/Framework/DeprecationManager.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -38,14 +36,14 @@ namespace StardewModdingAPI.Framework
         }
 
         /// <summary>Get the source name for a mod from its unique ID.</summary>
-        public string GetSourceNameFromStack()
+        public string? GetSourceNameFromStack()
         {
             return this.ModRegistry.GetFromStack()?.DisplayName;
         }
 
         /// <summary>Get the source name for a mod from its unique ID.</summary>
         /// <param name="modId">The mod's unique ID.</param>
-        public string GetSourceName(string modId)
+        public string? GetSourceName(string modId)
         {
             return this.ModRegistry.Get(modId)?.DisplayName;
         }
@@ -55,10 +53,12 @@ namespace StardewModdingAPI.Framework
         /// <param name="nounPhrase">A noun phrase describing what is deprecated.</param>
         /// <param name="version">The SMAPI version which deprecated it.</param>
         /// <param name="severity">How deprecated the code is.</param>
-        public void Warn(string source, string nounPhrase, string version, DeprecationLevel severity)
+        public void Warn(string? source, string nounPhrase, string version, DeprecationLevel severity)
         {
+            source ??= this.GetSourceNameFromStack() ?? "<unknown>";
+
             // ignore if already warned
-            if (!this.MarkWarned(source ?? this.GetSourceNameFromStack() ?? "<unknown>", nounPhrase, version))
+            if (!this.MarkWarned(source, nounPhrase, version))
                 return;
 
             // queue warning
@@ -99,17 +99,12 @@ namespace StardewModdingAPI.Framework
                 }
 
                 // log message
-                if (warning.ModName != null)
-                    this.Monitor.Log(message, level);
+                if (level == LogLevel.Trace)
+                    this.Monitor.Log($"{message}\n{warning.StackTrace}", level);
                 else
                 {
-                    if (level == LogLevel.Trace)
-                        this.Monitor.Log($"{message}\n{warning.StackTrace}", level);
-                    else
-                    {
-                        this.Monitor.Log(message, level);
-                        this.Monitor.Log(warning.StackTrace, LogLevel.Debug);
-                    }
+                    this.Monitor.Log(message, level);
+                    this.Monitor.Log(warning.StackTrace, LogLevel.Debug);
                 }
             }
 
diff --git a/src/SMAPI/Framework/Input/GamePadStateBuilder.cs b/src/SMAPI/Framework/Input/GamePadStateBuilder.cs
index 21168b7a..4ac3332c 100644
--- a/src/SMAPI/Framework/Input/GamePadStateBuilder.cs
+++ b/src/SMAPI/Framework/Input/GamePadStateBuilder.cs
@@ -1,6 +1,5 @@
-#nullable disable
-
 using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using Microsoft.Xna.Framework;
 using Microsoft.Xna.Framework.Input;
@@ -23,7 +22,7 @@ namespace StardewModdingAPI.Framework.Input
         private GamePadState? State;
 
         /// <summary>The current button states.</summary>
-        private readonly IDictionary<SButton, ButtonState> ButtonStates;
+        private readonly IDictionary<SButton, ButtonState>? ButtonStates;
 
         /// <summary>The left trigger value.</summary>
         private float LeftTrigger;
@@ -42,6 +41,7 @@ namespace StardewModdingAPI.Framework.Input
         ** Accessors
         *********/
         /// <summary>Whether the gamepad is currently connected.</summary>
+        [MemberNotNullWhen(true, nameof(GamePadStateBuilder.ButtonStates))]
         public bool IsConnected { get; }
 
 
@@ -213,6 +213,9 @@ namespace StardewModdingAPI.Framework.Input
         /// <summary>Get the pressed gamepad buttons.</summary>
         private IEnumerable<Buttons> GetPressedGamePadButtons()
         {
+            if (!this.IsConnected)
+                yield break;
+
             foreach (var pair in this.ButtonStates)
             {
                 if (pair.Value == ButtonState.Pressed && pair.Key.TryGetController(out Buttons button))
diff --git a/src/SMAPI/Framework/Input/SInputState.cs b/src/SMAPI/Framework/Input/SInputState.cs
index 37b3c8ef..fef83af7 100644
--- a/src/SMAPI/Framework/Input/SInputState.cs
+++ b/src/SMAPI/Framework/Input/SInputState.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -17,7 +15,7 @@ namespace StardewModdingAPI.Framework.Input
         ** Accessors
         *********/
         /// <summary>The cursor position on the screen adjusted for the zoom level.</summary>
-        private CursorPosition CursorPositionImpl;
+        private CursorPosition CursorPositionImpl = new(Vector2.Zero, Vector2.Zero, Vector2.Zero, Vector2.Zero);
 
         /// <summary>The player's last known tile position.</summary>
         private Vector2? LastPlayerTile;
@@ -106,7 +104,7 @@ namespace StardewModdingAPI.Framework.Input
                 this.KeyboardState = keyboard.GetState();
                 this.MouseState = mouse.GetState();
                 this.ButtonStates = activeButtons;
-                if (cursorAbsolutePos != this.CursorPositionImpl?.AbsolutePixels || playerTilePos != this.LastPlayerTile)
+                if (cursorAbsolutePos != this.CursorPositionImpl.AbsolutePixels || playerTilePos != this.LastPlayerTile)
                 {
                     this.LastPlayerTile = playerTilePos;
                     this.CursorPositionImpl = this.GetCursorPosition(this.MouseState, cursorAbsolutePos, zoomMultiplier);
diff --git a/src/SMAPI/Framework/InternalExtensions.cs b/src/SMAPI/Framework/InternalExtensions.cs
index a1d87487..fd8cc86f 100644
--- a/src/SMAPI/Framework/InternalExtensions.cs
+++ b/src/SMAPI/Framework/InternalExtensions.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -43,6 +41,9 @@ namespace StardewModdingAPI.Framework
         /// <param name="level">The log severity level.</param>
         public static void LogAsMod(this IModMetadata metadata, string message, LogLevel level = LogLevel.Trace)
         {
+            if (metadata.Monitor is null)
+                throw new InvalidOperationException($"Can't log as mod {metadata.DisplayName}: mod is broken or a content pack. Logged message:\n[{level}] {message}");
+
             metadata.Monitor.Log(message, level);
         }
 
@@ -52,7 +53,7 @@ namespace StardewModdingAPI.Framework
         /// <param name="level">The log severity level.</param>
         public static void LogAsModOnce(this IModMetadata metadata, string message, LogLevel level = LogLevel.Trace)
         {
-            metadata.Monitor.LogOnce(message, level);
+            metadata.Monitor?.LogOnce(message, level);
         }
 
         /****
@@ -159,7 +160,7 @@ namespace StardewModdingAPI.Framework
         /// <param name="reflection">The reflection helper with which to access private fields.</param>
         public static bool IsOpen(this SpriteBatch spriteBatch, Reflector reflection)
         {
-            return reflection.GetField<bool>(spriteBatch, "_beginCalled").GetValue();
+            return reflection.GetField<bool>(spriteBatch, "_beginCalled")!.GetValue();
         }
     }
 }
diff --git a/src/SMAPI/Framework/Logging/InterceptingTextWriter.cs b/src/SMAPI/Framework/Logging/InterceptingTextWriter.cs
index a0957b90..9ecc1626 100644
--- a/src/SMAPI/Framework/Logging/InterceptingTextWriter.cs
+++ b/src/SMAPI/Framework/Logging/InterceptingTextWriter.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 using System;
 using System.IO;
 using System.Text;
@@ -9,6 +7,13 @@ namespace StardewModdingAPI.Framework.Logging
     /// <summary>A text writer which allows intercepting output.</summary>
     internal class InterceptingTextWriter : TextWriter
     {
+        /*********
+        ** Fields
+        *********/
+        /// <summary>The event raised when a message is written to the console directly.</summary>
+        private readonly Action<string> OnMessageIntercepted;
+
+
         /*********
         ** Accessors
         *********/
@@ -21,9 +26,6 @@ namespace StardewModdingAPI.Framework.Logging
         /// <inheritdoc />
         public override Encoding Encoding => this.Out.Encoding;
 
-        /// <summary>The event raised when a message is written to the console directly.</summary>
-        public event Action<string> OnMessageIntercepted;
-
         /// <summary>Whether the text writer should ignore the next input if it's a newline.</summary>
         /// <remarks>This is used when log output is suppressed from the console, since <c>Console.WriteLine</c> writes the trailing newline as a separate call.</remarks>
         public bool IgnoreNextIfNewline { get; set; }
@@ -34,9 +36,11 @@ namespace StardewModdingAPI.Framework.Logging
         *********/
         /// <summary>Construct an instance.</summary>
         /// <param name="output">The underlying output writer.</param>
-        public InterceptingTextWriter(TextWriter output)
+        /// <param name="onMessageIntercepted">The event raised when a message is written to the console directly.</param>
+        public InterceptingTextWriter(TextWriter output, Action<string> onMessageIntercepted)
         {
             this.Out = output;
+            this.OnMessageIntercepted = onMessageIntercepted;
         }
 
         /// <inheritdoc />
@@ -65,7 +69,7 @@ namespace StardewModdingAPI.Framework.Logging
                     this.Out.Write(buffer, index, count);
             }
             else
-                this.OnMessageIntercepted?.Invoke(new string(buffer, index, count));
+                this.OnMessageIntercepted(new string(buffer, index, count));
         }
 
         /// <inheritdoc />
@@ -74,12 +78,6 @@ namespace StardewModdingAPI.Framework.Logging
             this.Out.Write(ch);
         }
 
-        /// <inheritdoc />
-        protected override void Dispose(bool disposing)
-        {
-            this.OnMessageIntercepted = null;
-        }
-
 
         /*********
         ** Private methods
diff --git a/src/SMAPI/Framework/Logging/LogManager.cs b/src/SMAPI/Framework/Logging/LogManager.cs
index dab7f554..a5989673 100644
--- a/src/SMAPI/Framework/Logging/LogManager.cs
+++ b/src/SMAPI/Framework/Logging/LogManager.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 using System;
 using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
@@ -95,6 +93,11 @@ namespace StardewModdingAPI.Framework.Logging
         /// <param name="getScreenIdForLog">Get the screen ID that should be logged to distinguish between players in split-screen mode, if any.</param>
         public LogManager(string logPath, ColorSchemeConfig colorConfig, bool writeToConsole, bool isVerbose, bool isDeveloperMode, Func<int?> getScreenIdForLog)
         {
+            // init fields
+            this.LogFile = new LogFileManager(logPath);
+            this.Monitor = this.GetMonitor("SMAPI");
+            this.MonitorForGame = this.GetMonitor("game");
+
             // init construction logic
             this.GetMonitorImpl = name => new Monitor(name, LogManager.IgnoreChar, this.LogFile, colorConfig, isVerbose, getScreenIdForLog)
             {
@@ -103,15 +106,13 @@ namespace StardewModdingAPI.Framework.Logging
                 ShowFullStampInConsole = isDeveloperMode
             };
 
-            // init fields
-            this.LogFile = new LogFileManager(logPath);
-            this.Monitor = this.GetMonitor("SMAPI");
-            this.MonitorForGame = this.GetMonitor("game");
-
             // redirect direct console output
-            this.ConsoleInterceptor = new InterceptingTextWriter(Console.Out);
-            if (writeToConsole)
-                this.ConsoleInterceptor.OnMessageIntercepted += message => this.HandleConsoleMessage(this.MonitorForGame, message);
+            this.ConsoleInterceptor = new InterceptingTextWriter(
+                output: Console.Out,
+                onMessageIntercepted: writeToConsole
+                    ? message => this.HandleConsoleMessage(this.MonitorForGame, message)
+                    : _ => { }
+            );
             Console.SetOut(this.ConsoleInterceptor);
 
             // enable Unicode handling on Windows
@@ -156,7 +157,7 @@ namespace StardewModdingAPI.Framework.Logging
                 while (true)
                 {
                     // get input
-                    string input = Console.ReadLine();
+                    string? input = Console.ReadLine();
                     if (string.IsNullOrWhiteSpace(input))
                         continue;
 
@@ -222,7 +223,7 @@ namespace StardewModdingAPI.Framework.Logging
             if (File.Exists(Constants.UpdateMarker))
             {
                 string[] rawUpdateFound = File.ReadAllText(Constants.UpdateMarker).Split(new[] { '|' }, 2);
-                if (SemanticVersion.TryParse(rawUpdateFound[0], out ISemanticVersion updateFound))
+                if (SemanticVersion.TryParse(rawUpdateFound[0], out ISemanticVersion? updateFound))
                 {
                     if (Constants.ApiVersion.IsPrerelease() && updateFound.IsNewerThan(Constants.ApiVersion))
                     {
@@ -264,7 +265,7 @@ namespace StardewModdingAPI.Framework.Logging
         /// <summary>Log the initial header with general SMAPI and system details.</summary>
         /// <param name="modsPath">The path from which mods will be loaded.</param>
         /// <param name="customSettings">The custom SMAPI settings.</param>
-        public void LogIntro(string modsPath, IDictionary<string, object> customSettings)
+        public void LogIntro(string modsPath, IDictionary<string, object?> customSettings)
         {
             // log platform
             this.Monitor.Log($"SMAPI {Constants.ApiVersion} with Stardew Valley {Constants.GameVersion} (build {Constants.GetBuildVersionLabel()}) on {EnvironmentUtility.GetFriendlyPlatformName(Constants.Platform)}", LogLevel.Info);
@@ -326,7 +327,7 @@ namespace StardewModdingAPI.Framework.Logging
             // log loaded content packs
             if (loadedContentPacks.Any())
             {
-                string GetModDisplayName(string id) => loadedMods.FirstOrDefault(p => p.HasID(id))?.DisplayName;
+                string? GetModDisplayName(string id) => loadedMods.FirstOrDefault(p => p.HasID(id))?.DisplayName;
 
                 this.Monitor.Log($"Loaded {loadedContentPacks.Length} content packs:", LogLevel.Info);
                 foreach (IModMetadata metadata in loadedContentPacks.OrderBy(p => p.DisplayName))
@@ -335,7 +336,7 @@ namespace StardewModdingAPI.Framework.Logging
                     this.Monitor.Log(
                         $"   {metadata.DisplayName} {manifest.Version}"
                         + (!string.IsNullOrWhiteSpace(manifest.Author) ? $" by {manifest.Author}" : "")
-                        + $" | for {GetModDisplayName(metadata.Manifest.ContentPackFor.UniqueID)}"
+                        + $" | for {GetModDisplayName(metadata.Manifest.ContentPackFor!.UniqueID)}"
                         + (!string.IsNullOrWhiteSpace(manifest.Description) ? $" | {manifest.Description}" : ""),
                         LogLevel.Info
                     );
@@ -398,6 +399,7 @@ namespace StardewModdingAPI.Framework.Logging
         /// <param name="mods">The loaded mods.</param>
         /// <param name="skippedMods">The mods which could not be loaded.</param>
         /// <param name="logParanoidWarnings">Whether to log issues for mods which directly use potentially sensitive .NET APIs like file or shell access.</param>
+        [SuppressMessage("ReSharper", "ConstantConditionalAccessQualifier", Justification = "Manifests aren't guaranteed non-null at this point in the loading process.")]
         private void LogModWarnings(IEnumerable<IModMetadata> mods, IModMetadata[] skippedMods, bool logParanoidWarnings)
         {
             // get mods with warnings
@@ -431,7 +433,7 @@ namespace StardewModdingAPI.Framework.Logging
                             // duplicate mod: log first one only, don't show redundant version
                             if (mod.FailReason == ModFailReason.Duplicate && mod.HasManifest())
                             {
-                                if (loggedDuplicateIds.Add(mod.Manifest.UniqueID))
+                                if (loggedDuplicateIds.Add(mod.Manifest!.UniqueID))
                                     continue; // already logged
 
                                 message = $"      - {mod.DisplayName} because {mod.Error}";
@@ -610,7 +612,7 @@ namespace StardewModdingAPI.Framework.Logging
         /// <param name="heading">A brief heading label for the group.</param>
         /// <param name="blurb">A detailed explanation of the warning, split into lines.</param>
         /// <param name="modLabel">Formats the mod label, or <c>null</c> to use the <see cref="IModMetadata.DisplayName"/>.</param>
-        private void LogModWarningGroup(IModMetadata[] mods, Func<IModMetadata, bool> match, LogLevel level, string heading, string[] blurb, Func<IModMetadata, string> modLabel = null)
+        private void LogModWarningGroup(IModMetadata[] mods, Func<IModMetadata, bool> match, LogLevel level, string heading, string[] blurb, Func<IModMetadata, string>? modLabel = null)
         {
             // get matching mods
             string[] modLabels = mods
diff --git a/src/SMAPI/Framework/ModHelpers/CommandHelper.cs b/src/SMAPI/Framework/ModHelpers/CommandHelper.cs
index c2b5092e..7d25979c 100644
--- a/src/SMAPI/Framework/ModHelpers/CommandHelper.cs
+++ b/src/SMAPI/Framework/ModHelpers/CommandHelper.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 using System;
 
 namespace StardewModdingAPI.Framework.ModHelpers
@@ -24,7 +22,7 @@ namespace StardewModdingAPI.Framework.ModHelpers
         /// <param name="mod">The mod using this instance.</param>
         /// <param name="commandManager">Manages console commands.</param>
         public CommandHelper(IModMetadata mod, CommandManager commandManager)
-            : base(mod?.Manifest?.UniqueID ?? "SMAPI")
+            : base(mod.Manifest.UniqueID)
         {
             this.Mod = mod;
             this.CommandManager = commandManager;
diff --git a/src/SMAPI/Framework/ModLoading/AssemblyLoader.cs b/src/SMAPI/Framework/ModLoading/AssemblyLoader.cs
index 070ee803..72b547b1 100644
--- a/src/SMAPI/Framework/ModLoading/AssemblyLoader.cs
+++ b/src/SMAPI/Framework/ModLoading/AssemblyLoader.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 using System;
 using System.Collections.Generic;
 using System.IO;
@@ -96,7 +94,12 @@ namespace StardewModdingAPI.Framework.ModLoading
             // get referenced local assemblies
             AssemblyParseResult[] assemblies;
             {
-                HashSet<string> visitedAssemblyNames = new HashSet<string>(AppDomain.CurrentDomain.GetAssemblies().Select(p => p.GetName().Name)); // don't try loading assemblies that are already loaded
+                HashSet<string> visitedAssemblyNames = new HashSet<string>( // don't try loading assemblies that are already loaded
+                    from assembly in AppDomain.CurrentDomain.GetAssemblies()
+                    let name = assembly.GetName().Name
+                    where name != null
+                    select name
+                );
                 assemblies = this.GetReferencedLocalAssemblies(new FileInfo(assemblyPath), visitedAssemblyNames, this.AssemblyDefinitionResolver).ToArray();
             }
 
@@ -113,11 +116,11 @@ namespace StardewModdingAPI.Framework.ModLoading
 
             // rewrite & load assemblies in leaf-to-root order
             bool oneAssembly = assemblies.Length == 1;
-            Assembly lastAssembly = null;
+            Assembly? lastAssembly = null;
             HashSet<string> loggedMessages = new HashSet<string>();
             foreach (AssemblyParseResult assembly in assemblies)
             {
-                if (assembly.Status == AssemblyLoadStatus.AlreadyLoaded)
+                if (!assembly.HasDefinition)
                     continue;
 
                 // rewrite assembly
@@ -165,7 +168,7 @@ namespace StardewModdingAPI.Framework.ModLoading
                 throw new IncompatibleInstructionException();
 
             // last assembly loaded is the root
-            return lastAssembly;
+            return lastAssembly!;
         }
 
         /// <summary>Get whether an assembly is loaded.</summary>
@@ -174,7 +177,8 @@ namespace StardewModdingAPI.Framework.ModLoading
         {
             try
             {
-                return this.AssemblyDefinitionResolver.Resolve(reference) != null;
+                _ = this.AssemblyDefinitionResolver.Resolve(reference);
+                return true;
             }
             catch (AssemblyResolutionException)
             {
@@ -190,7 +194,7 @@ namespace StardewModdingAPI.Framework.ModLoading
         /// assemblies (especially with Mono). Since this is meant to be called on <see cref="AppDomain.AssemblyResolve"/>,
         /// the implicit assumption is that loading the exact assembly failed.
         /// </remarks>
-        public static Assembly ResolveAssembly(string name)
+        public static Assembly? ResolveAssembly(string name)
         {
             string shortName = name.Split(new[] { ',' }, 2).First(); // get simple name (without version and culture)
             return AppDomain.CurrentDomain
@@ -212,7 +216,8 @@ namespace StardewModdingAPI.Framework.ModLoading
         /// <summary>Track an object for disposal as part of the assembly loader.</summary>
         /// <typeparam name="T">The instance type.</typeparam>
         /// <param name="instance">The disposable instance.</param>
-        private T TrackForDisposal<T>(T instance) where T : IDisposable
+        private T TrackForDisposal<T>(T instance)
+            where T : IDisposable
         {
             this.Disposables.Add(instance);
             return instance;
@@ -321,9 +326,9 @@ namespace StardewModdingAPI.Framework.ModLoading
                     // rewrite types using custom attributes
                     foreach (TypeDefinition type in module.GetTypes())
                     {
-                        foreach (var attr in type.CustomAttributes)
+                        foreach (CustomAttribute attr in type.CustomAttributes)
                         {
-                            foreach (var conField in attr.ConstructorArguments)
+                            foreach (CustomAttributeArgument conField in attr.ConstructorArguments)
                             {
                                 if (conField.Value is TypeReference typeRef)
                                     this.ChangeTypeScope(typeRef);
@@ -382,7 +387,7 @@ namespace StardewModdingAPI.Framework.ModLoading
         {
             // get message template
             // ($phrase is replaced with the noun phrase or messages)
-            string template = null;
+            string? template = null;
             switch (result)
             {
                 case InstructionHandleResult.Rewritten:
@@ -441,20 +446,20 @@ namespace StardewModdingAPI.Framework.ModLoading
             // format messages
             string phrase = handler.Phrases.Any()
                 ? string.Join(", ", handler.Phrases)
-                : handler.DefaultPhrase ?? handler.GetType().Name;
+                : handler.DefaultPhrase;
             this.Monitor.LogOnce(loggedMessages, template.Replace("$phrase", phrase));
         }
 
         /// <summary>Get the correct reference to use for compatibility with the current platform.</summary>
         /// <param name="type">The type reference to rewrite.</param>
-        private void ChangeTypeScope(TypeReference type)
+        private void ChangeTypeScope(TypeReference? type)
         {
             // check skip conditions
             if (type == null || type.FullName.StartsWith("System."))
                 return;
 
             // get assembly
-            if (!this.TypeAssemblies.TryGetValue(type.FullName, out Assembly assembly))
+            if (!this.TypeAssemblies.TryGetValue(type.FullName, out Assembly? assembly))
                 return;
 
             // replace scope
diff --git a/src/SMAPI/Framework/ModLoading/AssemblyParseResult.cs b/src/SMAPI/Framework/ModLoading/AssemblyParseResult.cs
index 56bd5a8b..b133f8d6 100644
--- a/src/SMAPI/Framework/ModLoading/AssemblyParseResult.cs
+++ b/src/SMAPI/Framework/ModLoading/AssemblyParseResult.cs
@@ -1,5 +1,5 @@
-#nullable disable
-
+using System;
+using System.Diagnostics.CodeAnalysis;
 using System.IO;
 using Mono.Cecil;
 
@@ -15,11 +15,15 @@ namespace StardewModdingAPI.Framework.ModLoading
         public readonly FileInfo File;
 
         /// <summary>The assembly definition.</summary>
-        public readonly AssemblyDefinition Definition;
+        public readonly AssemblyDefinition? Definition;
 
         /// <summary>The result of the assembly load.</summary>
         public AssemblyLoadStatus Status;
 
+        /// <summary>Whether the <see cref="Definition"/> is loaded and ready (i.e. the <see cref="Status"/> is not <see cref="AssemblyLoadStatus.AlreadyLoaded"/> or <see cref="AssemblyLoadStatus.Failed"/>).</summary>
+        [MemberNotNullWhen(true, nameof(AssemblyParseResult.Definition))]
+        public bool HasDefinition => this.Status == AssemblyLoadStatus.Okay;
+
 
         /*********
         ** Public methods
@@ -28,11 +32,14 @@ namespace StardewModdingAPI.Framework.ModLoading
         /// <param name="file">The original assembly file.</param>
         /// <param name="assembly">The assembly definition.</param>
         /// <param name="status">The result of the assembly load.</param>
-        public AssemblyParseResult(FileInfo file, AssemblyDefinition assembly, AssemblyLoadStatus status)
+        public AssemblyParseResult(FileInfo file, AssemblyDefinition? assembly, AssemblyLoadStatus status)
         {
             this.File = file;
             this.Definition = assembly;
             this.Status = status;
+
+            if (status == AssemblyLoadStatus.Okay && assembly == null)
+                throw new InvalidOperationException($"Invalid assembly parse result: load status {status} with a null assembly.");
         }
     }
 }
diff --git a/src/SMAPI/Framework/ModLoading/ModResolver.cs b/src/SMAPI/Framework/ModLoading/ModResolver.cs
index 4fdeefbc..afb388d0 100644
--- a/src/SMAPI/Framework/ModLoading/ModResolver.cs
+++ b/src/SMAPI/Framework/ModLoading/ModResolver.cs
@@ -1,7 +1,6 @@
-#nullable disable
-
 using System;
 using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
 using System.IO;
 using System.Linq;
 using StardewModdingAPI.Toolkit;
@@ -28,10 +27,10 @@ namespace StardewModdingAPI.Framework.ModLoading
         {
             foreach (ModFolder folder in toolkit.GetModFolders(rootPath))
             {
-                Manifest manifest = folder.Manifest;
+                Manifest? manifest = folder.Manifest;
 
                 // parse internal data record (if any)
-                ModDataRecordVersionedFields dataRecord = modDatabase.Get(manifest?.UniqueID)?.GetVersionedFields(manifest);
+                ModDataRecordVersionedFields? dataRecord = modDatabase.Get(manifest?.UniqueID)?.GetVersionedFields(manifest);
 
                 // apply defaults
                 if (manifest != null && dataRecord?.UpdateKey is not null)
@@ -43,7 +42,7 @@ namespace StardewModdingAPI.Framework.ModLoading
                     ? ModMetadataStatus.Found
                     : ModMetadataStatus.Failed;
 
-                var metadata = new ModMetadata(folder.DisplayName, folder.Directory.FullName, rootPath, manifest, dataRecord, isIgnored: shouldIgnore);
+                IModMetadata metadata = new ModMetadata(folder.DisplayName, folder.Directory.FullName, rootPath, manifest, dataRecord, isIgnored: shouldIgnore);
                 if (shouldIgnore)
                     metadata.SetStatus(status, ModFailReason.DisabledByDotConvention, "disabled by dot convention");
                 else
@@ -57,7 +56,9 @@ namespace StardewModdingAPI.Framework.ModLoading
         /// <param name="mods">The mod manifests to validate.</param>
         /// <param name="apiVersion">The current SMAPI version.</param>
         /// <param name="getUpdateUrl">Get an update URL for an update key (if valid).</param>
-        public void ValidateManifests(IEnumerable<IModMetadata> mods, ISemanticVersion apiVersion, Func<string, string> getUpdateUrl)
+        [SuppressMessage("ReSharper", "ConstantConditionalAccessQualifier", Justification = "Manifest values may be null before they're validated.")]
+        [SuppressMessage("ReSharper", "ConditionIsAlwaysTrueOrFalse", Justification = "Manifest values may be null before they're validated.")]
+        public void ValidateManifests(IEnumerable<IModMetadata> mods, ISemanticVersion apiVersion, Func<string, string?> getUpdateUrl)
         {
             mods = mods.ToArray();
 
@@ -84,7 +85,7 @@ namespace StardewModdingAPI.Framework.ModLoading
                             List<string> updateUrls = new List<string>();
                             foreach (UpdateKey key in mod.GetUpdateKeys(validOnly: true))
                             {
-                                string url = getUpdateUrl(key.ToString());
+                                string? url = getUpdateUrl(key.ToString());
                                 if (url != null)
                                     updateUrls.Add(url);
                             }
@@ -94,7 +95,7 @@ namespace StardewModdingAPI.Framework.ModLoading
 
                             // build error
                             string error = $"{reasonPhrase}. Please check for a ";
-                            if (mod.DataRecord.StatusUpperVersion == null || mod.Manifest.Version.Equals(mod.DataRecord.StatusUpperVersion))
+                            if (mod.DataRecord.StatusUpperVersion == null || mod.Manifest.Version?.Equals(mod.DataRecord.StatusUpperVersion) == true)
                                 error += "newer version";
                             else
                                 error += $"version newer than {mod.DataRecord.StatusUpperVersion}";
@@ -133,21 +134,21 @@ namespace StardewModdingAPI.Framework.ModLoading
                     if (hasDll)
                     {
                         // invalid filename format
-                        if (mod.Manifest.EntryDll.Intersect(Path.GetInvalidFileNameChars()).Any())
+                        if (mod.Manifest.EntryDll!.Intersect(Path.GetInvalidFileNameChars()).Any())
                         {
                             mod.SetStatus(ModMetadataStatus.Failed, ModFailReason.InvalidManifest, $"its manifest has invalid filename '{mod.Manifest.EntryDll}' for the EntryDLL field.");
                             continue;
                         }
 
                         // invalid path
-                        if (!File.Exists(Path.Combine(mod.DirectoryPath, mod.Manifest.EntryDll)))
+                        if (!File.Exists(Path.Combine(mod.DirectoryPath, mod.Manifest.EntryDll!)))
                         {
                             mod.SetStatus(ModMetadataStatus.Failed, ModFailReason.InvalidManifest, $"its DLL '{mod.Manifest.EntryDll}' doesn't exist.");
                             continue;
                         }
 
                         // invalid capitalization
-                        string actualFilename = new DirectoryInfo(mod.DirectoryPath).GetFiles(mod.Manifest.EntryDll).FirstOrDefault()?.Name;
+                        string? actualFilename = new DirectoryInfo(mod.DirectoryPath).GetFiles(mod.Manifest.EntryDll!).FirstOrDefault()?.Name;
                         if (actualFilename != mod.Manifest.EntryDll)
                         {
                             mod.SetStatus(ModMetadataStatus.Failed, ModFailReason.InvalidManifest, $"its {nameof(IManifest.EntryDll)} value '{mod.Manifest.EntryDll}' doesn't match the actual file capitalization '{actualFilename}'. The capitalization must match for crossplatform compatibility.");
@@ -159,7 +160,7 @@ namespace StardewModdingAPI.Framework.ModLoading
                     else
                     {
                         // invalid content pack ID
-                        if (string.IsNullOrWhiteSpace(mod.Manifest.ContentPackFor.UniqueID))
+                        if (string.IsNullOrWhiteSpace(mod.Manifest.ContentPackFor!.UniqueID))
                         {
                             mod.SetStatus(ModMetadataStatus.Failed, ModFailReason.InvalidManifest, $"its manifest declares {nameof(IManifest.ContentPackFor)} without its required {nameof(IManifestContentPackFor.UniqueID)} field.");
                             continue;
@@ -190,7 +191,7 @@ namespace StardewModdingAPI.Framework.ModLoading
                     mod.SetStatus(ModMetadataStatus.Failed, ModFailReason.InvalidManifest, "its manifest specifies an invalid ID (IDs must only contain letters, numbers, underscores, periods, or hyphens).");
 
                 // validate dependencies
-                foreach (var dependency in mod.Manifest.Dependencies)
+                foreach (IManifestDependency? dependency in mod.Manifest.Dependencies)
                 {
                     // null dependency
                     if (dependency == null)
@@ -328,8 +329,11 @@ namespace StardewModdingAPI.Framework.ModLoading
                 string[] failedLabels =
                     (
                         from entry in dependencies
-                        where entry.Mod != null && entry.MinVersion != null && entry.MinVersion.IsNewerThan(entry.Mod.Manifest.Version)
-                        select $"{entry.Mod.DisplayName} (needs {entry.MinVersion} or later)"
+                        where
+                            entry.Mod != null
+                            && entry.MinVersion != null
+                            && entry.MinVersion.IsNewerThan(entry.Mod.Manifest.Version)
+                        select $"{entry.Mod!.DisplayName} (needs {entry.MinVersion} or later)"
                     )
                     .ToArray();
                 if (failedLabels.Any())
@@ -345,16 +349,14 @@ namespace StardewModdingAPI.Framework.ModLoading
                 states[mod] = ModDependencyStatus.Checking;
 
                 // recursively sort dependencies
-                foreach (var dependency in dependencies)
+                foreach (ModDependency dependency in dependencies)
                 {
-                    IModMetadata requiredMod = dependency.Mod;
-                    var subchain = new List<IModMetadata>(currentChain) { mod };
-
-                    // ignore missing optional dependency
-                    if (!dependency.IsRequired && requiredMod == null)
-                        continue;
+                    IModMetadata? requiredMod = dependency.Mod;
+                    if (requiredMod == null)
+                        continue; // missing dependencies are handled earlier
 
                     // detect dependency loop
+                    var subchain = new List<IModMetadata>(currentChain) { mod };
                     if (states[requiredMod] == ModDependencyStatus.Checking)
                     {
                         sortedMods.Push(mod);
@@ -363,8 +365,8 @@ namespace StardewModdingAPI.Framework.ModLoading
                     }
 
                     // recursively process each dependency
-                    var substatus = this.ProcessDependencies(mods, modDatabase, requiredMod, states, sortedMods, subchain);
-                    switch (substatus)
+                    var subStatus = this.ProcessDependencies(mods, modDatabase, requiredMod, states, sortedMods, subchain);
+                    switch (subStatus)
                     {
                         // sorted successfully
                         case ModDependencyStatus.Sorted:
@@ -380,7 +382,7 @@ namespace StardewModdingAPI.Framework.ModLoading
                         // unexpected status
                         case ModDependencyStatus.Queued:
                         case ModDependencyStatus.Checking:
-                            throw new InvalidModStateException($"Something went wrong sorting dependencies: mod '{requiredMod.DisplayName}' unexpectedly stayed in the '{substatus}' status.");
+                            throw new InvalidModStateException($"Something went wrong sorting dependencies: mod '{requiredMod.DisplayName}' unexpectedly stayed in the '{subStatus}' status.");
 
                         // sanity check
                         default:
@@ -399,14 +401,11 @@ namespace StardewModdingAPI.Framework.ModLoading
         /// <param name="loadedMods">The loaded mods.</param>
         private IEnumerable<ModDependency> GetDependenciesFrom(IManifest manifest, IModMetadata[] loadedMods)
         {
-            IModMetadata FindMod(string id) => loadedMods.FirstOrDefault(m => m.HasID(id));
+            IModMetadata? FindMod(string id) => loadedMods.FirstOrDefault(m => m.HasID(id));
 
             // yield dependencies
-            if (manifest.Dependencies != null)
-            {
-                foreach (var entry in manifest.Dependencies)
-                    yield return new ModDependency(entry.UniqueID, entry.MinimumVersion, FindMod(entry.UniqueID), entry.IsRequired);
-            }
+            foreach (IManifestDependency entry in manifest.Dependencies)
+                yield return new ModDependency(entry.UniqueID, entry.MinimumVersion, FindMod(entry.UniqueID), entry.IsRequired);
 
             // yield content pack parent
             if (manifest.ContentPackFor != null)
@@ -415,10 +414,10 @@ namespace StardewModdingAPI.Framework.ModLoading
 
         /// <summary>Get a technical message indicating why a mod's compatibility status was overridden, if applicable.</summary>
         /// <param name="mod">The mod metadata.</param>
-        private string GetTechnicalReasonForStatusOverride(IModMetadata mod)
+        private string? GetTechnicalReasonForStatusOverride(IModMetadata mod)
         {
             // get compatibility list record
-            var data = mod.DataRecord;
+            ModDataRecordVersionedFields? data = mod.DataRecord;
             if (data == null)
                 return null;
 
@@ -432,14 +431,14 @@ namespace StardewModdingAPI.Framework.ModLoading
             };
 
             // get reason
-            string[] reasons = new[] { mod.DataRecord.StatusReasonPhrase, mod.DataRecord.StatusReasonDetails }
+            string?[] reasons = new[] { data.StatusReasonPhrase, data.StatusReasonDetails }
                 .Where(p => !string.IsNullOrWhiteSpace(p))
                 .ToArray();
 
             // build message
             return
                 $"marked {statusLabel} in SMAPI's internal compatibility list for "
-                + (mod.DataRecord.StatusUpperVersion != null ? $"versions up to {mod.DataRecord.StatusUpperVersion}" : "all versions")
+                + (data.StatusUpperVersion != null ? $"versions up to {data.StatusUpperVersion}" : "all versions")
                 + ": "
                 + (reasons.Any() ? string.Join(": ", reasons) : "no reason given")
                 + ".";
@@ -459,13 +458,13 @@ namespace StardewModdingAPI.Framework.ModLoading
             public string ID { get; }
 
             /// <summary>The minimum required version (if any).</summary>
-            public ISemanticVersion MinVersion { get; }
+            public ISemanticVersion? MinVersion { get; }
 
             /// <summary>Whether the mod shouldn't be loaded if the dependency isn't available.</summary>
             public bool IsRequired { get; }
 
             /// <summary>The loaded mod that fulfills the dependency (if available).</summary>
-            public IModMetadata Mod { get; }
+            public IModMetadata? Mod { get; }
 
 
             /*********
@@ -476,7 +475,7 @@ namespace StardewModdingAPI.Framework.ModLoading
             /// <param name="minVersion">The minimum required version (if any).</param>
             /// <param name="mod">The loaded mod that fulfills the dependency (if available).</param>
             /// <param name="isRequired">Whether the mod shouldn't be loaded if the dependency isn't available.</param>
-            public ModDependency(string id, ISemanticVersion minVersion, IModMetadata mod, bool isRequired)
+            public ModDependency(string id, ISemanticVersion? minVersion, IModMetadata? mod, bool isRequired)
             {
                 this.ID = id;
                 this.MinVersion = minVersion;
diff --git a/src/SMAPI/Framework/ModLoading/Rewriters/FieldReplaceRewriter.cs b/src/SMAPI/Framework/ModLoading/Rewriters/FieldReplaceRewriter.cs
index 806fca62..d5f4cf4a 100644
--- a/src/SMAPI/Framework/ModLoading/Rewriters/FieldReplaceRewriter.cs
+++ b/src/SMAPI/Framework/ModLoading/Rewriters/FieldReplaceRewriter.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 using System;
 using System.Collections.Generic;
 using System.Reflection;
@@ -33,13 +31,19 @@ namespace StardewModdingAPI.Framework.ModLoading.Rewriters
         /// <param name="toFieldName">The new field name to reference.</param>
         public FieldReplaceRewriter AddField(Type fromType, string fromFieldName, Type toType, string toFieldName)
         {
+            // validate parameters
+            if (fromType == null)
+                throw new InvalidOperationException("Can't replace a field on a null source type.");
+            if (toType == null)
+                throw new InvalidOperationException("Can't replace a field on a null target type.");
+
             // get full type name
-            string fromTypeName = fromType?.FullName;
+            string? fromTypeName = fromType.FullName;
             if (fromTypeName == null)
                 throw new InvalidOperationException($"Can't replace field for invalid type reference {toType}.");
 
             // get target field
-            FieldInfo toField = toType.GetField(toFieldName);
+            FieldInfo? toField = toType.GetField(toFieldName);
             if (toField == null)
                 throw new InvalidOperationException($"The {toType.FullName} class doesn't have a {toFieldName} field.");
 
@@ -54,15 +58,15 @@ namespace StardewModdingAPI.Framework.ModLoading.Rewriters
         /// <inheritdoc />
         public override bool Handle(ModuleDefinition module, ILProcessor cil, Instruction instruction)
         {
-            FieldReference fieldRef = RewriteHelper.AsFieldReference(instruction);
-            string declaringType = fieldRef?.DeclaringType?.FullName;
+            FieldReference? fieldRef = RewriteHelper.AsFieldReference(instruction);
+            string? declaringType = fieldRef?.DeclaringType?.FullName;
 
             // get mapped field
-            if (declaringType == null || !this.FieldMaps.TryGetValue(declaringType, out var fieldMap) || !fieldMap.TryGetValue(fieldRef.Name, out FieldInfo toField))
+            if (declaringType == null || !this.FieldMaps.TryGetValue(declaringType, out var fieldMap) || !fieldMap.TryGetValue(fieldRef!.Name, out FieldInfo? toField))
                 return false;
 
             // replace with new field
-            this.Phrases.Add($"{fieldRef.DeclaringType.Name}.{fieldRef.Name} field");
+            this.Phrases.Add($"{fieldRef.DeclaringType!.Name}.{fieldRef.Name} field");
             instruction.Operand = module.ImportReference(toField);
             return this.MarkRewritten();
         }
diff --git a/src/SMAPI/Framework/Models/SConfig.cs b/src/SMAPI/Framework/Models/SConfig.cs
index e74d73b5..d626ab4d 100644
--- a/src/SMAPI/Framework/Models/SConfig.cs
+++ b/src/SMAPI/Framework/Models/SConfig.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -40,60 +38,96 @@ namespace StardewModdingAPI.Framework.Models
         ** Accessors
         ********/
         /// <summary>Whether to enable development features.</summary>
-        public bool DeveloperMode { get; set; }
+        public bool DeveloperMode { get; private set; }
 
         /// <summary>Whether to check for newer versions of SMAPI and mods on startup.</summary>
-        public bool CheckForUpdates { get; set; }
+        public bool CheckForUpdates { get; }
 
         /// <summary>Whether to add a section to the 'mod issues' list for mods which which directly use potentially sensitive .NET APIs like file or shell access.</summary>
-        public bool ParanoidWarnings { get; set; } = (bool)SConfig.DefaultValues[nameof(SConfig.ParanoidWarnings)];
+        public bool ParanoidWarnings { get; }
 
         /// <summary>Whether to show beta versions as valid updates.</summary>
-        public bool UseBetaChannel { get; set; } = (bool)SConfig.DefaultValues[nameof(SConfig.UseBetaChannel)];
+        public bool UseBetaChannel { get; }
 
         /// <summary>SMAPI's GitHub project name, used to perform update checks.</summary>
-        public string GitHubProjectName { get; set; }
+        public string GitHubProjectName { get; }
 
         /// <summary>The base URL for SMAPI's web API, used to perform update checks.</summary>
-        public string WebApiBaseUrl { get; set; }
+        public string WebApiBaseUrl { get; }
 
         /// <summary>Whether SMAPI should log more information about the game context.</summary>
-        public bool VerboseLogging { get; set; }
+        public bool VerboseLogging { get; }
 
         /// <summary>Whether SMAPI should rewrite mods for compatibility.</summary>
-        public bool RewriteMods { get; set; } = (bool)SConfig.DefaultValues[nameof(SConfig.RewriteMods)];
+        public bool RewriteMods { get; }
 
         /// <summary>Whether to enable more aggressive memory optimizations.</summary>
-        public bool AggressiveMemoryOptimizations { get; set; } = (bool)SConfig.DefaultValues[nameof(SConfig.AggressiveMemoryOptimizations)];
+        public bool AggressiveMemoryOptimizations { get; }
 
         /// <summary>Whether SMAPI should log network traffic. Best combined with <see cref="VerboseLogging"/>, which includes network metadata.</summary>
-        public bool LogNetworkTraffic { get; set; }
+        public bool LogNetworkTraffic { get; }
 
         /// <summary>The colors to use for text written to the SMAPI console.</summary>
-        public ColorSchemeConfig ConsoleColors { get; set; }
+        public ColorSchemeConfig ConsoleColors { get; }
 
         /// <summary>The mod IDs SMAPI should ignore when performing update checks or validating update keys.</summary>
-        public string[] SuppressUpdateChecks { get; set; }
+        public string[] SuppressUpdateChecks { get; }
 
 
         /********
         ** Public methods
         ********/
+        /// <summary>Construct an instance.</summary>
+        /// <param name="developerMode">Whether to enable development features.</param>
+        /// <param name="checkForUpdates">Whether to check for newer versions of SMAPI and mods on startup.</param>
+        /// <param name="paranoidWarnings">Whether to add a section to the 'mod issues' list for mods which which directly use potentially sensitive .NET APIs like file or shell access.</param>
+        /// <param name="useBetaChannel">Whether to show beta versions as valid updates.</param>
+        /// <param name="gitHubProjectName">SMAPI's GitHub project name, used to perform update checks.</param>
+        /// <param name="webApiBaseUrl">The base URL for SMAPI's web API, used to perform update checks.</param>
+        /// <param name="verboseLogging">Whether SMAPI should log more information about the game context.</param>
+        /// <param name="rewriteMods">Whether SMAPI should rewrite mods for compatibility.</param>
+        /// <param name="aggressiveMemoryOptimizations">Whether to enable more aggressive memory optimizations.</param>
+        /// <param name="logNetworkTraffic">Whether SMAPI should log network traffic.</param>
+        /// <param name="consoleColors">The colors to use for text written to the SMAPI console.</param>
+        /// <param name="suppressUpdateChecks">The mod IDs SMAPI should ignore when performing update checks or validating update keys.</param>
+        public SConfig(bool developerMode, bool checkForUpdates, bool? paranoidWarnings, bool? useBetaChannel, string gitHubProjectName, string webApiBaseUrl, bool verboseLogging, bool? rewriteMods, bool? aggressiveMemoryOptimizations, bool logNetworkTraffic, ColorSchemeConfig consoleColors, string[]? suppressUpdateChecks)
+        {
+            this.DeveloperMode = developerMode;
+            this.CheckForUpdates = checkForUpdates;
+            this.ParanoidWarnings = paranoidWarnings ?? (bool)SConfig.DefaultValues[nameof(SConfig.ParanoidWarnings)];
+            this.UseBetaChannel = useBetaChannel ?? (bool)SConfig.DefaultValues[nameof(SConfig.UseBetaChannel)];
+            this.GitHubProjectName = gitHubProjectName;
+            this.WebApiBaseUrl = webApiBaseUrl;
+            this.VerboseLogging = verboseLogging;
+            this.RewriteMods = rewriteMods ?? (bool)SConfig.DefaultValues[nameof(SConfig.RewriteMods)];
+            this.AggressiveMemoryOptimizations = aggressiveMemoryOptimizations ?? (bool)SConfig.DefaultValues[nameof(SConfig.AggressiveMemoryOptimizations)];
+            this.LogNetworkTraffic = logNetworkTraffic;
+            this.ConsoleColors = consoleColors;
+            this.SuppressUpdateChecks = suppressUpdateChecks ?? Array.Empty<string>();
+        }
+
+        /// <summary>Override the value of <see cref="DeveloperMode"/>.</summary>
+        /// <param name="value">The value to set.</param>
+        public void OverrideDeveloperMode(bool value)
+        {
+            this.DeveloperMode = value;
+        }
+
         /// <summary>Get the settings which have been customized by the player.</summary>
-        public IDictionary<string, object> GetCustomSettings()
+        public IDictionary<string, object?> GetCustomSettings()
         {
-            IDictionary<string, object> custom = new Dictionary<string, object>();
+            Dictionary<string, object?> custom = new();
 
-            foreach (var pair in SConfig.DefaultValues)
+            foreach ((string? name, object defaultValue) in SConfig.DefaultValues)
             {
-                object value = typeof(SConfig).GetProperty(pair.Key)?.GetValue(this);
-                if (!pair.Value.Equals(value))
-                    custom[pair.Key] = value;
+                object? value = typeof(SConfig).GetProperty(name)?.GetValue(this);
+                if (!defaultValue.Equals(value))
+                    custom[name] = value;
             }
 
-            HashSet<string> curSuppressUpdateChecks = new HashSet<string>(this.SuppressUpdateChecks ?? Array.Empty<string>(), StringComparer.OrdinalIgnoreCase);
+            HashSet<string> curSuppressUpdateChecks = new(this.SuppressUpdateChecks, StringComparer.OrdinalIgnoreCase);
             if (SConfig.DefaultSuppressUpdateChecks.Count != curSuppressUpdateChecks.Count || SConfig.DefaultSuppressUpdateChecks.Any(p => !curSuppressUpdateChecks.Contains(p)))
-                custom[nameof(this.SuppressUpdateChecks)] = "[" + string.Join(", ", this.SuppressUpdateChecks ?? Array.Empty<string>()) + "]";
+                custom[nameof(this.SuppressUpdateChecks)] = "[" + string.Join(", ", this.SuppressUpdateChecks) + "]";
 
             return custom;
         }
diff --git a/src/SMAPI/Framework/Networking/ModMessageModel.cs b/src/SMAPI/Framework/Networking/ModMessageModel.cs
index 4e7d01eb..01672714 100644
--- a/src/SMAPI/Framework/Networking/ModMessageModel.cs
+++ b/src/SMAPI/Framework/Networking/ModMessageModel.cs
@@ -1,6 +1,5 @@
-#nullable disable
-
 using System.Linq;
+using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 
 namespace StardewModdingAPI.Framework.Networking
@@ -15,33 +14,30 @@ namespace StardewModdingAPI.Framework.Networking
         ** Origin
         ****/
         /// <summary>The unique ID of the player who broadcast the message.</summary>
-        public long FromPlayerID { get; set; }
+        public long FromPlayerID { get; }
 
         /// <summary>The unique ID of the mod which broadcast the message.</summary>
-        public string FromModID { get; set; }
+        public string FromModID { get; }
 
         /****
         ** Destination
         ****/
         /// <summary>The players who should receive the message.</summary>
-        public long[] ToPlayerIDs { get; set; }
+        public long[]? ToPlayerIDs { get; init; }
 
         /// <summary>The mods which should receive the message, or <c>null</c> for all mods.</summary>
-        public string[] ToModIDs { get; set; }
+        public string[]? ToModIDs { get; }
 
         /// <summary>A message type which receiving mods can use to decide whether it's the one they want to handle, like <c>SetPlayerLocation</c>. This doesn't need to be globally unique, since mods should check the originating mod ID.</summary>
-        public string Type { get; set; }
+        public string Type { get; }
 
         /// <summary>The custom mod data being broadcast.</summary>
-        public JToken Data { get; set; }
+        public JToken Data { get; }
 
 
         /*********
         ** Public methods
         *********/
-        /// <summary>Construct an instance.</summary>
-        public ModMessageModel() { }
-
         /// <summary>Construct an instance.</summary>
         /// <param name="fromPlayerID">The unique ID of the player who broadcast the message.</param>
         /// <param name="fromModID">The unique ID of the mod which broadcast the message.</param>
@@ -49,7 +45,8 @@ namespace StardewModdingAPI.Framework.Networking
         /// <param name="toModIDs">The mods which should receive the message, or <c>null</c> for all mods.</param>
         /// <param name="type">A message type which receiving mods can use to decide whether it's the one they want to handle, like <c>SetPlayerLocation</c>. This doesn't need to be globally unique, since mods should check the originating mod ID.</param>
         /// <param name="data">The custom mod data being broadcast.</param>
-        public ModMessageModel(long fromPlayerID, string fromModID, long[] toPlayerIDs, string[] toModIDs, string type, JToken data)
+        [JsonConstructor]
+        public ModMessageModel(long fromPlayerID, string fromModID, long[]? toPlayerIDs, string[]? toModIDs, string type, JToken data)
         {
             this.FromPlayerID = fromPlayerID;
             this.FromModID = fromModID;
diff --git a/src/SMAPI/Framework/Networking/MultiplayerPeer.cs b/src/SMAPI/Framework/Networking/MultiplayerPeer.cs
index 8ee5c309..b37c1e89 100644
--- a/src/SMAPI/Framework/Networking/MultiplayerPeer.cs
+++ b/src/SMAPI/Framework/Networking/MultiplayerPeer.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -39,10 +37,10 @@ namespace StardewModdingAPI.Framework.Networking
         public GamePlatform? Platform { get; }
 
         /// <inheritdoc />
-        public ISemanticVersion GameVersion { get; }
+        public ISemanticVersion? GameVersion { get; }
 
         /// <inheritdoc />
-        public ISemanticVersion ApiVersion { get; }
+        public ISemanticVersion? ApiVersion { get; }
 
         /// <inheritdoc />
         public IEnumerable<IMultiplayerPeerMod> Mods { get; }
@@ -57,11 +55,12 @@ namespace StardewModdingAPI.Framework.Networking
         /// <param name="model">The metadata to copy.</param>
         /// <param name="sendMessage">A method which sends a message to the peer.</param>
         /// <param name="isHost">Whether this is a connection to the host player.</param>
-        public MultiplayerPeer(long playerID, int? screenID, RemoteContextModel model, Action<OutgoingMessage> sendMessage, bool isHost)
+        public MultiplayerPeer(long playerID, int? screenID, RemoteContextModel? model, Action<OutgoingMessage> sendMessage, bool isHost)
         {
             this.PlayerID = playerID;
             this.ScreenID = screenID;
             this.IsHost = isHost;
+
             if (model != null)
             {
                 this.Platform = model.Platform;
@@ -69,13 +68,16 @@ namespace StardewModdingAPI.Framework.Networking
                 this.ApiVersion = model.ApiVersion;
                 this.Mods = model.Mods.Select(mod => new MultiplayerPeerMod(mod)).ToArray();
             }
+            else
+                this.Mods = Array.Empty<IMultiplayerPeerMod>();
+
             this.SendMessageImpl = sendMessage;
         }
 
         /// <inheritdoc />
-        public IMultiplayerPeerMod GetMod(string id)
+        public IMultiplayerPeerMod? GetMod(string? id)
         {
-            if (string.IsNullOrWhiteSpace(id) || this.Mods == null || !this.Mods.Any())
+            if (string.IsNullOrWhiteSpace(id) || !this.Mods.Any())
                 return null;
 
             id = id.Trim();
diff --git a/src/SMAPI/Framework/Networking/MultiplayerPeerMod.cs b/src/SMAPI/Framework/Networking/MultiplayerPeerMod.cs
index 6fdb9e54..1e150508 100644
--- a/src/SMAPI/Framework/Networking/MultiplayerPeerMod.cs
+++ b/src/SMAPI/Framework/Networking/MultiplayerPeerMod.cs
@@ -1,4 +1,4 @@
-#nullable disable
+using System.Diagnostics.CodeAnalysis;
 
 namespace StardewModdingAPI.Framework.Networking
 {
@@ -22,10 +22,11 @@ namespace StardewModdingAPI.Framework.Networking
         *********/
         /// <summary>Construct an instance.</summary>
         /// <param name="mod">The mod metadata.</param>
+        [SuppressMessage("ReSharper", "ConstantConditionalAccessQualifier", Justification = "The ID shouldn't be null, but we should handle it to avoid an error just in case.")]
         public MultiplayerPeerMod(RemoteContextModModel mod)
         {
             this.Name = mod.Name;
-            this.ID = mod.ID?.Trim();
+            this.ID = mod.ID?.Trim() ?? string.Empty;
             this.Version = mod.Version;
         }
     }
diff --git a/src/SMAPI/Framework/Networking/RemoteContextModModel.cs b/src/SMAPI/Framework/Networking/RemoteContextModModel.cs
index 0383576c..7571acba 100644
--- a/src/SMAPI/Framework/Networking/RemoteContextModModel.cs
+++ b/src/SMAPI/Framework/Networking/RemoteContextModModel.cs
@@ -1,17 +1,33 @@
-#nullable disable
-
 namespace StardewModdingAPI.Framework.Networking
 {
     /// <summary>Metadata about an installed mod exchanged with connected computers.</summary>
     public class RemoteContextModModel
     {
-        /// <summary>The mod's display name.</summary>
-        public string Name { get; set; }
-
+        /*********
+        ** Accessors
+        *********/
         /// <summary>The unique mod ID.</summary>
-        public string ID { get; set; }
+        public string ID { get; }
+
+        /// <summary>The mod's display name.</summary>
+        public string Name { get; }
 
         /// <summary>The mod version.</summary>
-        public ISemanticVersion Version { get; set; }
+        public ISemanticVersion Version { get; }
+
+
+        /*********
+        ** Accessors
+        *********/
+        /// <summary>Construct an instance.</summary>
+        /// <param name="id">The unique mod ID.</param>
+        /// <param name="name">The mod's display name.</param>
+        /// <param name="version">The mod version.</param>
+        public RemoteContextModModel(string id, string name, ISemanticVersion version)
+        {
+            this.ID = id;
+            this.Name = name;
+            this.Version = version;
+        }
     }
 }
diff --git a/src/SMAPI/Framework/Networking/RemoteContextModel.cs b/src/SMAPI/Framework/Networking/RemoteContextModel.cs
index 37fafa67..7d53e732 100644
--- a/src/SMAPI/Framework/Networking/RemoteContextModel.cs
+++ b/src/SMAPI/Framework/Networking/RemoteContextModel.cs
@@ -1,4 +1,4 @@
-#nullable disable
+using System;
 
 namespace StardewModdingAPI.Framework.Networking
 {
@@ -9,18 +9,37 @@ namespace StardewModdingAPI.Framework.Networking
         ** Accessors
         *********/
         /// <summary>Whether this player is the host player.</summary>
-        public bool IsHost { get; set; }
+        public bool IsHost { get; }
 
-        /// <summary>The game's platform version.</summary>
-        public GamePlatform Platform { get; set; }
+        /// <summary>The game's platform.</summary>
+        public GamePlatform Platform { get; }
 
         /// <summary>The installed version of Stardew Valley.</summary>
-        public ISemanticVersion GameVersion { get; set; }
+        public ISemanticVersion? GameVersion { get; }
 
         /// <summary>The installed version of SMAPI.</summary>
-        public ISemanticVersion ApiVersion { get; set; }
+        public ISemanticVersion? ApiVersion { get; }
 
         /// <summary>The installed mods.</summary>
-        public RemoteContextModModel[] Mods { get; set; }
+        public RemoteContextModModel[] Mods { get; }
+
+
+        /*********
+        ** Public methods
+        *********/
+        /// <summary>Construct an instance.</summary>
+        /// <param name="isHost">Whether this player is the host player.</param>
+        /// <param name="platform">The game's platform.</param>
+        /// <param name="gameVersion">The installed version of Stardew Valley.</param>
+        /// <param name="apiVersion">The installed version of SMAPI.</param>
+        /// <param name="mods">The installed mods.</param>
+        public RemoteContextModel(bool isHost, GamePlatform platform, ISemanticVersion gameVersion, ISemanticVersion apiVersion, RemoteContextModModel[]? mods)
+        {
+            this.IsHost = isHost;
+            this.Platform = platform;
+            this.GameVersion = gameVersion;
+            this.ApiVersion = apiVersion;
+            this.Mods = mods ?? Array.Empty<RemoteContextModModel>();
+        }
     }
 }
diff --git a/src/SMAPI/Framework/Reflection/CacheEntry.cs b/src/SMAPI/Framework/Reflection/CacheEntry.cs
index 6b18d204..27f48a1f 100644
--- a/src/SMAPI/Framework/Reflection/CacheEntry.cs
+++ b/src/SMAPI/Framework/Reflection/CacheEntry.cs
@@ -1,5 +1,4 @@
-#nullable disable
-
+using System.Diagnostics.CodeAnalysis;
 using System.Reflection;
 
 namespace StardewModdingAPI.Framework.Reflection
@@ -11,21 +10,20 @@ namespace StardewModdingAPI.Framework.Reflection
         ** Accessors
         *********/
         /// <summary>Whether the lookup found a valid match.</summary>
-        public bool IsValid { get; }
+        [MemberNotNullWhen(true, nameof(CacheEntry.MemberInfo))]
+        public bool IsValid => this.MemberInfo != null;
 
         /// <summary>The reflection data for this member (or <c>null</c> if invalid).</summary>
-        public MemberInfo MemberInfo { get; }
+        public MemberInfo? MemberInfo { get; }
 
 
         /*********
         ** Public methods
         *********/
         /// <summary>Construct an instance.</summary>
-        /// <param name="isValid">Whether the lookup found a valid match.</param>
         /// <param name="memberInfo">The reflection data for this member (or <c>null</c> if invalid).</param>
-        public CacheEntry(bool isValid, MemberInfo memberInfo)
+        public CacheEntry(MemberInfo? memberInfo)
         {
-            this.IsValid = isValid;
             this.MemberInfo = memberInfo;
         }
     }
diff --git a/src/SMAPI/Framework/Reflection/Reflector.cs b/src/SMAPI/Framework/Reflection/Reflector.cs
index c6fc2c79..3490ee97 100644
--- a/src/SMAPI/Framework/Reflection/Reflector.cs
+++ b/src/SMAPI/Framework/Reflection/Reflector.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 using System;
 using System.Reflection;
 using System.Runtime.Caching;
@@ -14,7 +12,7 @@ namespace StardewModdingAPI.Framework.Reflection
         ** Fields
         *********/
         /// <summary>The cached fields and methods found via reflection.</summary>
-        private readonly MemoryCache Cache = new(typeof(Reflector).FullName);
+        private readonly MemoryCache Cache = new(typeof(Reflector).FullName!);
 
         /// <summary>The sliding cache expiration time.</summary>
         private readonly TimeSpan SlidingCacheExpiry = TimeSpan.FromMinutes(5);
@@ -30,8 +28,9 @@ namespace StardewModdingAPI.Framework.Reflection
         /// <typeparam name="TValue">The field type.</typeparam>
         /// <param name="obj">The object which has the field.</param>
         /// <param name="name">The field name.</param>
-        /// <param name="required">Whether to throw an exception if the field is not found.</param>
-        /// <returns>Returns the field wrapper, or <c>null</c> if the field doesn't exist and <paramref name="required"/> is <c>false</c>.</returns>
+        /// <param name="required">Whether to throw an exception if the field isn't found. <strong>Due to limitations with nullable reference types, setting this to <c>false</c> will still mark the value non-nullable.</strong></param>
+        /// <returns>Returns the field wrapper, or <c>null</c> if <paramref name="required"/> is <c>false</c> and the field doesn't exist.</returns>
+        /// <exception cref="InvalidOperationException">The target field doesn't exist, and <paramref name="required"/> is true.</exception>
         public IReflectedField<TValue> GetField<TValue>(object obj, string name, bool required = true)
         {
             // validate
@@ -39,24 +38,26 @@ namespace StardewModdingAPI.Framework.Reflection
                 throw new ArgumentNullException(nameof(obj), "Can't get a instance field from a null object.");
 
             // get field from hierarchy
-            IReflectedField<TValue> field = this.GetFieldFromHierarchy<TValue>(obj.GetType(), obj, name, BindingFlags.Instance | BindingFlags.NonPublic | BindingFlags.Public);
+            IReflectedField<TValue>? field = this.GetFieldFromHierarchy<TValue>(obj.GetType(), obj, name, BindingFlags.Instance | BindingFlags.NonPublic | BindingFlags.Public);
             if (required && field == null)
                 throw new InvalidOperationException($"The {obj.GetType().FullName} object doesn't have a '{name}' instance field.");
-            return field;
+            return field!;
         }
 
         /// <summary>Get a static field.</summary>
         /// <typeparam name="TValue">The field type.</typeparam>
         /// <param name="type">The type which has the field.</param>
         /// <param name="name">The field name.</param>
-        /// <param name="required">Whether to throw an exception if the field is not found.</param>
+        /// <param name="required">Whether to throw an exception if the field isn't found. <strong>Due to limitations with nullable reference types, setting this to <c>false</c> will still mark the value non-nullable.</strong></param>
+        /// <returns>Returns the field wrapper, or <c>null</c> if <paramref name="required"/> is <c>false</c> and the field doesn't exist.</returns>
+        /// <exception cref="InvalidOperationException">The target field doesn't exist, and <paramref name="required"/> is true.</exception>
         public IReflectedField<TValue> GetField<TValue>(Type type, string name, bool required = true)
         {
             // get field from hierarchy
-            IReflectedField<TValue> field = this.GetFieldFromHierarchy<TValue>(type, null, name, BindingFlags.NonPublic | BindingFlags.Static | BindingFlags.Public);
+            IReflectedField<TValue>? field = this.GetFieldFromHierarchy<TValue>(type, null, name, BindingFlags.NonPublic | BindingFlags.Static | BindingFlags.Public);
             if (required && field == null)
                 throw new InvalidOperationException($"The {type.FullName} object doesn't have a '{name}' static field.");
-            return field;
+            return field!;
         }
 
         /****
@@ -66,7 +67,9 @@ namespace StardewModdingAPI.Framework.Reflection
         /// <typeparam name="TValue">The property type.</typeparam>
         /// <param name="obj">The object which has the property.</param>
         /// <param name="name">The property name.</param>
-        /// <param name="required">Whether to throw an exception if the property is not found.</param>
+        /// <param name="required">Whether to throw an exception if the property isn't found. <strong>Due to limitations with nullable reference types, setting this to <c>false</c> will still mark the value non-nullable.</strong></param>
+        /// <returns>Returns the property wrapper, or <c>null</c> if <paramref name="required"/> is <c>false</c> and the property doesn't exist.</returns>
+        /// <exception cref="InvalidOperationException">The target property doesn't exist, and <paramref name="required"/> is true.</exception>
         public IReflectedProperty<TValue> GetProperty<TValue>(object obj, string name, bool required = true)
         {
             // validate
@@ -74,24 +77,26 @@ namespace StardewModdingAPI.Framework.Reflection
                 throw new ArgumentNullException(nameof(obj), "Can't get a instance property from a null object.");
 
             // get property from hierarchy
-            IReflectedProperty<TValue> property = this.GetPropertyFromHierarchy<TValue>(obj.GetType(), obj, name, BindingFlags.Instance | BindingFlags.NonPublic | BindingFlags.Public);
+            IReflectedProperty<TValue>? property = this.GetPropertyFromHierarchy<TValue>(obj.GetType(), obj, name, BindingFlags.Instance | BindingFlags.NonPublic | BindingFlags.Public);
             if (required && property == null)
                 throw new InvalidOperationException($"The {obj.GetType().FullName} object doesn't have a '{name}' instance property.");
-            return property;
+            return property!;
         }
 
         /// <summary>Get a static property.</summary>
         /// <typeparam name="TValue">The property type.</typeparam>
         /// <param name="type">The type which has the property.</param>
         /// <param name="name">The property name.</param>
-        /// <param name="required">Whether to throw an exception if the property is not found.</param>
+        /// <param name="required">Whether to throw an exception if the property isn't found. <strong>Due to limitations with nullable reference types, setting this to <c>false</c> will still mark the value non-nullable.</strong></param>
+        /// <returns>Returns the property wrapper, or <c>null</c> if <paramref name="required"/> is <c>false</c> and the property doesn't exist.</returns>
+        /// <exception cref="InvalidOperationException">The target property doesn't exist, and <paramref name="required"/> is true.</exception>
         public IReflectedProperty<TValue> GetProperty<TValue>(Type type, string name, bool required = true)
         {
             // get field from hierarchy
-            IReflectedProperty<TValue> property = this.GetPropertyFromHierarchy<TValue>(type, null, name, BindingFlags.NonPublic | BindingFlags.Public | BindingFlags.Static);
+            IReflectedProperty<TValue>? property = this.GetPropertyFromHierarchy<TValue>(type, null, name, BindingFlags.NonPublic | BindingFlags.Public | BindingFlags.Static);
             if (required && property == null)
                 throw new InvalidOperationException($"The {type.FullName} object doesn't have a '{name}' static property.");
-            return property;
+            return property!;
         }
 
         /****
@@ -99,8 +104,10 @@ namespace StardewModdingAPI.Framework.Reflection
         ****/
         /// <summary>Get a instance method.</summary>
         /// <param name="obj">The object which has the method.</param>
-        /// <param name="name">The field name.</param>
-        /// <param name="required">Whether to throw an exception if the field is not found.</param>
+        /// <param name="name">The method name.</param>
+        /// <param name="required">Whether to throw an exception if the method isn't found. <strong>Due to limitations with nullable reference types, setting this to <c>false</c> will still mark the value non-nullable.</strong></param>
+        /// <returns>Returns the method wrapper, or <c>null</c> if <paramref name="required"/> is <c>false</c> and the method doesn't exist.</returns>
+        /// <exception cref="InvalidOperationException">The target method doesn't exist, and <paramref name="required"/> is true.</exception>
         public IReflectedMethod GetMethod(object obj, string name, bool required = true)
         {
             // validate
@@ -108,23 +115,25 @@ namespace StardewModdingAPI.Framework.Reflection
                 throw new ArgumentNullException(nameof(obj), "Can't get a instance method from a null object.");
 
             // get method from hierarchy
-            IReflectedMethod method = this.GetMethodFromHierarchy(obj.GetType(), obj, name, BindingFlags.Instance | BindingFlags.NonPublic | BindingFlags.Public);
+            IReflectedMethod? method = this.GetMethodFromHierarchy(obj.GetType(), obj, name, BindingFlags.Instance | BindingFlags.NonPublic | BindingFlags.Public);
             if (required && method == null)
                 throw new InvalidOperationException($"The {obj.GetType().FullName} object doesn't have a '{name}' instance method.");
-            return method;
+            return method!;
         }
 
         /// <summary>Get a static method.</summary>
         /// <param name="type">The type which has the method.</param>
-        /// <param name="name">The field name.</param>
-        /// <param name="required">Whether to throw an exception if the field is not found.</param>
+        /// <param name="name">The method name.</param>
+        /// <param name="required">Whether to throw an exception if the method isn't found. <strong>Due to limitations with nullable reference types, setting this to <c>false</c> will still mark the value non-nullable.</strong></param>
+        /// <returns>Returns the method wrapper, or <c>null</c> if <paramref name="required"/> is <c>false</c> and the method doesn't exist.</returns>
+        /// <exception cref="InvalidOperationException">The target method doesn't exist, and <paramref name="required"/> is true.</exception>
         public IReflectedMethod GetMethod(Type type, string name, bool required = true)
         {
             // get method from hierarchy
-            IReflectedMethod method = this.GetMethodFromHierarchy(type, null, name, BindingFlags.NonPublic | BindingFlags.Public | BindingFlags.Static);
+            IReflectedMethod? method = this.GetMethodFromHierarchy(type, null, name, BindingFlags.NonPublic | BindingFlags.Public | BindingFlags.Static);
             if (required && method == null)
                 throw new InvalidOperationException($"The {type.FullName} object doesn't have a '{name}' static method.");
-            return method;
+            return method!;
         }
 
 
@@ -134,18 +143,25 @@ namespace StardewModdingAPI.Framework.Reflection
         /// <summary>Get a field from the type hierarchy.</summary>
         /// <typeparam name="TValue">The expected field type.</typeparam>
         /// <param name="type">The type which has the field.</param>
-        /// <param name="obj">The object which has the field.</param>
+        /// <param name="obj">The object which has the field, or <c>null</c> for a static field.</param>
         /// <param name="name">The field name.</param>
         /// <param name="bindingFlags">The reflection binding which flags which indicates what type of field to find.</param>
-        private IReflectedField<TValue> GetFieldFromHierarchy<TValue>(Type type, object obj, string name, BindingFlags bindingFlags)
+        private IReflectedField<TValue>? GetFieldFromHierarchy<TValue>(Type type, object? obj, string name, BindingFlags bindingFlags)
         {
             bool isStatic = bindingFlags.HasFlag(BindingFlags.Static);
-            FieldInfo field = this.GetCached<FieldInfo>($"field::{isStatic}::{type.FullName}::{name}", () =>
+            FieldInfo? field = this.GetCached($"field::{isStatic}::{type.FullName}::{name}", () =>
             {
-                FieldInfo fieldInfo = null;
-                for (; type != null && fieldInfo == null; type = type.BaseType)
-                    fieldInfo = type.GetField(name, bindingFlags);
-                return fieldInfo;
+                for (Type? curType = type; curType != null; curType = curType.BaseType)
+                {
+                    FieldInfo? fieldInfo = type.GetField(name, bindingFlags);
+                    if (fieldInfo != null)
+                    {
+                        type = curType;
+                        return fieldInfo;
+                    }
+                }
+
+                return null;
             });
 
             return field != null
@@ -156,18 +172,25 @@ namespace StardewModdingAPI.Framework.Reflection
         /// <summary>Get a property from the type hierarchy.</summary>
         /// <typeparam name="TValue">The expected property type.</typeparam>
         /// <param name="type">The type which has the property.</param>
-        /// <param name="obj">The object which has the property.</param>
+        /// <param name="obj">The object which has the property, or <c>null</c> for a static property.</param>
         /// <param name="name">The property name.</param>
         /// <param name="bindingFlags">The reflection binding which flags which indicates what type of property to find.</param>
-        private IReflectedProperty<TValue> GetPropertyFromHierarchy<TValue>(Type type, object obj, string name, BindingFlags bindingFlags)
+        private IReflectedProperty<TValue>? GetPropertyFromHierarchy<TValue>(Type type, object? obj, string name, BindingFlags bindingFlags)
         {
             bool isStatic = bindingFlags.HasFlag(BindingFlags.Static);
-            PropertyInfo property = this.GetCached<PropertyInfo>($"property::{isStatic}::{type.FullName}::{name}", () =>
+            PropertyInfo? property = this.GetCached<PropertyInfo>($"property::{isStatic}::{type.FullName}::{name}", () =>
             {
-                PropertyInfo propertyInfo = null;
-                for (; type != null && propertyInfo == null; type = type.BaseType)
-                    propertyInfo = type.GetProperty(name, bindingFlags);
-                return propertyInfo;
+                for (Type? curType = type; curType != null; curType = curType.BaseType)
+                {
+                    PropertyInfo? propertyInfo = type.GetProperty(name, bindingFlags);
+                    if (propertyInfo != null)
+                    {
+                        type = curType;
+                        return propertyInfo;
+                    }
+                }
+
+                return null;
             });
 
             return property != null
@@ -177,18 +200,25 @@ namespace StardewModdingAPI.Framework.Reflection
 
         /// <summary>Get a method from the type hierarchy.</summary>
         /// <param name="type">The type which has the method.</param>
-        /// <param name="obj">The object which has the method.</param>
+        /// <param name="obj">The object which has the method, or <c>null</c> for a static method.</param>
         /// <param name="name">The method name.</param>
         /// <param name="bindingFlags">The reflection binding which flags which indicates what type of method to find.</param>
-        private IReflectedMethod GetMethodFromHierarchy(Type type, object obj, string name, BindingFlags bindingFlags)
+        private IReflectedMethod? GetMethodFromHierarchy(Type type, object? obj, string name, BindingFlags bindingFlags)
         {
             bool isStatic = bindingFlags.HasFlag(BindingFlags.Static);
-            MethodInfo method = this.GetCached($"method::{isStatic}::{type.FullName}::{name}", () =>
+            MethodInfo? method = this.GetCached($"method::{isStatic}::{type.FullName}::{name}", () =>
             {
-                MethodInfo methodInfo = null;
-                for (; type != null && methodInfo == null; type = type.BaseType)
-                    methodInfo = type.GetMethod(name, bindingFlags);
-                return methodInfo;
+                for (Type? curType = type; curType != null; curType = curType.BaseType)
+                {
+                    MethodInfo? methodInfo = type.GetMethod(name, bindingFlags);
+                    if (methodInfo != null)
+                    {
+                        type = curType;
+                        return methodInfo;
+                    }
+                }
+
+                return null;
             });
 
             return method != null
@@ -200,7 +230,8 @@ namespace StardewModdingAPI.Framework.Reflection
         /// <typeparam name="TMemberInfo">The expected <see cref="MemberInfo"/> type.</typeparam>
         /// <param name="key">The cache key.</param>
         /// <param name="fetch">Fetches a new value to cache.</param>
-        private TMemberInfo GetCached<TMemberInfo>(string key, Func<TMemberInfo> fetch) where TMemberInfo : MemberInfo
+        private TMemberInfo? GetCached<TMemberInfo>(string key, Func<TMemberInfo?> fetch)
+            where TMemberInfo : MemberInfo
         {
             // get from cache
             if (this.Cache.Contains(key))
@@ -212,8 +243,8 @@ namespace StardewModdingAPI.Framework.Reflection
             }
 
             // fetch & cache new value
-            TMemberInfo result = fetch();
-            CacheEntry cacheEntry = new(result != null, result);
+            TMemberInfo? result = fetch();
+            CacheEntry cacheEntry = new(result);
             this.Cache.Add(key, cacheEntry, new CacheItemPolicy { SlidingExpiration = this.SlidingCacheExpiry });
             return result;
         }
diff --git a/src/SMAPI/Framework/SCore.cs b/src/SMAPI/Framework/SCore.cs
index 364a7632..bce7cffa 100644
--- a/src/SMAPI/Framework/SCore.cs
+++ b/src/SMAPI/Framework/SCore.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 using System;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
@@ -92,13 +90,13 @@ namespace StardewModdingAPI.Framework
         private readonly CommandManager CommandManager;
 
         /// <summary>The underlying game instance.</summary>
-        private SGameRunner Game;
+        private SGameRunner Game = null!; // initialized very early
 
         /// <summary>SMAPI's content manager.</summary>
-        private ContentCoordinator ContentCore;
+        private ContentCoordinator ContentCore = null!; // initialized very early
 
         /// <summary>The game's core multiplayer utility for the main player.</summary>
-        private SMultiplayer Multiplayer;
+        private SMultiplayer Multiplayer = null!; // initialized very early
 
         /// <summary>Tracks the installed mods.</summary>
         /// <remarks>This is initialized after the game starts.</remarks>
@@ -146,19 +144,18 @@ namespace StardewModdingAPI.Framework
         private readonly ConcurrentQueue<string> RawCommandQueue = new();
 
         /// <summary>A list of commands to execute on each screen.</summary>
-        private readonly PerScreen<List<Tuple<Command, string, string[]>>> ScreenCommandQueue = new(() => new List<Tuple<Command, string, string[]>>());
-
+        private readonly PerScreen<List<QueuedCommand>> ScreenCommandQueue = new(() => new List<QueuedCommand>());
 
         /*********
         ** Accessors
         *********/
         /// <summary>Manages deprecation warnings.</summary>
         /// <remarks>This is initialized after the game starts. This is accessed directly because it's not part of the normal class model.</remarks>
-        internal static DeprecationManager DeprecationManager { get; private set; }
+        internal static DeprecationManager DeprecationManager { get; private set; } = null!; // initialized in constructor, which happens before other code can access it
 
         /// <summary>The singleton instance.</summary>
         /// <remarks>This is only intended for use by external code like the Error Handler mod.</remarks>
-        internal static SCore Instance { get; private set; }
+        internal static SCore Instance { get; private set; } = null!; // initialized in constructor, which happens before other code can access it
 
         /// <summary>The number of game update ticks which have already executed. This is similar to <see cref="Game1.ticks"/>, but incremented more consistently for every tick.</summary>
         internal static uint TicksElapsed { get; private set; }
@@ -191,7 +188,8 @@ namespace StardewModdingAPI.Framework
             this.Settings = JsonConvert.DeserializeObject<SConfig>(File.ReadAllText(Constants.ApiConfigPath));
             if (File.Exists(Constants.ApiUserConfigPath))
                 JsonConvert.PopulateObject(File.ReadAllText(Constants.ApiUserConfigPath), this.Settings);
-            this.Settings.DeveloperMode = developerMode ?? this.Settings.DeveloperMode;
+            if (developerMode.HasValue)
+                this.Settings.OverrideDeveloperMode(developerMode.Value);
 
             this.LogManager = new LogManager(logPath: logPath, colorConfig: this.Settings.ConsoleColors, writeToConsole: writeToConsole, isVerbose: this.Settings.VerboseLogging, isDeveloperMode: this.Settings.DeveloperMode, getScreenIdForLog: this.GetScreenIdForLog);
             this.CommandManager = new CommandManager(this.Monitor);
@@ -331,6 +329,7 @@ namespace StardewModdingAPI.Framework
         }
 
         /// <summary>Performs application-defined tasks associated with freeing, releasing, or resetting unmanaged resources.</summary>
+        [SuppressMessage("ReSharper", "ConstantConditionalAccessQualifier", Justification = "May be disposed before SMAPI is fully initialized.")]
         public void Dispose()
         {
             // skip if already disposed
@@ -355,9 +354,9 @@ namespace StardewModdingAPI.Framework
             // dispose core components
             this.IsGameRunning = false;
             this.ContentCore?.Dispose();
-            this.CancellationToken?.Dispose();
+            this.CancellationToken.Dispose();
             this.Game?.Dispose();
-            this.LogManager?.Dispose(); // dispose last to allow for any last-second log messages
+            this.LogManager.Dispose(); // dispose last to allow for any last-second log messages
 
             // end game (moved from Game1.OnExiting to let us clean up first)
             Process.GetCurrentProcess().Kill();
@@ -517,12 +516,12 @@ namespace StardewModdingAPI.Framework
                 /*********
                 ** Parse commands
                 *********/
-                while (this.RawCommandQueue.TryDequeue(out string rawInput))
+                while (this.RawCommandQueue.TryDequeue(out string? rawInput))
                 {
                     // parse command
-                    string name;
-                    string[] args;
-                    Command command;
+                    string? name;
+                    string[]? args;
+                    Command? command;
                     int screenId;
                     try
                     {
@@ -539,7 +538,7 @@ namespace StardewModdingAPI.Framework
                     }
 
                     // queue command for screen
-                    this.ScreenCommandQueue.GetValueForScreen(screenId).Add(Tuple.Create(command, name, args));
+                    this.ScreenCommandQueue.GetValueForScreen(screenId).Add(new(command, name, args));
                 }
 
 
@@ -556,7 +555,7 @@ namespace StardewModdingAPI.Framework
             catch (Exception ex)
             {
                 // log error
-                this.Monitor.Log($"An error occured in the overridden update loop: {ex.GetLogSummary()}", LogLevel.Error);
+                this.Monitor.Log($"An error occurred in the overridden update loop: {ex.GetLogSummary()}", LogLevel.Error);
 
                 // exit if irrecoverable
                 if (!this.UpdateCrashTimer.Decrement())
@@ -575,7 +574,7 @@ namespace StardewModdingAPI.Framework
         /// <param name="runUpdate">Invoke the game's update logic.</param>
         private void OnPlayerInstanceUpdating(SGame instance, GameTime gameTime, Action runUpdate)
         {
-            var events = this.EventManager;
+            EventManager events = this.EventManager;
 
             try
             {
@@ -595,12 +594,8 @@ namespace StardewModdingAPI.Framework
                 *********/
                 {
                     var commandQueue = this.ScreenCommandQueue.Value;
-                    foreach (var entry in commandQueue)
+                    foreach ((Command? command, string? name, string[]? args) in commandQueue)
                     {
-                        Command command = entry.Item1;
-                        string name = entry.Item2;
-                        string[] args = entry.Item3;
-
                         try
                         {
                             command.Callback.Invoke(name, args);
@@ -637,6 +632,7 @@ namespace StardewModdingAPI.Framework
                 {
                     this.Monitor.Log("Game loader synchronizing...");
                     this.Reflection.GetMethod(Game1.game1, "UpdateTitleScreen").Invoke(Game1.currentGameTime); // run game logic to change music on load, etc
+                    // ReSharper disable once ConstantConditionalAccessQualifier -- may become null within the loop
                     while (Game1.currentLoader?.MoveNext() == true)
                     {
                         SCore.ProcessTicksElapsed++;
@@ -825,7 +821,7 @@ namespace StardewModdingAPI.Framework
 
                             // raise cursor moved event
                             if (state.Cursor.IsChanged)
-                                events.CursorMoved.Raise(new CursorMovedEventArgs(state.Cursor.Old, state.Cursor.New));
+                                events.CursorMoved.Raise(new CursorMovedEventArgs(state.Cursor.Old!, state.Cursor.New!));
 
                             // raise mouse wheel scrolled
                             if (state.MouseWheelScroll.IsChanged)
@@ -956,7 +952,7 @@ namespace StardewModdingAPI.Framework
                         // raise player events
                         if (raiseWorldEvents)
                         {
-                            PlayerSnapshot playerState = state.CurrentPlayer;
+                            PlayerSnapshot playerState = state.CurrentPlayer!; // not null at this point
                             Farmer player = playerState.Player;
 
                             // raise current location changed
@@ -965,25 +961,25 @@ namespace StardewModdingAPI.Framework
                                 if (this.Monitor.IsVerbose)
                                     this.Monitor.Log($"Context: set location to {playerState.Location.New}.");
 
-                                events.Warped.Raise(new WarpedEventArgs(player, playerState.Location.Old, playerState.Location.New));
+                                events.Warped.Raise(new WarpedEventArgs(player, playerState.Location.Old!, playerState.Location.New!));
                             }
 
                             // raise player leveled up a skill
-                            foreach (var pair in playerState.Skills)
+                            foreach ((SkillType skill, var value) in playerState.Skills)
                             {
-                                if (!pair.Value.IsChanged)
+                                if (!value.IsChanged)
                                     continue;
 
                                 if (this.Monitor.IsVerbose)
-                                    this.Monitor.Log($"Events: player skill '{pair.Key}' changed from {pair.Value.Old} to {pair.Value.New}.");
+                                    this.Monitor.Log($"Events: player skill '{skill}' changed from {value.Old} to {value.New}.");
 
-                                events.LevelChanged.Raise(new LevelChangedEventArgs(player, pair.Key, pair.Value.Old, pair.Value.New));
+                                events.LevelChanged.Raise(new LevelChangedEventArgs(player, skill, value.Old, value.New));
                             }
 
                             // raise player inventory changed
                             if (playerState.Inventory.IsChanged)
                             {
-                                var inventory = playerState.Inventory;
+                                SnapshotItemListDiff inventory = playerState.Inventory;
 
                                 if (this.Monitor.IsVerbose)
                                     this.Monitor.Log("Events: player inventory changed.");
@@ -1070,7 +1066,8 @@ namespace StardewModdingAPI.Framework
             // update mod translation helpers
             foreach (IModMetadata mod in this.ModRegistry.GetAll())
             {
-                mod.Translations.SetLocale(locale, languageCode);
+                TranslationHelper translations = mod.Translations!; // not null at this point
+                translations.SetLocale(locale, languageCode);
 
                 foreach (ContentPack contentPack in mod.GetFakeContentPacks())
                     contentPack.TranslationImpl.SetLocale(locale, languageCode);
@@ -1117,7 +1114,7 @@ namespace StardewModdingAPI.Framework
                     break;
 
                 case LoadStage.Loaded:
-                    // override chatbox
+                    // override chat box
                     Game1.onScreenMenus.Remove(Game1.chatBox);
                     Game1.onScreenMenus.Add(Game1.chatBox = new SChatBox(this.LogManager.MonitorForGame));
                     break;
@@ -1182,7 +1179,7 @@ namespace StardewModdingAPI.Framework
         /// <param name="id">The content pack ID.</param>
         /// <param name="verb">The verb phrase indicating what action will be performed, like 'load assets' or 'edit assets'.</param>
         /// <returns>Returns the content pack metadata if valid, else <c>null</c>.</returns>
-        private IModMetadata GetOnBehalfOfContentPack(IModMetadata mod, string id, string verb)
+        private IModMetadata? GetOnBehalfOfContentPack(IModMetadata mod, string? id, string verb)
         {
             if (id == null)
                 return null;
@@ -1190,7 +1187,7 @@ namespace StardewModdingAPI.Framework
             string errorPrefix = $"Can't {verb} on behalf of content pack ID '{id}'";
 
             // get target mod
-            IModMetadata onBehalfOf = this.ModRegistry.Get(id);
+            IModMetadata? onBehalfOf = this.ModRegistry.Get(id);
             if (onBehalfOf == null)
             {
                 mod.LogAsModOnce($"{errorPrefix}: there's no content pack installed with that ID.", LogLevel.Warn);
@@ -1198,7 +1195,7 @@ namespace StardewModdingAPI.Framework
             }
 
             // make sure it's a content pack for the requesting mod
-            if (!onBehalfOf.IsContentPack || !string.Equals(onBehalfOf.Manifest?.ContentPackFor?.UniqueID, mod.Manifest.UniqueID))
+            if (!onBehalfOf.IsContentPack || !string.Equals(onBehalfOf.Manifest.ContentPackFor?.UniqueID, mod.Manifest.UniqueID))
             {
                 mod.LogAsModOnce($"{errorPrefix}: that isn't a content pack for this mod.", LogLevel.Warn);
                 return null;
@@ -1232,7 +1229,7 @@ namespace StardewModdingAPI.Framework
                 modIDs.Remove(message.FromModID); // don't send a broadcast back to the sender
 
             // raise events
-            this.EventManager.ModMessageReceived.Raise(new ModMessageReceivedEventArgs(message, this.Toolkit.JsonHelper), mod => mod != null && modIDs.Contains(mod.Manifest.UniqueID));
+            this.EventManager.ModMessageReceived.Raise(new ModMessageReceivedEventArgs(message, this.Toolkit.JsonHelper), mod => modIDs.Contains(mod.Manifest.UniqueID));
         }
 
         /// <summary>Constructor a content manager to read game content files.</summary>
@@ -1241,6 +1238,7 @@ namespace StardewModdingAPI.Framework
         private LocalizedContentManager CreateContentManager(IServiceProvider serviceProvider, string rootDirectory)
         {
             // Game1._temporaryContent initializing from SGame constructor
+            // ReSharper disable once ConditionIsAlwaysTrueOrFalse -- this is the method that initializes it
             if (this.ContentCore == null)
             {
                 this.ContentCore = new ContentCoordinator(
@@ -1293,21 +1291,21 @@ namespace StardewModdingAPI.Framework
                 // detect issues
                 bool hasObjectIssues = false;
                 void LogIssue(int id, string issue) => this.Monitor.Log($@"Detected issue: item #{id} in Content\Data\ObjectInformation.xnb is invalid ({issue}).");
-                foreach (KeyValuePair<int, string> entry in Game1.objectInformation)
+                foreach ((int id, string? fieldsStr) in Game1.objectInformation)
                 {
                     // must not be empty
-                    if (string.IsNullOrWhiteSpace(entry.Value))
+                    if (string.IsNullOrWhiteSpace(fieldsStr))
                     {
-                        LogIssue(entry.Key, "entry is empty");
+                        LogIssue(id, "entry is empty");
                         hasObjectIssues = true;
                         continue;
                     }
 
                     // require core fields
-                    string[] fields = entry.Value.Split('/');
+                    string[] fields = fieldsStr.Split('/');
                     if (fields.Length < SObject.objectInfoDescriptionIndex + 1)
                     {
-                        LogIssue(entry.Key, "too few fields for an object");
+                        LogIssue(id, "too few fields for an object");
                         hasObjectIssues = true;
                         continue;
                     }
@@ -1318,7 +1316,7 @@ namespace StardewModdingAPI.Framework
                         case "Cooking":
                             if (fields.Length < SObject.objectInfoBuffDurationIndex + 1)
                             {
-                                LogIssue(entry.Key, "too few fields for a cooking item");
+                                LogIssue(id, "too few fields for a cooking item");
                                 hasObjectIssues = true;
                             }
                             break;
@@ -1366,7 +1364,7 @@ namespace StardewModdingAPI.Framework
                 string[] installedNames = registryKeys
                     .SelectMany(registryKey =>
                     {
-                        using RegistryKey key = Registry.LocalMachine.OpenSubKey(registryKey);
+                        using RegistryKey? key = Registry.LocalMachine.OpenSubKey(registryKey);
                         if (key == null)
                             return Array.Empty<string>();
 
@@ -1374,9 +1372,9 @@ namespace StardewModdingAPI.Framework
                             .GetSubKeyNames()
                             .Select(subkeyName =>
                             {
-                                using RegistryKey subkey = key.OpenSubKey(subkeyName);
-                                string displayName = (string)subkey?.GetValue("DisplayName");
-                                string displayVersion = (string)subkey?.GetValue("DisplayVersion");
+                                using RegistryKey? subkey = key.OpenSubKey(subkeyName);
+                                string? displayName = (string?)subkey?.GetValue("DisplayName");
+                                string? displayVersion = (string?)subkey?.GetValue("DisplayVersion");
 
                                 if (displayName != null && displayVersion != null && displayName.EndsWith($" {displayVersion}"))
                                     displayName = displayName.Substring(0, displayName.Length - displayVersion.Length - 1);
@@ -1386,6 +1384,7 @@ namespace StardewModdingAPI.Framework
                             .ToArray();
                     })
                     .Where(name => name != null && (name.Contains("MSI Afterburner") || name.Contains("RivaTuner")))
+                    .Select(name => name!)
                     .Distinct()
                     .OrderBy(name => name)
                     .ToArray();
@@ -1418,14 +1417,14 @@ namespace StardewModdingAPI.Framework
 
                 // check SMAPI version
                 {
-                    ISemanticVersion updateFound = null;
-                    string updateUrl = null;
+                    ISemanticVersion? updateFound = null;
+                    string? updateUrl = null;
                     try
                     {
                         // fetch update check
                         ModEntryModel response = client.GetModInfo(new[] { new ModSearchEntryModel("Pathoschild.SMAPI", Constants.ApiVersion, new[] { $"GitHub:{this.Settings.GitHubProjectName}" }) }, apiVersion: Constants.ApiVersion, gameVersion: Constants.GameVersion, platform: Constants.Platform).Single().Value;
                         updateFound = response.SuggestedUpdate?.Version;
-                        updateUrl = response.SuggestedUpdate?.Url ?? Constants.HomePageUrl;
+                        updateUrl = response.SuggestedUpdate?.Url;
 
                         // log message
                         if (updateFound != null)
@@ -1451,7 +1450,7 @@ namespace StardewModdingAPI.Framework
 
                     // show update message on next launch
                     if (updateFound != null)
-                        this.LogManager.WriteUpdateMarker(updateFound.ToString(), updateUrl);
+                        this.LogManager.WriteUpdateMarker(updateFound.ToString(), updateUrl ?? Constants.HomePageUrl);
                 }
 
                 // check mod versions
@@ -1485,12 +1484,12 @@ namespace StardewModdingAPI.Framework
                         foreach (IModMetadata mod in mods.OrderBy(p => p.DisplayName))
                         {
                             // link to update-check data
-                            if (!mod.HasID() || !results.TryGetValue(mod.Manifest.UniqueID, out ModEntryModel result))
+                            if (!mod.HasID() || !results.TryGetValue(mod.Manifest.UniqueID, out ModEntryModel? result))
                                 continue;
                             mod.SetUpdateData(result);
 
                             // handle errors
-                            if (result.Errors != null && result.Errors.Any())
+                            if (result.Errors.Any())
                             {
                                 errors.AppendLine(result.Errors.Length == 1
                                     ? $"   {mod.DisplayName}: {result.Errors[0]}"
@@ -1512,13 +1511,8 @@ namespace StardewModdingAPI.Framework
                         {
                             this.Monitor.Newline();
                             this.Monitor.Log($"You can update {updates.Count} mod{(updates.Count != 1 ? "s" : "")}:", LogLevel.Alert);
-                            foreach (var entry in updates)
-                            {
-                                IModMetadata mod = entry.Item1;
-                                ISemanticVersion newVersion = entry.Item2;
-                                string newUrl = entry.Item3;
+                            foreach ((IModMetadata mod, ISemanticVersion newVersion, string newUrl) in updates)
                                 this.Monitor.Log($"   {mod.DisplayName} {newVersion}: {newUrl}", LogLevel.Alert);
-                            }
                         }
                         else
                             this.Monitor.Log("   All mods up to date.");
@@ -1571,9 +1565,8 @@ namespace StardewModdingAPI.Framework
                 // load mods
                 foreach (IModMetadata mod in mods)
                 {
-                    if (!this.TryLoadMod(mod, mods, modAssemblyLoader, proxyFactory, jsonHelper, contentCore, modDatabase, suppressUpdateChecks, out ModFailReason? failReason, out string errorPhrase, out string errorDetails))
+                    if (!this.TryLoadMod(mod, mods, modAssemblyLoader, proxyFactory, jsonHelper, contentCore, modDatabase, suppressUpdateChecks, out ModFailReason? failReason, out string? errorPhrase, out string? errorDetails))
                     {
-                        failReason ??= ModFailReason.LoadFailed;
                         mod.SetStatus(ModMetadataStatus.Failed, failReason.Value, errorPhrase, errorDetails);
                         skippedMods.Add(mod);
                     }
@@ -1599,7 +1592,7 @@ namespace StardewModdingAPI.Framework
             foreach (IModMetadata metadata in loadedMods)
             {
                 // add interceptors
-                if (metadata.Mod.Helper is ModHelper helper)
+                if (metadata.Mod?.Helper is ModHelper helper)
                 {
                     // ReSharper disable SuspiciousTypeConversion.Global
                     if (metadata.Mod is IAssetEditor editor)
@@ -1636,8 +1629,8 @@ namespace StardewModdingAPI.Framework
                 // call entry method
                 try
                 {
-                    IMod mod = metadata.Mod;
-                    mod.Entry(mod.Helper);
+                    IMod mod = metadata.Mod!;
+                    mod.Entry(mod.Helper!);
                 }
                 catch (Exception ex)
                 {
@@ -1647,7 +1640,7 @@ namespace StardewModdingAPI.Framework
                 // get mod API
                 try
                 {
-                    object api = metadata.Mod.GetApi();
+                    object? api = metadata.Mod!.GetApi();
                     if (api != null && !api.GetType().IsPublic)
                     {
                         api = null;
@@ -1676,7 +1669,8 @@ namespace StardewModdingAPI.Framework
         /// <param name="added">The interceptors that were added.</param>
         /// <param name="removed">The interceptors that were removed.</param>
         /// <param name="list">A list of interceptors to update for the change.</param>
-        private void OnAssetInterceptorsChanged<T>(IModMetadata mod, IEnumerable<T> added, IEnumerable<T> removed, IList<ModLinked<T>> list)
+        private void OnAssetInterceptorsChanged<T>(IModMetadata mod, IEnumerable<T>? added, IEnumerable<T>? removed, IList<ModLinked<T>> list)
+            where T : notnull
         {
             foreach (T interceptor in added ?? Array.Empty<T>())
             {
@@ -1705,7 +1699,7 @@ namespace StardewModdingAPI.Framework
         /// <param name="errorReasonPhrase">The user-facing reason phrase explaining why the mod couldn't be loaded (if applicable).</param>
         /// <param name="errorDetails">More detailed details about the error intended for developers (if any).</param>
         /// <returns>Returns whether the mod was successfully loaded.</returns>
-        private bool TryLoadMod(IModMetadata mod, IModMetadata[] mods, AssemblyLoader assemblyLoader, InterfaceProxyFactory proxyFactory, JsonHelper jsonHelper, ContentCoordinator contentCore, ModDatabase modDatabase, HashSet<string> suppressUpdateChecks, out ModFailReason? failReason, out string errorReasonPhrase, out string errorDetails)
+        private bool TryLoadMod(IModMetadata mod, IModMetadata[] mods, AssemblyLoader assemblyLoader, InterfaceProxyFactory proxyFactory, JsonHelper jsonHelper, ContentCoordinator contentCore, ModDatabase modDatabase, HashSet<string> suppressUpdateChecks, [NotNullWhen(false)] out ModFailReason? failReason, out string? errorReasonPhrase, out string? errorDetails)
         {
             errorDetails = null;
 
@@ -1714,6 +1708,7 @@ namespace StardewModdingAPI.Framework
                 string relativePath = mod.GetRelativePathWithRoot();
                 if (mod.IsContentPack)
                     this.Monitor.Log($"   {mod.DisplayName} (from {relativePath}) [content pack]...");
+                // ReSharper disable once ConstantConditionalAccessQualifier -- mod may be invalid at this point
                 else if (mod.Manifest?.EntryDll != null)
                     this.Monitor.Log($"   {mod.DisplayName} (from {relativePath}{Path.DirectorySeparatorChar}{mod.Manifest.EntryDll})..."); // don't use Path.Combine here, since EntryDLL might not be valid
                 else
@@ -1721,21 +1716,22 @@ namespace StardewModdingAPI.Framework
             }
 
             // add warning for missing update key
-            if (mod.HasID() && !suppressUpdateChecks.Contains(mod.Manifest.UniqueID) && !mod.HasValidUpdateKeys())
+            if (mod.HasID() && !suppressUpdateChecks.Contains(mod.Manifest!.UniqueID) && !mod.HasValidUpdateKeys())
                 mod.SetWarning(ModWarning.NoUpdateKeys);
 
             // validate status
             if (mod.Status == ModMetadataStatus.Failed)
             {
                 this.Monitor.Log($"      Failed: {mod.ErrorDetails ?? mod.Error}");
-                failReason = mod.FailReason;
+                failReason = mod.FailReason ?? ModFailReason.LoadFailed;
                 errorReasonPhrase = mod.Error;
                 return false;
             }
+            IManifest manifest = mod.Manifest!;
 
             // validate dependencies
             // Although dependencies are validated before mods are loaded, a dependency may have failed to load.
-            foreach (IManifestDependency dependency in mod.Manifest.Dependencies.Where(p => p.IsRequired))
+            foreach (IManifestDependency dependency in manifest.Dependencies.Where(p => p.IsRequired))
             {
                 if (this.ModRegistry.Get(dependency.UniqueID) == null)
                 {
@@ -1751,7 +1747,6 @@ namespace StardewModdingAPI.Framework
             // load as content pack
             if (mod.IsContentPack)
             {
-                IManifest manifest = mod.Manifest;
                 IMonitor monitor = this.LogManager.GetMonitor(mod.DisplayName);
                 CaseInsensitivePathCache relativePathCache = this.ContentCore.GetCaseInsensitivePathCache(mod.DirectoryPath);
                 GameContentHelper gameContentHelper = new(this.ContentCore, manifest.UniqueID, mod.DisplayName, monitor, this.Reflection);
@@ -1770,8 +1765,7 @@ namespace StardewModdingAPI.Framework
             else
             {
                 // get mod info
-                IManifest manifest = mod.Manifest;
-                string assemblyPath = Path.Combine(mod.DirectoryPath, manifest.EntryDll);
+                string assemblyPath = Path.Combine(mod.DirectoryPath, manifest.EntryDll!);
 
                 // load mod
                 Assembly modAssembly;
@@ -1782,7 +1776,7 @@ namespace StardewModdingAPI.Framework
                 }
                 catch (IncompatibleInstructionException) // details already in trace logs
                 {
-                    string[] updateUrls = new[] { modDatabase.GetModPageUrlFor(manifest.UniqueID), "https://smapi.io/mods" }.Where(p => p != null).ToArray();
+                    string[] updateUrls = new[] { modDatabase.GetModPageUrlFor(manifest.UniqueID), "https://smapi.io/mods" }.Where(p => p != null).ToArray()!;
                     errorReasonPhrase = $"it's no longer compatible. Please check for a new version at {string.Join(" or ", updateUrls)}";
                     failReason = ModFailReason.Incompatible;
                     return false;
@@ -1808,7 +1802,7 @@ namespace StardewModdingAPI.Framework
                 try
                 {
                     // get mod instance
-                    if (!this.TryLoadModEntry(modAssembly, out Mod modEntry, out errorReasonPhrase))
+                    if (!this.TryLoadModEntry(modAssembly, out Mod? modEntry, out errorReasonPhrase))
                     {
                         failReason = ModFailReason.LoadFailed;
                         return false;
@@ -1822,8 +1816,8 @@ namespace StardewModdingAPI.Framework
 
                         return this.ModRegistry
                             .GetAll(assemblyMods: false)
-                            .Where(p => p.IsContentPack && mod.HasID(p.Manifest.ContentPackFor.UniqueID))
-                            .Select(p => p.ContentPack)
+                            .Where(p => p.IsContentPack && mod.HasID(p.Manifest.ContentPackFor!.UniqueID))
+                            .Select(p => p.ContentPack!)
                             .ToArray();
                     }
 
@@ -1890,7 +1884,7 @@ namespace StardewModdingAPI.Framework
         /// <param name="mod">The loaded instance.</param>
         /// <param name="error">The error indicating why loading failed (if applicable).</param>
         /// <returns>Returns whether the mod entry class was successfully loaded.</returns>
-        private bool TryLoadModEntry(Assembly modAssembly, out Mod mod, out string error)
+        private bool TryLoadModEntry(Assembly modAssembly, [NotNullWhen(true)] out Mod? mod, [NotNullWhen(false)] out string? error)
         {
             mod = null;
 
@@ -1908,7 +1902,7 @@ namespace StardewModdingAPI.Framework
             }
 
             // get implementation
-            mod = (Mod)modAssembly.CreateInstance(modEntries[0].ToString());
+            mod = (Mod?)modAssembly.CreateInstance(modEntries[0].ToString());
             if (mod == null)
             {
                 error = "its entry class couldn't be instantiated.";
@@ -1954,7 +1948,7 @@ namespace StardewModdingAPI.Framework
                             metadata.LogAsMod($"  - {error}", LogLevel.Warn);
                     }
 
-                    metadata.Translations.SetTranslations(translations);
+                    metadata.Translations!.SetTranslations(translations);
                 }
 
                 // fake content packs
@@ -1997,7 +1991,7 @@ namespace StardewModdingAPI.Framework
                     string locale = Path.GetFileNameWithoutExtension(file.Name.ToLower().Trim());
                     try
                     {
-                        if (!jsonHelper.ReadJsonFileIfExists(file.FullName, out IDictionary<string, string> data) || data == null)
+                        if (!jsonHelper.ReadJsonFileIfExists(file.FullName, out IDictionary<string, string>? data))
                         {
                             errors.Add($"{file.Name} file couldn't be read"); // mainly happens when the file is corrupted or empty
                             continue;
@@ -2016,8 +2010,8 @@ namespace StardewModdingAPI.Framework
             foreach (string locale in translations.Keys.ToArray())
             {
                 // handle duplicates
-                HashSet<string> keys = new HashSet<string>(StringComparer.OrdinalIgnoreCase);
-                HashSet<string> duplicateKeys = new HashSet<string>(StringComparer.OrdinalIgnoreCase);
+                HashSet<string> keys = new(StringComparer.OrdinalIgnoreCase);
+                HashSet<string> duplicateKeys = new(StringComparer.OrdinalIgnoreCase);
                 foreach (string key in translations[locale].Keys.ToArray())
                 {
                     if (!keys.Add(key))
@@ -2107,5 +2101,15 @@ namespace StardewModdingAPI.Framework
 
             return null;
         }
+
+
+        /*********
+        ** Private types
+        *********/
+        /// <summary>A queued console command to run during the update loop.</summary>
+        /// <param name="Command">The command which can handle the input.</param>
+        /// <param name="Name">The parsed command name.</param>
+        /// <param name="Args">The parsed command arguments.</param>
+        private readonly record struct QueuedCommand(Command Command, string Name, string[] Args);
     }
 }
diff --git a/src/SMAPI/Framework/SMultiplayer.cs b/src/SMAPI/Framework/SMultiplayer.cs
index de3c25a5..c0e8ee81 100644
--- a/src/SMAPI/Framework/SMultiplayer.cs
+++ b/src/SMAPI/Framework/SMultiplayer.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 using System;
 using System.Collections.Generic;
 using System.IO;
@@ -61,7 +59,7 @@ namespace StardewModdingAPI.Framework
         private readonly PerScreen<IDictionary<long, MultiplayerPeer>> PeersImpl = new(() => new Dictionary<long, MultiplayerPeer>());
 
         /// <summary>The backing field for <see cref="HostPeer"/>.</summary>
-        private readonly PerScreen<MultiplayerPeer> HostPeerImpl = new();
+        private readonly PerScreen<MultiplayerPeer?> HostPeerImpl = new();
 
 
         /*********
@@ -71,7 +69,7 @@ namespace StardewModdingAPI.Framework
         public IDictionary<long, MultiplayerPeer> Peers => this.PeersImpl.Value;
 
         /// <summary>The metadata for the host player, if the current player is a farmhand.</summary>
-        public MultiplayerPeer HostPeer
+        public MultiplayerPeer? HostPeer
         {
             get => this.HostPeerImpl.Value;
             private set => this.HostPeerImpl.Value = value;
@@ -115,13 +113,13 @@ namespace StardewModdingAPI.Framework
             {
                 case LidgrenClient:
                     {
-                        string address = this.Reflection.GetField<string>(client, "address").GetValue();
+                        string address = this.Reflection.GetField<string>(client, "address").GetValue() ?? throw new InvalidOperationException("Can't initialize base networking client: no valid address found.");
                         return new SLidgrenClient(address, this.OnClientProcessingMessage, this.OnClientSendingMessage);
                     }
 
                 case GalaxyNetClient:
                     {
-                        GalaxyID address = this.Reflection.GetField<GalaxyID>(client, "lobbyId").GetValue();
+                        GalaxyID address = this.Reflection.GetField<GalaxyID>(client, "lobbyId").GetValue() ?? throw new InvalidOperationException("Can't initialize GOG networking client: no valid address found.");
                         return new SGalaxyNetClient(address, this.OnClientProcessingMessage, this.OnClientSendingMessage);
                     }
 
@@ -139,13 +137,13 @@ namespace StardewModdingAPI.Framework
             {
                 case LidgrenServer:
                     {
-                        IGameServer gameServer = this.Reflection.GetField<IGameServer>(server, "gameServer").GetValue();
+                        IGameServer gameServer = this.Reflection.GetField<IGameServer>(server, "gameServer").GetValue() ?? throw new InvalidOperationException("Can't initialize base networking client: the required 'gameServer' field wasn't found.");
                         return new SLidgrenServer(gameServer, this, this.OnServerProcessingMessage);
                     }
 
                 case GalaxyNetServer:
                     {
-                        IGameServer gameServer = this.Reflection.GetField<IGameServer>(server, "gameServer").GetValue();
+                        IGameServer gameServer = this.Reflection.GetField<IGameServer>(server, "gameServer").GetValue() ?? throw new InvalidOperationException("Can't initialize GOG networking client: the required 'gameServer' field wasn't found.");
                         return new SGalaxyNetServer(gameServer, this, this.OnServerProcessingMessage);
                     }
 
@@ -194,7 +192,7 @@ namespace StardewModdingAPI.Framework
                 case (byte)MessageType.ModContext:
                     {
                         // parse message
-                        RemoteContextModel model = this.ReadContext(message.Reader);
+                        RemoteContextModel? model = this.ReadContext(message.Reader);
                         this.Monitor.Log($"Received context for farmhand {message.FarmerID} running {(model != null ? $"SMAPI {model.ApiVersion} with {model.Mods.Length} mods" : "vanilla")}.");
 
                         // store peer
@@ -290,7 +288,7 @@ namespace StardewModdingAPI.Framework
                 case (byte)MessageType.ModContext:
                     {
                         // parse message
-                        RemoteContextModel model = this.ReadContext(message.Reader);
+                        RemoteContextModel? model = this.ReadContext(message.Reader);
                         this.Monitor.Log($"Received context for {(model?.IsHost == true ? "host" : "farmhand")} {message.FarmerID} running {(model != null ? $"SMAPI {model.ApiVersion} with {model.Mods.Length} mods" : "vanilla")}.");
 
                         // store peer
@@ -334,7 +332,7 @@ namespace StardewModdingAPI.Framework
                 case (byte)MessageType.PlayerIntroduction:
                     {
                         // store peer
-                        if (!this.Peers.TryGetValue(message.FarmerID, out MultiplayerPeer peer))
+                        if (!this.Peers.TryGetValue(message.FarmerID, out MultiplayerPeer? peer))
                         {
                             peer = new MultiplayerPeer(
                                 playerID: message.FarmerID,
@@ -367,7 +365,7 @@ namespace StardewModdingAPI.Framework
         {
             foreach (long playerID in this.disconnectingFarmers)
             {
-                if (this.Peers.TryGetValue(playerID, out MultiplayerPeer peer))
+                if (this.Peers.TryGetValue(playerID, out MultiplayerPeer? peer))
                 {
                     this.Monitor.Log($"Player quit: {playerID}");
                     this.Peers.Remove(playerID);
@@ -384,7 +382,7 @@ namespace StardewModdingAPI.Framework
         /// <param name="fromModID">The unique ID of the mod sending the message.</param>
         /// <param name="toModIDs">The mod IDs which should receive the message on the destination computers, or <c>null</c> for all mods. Specifying mod IDs is recommended to improve performance, unless it's a general-purpose broadcast.</param>
         /// <param name="toPlayerIDs">The <see cref="Farmer.UniqueMultiplayerID" /> values for the players who should receive the message, or <c>null</c> for all players. If you don't need to broadcast to all players, specifying player IDs is recommended to reduce latency.</param>
-        public void BroadcastModMessage<TMessage>(TMessage message, string messageType, string fromModID, string[] toModIDs, long[] toPlayerIDs)
+        public void BroadcastModMessage<TMessage>(TMessage message, string messageType, string fromModID, string[]? toModIDs, long[]? toPlayerIDs)
         {
             // validate input
             if (message == null)
@@ -488,13 +486,13 @@ namespace StardewModdingAPI.Framework
 
         /// <summary>Read the metadata context for a player.</summary>
         /// <param name="reader">The stream reader.</param>
-        private RemoteContextModel ReadContext(BinaryReader reader)
+        private RemoteContextModel? ReadContext(BinaryReader reader)
         {
             string data = reader.ReadString();
             RemoteContextModel model = this.JsonHelper.Deserialize<RemoteContextModel>(data);
             return model.ApiVersion != null
                 ? model
-                : null; // no data available for unmodded players
+                : null; // no data available for vanilla players
         }
 
         /// <summary>Receive a mod message sent from another player's mods.</summary>
@@ -515,12 +513,15 @@ namespace StardewModdingAPI.Framework
             // forward to other players
             if (Context.IsMainPlayer && playerIDs.Any(p => p != Game1.player.UniqueMultiplayerID))
             {
-                ModMessageModel newModel = new(model);
                 foreach (long playerID in playerIDs)
                 {
-                    if (playerID != Game1.player.UniqueMultiplayerID && playerID != model.FromPlayerID && this.Peers.TryGetValue(playerID, out MultiplayerPeer peer))
+                    if (playerID != Game1.player.UniqueMultiplayerID && playerID != model.FromPlayerID && this.Peers.TryGetValue(playerID, out MultiplayerPeer? peer))
                     {
-                        newModel.ToPlayerIDs = new[] { peer.PlayerID };
+                        ModMessageModel newModel = new(model)
+                        {
+                            ToPlayerIDs = new[] { peer.PlayerID }
+                        };
+
                         this.Monitor.VerboseLog($"  Forwarding message to player {peer.PlayerID}.");
                         peer.SendMessage(new OutgoingMessage((byte)MessageType.ModMessage, peer.PlayerID, this.JsonHelper.Serialize(newModel, Formatting.None)));
                     }
@@ -546,22 +547,20 @@ namespace StardewModdingAPI.Framework
         /// <summary>Get the fields to include in a context sync message sent to other players.</summary>
         private object[] GetContextSyncMessageFields()
         {
-            RemoteContextModel model = new()
-            {
-                IsHost = Context.IsWorldReady && Context.IsMainPlayer,
-                Platform = Constants.TargetPlatform,
-                ApiVersion = Constants.ApiVersion,
-                GameVersion = Constants.GameVersion,
-                Mods = this.ModRegistry
+            RemoteContextModel model = new(
+                isHost: Context.IsWorldReady && Context.IsMainPlayer,
+                platform: Constants.TargetPlatform,
+                apiVersion: Constants.ApiVersion,
+                gameVersion: Constants.GameVersion,
+                mods: this.ModRegistry
                     .GetAll()
-                    .Select(mod => new RemoteContextModModel
-                    {
-                        ID = mod.Manifest.UniqueID,
-                        Name = mod.Manifest.Name,
-                        Version = mod.Manifest.Version
-                    })
+                    .Select(mod => new RemoteContextModModel(
+                        id: mod.Manifest.UniqueID,
+                        name: mod.Manifest.Name,
+                        version: mod.Manifest.Version
+                    ))
                     .ToArray()
-            };
+            );
 
             return new object[] { this.JsonHelper.Serialize(model, Formatting.None) };
         }
@@ -573,21 +572,19 @@ namespace StardewModdingAPI.Framework
             if (!peer.HasSmapi)
                 return new object[] { "{}" };
 
-            RemoteContextModel model = new()
-            {
-                IsHost = peer.IsHost,
-                Platform = peer.Platform.Value,
-                ApiVersion = peer.ApiVersion,
-                GameVersion = peer.GameVersion,
-                Mods = peer.Mods
-                    .Select(mod => new RemoteContextModModel
-                    {
-                        ID = mod.ID,
-                        Name = mod.Name,
-                        Version = mod.Version
-                    })
+            RemoteContextModel model = new(
+                isHost: peer.IsHost,
+                platform: peer.Platform.Value,
+                apiVersion: peer.ApiVersion,
+                gameVersion: peer.GameVersion,
+                mods: peer.Mods
+                    .Select(mod => new RemoteContextModModel(
+                        id: mod.ID,
+                        name: mod.Name,
+                        version: mod.Version
+                    ))
                     .ToArray()
-            };
+            );
 
             return new object[] { this.JsonHelper.Serialize(model, Formatting.None) };
         }
diff --git a/src/SMAPI/Framework/Serialization/KeybindConverter.cs b/src/SMAPI/Framework/Serialization/KeybindConverter.cs
index f3bab20d..539f1291 100644
--- a/src/SMAPI/Framework/Serialization/KeybindConverter.cs
+++ b/src/SMAPI/Framework/Serialization/KeybindConverter.cs
@@ -53,13 +53,13 @@ namespace StardewModdingAPI.Framework.Serialization
 
                         if (objectType == typeof(Keybind))
                         {
-                            return Keybind.TryParse(str, out Keybind parsed, out string[] errors)
+                            return Keybind.TryParse(str, out Keybind? parsed, out string[] errors)
                                 ? parsed
                                 : throw new SParseException($"Can't parse {nameof(Keybind)} from invalid value '{str}' (path: {path}).\n{string.Join("\n", errors)}");
                         }
                         else
                         {
-                            return KeybindList.TryParse(str, out KeybindList parsed, out string[] errors)
+                            return KeybindList.TryParse(str, out KeybindList? parsed, out string[] errors)
                                 ? parsed
                                 : throw new SParseException($"Can't parse {nameof(KeybindList)} from invalid value '{str}' (path: {path}).\n{string.Join("\n", errors)}");
                         }
diff --git a/src/SMAPI/Framework/StateTracking/FieldWatchers/ComparableWatcher.cs b/src/SMAPI/Framework/StateTracking/FieldWatchers/ComparableWatcher.cs
index 4f94294c..5f76fe0a 100644
--- a/src/SMAPI/Framework/StateTracking/FieldWatchers/ComparableWatcher.cs
+++ b/src/SMAPI/Framework/StateTracking/FieldWatchers/ComparableWatcher.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 using System;
 using System.Collections.Generic;
 
@@ -42,7 +40,8 @@ namespace StardewModdingAPI.Framework.StateTracking.FieldWatchers
         {
             this.GetValue = getValue;
             this.Comparer = comparer;
-            this.PreviousValue = getValue();
+            this.CurrentValue = getValue();
+            this.PreviousValue = this.CurrentValue;
         }
 
         /// <summary>Update the current value if needed.</summary>
diff --git a/src/SMAPI/Framework/StateTracking/PlayerTracker.cs b/src/SMAPI/Framework/StateTracking/PlayerTracker.cs
index 367eafea..5433ac8e 100644
--- a/src/SMAPI/Framework/StateTracking/PlayerTracker.cs
+++ b/src/SMAPI/Framework/StateTracking/PlayerTracker.cs
@@ -1,7 +1,6 @@
-#nullable disable
-
 using System;
 using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using StardewModdingAPI.Enums;
 using StardewModdingAPI.Framework.StateTracking.Comparers;
@@ -23,7 +22,7 @@ namespace StardewModdingAPI.Framework.StateTracking
         private IDictionary<Item, int> CurrentInventory;
 
         /// <summary>The player's last valid location.</summary>
-        private GameLocation LastValidLocation;
+        private GameLocation? LastValidLocation;
 
         /// <summary>The underlying watchers.</summary>
         private readonly List<IWatcher> Watchers = new();
@@ -36,7 +35,7 @@ namespace StardewModdingAPI.Framework.StateTracking
         public Farmer Player { get; }
 
         /// <summary>The player's current location.</summary>
-        public IValueWatcher<GameLocation> LocationWatcher { get; }
+        public IValueWatcher<GameLocation?> LocationWatcher { get; }
 
         /// <summary>Tracks changes to the player's skill levels.</summary>
         public IDictionary<SkillType, IValueWatcher<int>> SkillWatchers { get; }
@@ -51,7 +50,8 @@ namespace StardewModdingAPI.Framework.StateTracking
         {
             // init player data
             this.Player = player;
-            this.PreviousInventory = this.GetInventory();
+            this.CurrentInventory = this.GetInventory();
+            this.PreviousInventory = new Dictionary<Item, int>(this.CurrentInventory);
 
             // init trackers
             this.LocationWatcher = WatcherFactory.ForReference(this.GetCurrentLocation);
@@ -95,7 +95,7 @@ namespace StardewModdingAPI.Framework.StateTracking
 
         /// <summary>Get the player's current location, ignoring temporary null values.</summary>
         /// <remarks>The game will set <see cref="Character.currentLocation"/> to null in some cases, e.g. when they're a secondary player in multiplayer and transition to a location that hasn't been synced yet. While that's happening, this returns the player's last valid location instead.</remarks>
-        public GameLocation GetCurrentLocation()
+        public GameLocation? GetCurrentLocation()
         {
             return this.Player.currentLocation ?? this.LastValidLocation;
         }
@@ -103,7 +103,7 @@ namespace StardewModdingAPI.Framework.StateTracking
         /// <summary>Get the inventory changes since the last update, if anything changed.</summary>
         /// <param name="changes">The inventory changes, or <c>null</c> if nothing changed.</param>
         /// <returns>Returns whether anything changed.</returns>
-        public bool TryGetInventoryChanges(out SnapshotItemListDiff changes)
+        public bool TryGetInventoryChanges([NotNullWhen(true)] out SnapshotItemListDiff? changes)
         {
             IDictionary<Item, int> current = this.GetInventory();
 
@@ -124,7 +124,7 @@ namespace StardewModdingAPI.Framework.StateTracking
         public void Dispose()
         {
             this.PreviousInventory.Clear();
-            this.CurrentInventory?.Clear();
+            this.CurrentInventory.Clear();
 
             foreach (IWatcher watcher in this.Watchers)
                 watcher.Dispose();
diff --git a/src/SMAPI/Framework/StateTracking/Snapshots/PlayerSnapshot.cs b/src/SMAPI/Framework/StateTracking/Snapshots/PlayerSnapshot.cs
index bf81a35e..6a24ec30 100644
--- a/src/SMAPI/Framework/StateTracking/Snapshots/PlayerSnapshot.cs
+++ b/src/SMAPI/Framework/StateTracking/Snapshots/PlayerSnapshot.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -47,17 +45,18 @@ namespace StardewModdingAPI.Framework.StateTracking.Snapshots
         public PlayerSnapshot(Farmer player)
         {
             this.Player = player;
+            this.Inventory = this.EmptyItemListDiff;
         }
 
         /// <summary>Update the tracked values.</summary>
         /// <param name="watcher">The player watcher to snapshot.</param>
         public void Update(PlayerTracker watcher)
         {
-            this.Location.Update(watcher.LocationWatcher);
-            foreach (var pair in this.Skills)
-                pair.Value.Update(watcher.SkillWatchers[pair.Key]);
+            this.Location.Update(watcher.LocationWatcher!);
+            foreach ((SkillType skill, var value) in this.Skills)
+                value.Update(watcher.SkillWatchers[skill]);
 
-            this.Inventory = watcher.TryGetInventoryChanges(out SnapshotItemListDiff itemChanges)
+            this.Inventory = watcher.TryGetInventoryChanges(out SnapshotItemListDiff? itemChanges)
                 ? itemChanges
                 : this.EmptyItemListDiff;
         }
diff --git a/src/SMAPI/Framework/TemporaryHacks/MiniMonoModHotfix.cs b/src/SMAPI/Framework/TemporaryHacks/MiniMonoModHotfix.cs
index 5f0ecfa0..b5fc1f57 100644
--- a/src/SMAPI/Framework/TemporaryHacks/MiniMonoModHotfix.cs
+++ b/src/SMAPI/Framework/TemporaryHacks/MiniMonoModHotfix.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 // This temporary utility fixes an esoteric issue in XNA Framework where deserialization depends on
 // the order of fields returned by Type.GetFields, but that order changes after Harmony/MonoMod use
 // reflection to access the fields due to an issue in .NET Framework.
@@ -7,15 +5,15 @@
 //
 // This will be removed when Harmony/MonoMod are updated to incorporate the fix.
 //
-// Special thanks to 0x0ade for submitting this worokaround! Copy/pasted and adapted from MonoMod.
+// Special thanks to 0x0ade for submitting this workaround! Copy/pasted and adapted from MonoMod.
 
 using System;
-using System.Reflection;
 using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
+using System.Reflection;
+using System.Reflection.Emit;
 using System.Runtime.CompilerServices;
 using HarmonyLib;
-using System.Reflection.Emit;
 
 // ReSharper disable once CheckNamespace -- Temporary hotfix submitted by the MonoMod author.
 namespace MonoMod.Utils
@@ -26,33 +24,33 @@ namespace MonoMod.Utils
     {
         // .NET Framework can break member ordering if using Module.Resolve* on certain members.
 
-        private static object[] _NoArgs = Array.Empty<object>();
-        private static object[] _CacheGetterArgs = { /* MemberListType.All */ 0, /* name apparently always null? */ null };
+        private static readonly object[] _NoArgs = Array.Empty<object>();
+        private static readonly object?[] _CacheGetterArgs = { /* MemberListType.All */ 0, /* name apparently always null? */ null };
 
-        private static Type t_RuntimeModule =
+        private static readonly Type? t_RuntimeModule =
             typeof(Module).Assembly
             .GetType("System.Reflection.RuntimeModule");
 
-        private static PropertyInfo p_RuntimeModule_RuntimeType =
+        private static readonly PropertyInfo? p_RuntimeModule_RuntimeType =
             typeof(Module).Assembly
             .GetType("System.Reflection.RuntimeModule")
             ?.GetProperty("RuntimeType", BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance);
 
-        private static Type t_RuntimeType =
+        private static readonly Type? t_RuntimeType =
             typeof(Type).Assembly
             .GetType("System.RuntimeType");
 
-        private static PropertyInfo p_RuntimeType_Cache =
+        private static readonly PropertyInfo? p_RuntimeType_Cache =
             typeof(Type).Assembly
             .GetType("System.RuntimeType")
             ?.GetProperty("Cache", BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance);
 
-        private static MethodInfo m_RuntimeTypeCache_GetFieldList =
+        private static readonly MethodInfo? m_RuntimeTypeCache_GetFieldList =
             typeof(Type).Assembly
             .GetType("System.RuntimeType+RuntimeTypeCache")
             ?.GetMethod("GetFieldList", BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance);
 
-        private static MethodInfo m_RuntimeTypeCache_GetPropertyList =
+        private static readonly MethodInfo? m_RuntimeTypeCache_GetPropertyList =
             typeof(Type).Assembly
             .GetType("System.RuntimeType+RuntimeTypeCache")
             ?.GetMethod("GetPropertyList", BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance);
@@ -65,37 +63,37 @@ namespace MonoMod.Utils
 
             harmony.Patch(
                 original: typeof(Harmony).Assembly
-                    .GetType("HarmonyLib.MethodBodyReader")
+                    .GetType("HarmonyLib.MethodBodyReader", throwOnError: true)!
                     .GetMethod("ReadOperand", BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance),
                 transpiler: new HarmonyMethod(typeof(MiniMonoModHotfix), nameof(ResolveTokenFix))
             );
 
             harmony.Patch(
                 original: typeof(MonoMod.Utils.ReflectionHelper).Assembly
-                    .GetType("MonoMod.Utils.DynamicMethodDefinition+<>c__DisplayClass3_0")
+                    .GetType("MonoMod.Utils.DynamicMethodDefinition+<>c__DisplayClass3_0", throwOnError: true)!
                     .GetMethod("<_CopyMethodToDefinition>g__ResolveTokenAs|1", BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance),
                 transpiler: new HarmonyMethod(typeof(MiniMonoModHotfix), nameof(ResolveTokenFix))
             );
 
         }
 
-        private static IEnumerable<CodeInstruction> ResolveTokenFix(IEnumerable<CodeInstruction> instrs)
+        private static IEnumerable<CodeInstruction> ResolveTokenFix(IEnumerable<CodeInstruction> instructions)
         {
-            MethodInfo getdecl = typeof(MiniMonoModHotfix).GetMethod(nameof(GetRealDeclaringType));
-            MethodInfo fixup = typeof(MiniMonoModHotfix).GetMethod(nameof(FixReflectionCache));
+            MethodInfo getRealDeclaringType = typeof(MiniMonoModHotfix).GetMethod(nameof(MiniMonoModHotfix.GetRealDeclaringType)) ?? throw new InvalidOperationException($"Can't get required method {nameof(MiniMonoModHotfix)}.{nameof(GetRealDeclaringType)}");
+            MethodInfo fixReflectionCache = typeof(MiniMonoModHotfix).GetMethod(nameof(MiniMonoModHotfix.FixReflectionCache)) ?? throw new InvalidOperationException($"Can't get required method {nameof(MiniMonoModHotfix)}.{nameof(FixReflectionCache)}");
 
-            foreach (CodeInstruction instr in instrs)
+            foreach (CodeInstruction instruction in instructions)
             {
-                yield return instr;
+                yield return instruction;
 
-                if (instr.operand is MethodInfo called)
+                if (instruction.operand is MethodInfo called)
                 {
                     switch (called.Name)
                     {
                         case "ResolveType":
                             // type.FixReflectionCache();
                             yield return new CodeInstruction(OpCodes.Dup);
-                            yield return new CodeInstruction(OpCodes.Call, fixup);
+                            yield return new CodeInstruction(OpCodes.Call, fixReflectionCache);
                             break;
 
                         case "ResolveMember":
@@ -103,15 +101,15 @@ namespace MonoMod.Utils
                         case "ResolveField":
                             // member.GetRealDeclaringType().FixReflectionCache();
                             yield return new CodeInstruction(OpCodes.Dup);
-                            yield return new CodeInstruction(OpCodes.Call, getdecl);
-                            yield return new CodeInstruction(OpCodes.Call, fixup);
+                            yield return new CodeInstruction(OpCodes.Call, getRealDeclaringType);
+                            yield return new CodeInstruction(OpCodes.Call, fixReflectionCache);
                             break;
                     }
                 }
             }
         }
 
-        public static Type GetModuleType(this Module module)
+        public static Type? GetModuleType(this Module? module)
         {
             // Sadly we can't blindly resolve type 0x02000001 as the runtime throws ArgumentException.
 
@@ -120,22 +118,21 @@ namespace MonoMod.Utils
 
             // .NET
             if (p_RuntimeModule_RuntimeType != null)
-                return (Type)p_RuntimeModule_RuntimeType.GetValue(module, _NoArgs);
+                return (Type?)p_RuntimeModule_RuntimeType.GetValue(module, _NoArgs);
 
             // The hotfix doesn't apply to Mono anyway, thus that's not copied over.
 
             return null;
         }
 
-        public static Type GetRealDeclaringType(this MemberInfo member)
-            => member.DeclaringType ?? member.Module.GetModuleType();
+        public static Type? GetRealDeclaringType(this MemberInfo member)
+        {
+            return member.DeclaringType ?? member.Module.GetModuleType();
+        }
 
-        public static void FixReflectionCache(this Type type)
+        public static void FixReflectionCache(this Type? type)
         {
-            if (t_RuntimeType == null ||
-                p_RuntimeType_Cache == null ||
-                m_RuntimeTypeCache_GetFieldList == null ||
-                m_RuntimeTypeCache_GetPropertyList == null)
+            if (t_RuntimeType == null || p_RuntimeType_Cache == null || m_RuntimeTypeCache_GetFieldList == null || m_RuntimeTypeCache_GetPropertyList == null)
                 return;
 
             for (; type != null; type = type.DeclaringType)
@@ -145,21 +142,17 @@ namespace MonoMod.Utils
                 if (!t_RuntimeType.IsInstanceOfType(type))
                     continue;
 
-                CacheFixEntry entry = _CacheFixed.GetValue(type, rt => {
-                    CacheFixEntry entryNew = new();
-                    object cache;
-                    Array properties, fields;
-
+                CacheFixEntry entry = _CacheFixed.GetValue(type, rt =>
+                {
                     // All RuntimeTypes MUST have a cache, the getter is non-virtual, it creates on demand and asserts non-null.
-                    entryNew.Cache = cache = p_RuntimeType_Cache.GetValue(rt, _NoArgs);
-                    entryNew.Properties = properties = _GetArray(cache, m_RuntimeTypeCache_GetPropertyList);
-                    entryNew.Fields = fields = _GetArray(cache, m_RuntimeTypeCache_GetFieldList);
+                    object cache = MiniMonoModHotfix.p_RuntimeType_Cache.GetValue(rt, MiniMonoModHotfix._NoArgs)!;
+                    Array properties = MiniMonoModHotfix._GetArray(cache, MiniMonoModHotfix.m_RuntimeTypeCache_GetPropertyList);
+                    Array fields = MiniMonoModHotfix._GetArray(cache, MiniMonoModHotfix.m_RuntimeTypeCache_GetFieldList);
 
                     _FixReflectionCacheOrder<PropertyInfo>(properties);
                     _FixReflectionCacheOrder<FieldInfo>(fields);
 
-                    entryNew.NeedsVerify = false;
-                    return entryNew;
+                    return new CacheFixEntry(cache, properties, fields, needsVerify: false);
                 });
 
                 if (entry.NeedsVerify && !_Verify(entry, type))
@@ -177,44 +170,43 @@ namespace MonoMod.Utils
 
         private static bool _Verify(CacheFixEntry entry, Type type)
         {
-            object cache;
-            Array properties, fields;
-
             // The cache can sometimes be invalidated.
             // TODO: Figure out if only the arrays get replaced or if the entire cache object gets replaced!
-            if (entry.Cache != (cache = p_RuntimeType_Cache.GetValue(type, _NoArgs)))
+            object cache = p_RuntimeType_Cache!.GetValue(type, _NoArgs)!;
+            if (entry.Cache != cache)
             {
                 entry.Cache = cache;
-                entry.Properties = _GetArray(cache, m_RuntimeTypeCache_GetPropertyList);
-                entry.Fields = _GetArray(cache, m_RuntimeTypeCache_GetFieldList);
+                entry.Properties = _GetArray(cache, m_RuntimeTypeCache_GetPropertyList!);
+                entry.Fields = _GetArray(cache, m_RuntimeTypeCache_GetFieldList!);
                 return false;
 
             }
-            else if (entry.Properties != (properties = _GetArray(cache, m_RuntimeTypeCache_GetPropertyList)))
+
+            Array properties = _GetArray(cache, m_RuntimeTypeCache_GetPropertyList!);
+            if (entry.Properties != properties)
             {
                 entry.Properties = properties;
-                entry.Fields = _GetArray(cache, m_RuntimeTypeCache_GetFieldList);
+                entry.Fields = _GetArray(cache, m_RuntimeTypeCache_GetFieldList!);
                 return false;
-
             }
-            else if (entry.Fields != (fields = _GetArray(cache, m_RuntimeTypeCache_GetFieldList)))
+
+            Array fields = _GetArray(cache, m_RuntimeTypeCache_GetFieldList!);
+            if (entry.Fields != fields)
             {
                 entry.Fields = fields;
                 return false;
 
             }
-            else
-            {
-                // Cache should still be the same, no re-fix necessary.
-                return true;
-            }
+
+            // Cache should still be the same, no re-fix necessary.
+            return true;
         }
 
         private static Array _GetArray(object cache, MethodInfo getter)
         {
             // Get and discard once, otherwise we might not be getting the actual backing array.
             getter.Invoke(cache, _CacheGetterArgs);
-            return (Array)getter.Invoke(cache, _CacheGetterArgs);
+            return (Array)getter.Invoke(cache, _CacheGetterArgs)!;
         }
 
         private static void _FixReflectionCacheOrder<T>(Array orig) where T : MemberInfo
@@ -222,7 +214,7 @@ namespace MonoMod.Utils
             // Sort using a short-lived list.
             List<T> list = new List<T>(orig.Length);
             for (int i = 0; i < orig.Length; i++)
-                list.Add((T)orig.GetValue(i));
+                list.Add((T)orig.GetValue(i)!);
 
             list.Sort((a, b) => a.MetadataToken - b.MetadataToken);
 
@@ -232,10 +224,18 @@ namespace MonoMod.Utils
 
         private class CacheFixEntry
         {
-            public object Cache;
+            public object? Cache;
             public Array Properties;
             public Array Fields;
             public bool NeedsVerify;
+
+            public CacheFixEntry(object? cache, Array properties, Array fields, bool needsVerify)
+            {
+                this.Cache = cache;
+                this.Properties = properties;
+                this.Fields = fields;
+                this.NeedsVerify = needsVerify;
+            }
         }
     }
 }
diff --git a/src/SMAPI/Metadata/CoreAssetPropagator.cs b/src/SMAPI/Metadata/CoreAssetPropagator.cs
index b7cec72c..f1b9af9a 100644
--- a/src/SMAPI/Metadata/CoreAssetPropagator.cs
+++ b/src/SMAPI/Metadata/CoreAssetPropagator.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 using System;
 using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
@@ -712,7 +710,7 @@ namespace StardewModdingAPI.Metadata
             bool isPaintMask = assetName.BaseName.EndsWith(paintMaskSuffix, StringComparison.OrdinalIgnoreCase);
 
             // get building type
-            string type = Path.GetFileName(assetName.BaseName)!;
+            string type = Path.GetFileName(assetName.BaseName);
             if (isPaintMask)
                 type = type.Substring(0, type.Length - paintMaskSuffix.Length);
 
@@ -749,7 +747,7 @@ namespace StardewModdingAPI.Metadata
 
             if (!ignoreWorld)
             {
-                foreach (var location in this.GetLocations())
+                foreach (GameLocation location in this.GetLocations())
                 {
                     foreach (MapSeat seat in location.mapSeats.Where(p => p != null))
                     {
@@ -783,7 +781,7 @@ namespace StardewModdingAPI.Metadata
 
             // update sprites
             Texture2D texture = content.Load<Texture2D>(assetName.BaseName);
-            foreach (var entry in critters)
+            foreach (Critter entry in critters)
                 entry.sprite.spriteTexture = texture;
 
             return critters.Length;
@@ -799,16 +797,16 @@ namespace StardewModdingAPI.Metadata
 
             foreach (GameLocation location in this.GetLocations())
             {
-                IEnumerable<InteriorDoor> doors = location.interiorDoors?.Doors;
+                IEnumerable<InteriorDoor?>? doors = location.interiorDoors?.Doors;
                 if (doors == null)
                     continue;
 
-                foreach (InteriorDoor door in doors)
+                foreach (InteriorDoor? door in doors)
                 {
                     if (door?.Sprite == null)
                         continue;
 
-                    string curKey = this.Reflection.GetField<string>(door.Sprite, "textureName").GetValue();
+                    string? curKey = this.Reflection.GetField<string>(door.Sprite, "textureName").GetValue();
                     if (this.IsSameBaseName(assetName, curKey))
                         door.Sprite.texture = texture.Value;
                 }
@@ -933,7 +931,7 @@ namespace StardewModdingAPI.Metadata
             // warping onto the wrong tile (or even off-screen) if a patch changes the farmhouse
             // map on location change.
             if (playerPos.HasValue)
-                Game1.player.Position = playerPos.Value;
+                Game1.player!.Position = playerPos.Value;
         }
 
         /// <summary>Reload the disposition data for matching NPCs.</summary>
@@ -1003,7 +1001,11 @@ namespace StardewModdingAPI.Metadata
                 {
                     GameLocation adventureGuild = Game1.getLocationFromName("AdventureGuild");
                     if (adventureGuild != null)
-                        characters.Add(new { Npc = this.Reflection.GetField<NPC>(adventureGuild, "Gil").GetValue(), AssetName = gilKey });
+                    {
+                        NPC? gil = this.Reflection.GetField<NPC>(adventureGuild, "Gil").GetValue();
+                        if (gil != null)
+                            characters.Add(new { Npc = gil, AssetName = gilKey });
+                    }
                 }
             }
 
@@ -1029,7 +1031,7 @@ namespace StardewModdingAPI.Metadata
 
             foreach (Farmer player in players)
             {
-                this.Reflection.GetField<Dictionary<string, Dictionary<int, List<int>>>>(typeof(FarmerRenderer), "_recolorOffsets").GetValue().Remove(player.getTexture());
+                this.Reflection.GetField<Dictionary<string, Dictionary<int, List<int>>>>(typeof(FarmerRenderer), "_recolorOffsets").GetValue()?.Remove(player.getTexture());
                 player.FarmerRenderer.MarkSpriteDirty();
             }
 
@@ -1048,11 +1050,12 @@ namespace StardewModdingAPI.Metadata
             {
                 // get suspension bridges field
                 var field = this.Reflection.GetField<IEnumerable<SuspensionBridge>>(location, nameof(IslandNorth.suspensionBridges), required: false);
+                // ReSharper disable once ConditionIsAlwaysTrueOrFalse -- field is nullable when required: false
                 if (field == null || !typeof(IEnumerable<SuspensionBridge>).IsAssignableFrom(field.FieldInfo.FieldType))
                     continue;
 
                 // update textures
-                foreach (SuspensionBridge bridge in field.GetValue())
+                foreach (SuspensionBridge bridge in field.GetValue()!)
                     this.Reflection.GetField<Texture2D>(bridge, "_texture").SetValue(texture.Value);
             }
 
@@ -1158,7 +1161,7 @@ namespace StardewModdingAPI.Metadata
             Game1.samBandName = content.LoadString("Strings/StringsFromCSFiles:Game1.cs.2156");
             Game1.elliottBookName = content.LoadString("Strings/StringsFromCSFiles:Game1.cs.2157");
 
-            string[] dayNames = this.Reflection.GetField<string[]>(typeof(Game1), "_shortDayDisplayName").GetValue();
+            string[] dayNames = this.Reflection.GetField<string[]>(typeof(Game1), "_shortDayDisplayName").GetValue()!;
             dayNames[0] = content.LoadString("Strings/StringsFromCSFiles:Game1.cs.3042");
             dayNames[1] = content.LoadString("Strings/StringsFromCSFiles:Game1.cs.3043");
             dayNames[2] = content.LoadString("Strings/StringsFromCSFiles:Game1.cs.3044");
@@ -1227,7 +1230,7 @@ namespace StardewModdingAPI.Metadata
                 {
                     foreach (Building building in buildableLocation.buildings)
                     {
-                        GameLocation indoors = building.indoors.Value;
+                        GameLocation? indoors = building.indoors.Value;
                         if (indoors != null)
                             yield return new LocationInfo(indoors, building);
                     }
@@ -1238,19 +1241,19 @@ namespace StardewModdingAPI.Metadata
         /// <summary>Get whether two asset names are equivalent if you ignore the locale code.</summary>
         /// <param name="left">The first value to compare.</param>
         /// <param name="right">The second value to compare.</param>
-        private bool IsSameBaseName(IAssetName left, string right)
+        private bool IsSameBaseName(IAssetName? left, string? right)
         {
             if (left is null || right is null)
                 return false;
 
-            IAssetName parsedB = this.ParseAssetNameOrNull(right);
+            IAssetName? parsedB = this.ParseAssetNameOrNull(right);
             return this.IsSameBaseName(left, parsedB);
         }
 
         /// <summary>Get whether two asset names are equivalent if you ignore the locale code.</summary>
         /// <param name="left">The first value to compare.</param>
         /// <param name="right">The second value to compare.</param>
-        private bool IsSameBaseName(IAssetName left, IAssetName right)
+        private bool IsSameBaseName(IAssetName? left, IAssetName? right)
         {
             if (left is null || right is null)
                 return false;
@@ -1260,7 +1263,7 @@ namespace StardewModdingAPI.Metadata
 
         /// <summary>Normalize an asset key to match the cache key and assert that it's valid, but don't raise an error for null or empty values.</summary>
         /// <param name="path">The asset key to normalize.</param>
-        private IAssetName ParseAssetNameOrNull(string path)
+        private IAssetName? ParseAssetNameOrNull(string? path)
         {
             if (string.IsNullOrWhiteSpace(path))
                 return null;
@@ -1270,7 +1273,7 @@ namespace StardewModdingAPI.Metadata
 
         /// <summary>Get the segments in a path (e.g. 'a/b' is 'a' and 'b').</summary>
         /// <param name="path">The path to check.</param>
-        private string[] GetSegments(string path)
+        private string[] GetSegments(string? path)
         {
             return path != null
                 ? PathUtilities.GetSegments(path)
@@ -1280,7 +1283,7 @@ namespace StardewModdingAPI.Metadata
         /// <summary>Load a texture, and dispose the old one if <see cref="AggressiveMemoryOptimizations"/> is enabled and it's different from the new instance.</summary>
         /// <param name="oldTexture">The previous texture to dispose.</param>
         /// <param name="key">The asset key to load.</param>
-        private Texture2D LoadAndDisposeIfNeeded(Texture2D oldTexture, string key)
+        private Texture2D LoadAndDisposeIfNeeded(Texture2D? oldTexture, string key)
         {
             // if aggressive memory optimizations are enabled, load the asset from the disposable
             // content manager and dispose the old instance if needed.
@@ -1322,7 +1325,7 @@ namespace StardewModdingAPI.Metadata
             public GameLocation Location { get; }
 
             /// <summary>The building which contains the location, if any.</summary>
-            public Building ParentBuilding { get; }
+            public Building? ParentBuilding { get; }
 
 
             /*********
@@ -1331,7 +1334,7 @@ namespace StardewModdingAPI.Metadata
             /// <summary>Construct an instance.</summary>
             /// <param name="location">The location instance.</param>
             /// <param name="parentBuilding">The building which contains the location, if any.</param>
-            public LocationInfo(GameLocation location, Building parentBuilding)
+            public LocationInfo(GameLocation location, Building? parentBuilding)
             {
                 this.Location = location;
                 this.ParentBuilding = parentBuilding;
diff --git a/src/SMAPI/Translation.cs b/src/SMAPI/Translation.cs
index 2a0d2ce8..eb608f15 100644
--- a/src/SMAPI/Translation.cs
+++ b/src/SMAPI/Translation.cs
@@ -96,7 +96,7 @@ namespace StardewModdingAPI
             {
                 string key = match.Groups[1].Value.Trim();
                 return tokenLookup.TryGetValue(key, out string? value)
-                    ? value
+                    ? (value ?? "")
                     : match.Value;
             });
             return new Translation(this.Locale, this.Key, text);
diff --git a/src/SMAPI/Utilities/KeybindList.cs b/src/SMAPI/Utilities/KeybindList.cs
index 18eeb9fd..aa12a37a 100644
--- a/src/SMAPI/Utilities/KeybindList.cs
+++ b/src/SMAPI/Utilities/KeybindList.cs
@@ -50,7 +50,7 @@ namespace StardewModdingAPI.Utilities
         /// <param name="input">The keybind string. See remarks on <see cref="ToString"/> for format details.</param>
         /// <param name="parsed">The parsed keybind list, if valid.</param>
         /// <param name="errors">The errors that occurred while parsing the input, if any.</param>
-        public static bool TryParse(string input, [NotNullWhen(true)] out KeybindList? parsed, out string[] errors)
+        public static bool TryParse(string? input, [NotNullWhen(true)] out KeybindList? parsed, out string[] errors)
         {
             // empty input
             if (string.IsNullOrWhiteSpace(input))
diff --git a/src/SMAPI/Utilities/PerScreen.cs b/src/SMAPI/Utilities/PerScreen.cs
index afe3ba91..799ff63b 100644
--- a/src/SMAPI/Utilities/PerScreen.cs
+++ b/src/SMAPI/Utilities/PerScreen.cs
@@ -1,8 +1,7 @@
-#nullable disable
-
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using StardewModdingAPI.Framework;
 
 namespace StardewModdingAPI.Utilities
 {
@@ -39,14 +38,28 @@ namespace StardewModdingAPI.Utilities
         ** Public methods
         *********/
         /// <summary>Construct an instance.</summary>
+        /// <remarks><strong>Limitation with nullable reference types:</strong> when the underlying type <typeparamref name="T"/> is nullable, this sets the default value to null regardless of whether you marked the type parameter nullable. To avoid that, set the default value with the 'createNewState' argument instead.</remarks>
         public PerScreen()
-            : this(null) { }
+            : this(null!) { }
 
         /// <summary>Construct an instance.</summary>
         /// <param name="createNewState">Create the initial state for a screen.</param>
         public PerScreen(Func<T> createNewState)
         {
-            this.CreateNewState = createNewState ?? (() => default);
+            // ReSharper disable once ConditionIsAlwaysTrueOrFalse -- required for backwards compatibility
+            if (createNewState is null)
+            {
+                SCore.DeprecationManager.Warn(
+                    SCore.DeprecationManager.GetSourceNameFromStack(),
+                    $"calling the {nameof(PerScreen<T>)} constructor with null",
+                    "3.14.0",
+                    DeprecationLevel.Notice
+                );
+
+                createNewState = (() => default!);
+            }
+
+            this.CreateNewState = createNewState;
         }
 
         /// <summary>Get all active values by screen ID. This doesn't initialize the value for a screen ID if it's not created yet.</summary>
@@ -61,7 +74,7 @@ namespace StardewModdingAPI.Utilities
         public T GetValueForScreen(int screenId)
         {
             this.RemoveDeadScreens();
-            return this.States.TryGetValue(screenId, out T state)
+            return this.States.TryGetValue(screenId, out T? state)
                 ? state
                 : this.States[screenId] = this.CreateNewState();
         }
-- 
cgit