Merge branch 'develop' into stable

1 files changed, 7 insertions, 7 deletions

diff --git a/src/SMAPI.Mods.ConsoleCommands/ModEntry.cs b/src/SMAPI.Mods.ConsoleCommands/ModEntry.cs
index 91437fd3..dbfca815 100644
--- a/src/SMAPI.Mods.ConsoleCommands/ModEntry.cs
+++ b/src/SMAPI.Mods.ConsoleCommands/ModEntry.cs
@@ -13,13 +13,13 @@ namespace StardewModdingAPI.Mods.ConsoleCommands
         ** Fields
         *********/
         /// <summary>The commands to handle.</summary>
-        private IConsoleCommand[] Commands;
+        private IConsoleCommand[] Commands = null!;
 
         /// <summary>The commands which may need to handle update ticks.</summary>
-        private IConsoleCommand[] UpdateHandlers;
+        private IConsoleCommand[] UpdateHandlers = null!;
 
         /// <summary>The commands which may need to handle input.</summary>
-        private IConsoleCommand[] InputHandlers;
+        private IConsoleCommand[] InputHandlers = null!;
 
 
         /*********
@@ -50,7 +50,7 @@ namespace StardewModdingAPI.Mods.ConsoleCommands
         /// <summary>The method invoked when a button is pressed.</summary>
         /// <param name="sender">The event sender.</param>
         /// <param name="e">The event arguments.</param>
-        private void OnButtonPressed(object sender, ButtonPressedEventArgs e)
+        private void OnButtonPressed(object? sender, ButtonPressedEventArgs e)
         {
             foreach (IConsoleCommand command in this.InputHandlers)
                 command.OnButtonPressed(this.Monitor, e.Button);
@@ -59,7 +59,7 @@ namespace StardewModdingAPI.Mods.ConsoleCommands
         /// <summary>The method invoked when the game updates its state.</summary>
         /// <param name="sender">The event sender.</param>
         /// <param name="e">The event arguments.</param>
-        private void OnUpdateTicked(object sender, EventArgs e)
+        private void OnUpdateTicked(object? sender, EventArgs e)
         {
             foreach (IConsoleCommand command in this.UpdateHandlers)
                 command.OnUpdated(this.Monitor);
@@ -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);
         }
 
@@ -81,7 +81,7 @@ namespace StardewModdingAPI.Mods.ConsoleCommands
             return (
                 from type in this.GetType().Assembly.GetTypes()
                 where !type.IsAbstract && typeof(IConsoleCommand).IsAssignableFrom(type)
-                select (IConsoleCommand)Activator.CreateInstance(type)
+                select (IConsoleCommand)Activator.CreateInstance(type)!
             );
         }
     }