Fixed CreateHints, Added UpdateHint

Author: Jarno458

Archipelago.MultiClient.Net.Tests/ArchipelagoSessionFixture.cs

@@ -193,7 +193,7 @@ static ArchipelagoSession CreateTestSession(IArchipelagoSocketHelper socket,
 			var roomState = new RoomStateHelper(socket, locations);
 			var dataStorage = new DataStorageHelper(socket, connectionInfo);
 			var messageLog = new MessageLogHelper(socket, itemInfoResolver, players, connectionInfo);
-			var createHints = new CreateHintsHelper(socket, players, locations, roomState);
+			var createHints = new HintsHelper(socket, players, locations, roomState, dataStorage);
 
 			return new ArchipelagoSession(socket, items, locations, players, roomState, connectionInfo, dataStorage, messageLog, createHints);
 		}

Archipelago.MultiClient.Net/Archipelago.MultiClient.Net.csproj

@@ -10,9 +10,9 @@
 		<PackageReadmeFile>README.md</PackageReadmeFile>
 		<RepositoryUrl>https://github.com/ArchipelagoMW/Archipelago.MultiClient.Net</RepositoryUrl>
 		<RepositoryType>git</RepositoryType>
-		<AssemblyVersion>6.6.2.0</AssemblyVersion>
-		<FileVersion>6.6.2.0</FileVersion>
-		<Version>6.6.2</Version>
+		<AssemblyVersion>6.7.0.0</AssemblyVersion>
+		<FileVersion>6.7.0.0</FileVersion>
+		<Version>6.7.0</Version>
 		<PackageLicenseExpression>MIT</PackageLicenseExpression>
 		<PackageRequireLicenseAcceptance>False</PackageRequireLicenseAcceptance>
 		<PackageIcon>blue-icon.png</PackageIcon>

Archipelago.MultiClient.Net/ArchipelagoSession.cs

@@ -57,6 +57,11 @@ public interface IArchipelagoSession : IArchipelagoSessionActions
 		/// </summary>
 		IMessageLogHelper MessageLog { get; }
 
+		/// <summary>
+		/// Provides methods to interact with the hints system
+		/// </summary>
+		IHintsHelper Hints { get; }
+
 #if !NET35
 		/// <summary>
 		/// Connect the websocket to the server
@@ -146,7 +151,7 @@ public partial class ArchipelagoSession : IArchipelagoSession
 		public IMessageLogHelper MessageLog { get; }
 
 		/// <inheritdoc/>
-		public ICreateHintsHelper CreateHints { get; }
+		public IHintsHelper Hints { get; }
 
 #if NET35
 	    volatile bool awaitingRoomInfo;
@@ -165,7 +170,7 @@ internal ArchipelagoSession(IArchipelagoSocketHelper socket,
                                     ConnectionInfoHelper connectionInfoHelper,
                                     IDataStorageHelper dataStorage,
                                     IMessageLogHelper messageLog,
-                                    ICreateHintsHelper createHints)
+                                    IHintsHelper createHints)
         {
             Socket = socket;
             Items = items;
@@ -175,7 +180,7 @@ internal ArchipelagoSession(IArchipelagoSocketHelper socket,
             connectionInfo = connectionInfoHelper;
             DataStorage = dataStorage;
             MessageLog = messageLog;
-            CreateHints = createHints;
+            Hints = createHints;
 
             socket.PacketReceived += Socket_PacketReceived;
         }

Archipelago.MultiClient.Net/ArchipelagoSessionFactory.cs

@@ -27,7 +27,7 @@ public static ArchipelagoSession CreateSession(Uri uri)
             var roomState = new RoomStateHelper(socket, locations);
             var dataStorage = new DataStorageHelper(socket, connectionInfo);
             var messageLog = new MessageLogHelper(socket, itemInfoResolver, players, connectionInfo);
-            var createHints = new CreateHintsHelper(socket, players, locations, roomState);
+            var createHints = new HintsHelper(socket, players, locations, roomState, dataStorage);
 
             return new ArchipelagoSession(socket, items, locations, players, roomState, connectionInfo, dataStorage, messageLog, createHints);
         }

Archipelago.MultiClient.Net/Converters/ArchipelagoPacketConverter.cs

@@ -13,7 +13,7 @@ namespace Archipelago.MultiClient.Net.Converters
     public class ArchipelagoPacketConverter : JsonConverter
     {
         static readonly Dictionary<ArchipelagoPacketType, Func<JObject, ArchipelagoPacketBase>> PacketDeserializationMap = 
-	        new Dictionary<ArchipelagoPacketType, Func<JObject, ArchipelagoPacketBase>>(23)
+	        new Dictionary<ArchipelagoPacketType, Func<JObject, ArchipelagoPacketBase>>(25)
         {
             [ArchipelagoPacketType.RoomInfo]          = obj => obj.ToObject<RoomInfoPacket>(),
             [ArchipelagoPacketType.ConnectionRefused] = obj => obj.ToObject<ConnectionRefusedPacket>(),
@@ -30,16 +30,19 @@ public class ArchipelagoPacketConverter : JsonConverter
             [ArchipelagoPacketType.StatusUpdate]      = obj => obj.ToObject<StatusUpdatePacket>(),
             [ArchipelagoPacketType.Say]               = obj => obj.ToObject<SayPacket>(),
             [ArchipelagoPacketType.GetDataPackage]    = obj => obj.ToObject<GetDataPackagePacket>(),
-            [ArchipelagoPacketType.DataPackage]       = obj => obj.ToObject<DataPackagePacket>(),
-            [ArchipelagoPacketType.Bounce]            = obj => obj.ToObject<BouncePacket>(),
-            [ArchipelagoPacketType.Bounced]           = obj => obj.ToObject<BouncedPacket>(),
-            [ArchipelagoPacketType.InvalidPacket]     = obj => obj.ToObject<InvalidPacketPacket>(),
+            [ArchipelagoPacketType.DataPackage]       = obj => obj.ToObject<DataPackagePacket>(),
+	        [ArchipelagoPacketType.Sync]              = obj => obj.ToObject<SyncPacket>(),
+	        [ArchipelagoPacketType.Bounced]           = obj => obj.ToObject<BouncedPacket>(),
+			[ArchipelagoPacketType.Bounce]            = obj => obj.ToObject<BouncePacket>(),
+			[ArchipelagoPacketType.InvalidPacket]     = obj => obj.ToObject<InvalidPacketPacket>(),
             [ArchipelagoPacketType.Get]               = obj => obj.ToObject<GetPacket>(),
             [ArchipelagoPacketType.Retrieved]         = obj => obj.ToObject<RetrievedPacket>(),
             [ArchipelagoPacketType.Set]               = obj => obj.ToObject<SetPacket>(),
             [ArchipelagoPacketType.SetNotify]         = obj => obj.ToObject<SetNotifyPacket>(),
-            [ArchipelagoPacketType.SetReply]          = obj => obj.ToObject<SetReplyPacket>(),
-        };
+            [ArchipelagoPacketType.SetReply]          = obj => obj.ToObject<SetReplyPacket>(),
+			[ArchipelagoPacketType.SetNotify]         = obj => obj.ToObject<SetNotifyPacket>(),
+			[ArchipelagoPacketType.UpdateHint]        = obj => obj.ToObject<UpdateHintPacket>(),
+		};
 
         /// <inheritdoc/>
 		public override bool CanWrite => false;
@@ -111,8 +114,7 @@ static ArchipelagoPacketBase DeserializePrintJsonPacket(JObject obj)
 
             return obj.ToObject<PrintJsonPacket>();
         }
-
-
+		
         static bool EnumTryParse<TEnum>(string value, out TEnum result) where TEnum : struct, IConvertible
         {
 #if NET35