From a07c42fc853d2a65fc24bd82eda11b3ccac06ec7 Mon Sep 17 00:00:00 2001 From: Kamron Batman <3953314+kamronbatman@users.noreply.github.com> Date: Mon, 13 Jun 2022 17:38:46 -0700 Subject: [PATCH] fix: Codegens gems (#1059) --- Projects/UOContent/Items/Gems/Amber.cs | 40 ++++++------------- Projects/UOContent/Items/Gems/Amethyst.cs | 40 ++++++------------- Projects/UOContent/Items/Gems/Citrine.cs | 40 ++++++------------- Projects/UOContent/Items/Gems/Diamond.cs | 40 ++++++------------- Projects/UOContent/Items/Gems/Emerald.cs | 40 ++++++------------- Projects/UOContent/Items/Gems/Ruby.cs | 40 ++++++------------- Projects/UOContent/Items/Gems/Sapphire.cs | 40 ++++++------------- Projects/UOContent/Items/Gems/StarSapphire.cs | 40 ++++++------------- Projects/UOContent/Items/Gems/Tourmaline.cs | 40 ++++++------------- .../Migrations/Server.Items.Amber.v0.json | 4 ++ .../Migrations/Server.Items.Amethyst.v0.json | 4 ++ .../Migrations/Server.Items.Citrine.v0.json | 4 ++ .../Migrations/Server.Items.Diamond.v0.json | 4 ++ .../Migrations/Server.Items.Emerald.v0.json | 4 ++ .../Migrations/Server.Items.Ruby.v0.json | 4 ++ .../Migrations/Server.Items.Sapphire.v0.json | 4 ++ .../Server.Items.StarSapphire.v0.json | 4 ++ .../Server.Items.Tourmaline.v0.json | 4 ++ 18 files changed, 144 insertions(+), 252 deletions(-) create mode 100644 Projects/UOContent/Migrations/Server.Items.Amber.v0.json create mode 100644 Projects/UOContent/Migrations/Server.Items.Amethyst.v0.json create mode 100644 Projects/UOContent/Migrations/Server.Items.Citrine.v0.json create mode 100644 Projects/UOContent/Migrations/Server.Items.Diamond.v0.json create mode 100644 Projects/UOContent/Migrations/Server.Items.Emerald.v0.json create mode 100644 Projects/UOContent/Migrations/Server.Items.Ruby.v0.json create mode 100644 Projects/UOContent/Migrations/Server.Items.Sapphire.v0.json create mode 100644 Projects/UOContent/Migrations/Server.Items.StarSapphire.v0.json create mode 100644 Projects/UOContent/Migrations/Server.Items.Tourmaline.v0.json diff --git a/Projects/UOContent/Items/Gems/Amber.cs b/Projects/UOContent/Items/Gems/Amber.cs index d811421cf..99760ef19 100644 --- a/Projects/UOContent/Items/Gems/Amber.cs +++ b/Projects/UOContent/Items/Gems/Amber.cs @@ -1,32 +1,16 @@ -namespace Server.Items +using ModernUO.Serialization; + +namespace Server.Items; + +[SerializationGenerator(0, false)] +public partial class Amber : Item { - public class Amber : Item + [Constructible] + public Amber(int amount = 1) : base(0xF25) { - [Constructible] - public Amber(int amount = 1) : base(0xF25) - { - Stackable = true; - Amount = amount; - } - - public Amber(Serial serial) : base(serial) - { - } - - public override double DefaultWeight => 0.1; - - public override void Serialize(IGenericWriter writer) - { - base.Serialize(writer); - - writer.Write(0); // version - } - - public override void Deserialize(IGenericReader reader) - { - base.Deserialize(reader); - - var version = reader.ReadInt(); - } + Stackable = true; + Amount = amount; } + + public override double DefaultWeight => 0.1; } diff --git a/Projects/UOContent/Items/Gems/Amethyst.cs b/Projects/UOContent/Items/Gems/Amethyst.cs index 99f684cc7..4e1cefd0d 100644 --- a/Projects/UOContent/Items/Gems/Amethyst.cs +++ b/Projects/UOContent/Items/Gems/Amethyst.cs @@ -1,32 +1,16 @@ -namespace Server.Items +using ModernUO.Serialization; + +namespace Server.Items; + +[SerializationGenerator(0, false)] +public partial class Amethyst : Item { - public class Amethyst : Item + [Constructible] + public Amethyst(int amount = 1) : base(0xF16) { - [Constructible] - public Amethyst(int amount = 1) : base(0xF16) - { - Stackable = true; - Amount = amount; - } - - public Amethyst(Serial serial) : base(serial) - { - } - - public override double DefaultWeight => 0.1; - - public override void Serialize(IGenericWriter writer) - { - base.Serialize(writer); - - writer.Write(0); // version - } - - public override void Deserialize(IGenericReader reader) - { - base.Deserialize(reader); - - var version = reader.ReadInt(); - } + Stackable = true; + Amount = amount; } + + public override double DefaultWeight => 0.1; } diff --git a/Projects/UOContent/Items/Gems/Citrine.cs b/Projects/UOContent/Items/Gems/Citrine.cs index 2f87a0462..cd06a3713 100644 --- a/Projects/UOContent/Items/Gems/Citrine.cs +++ b/Projects/UOContent/Items/Gems/Citrine.cs @@ -1,32 +1,16 @@ -namespace Server.Items +using ModernUO.Serialization; + +namespace Server.Items; + +[SerializationGenerator(0, false)] +public partial class Citrine : Item { - public class Citrine : Item + [Constructible] + public Citrine(int amount = 1) : base(0xF15) { - [Constructible] - public Citrine(int amount = 1) : base(0xF15) - { - Stackable = true; - Amount = amount; - } - - public Citrine(Serial serial) : base(serial) - { - } - - public override double DefaultWeight => 0.1; - - public override void Serialize(IGenericWriter writer) - { - base.Serialize(writer); - - writer.Write(0); // version - } - - public override void Deserialize(IGenericReader reader) - { - base.Deserialize(reader); - - var version = reader.ReadInt(); - } + Stackable = true; + Amount = amount; } + + public override double DefaultWeight => 0.1; } diff --git a/Projects/UOContent/Items/Gems/Diamond.cs b/Projects/UOContent/Items/Gems/Diamond.cs index 22802ba8e..22194b60c 100644 --- a/Projects/UOContent/Items/Gems/Diamond.cs +++ b/Projects/UOContent/Items/Gems/Diamond.cs @@ -1,32 +1,16 @@ -namespace Server.Items +using ModernUO.Serialization; + +namespace Server.Items; + +[SerializationGenerator(0, false)] +public partial class Diamond : Item { - public class Diamond : Item + [Constructible] + public Diamond(int amount = 1) : base(0xF26) { - [Constructible] - public Diamond(int amount = 1) : base(0xF26) - { - Stackable = true; - Amount = amount; - } - - public Diamond(Serial serial) : base(serial) - { - } - - public override double DefaultWeight => 0.1; - - public override void Serialize(IGenericWriter writer) - { - base.Serialize(writer); - - writer.Write(0); // version - } - - public override void Deserialize(IGenericReader reader) - { - base.Deserialize(reader); - - var version = reader.ReadInt(); - } + Stackable = true; + Amount = amount; } + + public override double DefaultWeight => 0.1; } diff --git a/Projects/UOContent/Items/Gems/Emerald.cs b/Projects/UOContent/Items/Gems/Emerald.cs index 90bde6ffc..de02a09dd 100644 --- a/Projects/UOContent/Items/Gems/Emerald.cs +++ b/Projects/UOContent/Items/Gems/Emerald.cs @@ -1,32 +1,16 @@ -namespace Server.Items +using ModernUO.Serialization; + +namespace Server.Items; + +[SerializationGenerator(0, false)] +public partial class Emerald : Item { - public class Emerald : Item + [Constructible] + public Emerald(int amount = 1) : base(0xF10) { - [Constructible] - public Emerald(int amount = 1) : base(0xF10) - { - Stackable = true; - Amount = amount; - } - - public Emerald(Serial serial) : base(serial) - { - } - - public override double DefaultWeight => 0.1; - - public override void Serialize(IGenericWriter writer) - { - base.Serialize(writer); - - writer.Write(0); // version - } - - public override void Deserialize(IGenericReader reader) - { - base.Deserialize(reader); - - var version = reader.ReadInt(); - } + Stackable = true; + Amount = amount; } + + public override double DefaultWeight => 0.1; } diff --git a/Projects/UOContent/Items/Gems/Ruby.cs b/Projects/UOContent/Items/Gems/Ruby.cs index 536f2a06b..9d2712818 100644 --- a/Projects/UOContent/Items/Gems/Ruby.cs +++ b/Projects/UOContent/Items/Gems/Ruby.cs @@ -1,32 +1,16 @@ -namespace Server.Items +using ModernUO.Serialization; + +namespace Server.Items; + +[SerializationGenerator(0, false)] +public partial class Ruby : Item { - public class Ruby : Item + [Constructible] + public Ruby(int amount = 1) : base(0xF13) { - [Constructible] - public Ruby(int amount = 1) : base(0xF13) - { - Stackable = true; - Amount = amount; - } - - public Ruby(Serial serial) : base(serial) - { - } - - public override double DefaultWeight => 0.1; - - public override void Serialize(IGenericWriter writer) - { - base.Serialize(writer); - - writer.Write(0); // version - } - - public override void Deserialize(IGenericReader reader) - { - base.Deserialize(reader); - - var version = reader.ReadInt(); - } + Stackable = true; + Amount = amount; } + + public override double DefaultWeight => 0.1; } diff --git a/Projects/UOContent/Items/Gems/Sapphire.cs b/Projects/UOContent/Items/Gems/Sapphire.cs index a43a7b7f5..870e4346a 100644 --- a/Projects/UOContent/Items/Gems/Sapphire.cs +++ b/Projects/UOContent/Items/Gems/Sapphire.cs @@ -1,32 +1,16 @@ -namespace Server.Items +using ModernUO.Serialization; + +namespace Server.Items; + +[SerializationGenerator(0, false)] +public partial class Sapphire : Item { - public class Sapphire : Item + [Constructible] + public Sapphire(int amount = 1) : base(0xF19) { - [Constructible] - public Sapphire(int amount = 1) : base(0xF19) - { - Stackable = true; - Amount = amount; - } - - public Sapphire(Serial serial) : base(serial) - { - } - - public override double DefaultWeight => 0.1; - - public override void Serialize(IGenericWriter writer) - { - base.Serialize(writer); - - writer.Write(0); // version - } - - public override void Deserialize(IGenericReader reader) - { - base.Deserialize(reader); - - var version = reader.ReadInt(); - } + Stackable = true; + Amount = amount; } + + public override double DefaultWeight => 0.1; } diff --git a/Projects/UOContent/Items/Gems/StarSapphire.cs b/Projects/UOContent/Items/Gems/StarSapphire.cs index 04f2aa463..06e464600 100644 --- a/Projects/UOContent/Items/Gems/StarSapphire.cs +++ b/Projects/UOContent/Items/Gems/StarSapphire.cs @@ -1,32 +1,16 @@ -namespace Server.Items +using ModernUO.Serialization; + +namespace Server.Items; + +[SerializationGenerator(0, false)] +public partial class StarSapphire : Item { - public class StarSapphire : Item + [Constructible] + public StarSapphire(int amount = 1) : base(0xF21) { - [Constructible] - public StarSapphire(int amount = 1) : base(0xF21) - { - Stackable = true; - Amount = amount; - } - - public StarSapphire(Serial serial) : base(serial) - { - } - - public override double DefaultWeight => 0.1; - - public override void Serialize(IGenericWriter writer) - { - base.Serialize(writer); - - writer.Write(0); // version - } - - public override void Deserialize(IGenericReader reader) - { - base.Deserialize(reader); - - var version = reader.ReadInt(); - } + Stackable = true; + Amount = amount; } + + public override double DefaultWeight => 0.1; } diff --git a/Projects/UOContent/Items/Gems/Tourmaline.cs b/Projects/UOContent/Items/Gems/Tourmaline.cs index c17503f80..8ead4268e 100644 --- a/Projects/UOContent/Items/Gems/Tourmaline.cs +++ b/Projects/UOContent/Items/Gems/Tourmaline.cs @@ -1,32 +1,16 @@ -namespace Server.Items +using ModernUO.Serialization; + +namespace Server.Items; + +[SerializationGenerator(0, false)] +public partial class Tourmaline : Item { - public class Tourmaline : Item + [Constructible] + public Tourmaline(int amount = 1) : base(0xF2D) { - [Constructible] - public Tourmaline(int amount = 1) : base(0xF2D) - { - Stackable = true; - Amount = amount; - } - - public Tourmaline(Serial serial) : base(serial) - { - } - - public override double DefaultWeight => 0.1; - - public override void Serialize(IGenericWriter writer) - { - base.Serialize(writer); - - writer.Write(0); // version - } - - public override void Deserialize(IGenericReader reader) - { - base.Deserialize(reader); - - var version = reader.ReadInt(); - } + Stackable = true; + Amount = amount; } + + public override double DefaultWeight => 0.1; } diff --git a/Projects/UOContent/Migrations/Server.Items.Amber.v0.json b/Projects/UOContent/Migrations/Server.Items.Amber.v0.json new file mode 100644 index 000000000..9d44ba15c --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.Amber.v0.json @@ -0,0 +1,4 @@ +{ + "version": 0, + "type": "Server.Items.Amber" +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.Amethyst.v0.json b/Projects/UOContent/Migrations/Server.Items.Amethyst.v0.json new file mode 100644 index 000000000..af9bad81e --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.Amethyst.v0.json @@ -0,0 +1,4 @@ +{ + "version": 0, + "type": "Server.Items.Amethyst" +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.Citrine.v0.json b/Projects/UOContent/Migrations/Server.Items.Citrine.v0.json new file mode 100644 index 000000000..8afa812e6 --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.Citrine.v0.json @@ -0,0 +1,4 @@ +{ + "version": 0, + "type": "Server.Items.Citrine" +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.Diamond.v0.json b/Projects/UOContent/Migrations/Server.Items.Diamond.v0.json new file mode 100644 index 000000000..16cfb07fe --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.Diamond.v0.json @@ -0,0 +1,4 @@ +{ + "version": 0, + "type": "Server.Items.Diamond" +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.Emerald.v0.json b/Projects/UOContent/Migrations/Server.Items.Emerald.v0.json new file mode 100644 index 000000000..84c2f40e9 --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.Emerald.v0.json @@ -0,0 +1,4 @@ +{ + "version": 0, + "type": "Server.Items.Emerald" +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.Ruby.v0.json b/Projects/UOContent/Migrations/Server.Items.Ruby.v0.json new file mode 100644 index 000000000..d98101a7c --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.Ruby.v0.json @@ -0,0 +1,4 @@ +{ + "version": 0, + "type": "Server.Items.Ruby" +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.Sapphire.v0.json b/Projects/UOContent/Migrations/Server.Items.Sapphire.v0.json new file mode 100644 index 000000000..a12b238df --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.Sapphire.v0.json @@ -0,0 +1,4 @@ +{ + "version": 0, + "type": "Server.Items.Sapphire" +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.StarSapphire.v0.json b/Projects/UOContent/Migrations/Server.Items.StarSapphire.v0.json new file mode 100644 index 000000000..a72f1d8d8 --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.StarSapphire.v0.json @@ -0,0 +1,4 @@ +{ + "version": 0, + "type": "Server.Items.StarSapphire" +} \ No newline at end of file diff --git a/Projects/UOContent/Migrations/Server.Items.Tourmaline.v0.json b/Projects/UOContent/Migrations/Server.Items.Tourmaline.v0.json new file mode 100644 index 000000000..56572c492 --- /dev/null +++ b/Projects/UOContent/Migrations/Server.Items.Tourmaline.v0.json @@ -0,0 +1,4 @@ +{ + "version": 0, + "type": "Server.Items.Tourmaline" +} \ No newline at end of file