diff --git a/Libraries/SPTarkov.Server.Core/Utils/Json/Converters/EftEnumConverter.cs b/Libraries/SPTarkov.Server.Core/Utils/Json/Converters/EftEnumConverter.cs index 4442412f..71dc6caf 100644 --- a/Libraries/SPTarkov.Server.Core/Utils/Json/Converters/EftEnumConverter.cs +++ b/Libraries/SPTarkov.Server.Core/Utils/Json/Converters/EftEnumConverter.cs @@ -4,7 +4,6 @@ using System.Text.Json.Serialization; namespace SPTarkov.Server.Core.Utils.Json.Converters; - public class EftEnumConverterFactory : JsonConverterFactory { public override bool CanConvert(Type typeToConvert) @@ -18,13 +17,10 @@ public class EftEnumConverterFactory : JsonConverterFactory ) { return (JsonConverter) - Activator.CreateInstance( - typeof(EftEnumConverter<>).MakeGenericType(typeToConvert) - ); + Activator.CreateInstance(typeof(EftEnumConverter<>).MakeGenericType(typeToConvert)); } } - public class EftEnumConverter : JsonConverter { private static readonly JsonSerializerOptions _options = new() diff --git a/Libraries/SPTarkov.Server.Core/Utils/Json/Converters/EftListEnumConverter.cs b/Libraries/SPTarkov.Server.Core/Utils/Json/Converters/EftListEnumConverter.cs index e8aa02e1..c8abccb1 100644 --- a/Libraries/SPTarkov.Server.Core/Utils/Json/Converters/EftListEnumConverter.cs +++ b/Libraries/SPTarkov.Server.Core/Utils/Json/Converters/EftListEnumConverter.cs @@ -7,9 +7,10 @@ public class EftListEnumConverterFactory : JsonConverterFactory { public override bool CanConvert(Type typeToConvert) { - return typeToConvert.IsGenericType && typeToConvert.GetGenericTypeDefinition() == typeof(List<>) && - typeToConvert.GenericTypeArguments[0].IsEnum && - (typeToConvert.GenericTypeArguments[0].Namespace?.Contains("SPTarkov") ?? false); + return typeToConvert.IsGenericType + && typeToConvert.GetGenericTypeDefinition() == typeof(List<>) + && typeToConvert.GenericTypeArguments[0].IsEnum + && (typeToConvert.GenericTypeArguments[0].Namespace?.Contains("SPTarkov") ?? false); } public override JsonConverter? CreateConverter( @@ -19,7 +20,9 @@ public class EftListEnumConverterFactory : JsonConverterFactory { return (JsonConverter) Activator.CreateInstance( - typeof(EftListEnumConverter<>).MakeGenericType(typeToConvert.GenericTypeArguments[0]) + typeof(EftListEnumConverter<>).MakeGenericType( + typeToConvert.GenericTypeArguments[0] + ) ); } } diff --git a/Libraries/SPTarkov.Server.Core/Utils/Json/Converters/EnumerableConverter.cs b/Libraries/SPTarkov.Server.Core/Utils/Json/Converters/EnumerableConverter.cs index 5704e64e..aad12719 100644 --- a/Libraries/SPTarkov.Server.Core/Utils/Json/Converters/EnumerableConverter.cs +++ b/Libraries/SPTarkov.Server.Core/Utils/Json/Converters/EnumerableConverter.cs @@ -36,7 +36,9 @@ public class EnumerableConverter : JsonConverter?> case JsonTokenType.String: case JsonTokenType.Number: case JsonTokenType.StartObject: - throw new Exception($"Error attempting to deserialize object, its not a valid array. Type {reader.TokenType}"); + throw new Exception( + $"Error attempting to deserialize object, its not a valid array. Type {reader.TokenType}" + ); case JsonTokenType.StartArray: var list = JsonSerializer.Deserialize>(ref reader, options); diff --git a/Libraries/SPTarkov.Server.Core/Utils/Json/Converters/SptJsonConverterRegistrator.cs b/Libraries/SPTarkov.Server.Core/Utils/Json/Converters/SptJsonConverterRegistrator.cs index 26bd3ab5..d6f14636 100644 --- a/Libraries/SPTarkov.Server.Core/Utils/Json/Converters/SptJsonConverterRegistrator.cs +++ b/Libraries/SPTarkov.Server.Core/Utils/Json/Converters/SptJsonConverterRegistrator.cs @@ -20,7 +20,7 @@ public class SptJsonConverterRegistrator : IJsonConverterRegistrator new StringToMongoIdConverter(), new EftEnumConverterFactory(), new EftListEnumConverterFactory(), - new EnumerableConverterFactory() + new EnumerableConverterFactory(), ]; } }