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

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

Browse source 
- [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
This commit is contained in:
Kamron Batman 2022-04-17 08:02:15 -07:00 • committed by GitHub
parent 5d972caa9c
commit 54d728a322
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
740 changed files with 2552 additions and 1743 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Projects/UOContent/Items/Containers/BaseTreasureChest.cs
View file

@ -1,8 +1,9 @@
using System;
using ModernUO.Serialization;
namespace Server.Items;
[Serializable(1, false)]
[SerializationGenerator(1, false)]
public partial class BaseTreasureChest : LockableContainer
{
public enum TreasureLevel

55
Projects/UOContent/Items/Containers/Container.cs
View file

@ -1,4 +1,5 @@
using System.Collections.Generic;
using ModernUO.Serialization;
using Server.ContextMenus;
using Server.Mobiles;
using Server.Multis;
@ -159,7 +160,7 @@ public abstract class BaseContainer : Container
}
}
[Serializable(0, false)]
[SerializationGenerator(0, false)]
public partial class CreatureBackpack : Backpack // Used on BaseCreature
{
[Constructible]
@ -209,7 +210,7 @@ public partial class CreatureBackpack : Backpack // Used on BaseCreature
public override bool TryDropItem(Mobile from, Item dropped, bool sendFullMessage) => false;
}
[Serializable(0, false)]
[SerializationGenerator(0, false)]
public partial class StrongBackpack : Backpack // Used on Pack animals
{
[Constructible]
@ -229,7 +230,7 @@ public partial class StrongBackpack : Backpack // Used on Pack animals
base.CheckContentDisplay(from);
}
[Serializable(0, false)]
[SerializationGenerator(0, false)]
public partial class Backpack : BaseContainer, IDyable
{
[Constructible]
@ -265,14 +266,14 @@ public partial class Backpack : BaseContainer, IDyable
}
}
[Serializable(0, false)]
[SerializationGenerator(0, false)]
public partial class Pouch : TrappableContainer
{
[Constructible]
public Pouch() : base(0xE79) => Weight = 1.0;
}
[Serializable(0, false)]
[SerializationGenerator(0, false)]
public abstract partial class BaseBagBall : BaseContainer, IDyable
{
public BaseBagBall(int itemID) : base(itemID) => Weight = 1.0;
@ -290,7 +291,7 @@ public abstract partial class BaseBagBall : BaseContainer, IDyable
}
}
[Serializable(0, false)]
[SerializationGenerator(0, false)]
public partial class SmallBagBall : BaseBagBall
{
[Constructible]
@ -299,7 +300,7 @@ public partial class SmallBagBall : BaseBagBall
}
}
[Serializable(0, false)]
[SerializationGenerator(0, false)]
public partial class LargeBagBall : BaseBagBall
{
[Constructible]
@ -308,7 +309,7 @@ public partial class LargeBagBall : BaseBagBall
}
}
[Serializable(0, false)]
[SerializationGenerator(0, false)]
public partial class Bag : BaseContainer, IDyable
{
[Constructible]
@ -327,28 +328,28 @@ public partial class Bag : BaseContainer, IDyable
}
}
[Serializable(0, false)]
[SerializationGenerator(0, false)]
public partial class Barrel : BaseContainer
{
[Constructible]
public Barrel() : base(0xE77) => Weight = 25.0;
}
[Serializable(0, false)]
[SerializationGenerator(0, false)]
public partial class Keg : BaseContainer
{
[Constructible]
public Keg() : base(0xE7F) => Weight = 15.0;
}
[Serializable(0, false)]
[SerializationGenerator(0, false)]
public partial class PicnicBasket : BaseContainer
{
[Constructible]
public PicnicBasket() : base(0xE7A) => Weight = 2.0;
}
[Serializable(0, false)]
[SerializationGenerator(0, false)]
public partial class Basket : BaseContainer
{
[Constructible]
@ -357,7 +358,7 @@ public partial class Basket : BaseContainer
[Furniture]
[Flippable(0x9AA, 0xE7D)]
[Serializable(0, false)]
[SerializationGenerator(0, false)]
public partial class WoodenBox : LockableContainer
{
[Constructible]
@ -366,7 +367,7 @@ public partial class WoodenBox : LockableContainer
[Furniture]
[Flippable(0x9A9, 0xE7E)]
[Serializable(0, false)]
[SerializationGenerator(0, false)]
public partial class SmallCrate : LockableContainer
{
[Constructible]
@ -375,7 +376,7 @@ public partial class SmallCrate : LockableContainer
[Furniture]
[Flippable(0xE3F, 0xE3E)]
[Serializable(0, false)]
[SerializationGenerator(0, false)]
public partial class MediumCrate : LockableContainer
{
[Constructible]
@ -384,7 +385,7 @@ public partial class MediumCrate : LockableContainer
[Furniture]
[Flippable(0xE3D, 0xE3C)]
[Serializable(0, false)]
[SerializationGenerator(0, false)]
public partial class LargeCrate : LockableContainer
{
[Constructible]
@ -393,7 +394,7 @@ public partial class LargeCrate : LockableContainer
[DynamicFlipping]
[Flippable(0x9A8, 0xE80)]
[Serializable(0, false)]
[SerializationGenerator(0, false)]
public partial class MetalBox : LockableContainer
{
[Constructible]
@ -404,7 +405,7 @@ public partial class MetalBox : LockableContainer
[DynamicFlipping]
[Flippable(0x9AB, 0xE7C)]
[Serializable(0, false)]
[SerializationGenerator(0, false)]
public partial class MetalChest : LockableContainer
{
[Constructible]
@ -414,7 +415,7 @@ public partial class MetalChest : LockableContainer
}
[DynamicFlipping, Flippable(0xE41, 0xE40)]
[Serializable(0, false)]
[SerializationGenerator(0, false)]
public partial class MetalGoldenChest : LockableContainer
{
[Constructible]
@ -425,7 +426,7 @@ public partial class MetalGoldenChest : LockableContainer
[Furniture]
[Flippable(0xe43, 0xe42)]
[Serializable(0, false)]
[SerializationGenerator(0, false)]
public partial class WoodenChest : LockableContainer
{
[Constructible]
@ -434,7 +435,7 @@ public partial class WoodenChest : LockableContainer
[Furniture]
[Flippable(0x280B, 0x280C)]
[Serializable(0, false)]
[SerializationGenerator(0, false)]
public partial class PlainWoodenChest : LockableContainer
{
[Constructible]
@ -445,7 +446,7 @@ public partial class PlainWoodenChest : LockableContainer
[Furniture]
[Flippable(0x280D, 0x280E)]
[Serializable(0, false)]
[SerializationGenerator(0, false)]
public partial class OrnateWoodenChest : LockableContainer
{
[Constructible]
@ -456,7 +457,7 @@ public partial class OrnateWoodenChest : LockableContainer
[Furniture]
[Flippable(0x280F, 0x2810)]
[Serializable(0, false)]
[SerializationGenerator(0, false)]
public partial class GildedWoodenChest : LockableContainer
{
[Constructible]
@ -467,7 +468,7 @@ public partial class GildedWoodenChest : LockableContainer
[Furniture]
[Flippable(0x2811, 0x2812)]
[Serializable(0, false)]
[SerializationGenerator(0, false)]
public partial class WoodenFootLocker : LockableContainer
{
[Constructible]
@ -476,7 +477,7 @@ public partial class WoodenFootLocker : LockableContainer
[Furniture]
[Flippable(0x2813, 0x2814)]
[Serializable(0, false)]
[SerializationGenerator(0, false)]
public partial class FinishedWoodenChest : LockableContainer
{
[Constructible]
@ -486,7 +487,7 @@ public partial class FinishedWoodenChest : LockableContainer
}
[Furniture]
[Serializable(0)]
[SerializationGenerator(0)]
[Flippable(0x2DF1, 0x2DF2)]
public partial class RarewoodChest : LockableContainer
{
@ -497,7 +498,7 @@ public partial class RarewoodChest : LockableContainer
}
[Furniture]
[Serializable(0)]
[SerializationGenerator(0)]
[Flippable(0x2DF3, 0x2DF4)]
public partial class DecorativeBox : LockableContainer
{

29
Projects/UOContent/Items/Containers/FurnitureContainer.cs
View file

@ -1,11 +1,12 @@
using System;
using System.Collections.Generic;
using ModernUO.Serialization;
namespace Server.Items;
[Furniture]
[Flippable(0x2815, 0x2816)]
[Serializable(0, false)]
[SerializationGenerator(0, false)]
public partial class TallCabinet : BaseContainer
{
[Constructible]
@ -14,7 +15,7 @@ public partial class TallCabinet : BaseContainer
[Furniture]
[Flippable(0x2817, 0x2818)]
[Serializable(0, false)]
[SerializationGenerator(0, false)]
public partial class ShortCabinet : BaseContainer
{
[Constructible]
@ -23,7 +24,7 @@ public partial class ShortCabinet : BaseContainer
[Furniture]
[Flippable(0x2857, 0x2858)]
[Serializable(0, false)]
[SerializationGenerator(0, false)]
public partial class RedArmoire : BaseContainer
{
[Constructible]
@ -32,7 +33,7 @@ public partial class RedArmoire : BaseContainer
[Furniture]
[Flippable(0x285D, 0x285E)]
[Serializable(0, false)]
[SerializationGenerator(0, false)]
public partial class CherryArmoire : BaseContainer
{
[Constructible]
@ -41,7 +42,7 @@ public partial class CherryArmoire : BaseContainer
[Furniture]
[Flippable(0x285B, 0x285C)]
[Serializable(0, false)]
[SerializationGenerator(0, false)]
public partial class MapleArmoire : BaseContainer
{
[Constructible]
@ -50,7 +51,7 @@ public partial class MapleArmoire : BaseContainer
[Furniture]
[Flippable(0x2859, 0x285A)]
[Serializable(0, false)]
[SerializationGenerator(0, false)]
public partial class ElegantArmoire : BaseContainer
{
[Constructible]
@ -58,7 +59,7 @@ public partial class ElegantArmoire : BaseContainer
}
[Furniture]
[Serializable(0)]
[SerializationGenerator(0)]
[Flippable(0x2D07, 0x2D08)]
public partial class FancyElvenArmoire : BaseContainer
{
@ -69,7 +70,7 @@ public partial class FancyElvenArmoire : BaseContainer
}
[Furniture]
[Serializable(0)]
[SerializationGenerator(0)]
[Flippable(0x2D05, 0x2D06)]
public partial class SimpleElvenArmoire : BaseContainer
{
@ -81,7 +82,7 @@ public partial class SimpleElvenArmoire : BaseContainer
[Furniture]
[Flippable(0xa97, 0xa99, 0xa98, 0xa9a, 0xa9b, 0xa9c)]
[Serializable(0, false)]
[SerializationGenerator(0, false)]
public partial class FullBookcase : BaseContainer
{
[Constructible]
@ -90,7 +91,7 @@ public partial class FullBookcase : BaseContainer
[Furniture]
[Flippable(0xa9d, 0xa9e)]
[Serializable(0, false)]
[SerializationGenerator(0, false)]
public partial class EmptyBookcase : BaseContainer
{
[Constructible]
@ -101,7 +102,7 @@ public partial class EmptyBookcase : BaseContainer
[Furniture]
[Flippable(0xa2c, 0xa34)]
[Serializable(0, false)]
[SerializationGenerator(0, false)]
public partial class Drawer : BaseContainer
{
[Constructible]
@ -110,7 +111,7 @@ public partial class Drawer : BaseContainer
[Furniture]
[Flippable(0xa30, 0xa38)]
[Serializable(0, false)]
[SerializationGenerator(0, false)]
public partial class FancyDrawer : BaseContainer
{
[Constructible]
@ -119,7 +120,7 @@ public partial class FancyDrawer : BaseContainer
[Furniture]
[Flippable(0xa4f, 0xa53)]
[Serializable(0, false)]
[SerializationGenerator(0, false)]
public partial class Armoire : BaseContainer
{
[Constructible]
@ -142,7 +143,7 @@ public partial class Armoire : BaseContainer
[Furniture]
[Flippable(0xa4d, 0xa51)]
[Serializable(0, false)]
[SerializationGenerator(0, false)]
public partial class FancyArmoire : BaseContainer
{
[Constructible]

3
Projects/UOContent/Items/Containers/LockableContainer.cs
View file

@ -1,10 +1,11 @@
using System;
using ModernUO.Serialization;
using Server.Engines.Craft;
using Server.Network;
namespace Server.Items;
[Serializable(0, false)]
[SerializationGenerator(0, false)]
public abstract partial class LockableContainer : TrappableContainer, ILockable, ILockpickable, ICraftable, IShipwreckedItem
{
public LockableContainer(int itemID) : base(itemID) => MaxLockLevel = 100;

3
Projects/UOContent/Items/Containers/MarkContainer.cs
View file

@ -1,8 +1,9 @@
using System;
using ModernUO.Serialization;
namespace Server.Items;
[Serializable(0, false)]
[SerializationGenerator(0, false)]
public partial class MarkContainer : LockableContainer
{
[SerializableField(0, getter: "private", setter: "private")]

4
Projects/UOContent/Items/Containers/ParagonChest.cs
View file

@ -1,7 +1,9 @@
using ModernUO.Serialization;
namespace Server.Items;
[Flippable]
[Serializable(0, false)]
[SerializationGenerator(0, false)]
public partial class ParagonChest : LockableContainer
{
private static readonly int[] _itemIDs =

3
Projects/UOContent/Items/Containers/SalvageBag.cs
View file

@ -1,6 +1,7 @@
using System;
using System.Collections.Generic;
using System.Linq;
using ModernUO.Serialization;
using Server.ContextMenus;
using Server.Engines.Craft;
using Server.Network;
@ -8,7 +9,7 @@ using Server.Utilities;
namespace Server.Items;
[Serializable(0)]
[SerializationGenerator(0)]
public partial class SalvageBag : Bag
{
private bool m_Failure;

3
Projects/UOContent/Items/Containers/Strongbox.cs
View file

@ -1,11 +1,12 @@
using System;
using System.Collections.Generic;
using ModernUO.Serialization;
using Server.Multis;
namespace Server.Items;
[Flippable(0xE80, 0x9A8)]
[Serializable(0, false)]
[SerializationGenerator(0, false)]
public partial class StrongBox : BaseContainer, IChoppable
{
[InvalidateProperties]

3
Projects/UOContent/Items/Containers/TrappableContainer.cs
View file

@ -1,3 +1,4 @@
using ModernUO.Serialization;
using Server.Network;
namespace Server.Items;
@ -11,7 +12,7 @@ public enum TrapType
PoisonTrap
}
[Serializable(3, false)]
[SerializationGenerator(3, false)]
public abstract partial class TrappableContainer : BaseContainer, ITelekinesisable
{
[SerializableField(0)]

8
Projects/UOContent/Items/Containers/TreasureChest.cs
View file

@ -1,7 +1,9 @@
using ModernUO.Serialization;
namespace Server.Items;
[Flippable(0xe43, 0xe42)]
[Serializable(0, false)]
[SerializationGenerator(0, false)]
public partial class WoodenTreasureChest : BaseTreasureChest
{
[Constructible]
@ -11,7 +13,7 @@ public partial class WoodenTreasureChest : BaseTreasureChest
}
[Flippable(0xe41, 0xe40)]
[Serializable(0, false)]
[SerializationGenerator(0, false)]
public partial class MetalGoldenTreasureChest : BaseTreasureChest
{
[Constructible]
@ -21,7 +23,7 @@ public partial class MetalGoldenTreasureChest : BaseTreasureChest
}
[Flippable(0x9ab, 0xe7c)]
[Serializable(0, false)]
[SerializationGenerator(0, false)]
public partial class MetalTreasureChest : BaseTreasureChest
{
[Constructible]

3
Projects/UOContent/Items/Containers/TreasureMapChest.cs
View file

@ -1,5 +1,6 @@
using System;
using System.Collections.Generic;
using ModernUO.Serialization;
using Server.ContextMenus;
using Server.Engines.PartySystem;
using Server.Gumps;
@ -8,7 +9,7 @@ using Server.Utilities;
namespace Server.Items;
[Serializable(2, false)]
[SerializationGenerator(2, false)]
public partial class TreasureMapChest : LockableContainer
{
[SerializableField(0, setter: "private")]