enable nullable annotations in SMAPI where no logic changes are needed (#837)

1 files changed, 5 insertions, 4 deletions

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.");