From 761f2d952b073b78a06453768992b7b0fd4c6463 Mon Sep 17 00:00:00 2001
From: Jesse Plamondon-Willard <Pathoschild@users.noreply.github.com>
Date: Sun, 10 Apr 2022 21:34:18 -0400
Subject: enable nullable annotations in mod data models (#837)

---
 src/SMAPI.Toolkit/Framework/ModData/ModDataRecord.cs | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

(limited to 'src/SMAPI.Toolkit/Framework/ModData/ModDataRecord.cs')

diff --git a/src/SMAPI.Toolkit/Framework/ModData/ModDataRecord.cs b/src/SMAPI.Toolkit/Framework/ModData/ModDataRecord.cs
index 4c09e1ba..e9ece387 100644
--- a/src/SMAPI.Toolkit/Framework/ModData/ModDataRecord.cs
+++ b/src/SMAPI.Toolkit/Framework/ModData/ModDataRecord.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -22,7 +20,7 @@ namespace StardewModdingAPI.Toolkit.Framework.ModData
         public string[] FormerIDs { get; }
 
         /// <summary>The mod warnings to suppress, even if they'd normally be shown.</summary>
-        public ModWarning SuppressWarnings { get; set; }
+        public ModWarning SuppressWarnings { get; }
 
         /// <summary>The versioned field data.</summary>
         public ModDataField[] Fields { get; }
@@ -72,9 +70,9 @@ namespace StardewModdingAPI.Toolkit.Framework.ModData
         }
 
         /// <summary>Get the default update key for this mod, if any.</summary>
-        public string GetDefaultUpdateKey()
+        public string? GetDefaultUpdateKey()
         {
-            string updateKey = this.Fields.FirstOrDefault(p => p.Key == ModDataFieldKey.UpdateKey && p.IsDefault)?.Value;
+            string? updateKey = this.Fields.FirstOrDefault(p => p.Key == ModDataFieldKey.UpdateKey && p.IsDefault)?.Value;
             return !string.IsNullOrWhiteSpace(updateKey)
                 ? updateKey
                 : null;
@@ -84,7 +82,7 @@ namespace StardewModdingAPI.Toolkit.Framework.ModData
         /// <param name="manifest">The manifest to match.</param>
         public ModDataRecordVersionedFields GetVersionedFields(IManifest manifest)
         {
-            ModDataRecordVersionedFields parsed = new() { DisplayName = this.DisplayName, DataRecord = this };
+            ModDataRecordVersionedFields parsed = new(this);
             foreach (ModDataField field in this.Fields.Where(field => field.IsMatch(manifest)))
             {
                 switch (field.Key)
-- 
cgit