Merge pull request #1390 from CaptainSticky/feature/brio-legacy-chara…

…-glasses-converter

Added support for legacy facewear serialization in chara files.

Anamnesis/Files/CharacterFile.cs

@@ -589,6 +589,11 @@ public GlassesSave(GlassesMemory from)
 			this.GlassesId = from.GlassesId;
 		}
 
+		public GlassesSave(ushort glassesId)
+		{
+			this.GlassesId = glassesId;
+		}
+
 		public ushort GlassesId { get; set; }
 
 		public void Write(GlassesMemory? glasses)

Anamnesis/Serialization/Converters/GlassesSaveConverter.cs

@@ -0,0 +1,48 @@
+// © Anamnesis.
+// Licensed under the MIT license.
+
+namespace Anamnesis.Serialization.Converters;
+
+using Anamnesis.Services;
+using System.Text.Json;
+using System;
+using System.Text.Json.Serialization;
+using Serilog;
+using static Anamnesis.Files.CharacterFile;
+
+internal class GlassesSaveConverter : JsonConverter<GlassesSave>
+{
+	public override GlassesSave Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	{
+		ushort glassesId = 0;
+
+		try
+		{
+			// Legacy chara files will have Glasses serialized as "Glasses" : #.
+			// Current chara files have it as an object with a GlassesId property.
+			if (reader.TokenType == JsonTokenType.Number)
+			{
+				glassesId = reader.GetUInt16();
+			}
+			else if (reader.TokenType == JsonTokenType.StartObject)
+			{
+				JsonDocument jsonDoc = JsonDocument.ParseValue(ref reader);
+				if (jsonDoc.RootElement.TryGetProperty("GlassesId", out JsonElement glassesIdEl))
+				{
+					glassesId = glassesIdEl.GetUInt16();
+				}
+			}
+		}
+		catch(Exception ex)
+		{
+			Log.Error(ex, "Error reading glasses from file.");
+		}
+
+		return new GlassesSave(GameDataService.Glasses.Get((byte)glassesId).GlassesId);
+	}
+
+	public override void Write(Utf8JsonWriter writer, GlassesSave value, JsonSerializerOptions options)
+	{
+		JsonSerializer.Serialize(writer, value);
+	}
+}

Anamnesis/Serialization/SerializerService.cs

@@ -37,7 +37,7 @@ static SerializerService()
 		Options.Converters.Add(new MediaColorConverter());
 		Options.Converters.Add(new PointConverter());
 		Options.Converters.Add(new VersionConverter());
-		Options.Converters.Add(new IGlassesConverter());
+		Options.Converters.Add(new GlassesSaveConverter());
 	}
 
 	public static string Serialize(object obj)