fix: Updates serialization to use v2.0 (#998)

- [X] Deletes serialization annotations
- [X] Updates to ModernUO.Serialization.Annotations nuget
- [X] Updates serializer to v2.0
- [X] Changes all `Serializable()` to `SerializationGenerator()`
- [X] Updates to schema generator v2.0

.config/dotnet-tools.json

@@ -3,7 +3,7 @@
   "isRoot": true,
   "tools": {
     "modernuoschemagenerator": {
-      "version": "1.0.2",
+      "version": "2.0.3",
       "commands": [
         "ModernUOSchemaGenerator"
       ]

Projects/Server/Collections/BitArray.cs

@@ -15,7 +15,7 @@ namespace Server.Collections;
 
 // A vector of bits.  Use this to store bits efficiently, without having to do bit
 // shifting yourself.
-[System.Serializable]
+[Serializable]
 public sealed class BitArray : ICollection, ICloneable
 {
     private int[] m_array; // Do not rename (binary serialization)

Projects/Server/Main.cs

@@ -599,7 +599,7 @@ namespace Server
                 if (World.DirtyTrackingEnabled)
                 {
                     var manualDirtyCheckingAttribute = type.GetCustomAttribute<ManualDirtyCheckingAttribute>(false);
-                    var codeGennedAttribute = type.GetCustomAttribute<SerializableAttribute>(false);
+                    var codeGennedAttribute = type.GetCustomAttribute<ModernUO.Serialization.SerializationGeneratorAttribute>(false);
 
                     if (manualDirtyCheckingAttribute == null && codeGennedAttribute == null)
                     {

Projects/Server/Serialization/Attributes/AfterDeserializationAttribute.cs

@@ -1,38 +0,0 @@
-/*************************************************************************
- * ModernUO                                                              *
- * Copyright 2019-2021 - ModernUO Development Team                       *
- * Email: hi@modernuo.com                                                *
- * File: AfterDeserializationAttribute.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;
-
-namespace Server
-{
-    /// <summary>
-    /// Hints to the source generator that this method should be executed after deserializing the object.
-    /// Method must have no parameters and return void.
-    /// </summary>
-    [AttributeUsage(AttributeTargets.Method)]
-    public class AfterDeserializationAttribute : Attribute
-    {
-        /// <summary>
-        /// Indicates whether the source generator should execute the method this is attached to immediately, or when
-        /// this is set to false, execute it using a Timer Delay.
-        ///
-        /// Note: Use false when the after deserialization involves deleting objects. This is to prevent corrupted
-        /// deserialization by removing an object before it has finished deserializing.
-        /// </summary>
-        public bool Synchronous { get; set; }
-
-        public AfterDeserializationAttribute(bool synchronous = true) => Synchronous = true;
-    }
-}

Projects/Server/Serialization/Attributes/DeltaDateTimeAttribute.cs

@@ -1,27 +0,0 @@
-/*************************************************************************
- * ModernUO                                                              *
- * Copyright 2019-2021 - ModernUO Development Team                       *
- * Email: hi@modernuo.com                                                *
- * File: DeltaDateTimeAttribute.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;
-
-namespace Server
-{
-    /// <summary>
-    /// Hints to the source generator that a serializable DateTime field or property is for delta time (duration)
-    /// </summary>
-    [AttributeUsage(AttributeTargets.Field | AttributeTargets.Property)]
-    public class DeltaDateTimeAttribute : Attribute
-    {
-    }
-}

Projects/Server/Serialization/Attributes/DeserializeTimerFieldAttribute.cs

@@ -1,34 +0,0 @@
-/*************************************************************************
- * ModernUO                                                              *
- * Copyright 2019-2021 - ModernUO Development Team                       *
- * Email: hi@modernuo.com                                                *
- * File: DeserializeTimerFieldAttribute.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;
-
-namespace Server
-{
-    /// <summary>
-    /// Hints to the source generator that the specified serializable field, which must be a timer,
-    /// can be deserialized by this method. The method signature should look like this:
-    ///
-    /// [DeserializeTimerField(0)]
-    /// private void DeserializeTimer(TimeSpan delay)
-    /// </summary>
-    [AttributeUsage(AttributeTargets.Method)]
-    public sealed class DeserializeTimerFieldAttribute : Attribute
-    {
-        public int Order { get; }
-
-        public DeserializeTimerFieldAttribute(int order) => Order = order;
-    }
-}

Projects/Server/Serialization/Attributes/EmbeddedSerializableAttribute.cs

@@ -1,32 +0,0 @@
-/*************************************************************************
- * ModernUO                                                              *
- * Copyright 2019-2021 - ModernUO Development Team                       *
- * Email: hi@modernuo.com                                                *
- * File: EmbeddedSerializableAttribute.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;
-
-namespace Server
-{
-    [AttributeUsage(AttributeTargets.Class)]
-    public sealed class EmbeddedSerializableAttribute : Attribute
-    {
-        public int Version { get; }
-        public bool EncodedVersion { get; }
-
-        public EmbeddedSerializableAttribute(int version, bool encodedVersion = true)
-        {
-            Version = version;
-            EncodedVersion = encodedVersion;
-        }
-    }
-}

Projects/Server/Serialization/Attributes/EncodedIntAttribute.cs

@@ -1,27 +0,0 @@
-/*************************************************************************
- * ModernUO                                                              *
- * Copyright 2019-2021 - ModernUO Development Team                       *
- * Email: hi@modernuo.com                                                *
- * File: EncodedIntAttribute.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;
-
-namespace Server
-{
-    /// <summary>
-    /// Hints to the source generator that a serializable int field or property should be encoded
-    /// </summary>
-    [AttributeUsage(AttributeTargets.Field | AttributeTargets.Property)]
-    public class EncodedIntAttribute : Attribute
-    {
-    }
-}

Projects/Server/Serialization/Attributes/InternStringAttribute.cs

@@ -1,27 +0,0 @@
-/*************************************************************************
- * ModernUO                                                              *
- * Copyright 2019-2021 - ModernUO Development Team                       *
- * Email: hi@modernuo.com                                                *
- * File: InternalizeString.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;
-
-namespace Server
-{
-    /// <summary>
-    /// Hints to the source generator that a serializable string field or property should be internalized on deserialization
-    /// </summary>
-    [AttributeUsage(AttributeTargets.Field | AttributeTargets.Property)]
-    public class InternStringAttribute : Attribute
-    {
-    }
-}

Projects/Server/Serialization/Attributes/InvalidatePropertiesAttribute.cs

@@ -1,28 +0,0 @@
-/*************************************************************************
- * ModernUO                                                              *
- * Copyright 2019-2021 - ModernUO Development Team                       *
- * Email: hi@modernuo.com                                                *
- * File: InvalidatePropertiesAttribute.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;
-
-namespace Server
-{
-    /// <summary>
-    /// Hints to the source generator that this field will execute an InvalidateProperties when the value is set
-    /// and the value is different from the current value.
-    /// </summary>
-    [AttributeUsage(AttributeTargets.Field)]
-    public class InvalidatePropertiesAttribute : Attribute
-    {
-    }
-}

Projects/Server/Serialization/Attributes/SerializableAttribute.cs

@@ -1,32 +0,0 @@
-/*************************************************************************
- * ModernUO                                                              *
- * Copyright (C) 2019-2021 - ModernUO Development Team                   *
- * Email: hi@modernuo.com                                                *
- * File: SerializableEntityAttribute.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;
-
-namespace Server
-{
-    [AttributeUsage(AttributeTargets.Class)]
-    public sealed class SerializableAttribute : Attribute
-    {
-        public int Version { get; }
-        public bool EncodedVersion { get; }
-
-        public SerializableAttribute(int version, bool encodedVersion = true)
-        {
-            Version = version;
-            EncodedVersion = encodedVersion;
-        }
-    }
-}

Projects/Server/Serialization/Attributes/SerializableFieldAttribute.cs

@@ -1,46 +0,0 @@
-/*************************************************************************
- * ModernUO                                                              *
- * Copyright (C) 2019-2021 - ModernUO Development Team                   *
- * Email: hi@modernuo.com                                                *
- * File: SerializableFieldAttribute.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;
-
-namespace Server
-{
-    /// <summary>
-    /// Hints to the source generator that this field or property should be serialized.
-    /// When used on a field, the source generator will generate the property entirely.
-    /// When used on a property, the user must call this.MarkDirty() after reassigning the value or modifying the value internally.
-    /// </summary>
-    [AttributeUsage(AttributeTargets.Field | AttributeTargets.Property)]
-    public sealed class SerializableFieldAttribute : Attribute
-    {
-        public int Order { get; }
-        public string PropertyGetter { get; }
-        public string? PropertySetter { get; }
-        public bool IsVirtual { get; }
-
-        public SerializableFieldAttribute(
-            int order,
-            string getter = "public",
-            string setter = "public",
-            bool isVirtual = false
-        )
-        {
-            Order = order;
-            PropertyGetter = getter;
-            PropertySetter = setter;
-            IsVirtual = isVirtual;
-        }
-    }
-}

Projects/Server/Serialization/Attributes/SerializableFieldAttributeAttribute.cs

@@ -1,46 +0,0 @@
-/*************************************************************************
- * ModernUO                                                              *
- * Copyright 2019-2021 - ModernUO Development Team                       *
- * Email: hi@modernuo.com                                                *
- * File: SerializableFieldAttributeAttribute.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;
-
-namespace Server
-{
-    /// <summary>
-    /// Hints to the source generator that this field will need this attribute on the generated property
-    /// [SerializableFieldAttr("[CommandProperty(AccessLevel.GameMaster)]")]
-    /// -or-
-    /// [SerializableFieldAttr(typeof(CommandPropertyAttribute), AccessLevel.GameMaster)]
-    /// </summary>
-    [AttributeUsage(AttributeTargets.Field, AllowMultiple = true)]
-    public sealed class SerializableFieldAttrAttribute : Attribute
-    {
-        public string AttributeString { get; }
-        public Type AttributeType { get; }
-        public object[] Arguments { get; }
-
-        public SerializableFieldAttrAttribute(string attrString) => AttributeString = attrString;
-
-        public SerializableFieldAttrAttribute(Type type, params object[] args)
-        {
-            if (typeof(Attribute).IsAssignableFrom(type))
-            {
-                throw new ArgumentException($"Argument {nameof(type)} must be an attribute.");
-            }
-
-            AttributeType = type;
-            Arguments = args;
-        }
-    }
-}

Projects/Server/Serialization/Attributes/SerializableFieldDefaultAttribute.cs

@@ -1,35 +0,0 @@
-/*************************************************************************
- * ModernUO                                                              *
- * Copyright 2019-2021 - ModernUO Development Team                       *
- * Email: hi@modernuo.com                                                *
- * File: SerializableFieldDefaultAttribute.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;
-
-namespace Server
-{
-    /// <summary>
-    /// Hints to the source generator that the field with the same order should use this default value
-    /// while deserializing. The default is used when the save flag indicates that we don't need to serialize the value
-    /// because this default can be used instead.
-    ///
-    /// Note: This is only used for the current version, not previous versions. Previous versions will always use a default
-    /// value for that type if it is not deserialized.
-    /// </summary>
-    [AttributeUsage(AttributeTargets.Method)]
-    public sealed class SerializableFieldDefaultAttribute : Attribute
-    {
-        public int Order { get; }
-
-        public SerializableFieldDefaultAttribute(int order) => Order = order;
-    }
-}

Projects/Server/Serialization/Attributes/SerializableFieldSaveFlagAttribute.cs

@@ -1,30 +0,0 @@
-/*************************************************************************
- * ModernUO                                                              *
- * Copyright 2019-2021 - ModernUO Development Team                       *
- * Email: hi@modernuo.com                                                *
- * File: SerializableFieldSaveFlagAttribute.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;
-
-namespace Server
-{
-    /// <summary>
-    /// Hints to the source generator that the field with the same order value should use a save flag.
-    /// </summary>
-    [AttributeUsage(AttributeTargets.Method)]
-    public sealed class SerializableFieldSaveFlagAttribute : Attribute
-    {
-        public int Order { get; }
-
-        public SerializableFieldSaveFlagAttribute(int order) => Order = order;
-    }
-}

Projects/Server/Serialization/Attributes/SerializableParentAttribute.cs

@@ -1,30 +0,0 @@
-/*************************************************************************
- * ModernUO                                                              *
- * Copyright 2019-2021 - ModernUO Development Team                       *
- * Email: hi@modernuo.com                                                *
- * File: SerializableParentAttribute.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;
-
-namespace Server
-{
-    /// <summary>
-    /// Hints to the source generator that this field or property indicates the ISerializable parent of this class.
-    /// </summary>
-    [AttributeUsage(AttributeTargets.Field | AttributeTargets.Property)]
-    public sealed class SerializableParentAttribute : Attribute
-    {
-        public SerializableParentAttribute()
-        {
-        }
-    }
-}

Projects/Server/Serialization/Attributes/TidyAttribute.cs

@@ -1,27 +0,0 @@
-/*************************************************************************
- * ModernUO                                                              *
- * Copyright 2019-2021 - ModernUO Development Team                       *
- * Email: hi@modernuo.com                                                *
- * File: TidyAttribute.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;
-
-namespace Server
-{
-    /// <summary>
-    /// Hints to the source generator that a serializable list should be tidied up
-    /// </summary>
-    [AttributeUsage(AttributeTargets.Field | AttributeTargets.Property)]
-    public class TidyAttribute : Attribute
-    {
-    }
-}

Projects/Server/Serialization/Attributes/TimerDriftAttribute.cs

@@ -1,28 +0,0 @@
-/*************************************************************************
- * ModernUO                                                              *
- * Copyright 2019-2021 - ModernUO Development Team                       *
- * Email: hi@modernuo.com                                                *
- * File: TimerDriftAttribute.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;
-
-namespace Server
-{
-    /// <summary>
-    /// Hints to the source generator that this serializable timer field or property will drift
-    /// during deserialization.
-    /// </summary>
-    [AttributeUsage(AttributeTargets.Field | AttributeTargets.Property)]
-    public class TimerDriftAttribute : Attribute
-    {
-    }
-}

Projects/Server/Server.csproj

@@ -38,7 +38,8 @@
         <PackageReference Include="PollGroup" Version="1.1.0" />
         <PackageReference Include="Zlib.Bindings" Version="1.8.0" />
 
-        <PackageReference Include="ModernUO.SerializationGenerator" Version="1.0.4" />
+        <PackageReference Include="ModernUO.Serialization.Annotations" Version="2.0.2" />
+        <PackageReference Include="ModernUO.Serialization.Generator" Version="2.0.3" />
     </ItemGroup>
     <ItemGroup>
         <AdditionalFiles Include="Migrations/*.v*.json" />

Projects/UOContent.Tests/Tests/Accounting/Security/PasswordProtectionTest.cs

@@ -1,5 +1,4 @@
 using System;
-using System.Security.Cryptography;
 using Server.Accounting;
 using Server.Accounting.Security;
 using Xunit;

Projects/UOContent/Accounting/Account.cs

@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.Net;
 using System.Runtime.CompilerServices;
 using System.Xml;
+using ModernUO.Serialization;
 using Server.Accounting.Security;
 using Server.Misc;
 using Server.Mobiles;
@@ -11,7 +12,7 @@ using Server.Network;
 
 namespace Server.Accounting
 {
-    [Serializable(4)]
+    [SerializationGenerator(4)]
     public partial class Account : IAccount, IComparable<Account>, ISerializable
     {
         public static readonly TimeSpan YoungDuration = TimeSpan.FromHours(40.0);

Projects/UOContent/Engines/Bulk Orders/BaseBOD.cs

@@ -1,8 +1,9 @@
 using System.Collections.Generic;
+using ModernUO.Serialization;
 
 namespace Server.Engines.BulkOrders
 {
-    [Serializable(1)]
+    [SerializationGenerator(1)]
     public abstract partial class BaseBOD : Item
     {
         public BaseBOD(int hue, int amountMax, bool requireExeptional, BulkMaterialType material) : this()

Projects/UOContent/Engines/Bulk Orders/LargeBOD.cs

@@ -1,8 +1,9 @@
+using ModernUO.Serialization;
 using Server.Mobiles;
 
 namespace Server.Engines.BulkOrders
 {
-    [Serializable(1)]
+    [SerializationGenerator(1)]
     public abstract partial class LargeBOD : BaseBOD
     {
         [InvalidateProperties]

Projects/UOContent/Engines/Bulk Orders/LargeSmithBOD.cs

@@ -1,6 +1,8 @@
+using ModernUO.Serialization;
+
 namespace Server.Engines.BulkOrders
 {
-    [Serializable(0, false)]
+    [SerializationGenerator(0, false)]
     public partial class LargeSmithBOD : LargeBOD
     {
         public static double[] m_BlacksmithMaterialChances =

Projects/UOContent/Engines/Bulk Orders/LargeTailorBOD.cs

@@ -1,6 +1,8 @@
+using ModernUO.Serialization;
+
 namespace Server.Engines.BulkOrders
 {
-    [Serializable(0, false)]
+    [SerializationGenerator(0, false)]
     public partial class LargeTailorBOD : LargeBOD
     {
         public static double[] m_TailoringMaterialChances =

Projects/UOContent/Engines/Bulk Orders/SmallSmithBOD.cs

@@ -1,10 +1,11 @@
 using System;
 using System.Collections.Generic;
+using ModernUO.Serialization;
 using Server.Engines.Craft;
 
 namespace Server.Engines.BulkOrders
 {
-    [Serializable(0, false)]
+    [SerializationGenerator(0, false)]
     public partial class SmallSmithBOD : SmallBOD
     {
         public static double[] m_BlacksmithMaterialChances =

Projects/UOContent/Engines/Bulk Orders/SmallTailorBOD.cs

@@ -1,10 +1,11 @@
 using System;
 using System.Collections.Generic;
+using ModernUO.Serialization;
 using Server.Engines.Craft;
 
 namespace Server.Engines.BulkOrders
 {
-    [Serializable(0, false)]
+    [SerializationGenerator(0, false)]
     public partial class SmallTailorBOD : SmallBOD
     {
         public static double[] m_TailoringMaterialChances =

Projects/UOContent/Holiday Stuff/Christmas/2010/Addons/FireFliesDeed.cs

@@ -1,3 +1,4 @@
+using ModernUO.Serialization;
 using Server.Gumps;
 using Server.Multis;
 using Server.Network;
@@ -5,7 +6,7 @@ using Server.Targeting;
 
 namespace Server.Items
 {
-    [Serializable(0)]
+    [SerializationGenerator(0)]
     public partial class Fireflies : Item, IAddon
     {
         [Constructible]
@@ -59,7 +60,7 @@ namespace Server.Items
         }
     }
 
-    [Serializable(0)]
+    [SerializationGenerator(0)]
     public partial class FirefliesDeed : Item
     {
         [Constructible]

Projects/UOContent/Holiday Stuff/Christmas/2010/Items/AngelDecoration.cs

@@ -1,6 +1,8 @@
-namespace Server.Items.Holiday
+using ModernUO.Serialization;
+
+namespace Server.Items.Holiday
 {
-    [Serializable(0, false)]
+    [SerializationGenerator(0, false)]
     [TypeAlias("Server.Items.AngelDecoration"), Flippable(0x46FA, 0x46FB)]
     public partial class AngelDecoration : Item
     {

Projects/UOContent/Holiday Stuff/Christmas/2010/Items/RockingHorse.cs

@@ -1,6 +1,8 @@
-namespace Server.Items.Holiday
+using ModernUO.Serialization;
+
+namespace Server.Items.Holiday
 {
-    [Serializable(0, false)]
+    [SerializationGenerator(0, false)]
     [TypeAlias("Server.Items.RockingHorse"), Flippable(0x4214, 0x4215)]
     public partial class RockingHorse : Item
     {

Projects/UOContent/Holiday Stuff/Easter/2011/Items/DragonEasterEgg.cs

@@ -1,6 +1,8 @@
-namespace Server.Items
+using ModernUO.Serialization;
+
+namespace Server.Items
 {
-    [Serializable(0, false)]
+    [SerializationGenerator(0, false)]
     public partial class DragonEasterEgg : Item, IDyable
     {
         [Constructible]

Projects/UOContent/Holiday Stuff/Halloween/2006/Engines/TrickOrTreat.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Runtime.CompilerServices;
+using ModernUO.Serialization;
 using Server.Events.Halloween;
 using Server.Items;
 using Server.Mobiles;
@@ -232,7 +233,7 @@ namespace Server.Engines.Events
         }
     }
 
-    [Serializable(0, false)]
+    [SerializationGenerator(0, false)]
     public partial class NaughtyTwin : BaseCreature
     {
         private static readonly Point3D[] Felucca_Locations =

Projects/UOContent/Holiday Stuff/Halloween/2006/Items/HalloweenPumpkin.cs

@@ -1,8 +1,9 @@
-using Server.Mobiles;
+using ModernUO.Serialization;
+using Server.Mobiles;
 
 namespace Server.Items
 {
-    [Serializable(1, false)]
+    [SerializationGenerator(1, false)]
     public partial class HalloweenPumpkin : Item
     {
         private static readonly string[] m_Staff =

Projects/UOContent/Holiday Stuff/Halloween/2006/Items/PumpkinScarecrow.cs

@@ -1,6 +1,8 @@
-namespace Server.Items
+using ModernUO.Serialization;
+
+namespace Server.Items
 {
-    [Serializable(0, false)]
+    [SerializationGenerator(0, false)]
     public partial class PumpkinScarecrow : Item
     {
         [Constructible]

Projects/UOContent/Holiday Stuff/Halloween/2006/Items/RuinedTapestry.cs

@@ -1,6 +1,8 @@
-namespace Server.Items
+using ModernUO.Serialization;
+
+namespace Server.Items
 {
-    [Serializable(0, false)]
+    [SerializationGenerator(0, false)]
     public partial class RuinedTapestry : Item
     {
         [Constructible]

Projects/UOContent/Holiday Stuff/Halloween/2006/Items/TwilightLantern.cs

@@ -1,6 +1,8 @@
-namespace Server.Items
+using ModernUO.Serialization;
+
+namespace Server.Items
 {
-    [Serializable(0, false)]
+    [SerializationGenerator(0, false)]
     public partial class TwilightLantern : Lantern
     {
         [Constructible]

Projects/UOContent/Holiday Stuff/Halloween/2009/Foods/CreepyCake.cs

@@ -1,10 +1,12 @@
-namespace Server.Items
+using ModernUO.Serialization;
+
+namespace Server.Items
 {
     /*
     first seen halloween 2009.  subsequently in 2010,
     2011 and 2012. GM Beggar-only Semi-Rare Treats
     */
-    [Serializable(0, false)]
+    [SerializationGenerator(0, false)]
     public partial class CreepyCake : Food
     {
         [Constructible]

Projects/UOContent/Holiday Stuff/Halloween/2009/Foods/HarvestWine.cs

@@ -1,10 +1,12 @@
-namespace Server.Items
+using ModernUO.Serialization;
+
+namespace Server.Items
 {
     /*
     first seen halloween 2009.  subsequently in 2010,
     2011 and 2012. GM Beggar-only Semi-Rare Treats
     */
-    [Serializable(0, false)]
+    [SerializationGenerator(0, false)]
     public partial class HarvestWine : BeverageBottle
     {
         [Constructible]

Projects/UOContent/Holiday Stuff/Halloween/2009/Foods/MrPlainsCookies.cs

@@ -1,6 +1,8 @@
-namespace Server.Items
+using ModernUO.Serialization;
+
+namespace Server.Items
 {
-    [Serializable(0, false)]
+    [SerializationGenerator(0, false)]
     public partial class MrPlainsCookies : Food
     {
         [Constructible]

Projects/UOContent/Holiday Stuff/Halloween/2009/Foods/MurkyMilk.cs

@@ -1,10 +1,12 @@
-namespace Server.Items
+using ModernUO.Serialization;
+
+namespace Server.Items
 {
     /*
     first seen halloween 2009.  subsequently in 2010,
     2011 and 2012. GM Beggar-only Semi-Rare Treats
     */
-    [Serializable(0, false)]
+    [SerializationGenerator(0, false)]
     public partial class MurkyMilk : Pitcher
     {
         [Constructible]

Projects/UOContent/Holiday Stuff/Halloween/2009/Foods/PumpkinPizza.cs

@@ -1,10 +1,12 @@
-namespace Server.Items
+using ModernUO.Serialization;
+
+namespace Server.Items
 {
     /*
     first seen halloween 2009.  subsequently in 2010,
     2011 and 2012. GM Beggar-only Semi-Rare Treats
     */
-    [Serializable(0, false)]
+    [SerializationGenerator(0, false)]
     public partial class PumpkinPizza : CheesePizza
     {
         [Constructible]

Projects/UOContent/Holiday Stuff/Halloween/2009/Items/GrimWarning.cs

@@ -1,10 +1,12 @@
-namespace Server.Items
+using ModernUO.Serialization;
+
+namespace Server.Items
 {
     /*
     first seen halloween 2009.  subsequently in 2010,
     2011 and 2012. GM Beggar-only Semi-Rare Treats
     */
-    [Serializable(0, false)]
+    [SerializationGenerator(0, false)]
     public partial class GrimWarning : Item
     {
         [Constructible]

Projects/UOContent/Holiday Stuff/Halloween/2009/Items/SkullsOnPike.cs

@@ -1,10 +1,12 @@
-namespace Server.Items
+using ModernUO.Serialization;
+
+namespace Server.Items
 {
     /*
     first seen halloween 2009.  subsequently in 2010,
     2011 and 2012. GM Beggar-only Semi-Rare Treats
     */
-    [Serializable(0, false)]
+    [SerializationGenerator(0, false)]
     public partial class SkullsOnPike : Item
     {
         [Constructible]

Projects/UOContent/Holiday Stuff/Halloween/2010/Items/ChairInAGhostCostume.cs

@@ -1,6 +1,8 @@
+using ModernUO.Serialization;
+
 namespace Server.Items
 {
-    [Serializable(0, false)]
+    [SerializationGenerator(0, false)]
     public partial class ChairInAGhostCostume : Item
     {
         [Constructible]

Projects/UOContent/Holiday Stuff/Halloween/2010/Items/ColoredSmallWebs.cs

@@ -1,6 +1,8 @@
+using ModernUO.Serialization;
+
 namespace Server.Items
 {
-    [Serializable(0, false)]
+    [SerializationGenerator(0, false)]
     public partial class ColoredSmallWebs : Item
     {
         [Constructible]

Projects/UOContent/Holiday Stuff/Halloween/2010/Items/ExcellentIronMaiden.cs

@@ -1,6 +1,8 @@
+using ModernUO.Serialization;
+
 namespace Server.Items
 {
-    [Serializable(0, false)]
+    [SerializationGenerator(0, false)]
     public partial class ExcellentIronMaiden : Item
     {
         [Constructible]

Projects/UOContent/Holiday Stuff/Halloween/2010/Items/HalloweenGuillotine.cs

@@ -1,6 +1,8 @@
+using ModernUO.Serialization;
+
 namespace Server.Items
 {
-    [Serializable(0, false)]
+    [SerializationGenerator(0, false)]
     public partial class HalloweenGuillotine : Item
     {
         [Constructible]

Projects/UOContent/Holiday Stuff/Halloween/2011/Items/BasePaintedMask.cs

@@ -1,6 +1,8 @@
-namespace Server.Items.Holiday
+using ModernUO.Serialization;
+
+namespace Server.Items.Holiday
 {
-    [Serializable(0, false)]
+    [SerializationGenerator(0, false)]
     [TypeAlias("Server.Items.ClownMask", "Server.Items.DaemonMask", "Server.Items.PlagueMask")]
     public partial class BasePaintedMask : Item
     {

Projects/UOContent/Holiday Stuff/Halloween/2011/Items/ClownMask.cs

@@ -1,6 +1,8 @@
-namespace Server.Items.Holiday
+using ModernUO.Serialization;
+
+namespace Server.Items.Holiday
 {
-    [Serializable(0, false)]
+    [SerializationGenerator(0, false)]
     public partial class PaintedEvilClownMask : BasePaintedMask
     {
         [Constructible]

Projects/UOContent/Holiday Stuff/Halloween/2011/Items/DaemonMask.cs

@@ -1,6 +1,8 @@
-namespace Server.Items.Holiday
+using ModernUO.Serialization;
+
+namespace Server.Items.Holiday
 {
-    [Serializable(0, false)]
+    [SerializationGenerator(0, false)]
     public partial class PaintedDaemonMask : BasePaintedMask
     {
         [Constructible]

Projects/UOContent/Holiday Stuff/Halloween/2011/Items/PlagueMask.cs

@@ -1,6 +1,8 @@
-namespace Server.Items.Holiday
+using ModernUO.Serialization;
+
+namespace Server.Items.Holiday
 {
-    [Serializable(0, false)]
+    [SerializationGenerator(0, false)]
     public partial class PaintedPlagueMask : BasePaintedMask
     {
         [Constructible]

Projects/UOContent/Holiday Stuff/Halloween/2011/Mobiles/PumpkinHead.cs

@@ -1,10 +1,11 @@
 using System;
+using ModernUO.Serialization;
 using Server.Items;
 using Server.Items.Holiday;
 
 namespace Server.Mobiles
 {
-    [Serializable(0, false)]
+    [SerializationGenerator(0, false)]
     public partial class PumpkinHead : BaseCreature
     {
         [Constructible]

Projects/UOContent/Holiday Stuff/Halloween/2012/Engines/PlayerZombies.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using ModernUO.Serialization;
 using Server.Events.Halloween;
 using Server.Items;
 using Server.Mobiles;
@@ -132,7 +133,7 @@ namespace Server.Engines.Events
         }
     }
 
-    [Serializable(0, false)]
+    [SerializationGenerator(0, false)]
     public partial class PlayerBones : BaseContainer
     {
         [Constructible]
@@ -150,7 +151,7 @@ namespace Server.Engines.Events
         }
     }
 
-    [Serializable(0, false)]
+    [SerializationGenerator(0, false)]
     public partial class ZombieSkeleton : BaseCreature
     {
         [SerializableField(0, "private", "private")]

Projects/UOContent/Holiday Stuff/Halloween/2012/Items/EvilJesterMask.cs

@@ -1,6 +1,8 @@
-namespace Server.Items.Holiday
+using ModernUO.Serialization;
+
+namespace Server.Items.Holiday
 {
-    [Serializable(0, false)]
+    [SerializationGenerator(0, false)]
     public partial class PaintedEvilJesterMask : BasePaintedMask
     {
         [Constructible]

Projects/UOContent/Holiday Stuff/Halloween/2012/Items/PorcelainMask.cs

@@ -1,6 +1,8 @@
-namespace Server.Items.Holiday
+using ModernUO.Serialization;
+
+namespace Server.Items.Holiday
 {
-    [Serializable(0, false)]
+    [SerializationGenerator(0, false)]
     public partial class PaintedPorcelainMask : BasePaintedMask
     {
         [Constructible]

Projects/UOContent/Holiday Stuff/Halloween/Treats/Jellybeans.cs

@@ -1,6 +1,8 @@
-namespace Server.Items
+using ModernUO.Serialization;
+
+namespace Server.Items
 {
-    [Serializable(0, false)]
+    [SerializationGenerator(0, false)]
     public partial class JellyBeans : CandyCane
     {
         [Constructible]

Projects/UOContent/Holiday Stuff/Halloween/Treats/Lollipops.cs

@@ -1,7 +1,9 @@
-namespace Server.Items
+using ModernUO.Serialization;
+
+namespace Server.Items
 {
     [TypeAlias("Server.Items.Lollipop")]
-    [Serializable(0, false)]
+    [SerializationGenerator(0, false)]
     public partial class Lollipops : CandyCane
     {
         [Constructible]

Projects/UOContent/Holiday Stuff/Halloween/Treats/NougatSwirl.cs

@@ -1,6 +1,8 @@
-namespace Server.Items
+using ModernUO.Serialization;
+
+namespace Server.Items
 {
-    [Serializable(0, false)]
+    [SerializationGenerator(0, false)]
     public partial class NougatSwirl : CandyCane
     {
         [Constructible]

Projects/UOContent/Holiday Stuff/Halloween/Treats/Taffy.cs

@@ -1,6 +1,8 @@
-namespace Server.Items
+using ModernUO.Serialization;
+
+namespace Server.Items
 {
-    [Serializable(0, false)]
+    [SerializationGenerator(0, false)]
     public partial class Taffy : CandyCane
     {
         [Constructible]

Projects/UOContent/Holiday Stuff/Halloween/Treats/WrappedCandy.cs

@@ -1,6 +1,8 @@
-namespace Server.Items
+using ModernUO.Serialization;
+
+namespace Server.Items
 {
-    [Serializable(0, false)]
+    [SerializationGenerator(0, false)]
     public partial class WrappedCandy : CandyCane
     {
         [Constructible]

Projects/UOContent/Holiday Stuff/Valentine/2010/Items/AnimatedHeartShapedBox.cs

@@ -1,6 +1,8 @@
+using ModernUO.Serialization;
+
 namespace Server.Items
 {
-    [Serializable(0, false)]
+    [SerializationGenerator(0, false)]
     [Flippable(0x49CC, 0x49D0)]
     public partial class AnimatedHeartShapedBox : HeartShapedBox
     {

Projects/UOContent/Holiday Stuff/Valentine/2011/Items/StValentinesBears.cs

@@ -1,10 +1,11 @@
 using System;
+using ModernUO.Serialization;
 using Server.Gumps;
 using Server.Network;
 
 namespace Server.Items
 {
-    [Serializable(0, false)]
+    [SerializationGenerator(0, false)]
     public abstract partial class StValentinesBear : Item
     {
         [InternString]
@@ -190,7 +191,7 @@ namespace Server.Items
         }
     }
 
-    [Serializable(0, false)]
+    [SerializationGenerator(0, false)]
     [Flippable(0x48E0, 0x48E1)]
     public partial class StValentinesPanda : StValentinesBear
     {
@@ -200,7 +201,7 @@ namespace Server.Items
         }
     }
 
-    [Serializable(0, false)]
+    [SerializationGenerator(0, false)]
     [Flippable(0x48E2, 0x48E3)]
     public partial class StValentinesPolarBear : StValentinesBear
     {

Projects/UOContent/Holiday Stuff/Valentine/2012/Items/CupidStatue.cs

@@ -1,6 +1,8 @@
+using ModernUO.Serialization;
+
 namespace Server.Items
 {
-    [Serializable(0, false)]
+    [SerializationGenerator(0, false)]
     [Flippable(0x4F7C, 0x4F7D)]
     public partial class CupidStatue : Item
     {

Projects/UOContent/Holiday Stuff/Valentine/2012/Items/CupidsArrow.cs

@@ -1,8 +1,9 @@
+using ModernUO.Serialization;
 using Server.Targeting;
 
 namespace Server.Items
 {
-    [Serializable(0, false)]
+    [SerializationGenerator(0, false)]
     public partial class CupidsArrow : Item
     {
         [InternString]

Projects/UOContent/Holiday Stuff/Valentine/2012/Items/HeartShapedBox.cs

@@ -1,6 +1,8 @@
+using ModernUO.Serialization;
+
 namespace Server.Items
 {
-    [Serializable(0, false)]
+    [SerializationGenerator(0, false)]
     [Flippable(0x49CA, 0x49CB)]
     public partial class HeartShapedBox : BaseContainer
     {

Projects/UOContent/Items/Addons/AbbatoirAddon.cs

@@ -1,6 +1,8 @@
+using ModernUO.Serialization;
+
 namespace Server.Items
 {
-    [Serializable(0, false)]
+    [SerializationGenerator(0, false)]
     public partial class AbbatoirAddon : BaseAddon
     {
         [Constructible]
@@ -20,7 +22,7 @@ namespace Server.Items
         public override BaseAddonDeed Deed => new AbbatoirDeed();
     }
 
-    [Serializable(0, false)]
+    [SerializationGenerator(0, false)]
     public partial class AbbatoirDeed : BaseAddonDeed
     {
         [Constructible]

Projects/UOContent/Items/Addons/AddonComponent.cs

@@ -1,9 +1,10 @@
+using ModernUO.Serialization;
 using Server.Engines.Craft;
 
 namespace Server.Items
 {
     [Anvil]
-    [Serializable(0, false)]
+    [SerializationGenerator(0, false)]
     public partial class AnvilComponent : AddonComponent
     {
         [Constructible]
@@ -13,7 +14,7 @@ namespace Server.Items
     }
 
     [Forge]
-    [Serializable(0, false)]
+    [SerializationGenerator(0, false)]
     public partial class ForgeComponent : AddonComponent
     {
         [Constructible]
@@ -22,7 +23,7 @@ namespace Server.Items
         }
     }
 
-    [Serializable(0, false)]
+    [SerializationGenerator(0, false)]
     public partial class LocalizedAddonComponent : AddonComponent
     {
         [InvalidateProperties]
@@ -36,7 +37,7 @@ namespace Server.Items
         public override int LabelNumber => _number;
     }
 
-    [Serializable(1, false)]
+    [SerializationGenerator(1, false)]
     public partial class AddonComponent : Item, IChoppable
     {
         private static readonly LightEntry[] m_Entries =

Projects/UOContent/Items/Addons/AddonContainerComponent.cs

@@ -1,12 +1,13 @@
 using System;
 using System.Buffers.Binary;
 using System.Collections.Generic;
+using ModernUO.Serialization;
 using Server.ContextMenus;
 using Server.Network;
 
 namespace Server.Items
 {
-    [Serializable(0, false)]
+    [SerializationGenerator(0, false)]
     public partial class AddonContainerComponent : Item, IChoppable
     {
         [Constructible]
@@ -107,7 +108,7 @@ namespace Server.Items
         }
     }
 
-    [Serializable(0, false)]
+    [SerializationGenerator(0, false)]
     public partial class LocalizedContainerComponent : AddonContainerComponent
     {
         [SerializableField(0, setter: "private")]

Projects/UOContent/Items/Addons/AlchemistTableEastAddon.cs

@@ -1,6 +1,8 @@
+using ModernUO.Serialization;
+
 namespace Server.Items
 {
-    [Serializable(0)]
+    [SerializationGenerator(0)]
     public partial class AlchemistTableEastAddon : BaseAddon
     {
         [Constructible]
@@ -12,7 +14,7 @@ namespace Server.Items
         public override BaseAddonDeed Deed => new AlchemistTableEastDeed();
     }
 
-    [Serializable(0)]
+    [SerializationGenerator(0)]
     public partial class AlchemistTableEastDeed : BaseAddonDeed
     {
         [Constructible]

Projects/UOContent/Items/Addons/AlchemistTableSouthAddon.cs

@@ -1,6 +1,8 @@
+using ModernUO.Serialization;
+
 namespace Server.Items
 {
-    [Serializable(0)]
+    [SerializationGenerator(0)]
     public partial class AlchemistTableSouthAddon : BaseAddon
     {
         [Constructible]
@@ -12,7 +14,7 @@ namespace Server.Items
         public override BaseAddonDeed Deed => new AlchemistTableSouthDeed();
     }
 
-    [Serializable(0)]
+    [SerializationGenerator(0)]
     public partial class AlchemistTableSouthDeed : BaseAddonDeed
     {
         [Constructible]

Projects/UOContent/Items/Addons/AnvilEastAddon.cs

@@ -1,6 +1,8 @@
+using ModernUO.Serialization;
+
 namespace Server.Items
 {
-    [Serializable(0, false)]
+    [SerializationGenerator(0, false)]
     public partial class AnvilEastAddon : BaseAddon
     {
         [Constructible]
@@ -12,7 +14,7 @@ namespace Server.Items
         public override BaseAddonDeed Deed => new AnvilEastDeed();
     }
 
-    [Serializable(0, false)]
+    [SerializationGenerator(0, false)]
     public partial class AnvilEastDeed : BaseAddonDeed
     {
         [Constructible]

Projects/UOContent/Items/Addons/AnvilSouthAddon.cs

@@ -1,6 +1,8 @@
+using ModernUO.Serialization;
+
 namespace Server.Items
 {
-    [Serializable(0, false)]
+    [SerializationGenerator(0, false)]
     public partial class AnvilSouthAddon : BaseAddon
     {
         [Constructible]
@@ -12,7 +14,7 @@ namespace Server.Items
         public override BaseAddonDeed Deed => new AnvilSouthDeed();
     }
 
-    [Serializable(0, false)]
+    [SerializationGenerator(0, false)]
     public partial class AnvilSouthDeed : BaseAddonDeed
     {
         [Constructible]

Projects/UOContent/Items/Addons/ArcaneBookshelfEastAddon.cs

@@ -1,6 +1,8 @@
+using ModernUO.Serialization;
+
 namespace Server.Items
 {
-    [Serializable(0)]
+    [SerializationGenerator(0)]
     public partial class ArcaneBookshelfEastAddon : BaseAddonContainer
     {
         [Constructible]
@@ -15,7 +17,7 @@ namespace Server.Items
         public override int DefaultDropSound => 0x42;
     }
 
-    [Serializable(0)]
+    [SerializationGenerator(0)]
     public partial class ArcaneBookshelfEastDeed : BaseAddonContainerDeed
     {
         [Constructible]

Projects/UOContent/Items/Addons/ArcaneBookshelfSouthAddon.cs

@@ -1,6 +1,8 @@
+using ModernUO.Serialization;
+
 namespace Server.Items
 {
-    [Serializable(0)]
+    [SerializationGenerator(0)]
     public partial class ArcaneBookshelfSouthAddon : BaseAddonContainer
     {
         [Constructible]
@@ -16,7 +18,7 @@ namespace Server.Items
         public override int LabelNumber => 1032420; // arcane bookshelf
     }
 
-    [Serializable(0)]
+    [SerializationGenerator(0)]
     public partial class ArcaneBookshelfSouthDeed : BaseAddonContainerDeed
     {
         [Constructible]

Projects/UOContent/Items/Addons/ArcaneCircleAddon.cs

@@ -1,6 +1,8 @@
+using ModernUO.Serialization;
+
 namespace Server.Items
 {
-    [Serializable(1)]
+    [SerializationGenerator(1)]
     public partial class ArcaneCircleAddon : BaseAddon
     {
         [Constructible]
@@ -40,7 +42,7 @@ namespace Server.Items
         }
     }
 
-    [Serializable(0)]
+    [SerializationGenerator(0)]
     public partial class ArcaneCircleDeed : BaseAddonDeed
     {
         [Constructible]

Projects/UOContent/Items/Addons/ArcanistStatueEastAddon.cs

@@ -1,6 +1,8 @@
+using ModernUO.Serialization;
+
 namespace Server.Items
 {
-    [Serializable(0)]
+    [SerializationGenerator(0)]
     public partial class ArcanistStatueEastAddon : BaseAddon
     {
         [Constructible]
@@ -12,7 +14,7 @@ namespace Server.Items
         public override BaseAddonDeed Deed => new ArcanistStatueEastDeed();
     }
 
-    [Serializable(0)]
+    [SerializationGenerator(0)]
     public partial class ArcanistStatueEastDeed : BaseAddonDeed
     {
         [Constructible]

Projects/UOContent/Items/Addons/ArcanistStatueSouthAddon.cs

@@ -1,6 +1,8 @@
+using ModernUO.Serialization;
+
 namespace Server.Items
 {
-    [Serializable(0)]
+    [SerializationGenerator(0)]
     public partial class ArcanistStatueSouthAddon : BaseAddon
     {
         [Constructible]
@@ -12,7 +14,7 @@ namespace Server.Items
         public override BaseAddonDeed Deed => new ArcanistStatueSouthDeed();
     }
 
-    [Serializable(0)]
+    [SerializationGenerator(0)]
     public partial class ArcanistStatueSouthDeed : BaseAddonDeed
     {
         [Constructible]

Projects/UOContent/Items/Addons/ArcheryButteAddon.cs

@@ -1,10 +1,11 @@
 using System;
 using System.Collections.Generic;
+using ModernUO.Serialization;
 using Server.Network;
 
 namespace Server.Items
 {
-    [Serializable(0, false)]
+    [SerializationGenerator(0, false)]
     [FlippableAttribute(0x100A /*East*/, 0x100B /*South*/)]
     public partial class ArcheryButte : AddonComponent
     {
@@ -293,7 +294,7 @@ namespace Server.Items
         }
     }
 
-    [Serializable(0, false)]
+    [SerializationGenerator(0, false)]
     public partial class ArcheryButteAddon : BaseAddon
     {
         [Constructible]
@@ -305,7 +306,7 @@ namespace Server.Items
         public override BaseAddonDeed Deed => new ArcheryButteDeed();
     }
 
-    [Serializable(0, false)]
+    [SerializationGenerator(0, false)]
     public partial class ArcheryButteDeed : BaseAddonDeed
     {
         [Constructible]

Projects/UOContent/Items/Addons/BallotBox.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using ModernUO.Serialization;
 using Server.Gumps;
 using Server.Multis;
 using Server.Network;
@@ -7,7 +8,7 @@ using Server.Prompts;
 
 namespace Server.Items
 {
-    [Serializable(0)]
+    [SerializationGenerator(0)]
     public partial class BallotBox : AddonComponent
     {
         public static readonly int MaxTopicLines = 6;
@@ -312,7 +313,7 @@ namespace Server.Items
         }
     }
 
-    [Serializable(0)]
+    [SerializationGenerator(0)]
     public partial class BallotBoxAddon : BaseAddon
     {
         public BallotBoxAddon()
@@ -321,7 +322,7 @@ namespace Server.Items
         }
     }
 
-    [Serializable(0)]
+    [SerializationGenerator(0)]
     public partial class BallotBoxDeed : BaseAddonDeed
     {
         [Constructible]

Projects/UOContent/Items/Addons/BaseAddon.cs

@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+using ModernUO.Serialization;
 using Server.Multis;
 
 namespace Server.Items
@@ -20,7 +21,7 @@ namespace Server.Items
         bool CouldFit(IPoint3D p, Map map);
     }
 
-    [Serializable(3, false)]
+    [SerializationGenerator(3, false)]
     public abstract partial class BaseAddon : Item, IChoppable, IAddon
     {
         [SerializableField(1, "private", "private")]

Projects/UOContent/Items/Addons/BaseAddonContainer.cs

@@ -1,9 +1,10 @@
 using System.Collections.Generic;
+using ModernUO.Serialization;
 using Server.Multis;
 
 namespace Server.Items
 {
-    [Serializable(2, false)]
+    [SerializationGenerator(2, false)]
     public abstract partial class BaseAddonContainer : BaseContainer, IChoppable, IAddon
     {
         [SerializableField(0, setter: "private")]

Projects/UOContent/Items/Addons/BaseAddonDeed.cs

@@ -1,10 +1,11 @@
+using ModernUO.Serialization;
 using Server.Multis;
 using Server.Spells;
 using Server.Targeting;
 
 namespace Server.Items
 {
-    [Serializable(0, false)]
+    [SerializationGenerator(0, false)]
     [Flippable(0x14F0, 0x14EF)]
     public abstract partial class BaseAddonDeed : Item
     {

Projects/UOContent/Items/Addons/BearRugs.cs

@@ -1,6 +1,8 @@
+using ModernUO.Serialization;
+
 namespace Server.Items
 {
-    [Serializable(0, false)]
+    [SerializationGenerator(0, false)]
     public partial class BrownBearRugEastAddon : BaseAddon
     {
         [Constructible]
@@ -20,7 +22,7 @@ namespace Server.Items
         public override BaseAddonDeed Deed => new BrownBearRugEastDeed();
     }
 
-    [Serializable(0, false)]
+    [SerializationGenerator(0, false)]
     public partial class BrownBearRugEastDeed : BaseAddonDeed
     {
         [Constructible]
@@ -32,7 +34,7 @@ namespace Server.Items
         public override int LabelNumber => 1049397; // a brown bear rug deed facing east
     }
 
-    [Serializable(0, false)]
+    [SerializationGenerator(0, false)]
     public partial class BrownBearRugSouthAddon : BaseAddon
     {
         [Constructible]
@@ -52,7 +54,7 @@ namespace Server.Items
         public override BaseAddonDeed Deed => new BrownBearRugSouthDeed();
     }
 
-    [Serializable(0, false)]
+    [SerializationGenerator(0, false)]
     public partial class BrownBearRugSouthDeed : BaseAddonDeed
     {
         [Constructible]
@@ -64,7 +66,7 @@ namespace Server.Items
         public override int LabelNumber => 1049398; // a brown bear rug deed facing south
     }
 
-    [Serializable(0, false)]
+    [SerializationGenerator(0, false)]
     public partial class PolarBearRugEastAddon : BaseAddon
     {
         [Constructible]
@@ -84,7 +86,7 @@ namespace Server.Items
         public override BaseAddonDeed Deed => new PolarBearRugEastDeed();
     }
 
-    [Serializable(0, false)]
+    [SerializationGenerator(0, false)]
     public partial class PolarBearRugEastDeed : BaseAddonDeed
     {
         [Constructible]
@@ -96,7 +98,7 @@ namespace Server.Items
         public override int LabelNumber => 1049399; // a polar bear rug deed facing east
     }
 
-    [Serializable(0, false)]
+    [SerializationGenerator(0, false)]
     public partial class PolarBearRugSouthAddon : BaseAddon
     {
         [Constructible]
@@ -116,7 +118,7 @@ namespace Server.Items
         public override BaseAddonDeed Deed => new PolarBearRugSouthDeed();
     }
 
-    [Serializable(0, false)]
+    [SerializationGenerator(0, false)]
     public partial class PolarBearRugSouthDeed : BaseAddonDeed
     {
         [Constructible]

Projects/UOContent/Items/Addons/BloodPentagram.cs

@@ -1,6 +1,8 @@
+using ModernUO.Serialization;
+
 namespace Server.Items
 {
-    [Serializable(0, false)]
+    [SerializationGenerator(0, false)]
     public partial class BloodPentagram : BaseAddon
     {
         [Constructible]

Projects/UOContent/Items/Addons/DartBoard.cs

@@ -1,8 +1,9 @@
+using ModernUO.Serialization;
 using Server.Network;
 
 namespace Server.Items
 {
-    [Serializable(0)]
+    [SerializationGenerator(0)]
     public partial class DartBoard : AddonComponent
     {
         [Constructible]
@@ -86,7 +87,7 @@ namespace Server.Items
         }
     }
 
-    [Serializable(0)]
+    [SerializationGenerator(0)]
     public partial class DartBoardEastAddon : BaseAddon
     {
         public DartBoardEastAddon()
@@ -97,7 +98,7 @@ namespace Server.Items
         public override BaseAddonDeed Deed => new DartBoardEastDeed();
     }
 
-    [Serializable(0)]
+    [SerializationGenerator(0)]
     public partial class DartBoardEastDeed : BaseAddonDeed
     {
         [Constructible]
@@ -110,7 +111,7 @@ namespace Server.Items
         public override int LabelNumber => 1044326; // dartboard (east)
     }
 
-    [Serializable(0)]
+    [SerializationGenerator(0)]
     public partial class DartBoardSouthAddon : BaseAddon
     {
         public DartBoardSouthAddon()
@@ -121,7 +122,7 @@ namespace Server.Items
         public override BaseAddonDeed Deed => new DartBoardSouthDeed();
     }
 
-    [Serializable(0)]
+    [SerializationGenerator(0)]
     public partial class DartBoardSouthDeed : BaseAddonDeed
     {
         [Constructible]

Projects/UOContent/Items/Addons/ElvenBedEastAddon.cs

@@ -1,6 +1,8 @@
+using ModernUO.Serialization;
+
 namespace Server.Items
 {
-    [Serializable(0)]
+    [SerializationGenerator(0)]
     public partial class ElvenBedEastAddon : BaseAddon
     {
         [Constructible]
@@ -13,7 +15,7 @@ namespace Server.Items
         public override BaseAddonDeed Deed => new ElvenBedEastDeed();
     }
 
-    [Serializable(0)]
+    [SerializationGenerator(0)]
     public partial class ElvenBedEastDeed : BaseAddonDeed
     {
         [Constructible]

Projects/UOContent/Items/Addons/ElvenBedSouthAddon.cs

@@ -1,6 +1,8 @@
+using ModernUO.Serialization;
+
 namespace Server.Items
 {
-    [Serializable(0)]
+    [SerializationGenerator(0)]
     public partial class ElvenBedSouthAddon : BaseAddon
     {
         [Constructible]
@@ -13,7 +15,7 @@ namespace Server.Items
         public override BaseAddonDeed Deed => new ElvenBedSouthDeed();
     }
 
-    [Serializable(0)]
+    [SerializationGenerator(0)]
     public partial class ElvenBedSouthDeed : BaseAddonDeed
     {
         [Constructible]

Projects/UOContent/Items/Addons/ElvenDresserEastAddon.cs

@@ -1,6 +1,8 @@
+using ModernUO.Serialization;
+
 namespace Server.Items
 {
-    [Serializable(0)]
+    [SerializationGenerator(0)]
     public partial class ElvenDresserEastAddon : BaseAddonContainer
     {
         [Constructible]
@@ -15,7 +17,7 @@ namespace Server.Items
         public override int DefaultDropSound => 0x42;
     }
 
-    [Serializable(0)]
+    [SerializationGenerator(0)]
     public partial class ElvenDresserEastDeed : BaseAddonContainerDeed
     {
         [Constructible]

Projects/UOContent/Items/Addons/ElvenDresserSouthAddon.cs

@@ -1,6 +1,8 @@
+using ModernUO.Serialization;
+
 namespace Server.Items
 {
-    [Serializable(0)]
+    [SerializationGenerator(0)]
     public partial class ElvenDresserSouthAddon : BaseAddonContainer
     {
         [Constructible]
@@ -15,7 +17,7 @@ namespace Server.Items
         public override int DefaultDropSound => 0x42;
     }
 
-    [Serializable(0)]
+    [SerializationGenerator(0)]
     public partial class ElvenDresserSouthDeed : BaseAddonContainerDeed
     {
         [Constructible]

Projects/UOContent/Items/Addons/ElvenForgeAddon.cs

@@ -1,6 +1,8 @@
+using ModernUO.Serialization;
+
 namespace Server.Items
 {
-    [Serializable(0)]
+    [SerializationGenerator(0)]
     public partial class ElvenForgeAddon : BaseAddon
     {
         [Constructible]
@@ -13,7 +15,7 @@ namespace Server.Items
         public override BaseAddonDeed Deed => new ElvenForgeDeed();
     }
 
-    [Serializable(0)]
+    [SerializationGenerator(0)]
     public partial class ElvenForgeDeed : BaseAddonDeed
     {
         [Constructible]

Projects/UOContent/Items/Addons/ElvenLoveseatEastAddon.cs

@@ -1,6 +1,8 @@
+using ModernUO.Serialization;
+
 namespace Server.Items
 {
-    [Serializable(0)]
+    [SerializationGenerator(0)]
     public partial class ElvenLoveseatEastAddon : BaseAddon
     {
         [Constructible]
@@ -13,7 +15,7 @@ namespace Server.Items
         public override BaseAddonDeed Deed => new ElvenLoveseatEastDeed();
     }
 
-    [Serializable(0)]
+    [SerializationGenerator(0)]
     public partial class ElvenLoveseatEastDeed : BaseAddonDeed
     {
         [Constructible]

Projects/UOContent/Items/Addons/ElvenLoveseatSouthAddon.cs

@@ -1,6 +1,8 @@
+using ModernUO.Serialization;
+
 namespace Server.Items
 {
-    [Serializable(0)]
+    [SerializationGenerator(0)]
     public partial class ElvenLoveseatSouthAddon : BaseAddon
     {
         [Constructible]
@@ -13,7 +15,7 @@ namespace Server.Items
         public override BaseAddonDeed Deed => new ElvenLoveseatSouthDeed();
     }
 
-    [Serializable(0)]
+    [SerializationGenerator(0)]
     public partial class ElvenLoveseatSouthDeed : BaseAddonDeed
     {
         [Constructible]

Projects/UOContent/Items/Addons/ElvenSpinningWheelEastAddon.cs

@@ -1,4 +1,5 @@
 using System;
+using ModernUO.Serialization;
 
 namespace Server.Items
 {
@@ -10,7 +11,7 @@ namespace Server.Items
         void BeginSpin(SpinCallback callback, Mobile from, int hue);
     }
 
-    [Serializable(0)]
+    [SerializationGenerator(0)]
     [TypeAlias("Server.Items.ElvenSpinningwheelEastAddon")]
     public partial class ElvenSpinningWheelEastAddon : BaseAddon, ISpinningWheel
     {
@@ -99,7 +100,7 @@ namespace Server.Items
         }
     }
 
-    [Serializable(0)]
+    [SerializationGenerator(0)]
     [TypeAlias("Server.Items.ElvenSpinningwheelEastDeed")]
     public partial class ElvenSpinningWheelEastDeed : BaseAddonDeed
     {

Projects/UOContent/Items/Addons/ElvenSpinningwheelSouthAddon.cs

@@ -1,8 +1,9 @@
 using System;
+using ModernUO.Serialization;
 
 namespace Server.Items
 {
-    [Serializable(0)]
+    [SerializationGenerator(0)]
     [TypeAlias("Server.Items.ElvenSpinningwheelSouthAddon")]
     public partial class ElvenSpinningWheelSouthAddon : BaseAddon, ISpinningWheel
     {
@@ -90,7 +91,7 @@ namespace Server.Items
         }
     }
 
-    [Serializable(0)]
+    [SerializationGenerator(0)]
     [TypeAlias("Server.Items.ElvenSpinningwheelSouthDeed")]
     public partial class ElvenSpinningWheelSouthDeed : BaseAddonDeed
     {

Projects/UOContent/Items/Addons/ElvenStoveEastAddon.cs

@@ -1,6 +1,8 @@
+using ModernUO.Serialization;
+
 namespace Server.Items
 {
-    [Serializable(0)]
+    [SerializationGenerator(0)]
     public partial class ElvenStoveEastAddon : BaseAddon
     {
         [Constructible]
@@ -12,7 +14,7 @@ namespace Server.Items
         public override BaseAddonDeed Deed => new ElvenStoveEastDeed();
     }
 
-    [Serializable(0)]
+    [SerializationGenerator(0)]
     public partial class ElvenStoveEastDeed : BaseAddonDeed
     {
         [Constructible]

Projects/UOContent/Items/Addons/ElvenStoveSouthAddon.cs

@@ -1,6 +1,8 @@
+using ModernUO.Serialization;
+
 namespace Server.Items
 {
-    [Serializable(0)]
+    [SerializationGenerator(0)]
     public partial class ElvenStoveSouthAddon : BaseAddon
     {
         [Constructible]
@@ -12,7 +14,7 @@ namespace Server.Items
         public override BaseAddonDeed Deed => new ElvenStoveSouthDeed();
     }
 
-    [Serializable(0)]
+    [SerializationGenerator(0)]
     public partial class ElvenStoveSouthDeed : BaseAddonDeed
     {
         [Constructible]

Projects/UOContent/Items/Addons/ElvenWashbasinEastAddon.cs

@@ -1,6 +1,8 @@
+using ModernUO.Serialization;
+
 namespace Server.Items
 {
-    [Serializable(0)]
+    [SerializationGenerator(0)]
     public partial class ElvenWashBasinEastAddon : BaseAddonContainer
     {
         [Constructible]
@@ -15,7 +17,7 @@ namespace Server.Items
         public override int DefaultDropSound => 0x0042;
     }
 
-    [Serializable(0)]
+    [SerializationGenerator(0)]
     public partial class ElvenWashBasinEastDeed : BaseAddonContainerDeed
     {
         [Constructible]

Projects/UOContent/Items/Addons/ElvenWashbasinSouthAddon.cs

@@ -1,6 +1,8 @@
+using ModernUO.Serialization;
+
 namespace Server.Items
 {
-    [Serializable(0)]
+    [SerializationGenerator(0)]
     public partial class ElvenWashBasinSouthAddon : BaseAddonContainer
     {
         [Constructible]
@@ -15,7 +17,7 @@ namespace Server.Items
         public override int DefaultDropSound => 0x0042;
     }
 
-    [Serializable(0)]
+    [SerializationGenerator(0)]
     public partial class ElvenWashBasinSouthDeed : BaseAddonContainerDeed
     {
         [Constructible]

Projects/UOContent/Items/Addons/FancyElvenTableEastAddon.cs

@@ -1,6 +1,8 @@
+using ModernUO.Serialization;
+
 namespace Server.Items
 {
-    [Serializable(0)]
+    [SerializationGenerator(0)]
     public partial class FancyElvenTableEastAddon : BaseAddon
     {
         [Constructible]
@@ -14,7 +16,7 @@ namespace Server.Items
         public override BaseAddonDeed Deed => new FancyElvenTableEastDeed();
     }
 
-    [Serializable(0)]
+    [SerializationGenerator(0)]
     public partial class FancyElvenTableEastDeed : BaseAddonDeed
     {
         [Constructible]

Projects/UOContent/Items/Addons/FancyElvenTableSouthAddon.cs

@@ -1,6 +1,8 @@
+using ModernUO.Serialization;
+
 namespace Server.Items
 {
-    [Serializable(0)]
+    [SerializationGenerator(0)]
     public partial class FancyElvenTableSouthAddon : BaseAddon
     {
         [Constructible]
@@ -14,7 +16,7 @@ namespace Server.Items
         public override BaseAddonDeed Deed => new FancyElvenTableSouthDeed();
     }
 
-    [Serializable(0)]
+    [SerializationGenerator(0)]
     public partial class FancyElvenTableSouthDeed : BaseAddonDeed
     {
         [Constructible]