warrentyexpired/ModernUO
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

5780
Distribution/Data/objects.json
View file

File diff suppressed because it is too large Load diff

35
Projects/Server/JsonConfiguration/Converters/TypeConverter.cs Normal file
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);
}
}

29
Projects/Server/JsonConfiguration/Converters/TypeConverterFactory.cs Normal file
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();
}
}

1
Projects/Server/JsonConfiguration/JsonConfig.cs
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]);

15
Projects/UOContent/Commands/Object Creation/CAGCategory.cs
View file

@ -1,3 +1,18 @@
/*************************************************************************
* ModernUO *
* Copyright (C) 2019-2020 - ModernUO Development Team *
* Email: hi@modernuo.com *
* File: CAGCategory.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 Server.Gumps;
namespace Server.Commands

41
Projects/UOContent/Commands/Object Creation/CAGLoader.cs
View file

@ -1,3 +1,19 @@
/*************************************************************************
* ModernUO *
* Copyright (C) 2019-2020 - ModernUO Development Team *
* Email: hi@modernuo.com *
* File: CAGLoader.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.Collections.Generic;
using System.IO;
using System.Text.Json.Serialization;
@ -23,11 +39,20 @@ namespace Server.Commands
for (var i = 0; i < categories.Length; i++)
{
var category = categories[i];
var oldParent = parent;
// No children, so let's make one
if (parent.Nodes == null)
{
var cat = new CAGCategory(category, parent);
parent.Nodes = new CAGNode[] { cat };
parent = cat;
continue;
}
var oldParent = parent;
for (var j = 0; j < parent.Nodes.Length; j++)
{
var node = parent.Nodes[i];
var node = parent.Nodes[j];
if (category == node.Title && node is CAGCategory cat)
{
parent = cat;
@ -35,8 +60,16 @@ namespace Server.Commands
}
}
if (parent == oldParent)
parent = new CAGCategory(category, parent);
// Didn't find the child, let's add it
if (oldParent == parent)
{
var nodes = parent.Nodes;
parent.Nodes = new CAGNode[nodes.Length + 1];
Array.Copy(nodes, parent.Nodes, nodes.Length);
var cat = new CAGCategory(category, parent);
parent.Nodes[^1] = cat;
parent = cat;
}
}
// Set the objects associated with the child most node

15
Projects/UOContent/Commands/Object Creation/CAGNode.cs
View file

@ -1,3 +1,18 @@
/*************************************************************************
* ModernUO *
* Copyright (C) 2019-2020 - ModernUO Development Team *
* Email: hi@modernuo.com *
* File: CAGNode.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/>. *
*************************************************************************/
namespace Server.Commands
{
public abstract class CAGNode

15
Projects/UOContent/Commands/Object Creation/CAGObject.cs
View file

@ -1,3 +1,18 @@
/*************************************************************************
* ModernUO *
* Copyright (C) 2019-2020 - ModernUO Development Team *
* Email: hi@modernuo.com *
* File: CAGObject.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.Serialization;
using Server.Gumps;