Item modifiers parser (#1287)

* Parse item modifiers

* Move everything to System.Text.Json

* Complete item parser

* Add some more energy + health mods

* Fix more mods

* Output ids as hex

Author: AlexMacocian

Daybreak.API/Serialization/ApiJsonSerializerContext.cs

@@ -1,5 +1,6 @@
 using Daybreak.API.Models;
 using Daybreak.Shared.Models.Api;
+using Daybreak.Shared.Models.Guildwars;
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
@@ -35,6 +36,8 @@ namespace Daybreak.API.Serialization;
 [JsonSerializable(typeof(LoginInfo))]
 [JsonSerializable(typeof(MainPlayerBuildContext))]
 [JsonSerializable(typeof(InventoryInformation))]
+[JsonSerializable(typeof(ItemProperty))]
+[JsonSourceGenerationOptions(UseStringEnumConverter = true)]
 public partial class ApiJsonSerializerContext : JsonSerializerContext
 {
 }

Daybreak.API/Services/InventoryService.cs

@@ -1,7 +1,9 @@
 using Daybreak.API.Interop.GuildWars;
 using Daybreak.API.Services.Interop;
 using Daybreak.Shared.Models.Api;
+using Daybreak.Shared.Models.Guildwars;
 using System.Extensions.Core;
+using System.Text;
 
 namespace Daybreak.API.Services;
 
@@ -37,15 +39,15 @@ public sealed class InventoryService(
                     return default;
                 }
 
-                var itemTuples = new List<(BagType Type,List<(uint ModelId, string EncodedCompleteName, string EncodedSingleName, string EncodedName, int Quantity, uint[] Modifiers, ItemType ItemType)>)>();
+                var itemTuples = new List<(BagType Type,List<(uint ModelId, string EncodedCompleteName, string EncodedSingleName, string EncodedName, bool Inscribable, int Quantity, uint[] Modifiers, ItemType ItemType)>)>();
                 foreach (var bag in inventory.Pointer->Bags)
                 {
                     if (bag is null)
                     {
                         continue;
                     }
 
-                    var retBag = new List<(uint ModelId, string EncodedCompleteName, string EncodedSingleName, string EncodedName, int Quantity, uint[] Modifiers, ItemType ItemType)>();
+                    var retBag = new List<(uint ModelId, string EncodedCompleteName, string EncodedSingleName, string EncodedName, bool Inscribable, int Quantity, uint[] Modifiers, ItemType ItemType)>();
                     itemTuples.Add((bag->Type, retBag));
                     if (bag->ItemsCount is 0)
                     {
@@ -68,7 +70,7 @@ public sealed class InventoryService(
                             modifiers[j] = item.Pointer->Modifiers[j].Mod;
                         }
 
-                        retBag.Add((item.Pointer->ModelId, completeNameEncoded, singleItemName, nameEncoded, item.Pointer->Quantity, modifiers, item.Pointer->Type));
+                        retBag.Add((item.Pointer->ModelId, completeNameEncoded, singleItemName, nameEncoded, item.Pointer->Inscribable, item.Pointer->Quantity, modifiers, item.Pointer->Type));
                     }
                 }
 
@@ -88,7 +90,7 @@ public sealed class InventoryService(
                 var decodedName = await this.uIService.DecodeString(item.EncodedName, Language.English, cancellationToken);
                 var decodedCompleteName = await this.uIService.DecodeString(item.EncodedCompleteName, Language.English, cancellationToken);
                 var decodedSingleName = await this.uIService.DecodeString(item.EncodedSingleName, Language.English, cancellationToken);
-                return (item.ModelId, item.EncodedName, DecodedName: decodedName, item.EncodedSingleName, DecodedSingleName: decodedSingleName, item.EncodedCompleteName, DecodedCompleteName: decodedCompleteName, item.Quantity, item.Modifiers, item.ItemType);
+                return (item.ModelId, item.EncodedName, DecodedName: decodedName, item.EncodedSingleName, DecodedSingleName: decodedSingleName, item.EncodedCompleteName, DecodedCompleteName: decodedCompleteName, item.Inscribable, item.Quantity, item.Modifiers, item.ItemType);
             }));
             return (tuple.Type, Items: decodedItems.ToList());
         }));
@@ -106,15 +108,15 @@ public sealed class InventoryService(
                             DecodedSingleName: item.DecodedSingleName ?? string.Empty,
                             EncodedCompleteName: ToBase64(item.EncodedCompleteName),
                             DecodedCompleteName: item.DecodedCompleteName ?? string.Empty,
+                            Inscribable: item.Inscribable,
                             Quantity: item.Quantity,
                             Modifiers: item.Modifiers,
+                            Properties: [.. ItemProperty.ParseItemModifiers([.. item.Modifiers.Select(m => (Shared.Models.Guildwars.ItemModifier)m)])],
                             ItemType: item.ItemType.ToString()))]))]);
     }
 
     private static string ToBase64(string encoded)
     {
-        var bytes = new byte[encoded.Length * sizeof(char)];
-        Buffer.BlockCopy(encoded.ToCharArray(), 0, bytes, 0, bytes.Length);
-        return Convert.ToBase64String(bytes);
+        return Convert.ToBase64String(Encoding.Unicode.GetBytes(encoded));
     }
 }

Daybreak.Shared/Converters/AttributeJsonConverter.cs

@@ -0,0 +1,26 @@
+using System.Text.Json;
+using System.Text.Json.Serialization;
+
+namespace Daybreak.Shared.Converters;
+
+public sealed class HexIntConverter : JsonConverter<int>
+{
+    public override int Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+    {
+        if (reader.TokenType == JsonTokenType.String)
+        {
+            var hexString = reader.GetString();
+            if (hexString is not null && hexString.StartsWith("0x", StringComparison.OrdinalIgnoreCase))
+            {
+                return Convert.ToInt32(hexString[2..], 16);
+            }
+        }
+
+        return reader.GetInt32();
+    }
+
+    public override void Write(Utf8JsonWriter writer, int value, JsonSerializerOptions options)
+    {
+        writer.WriteStringValue($"0x{value:X4}");
+    }
+}

Daybreak.Shared/Converters/CampaignJsonConverter.cs

@@ -0,0 +1,36 @@
+using System.Text.Json;
+using System.Text.Json.Serialization;
+
+namespace Daybreak.Shared.Converters;
+
+public sealed class HexUIntArrayJsonConverter : JsonConverter<uint[]>
+{
+    private static readonly HexUintConverter ElementConverter = new();
+
+    public override uint[]? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+    {
+        if (reader.TokenType != JsonTokenType.StartArray)
+        {
+            throw new JsonException();
+        }
+
+        var list = new List<uint>();
+        while (reader.Read() && reader.TokenType != JsonTokenType.EndArray)
+        {
+            list.Add(ElementConverter.Read(ref reader, typeof(uint), options));
+        }
+
+        return [.. list];
+    }
+
+    public override void Write(Utf8JsonWriter writer, uint[] value, JsonSerializerOptions options)
+    {
+        writer.WriteStartArray();
+        foreach (var item in value)
+        {
+            ElementConverter.Write(writer, item, options);
+        }
+
+        writer.WriteEndArray();
+    }
+}

Daybreak.Shared/Converters/ContinentJsonConverter.cs

@@ -0,0 +1,26 @@
+using System.Text.Json;
+using System.Text.Json.Serialization;
+
+namespace Daybreak.Shared.Converters;
+
+public sealed class HexUintConverter : JsonConverter<uint>
+{
+    public override uint Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+    {
+        if (reader.TokenType == JsonTokenType.String)
+        {
+            var hexString = reader.GetString();
+            if (hexString is not null && hexString.StartsWith("0x", StringComparison.OrdinalIgnoreCase))
+            {
+                return Convert.ToUInt32(hexString[2..], 16);
+            }
+        }
+
+        return reader.GetUInt32();
+    }
+
+    public override void Write(Utf8JsonWriter writer, uint value, JsonSerializerOptions options)
+    {
+        writer.WriteStringValue($"0x{value:X4}");
+    }
+}