Merge branch 'develop' into stable

7 files changed, 77 insertions, 32 deletions

diff --git a/src/SMAPI/Framework/Networking/ModMessageModel.cs b/src/SMAPI/Framework/Networking/ModMessageModel.cs
index 4f694f9c..01672714 100644
--- a/src/SMAPI/Framework/Networking/ModMessageModel.cs
+++ b/src/SMAPI/Framework/Networking/ModMessageModel.cs
@@ -1,4 +1,5 @@
 using System.Linq;
+using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 
 namespace StardewModdingAPI.Framework.Networking
@@ -13,41 +14,39 @@ 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>
         /// <param name="toPlayerIDs">The players who should receive the message, or <c>null</c> for all players.</param>
         /// <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 3923700f..b37c1e89 100644
--- a/src/SMAPI/Framework/Networking/MultiplayerPeer.cs
+++ b/src/SMAPI/Framework/Networking/MultiplayerPeer.cs
@@ -37,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; }
@@ -55,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;
@@ -67,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 8087dc7e..1e150508 100644
--- a/src/SMAPI/Framework/Networking/MultiplayerPeerMod.cs
+++ b/src/SMAPI/Framework/Networking/MultiplayerPeerMod.cs
@@ -1,3 +1,5 @@
+using System.Diagnostics.CodeAnalysis;
+
 namespace StardewModdingAPI.Framework.Networking
 {
     internal class MultiplayerPeerMod : IMultiplayerPeerMod
@@ -20,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 9795d971..7571acba 100644
--- a/src/SMAPI/Framework/Networking/RemoteContextModModel.cs
+++ b/src/SMAPI/Framework/Networking/RemoteContextModModel.cs
@@ -3,13 +3,31 @@ 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 7befb151..7d53e732 100644
--- a/src/SMAPI/Framework/Networking/RemoteContextModel.cs
+++ b/src/SMAPI/Framework/Networking/RemoteContextModel.cs
@@ -1,3 +1,5 @@
+using System;
+
 namespace StardewModdingAPI.Framework.Networking
 {
     /// <summary>Metadata about the game, SMAPI, and installed mods exchanged with connected computers.</summary>
@@ -7,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/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)
             {