Fixes Add Menu Command & Reading JSON files (#222)

This commit is contained in:
Kamron Batman 2020-09-04 00:19:35 -07:00 • committed by GitHub
parent d18329dbf6
commit 81a6143291
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 3037 additions and 2894 deletions

View file

@ -0,0 +1,35 @@
/*************************************************************************
* ModernUO *
* Copyright (C) 2019-2020 - ModernUO Development Team *
* Email: hi@modernuo.com *
* File: TypeConverter.cs *
* *
* This program is free software: you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by *
* the Free Software Foundation, either version 3 of the License, or *
* (at your option) any later version. *
* *
* You should have received a copy of the GNU General Public License *
* along with this program. If not, see <http://www.gnu.org/licenses/>. *
*************************************************************************/
using System;
using System.Text.Json;
using System.Text.Json.Serialization;
namespace Server.Json
{
public class TypeConverter : JsonConverter<Type>
{
public override Type Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
{
if (reader.TokenType != JsonTokenType.String)
throw new JsonException("The JSON value could not be converted to System.Type");
return AssemblyHandler.FindFirstTypeForName(reader.GetString());
}
public override void Write(Utf8JsonWriter writer, Type value, JsonSerializerOptions options) =>
writer.WriteStringValue(value.FullName);
}
}

View file

@ -0,0 +1,29 @@
/*************************************************************************
* ModernUO *
* Copyright (C) 2019-2020 - ModernUO Development Team *
* Email: hi@modernuo.com *
* File: TypeConverterFactory.cs *
* *
* This program is free software: you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by *
* the Free Software Foundation, either version 3 of the License, or *
* (at your option) any later version. *
* *
* You should have received a copy of the GNU General Public License *
* along with this program. If not, see <http://www.gnu.org/licenses/>. *
*************************************************************************/
using System;
using System.Text.Json;
using System.Text.Json.Serialization;
namespace Server.Json
{
public class TypeConverterFactory : JsonConverterFactory
{
public override bool CanConvert(Type typeToConvert) => typeToConvert == typeof(Type);
public override JsonConverter CreateConverter(Type typeToConvert, JsonSerializerOptions options) =>
new TypeConverter();
}
}

View file

@ -42,6 +42,7 @@ namespace Server.Json
options.Converters.Add(new TimeSpanConverterFactory());
options.Converters.Add(new IPEndPointConverterFactory());
options.Converters.Add(new NullableStructSerializerFactory());
options.Converters.Add(new TypeConverterFactory());
for (var i = 0; i < converters.Length; i++) options.Converters.Add(converters[i]);