fix: Fixes ML containers and addons (#804)

* Fixes some ML addons so they are containers
* Adds some missing ML artifacts
* Fixes carpentry gump crafting entries

Projects/UOContent/Items/Addons/ArcaneBookshelfSouthAddon.cs

@@ -1,27 +1,30 @@
 namespace Server.Items
 {
     [Serializable(0)]
-    public partial class ArcaneBookshelfSouthAddon : BaseAddon
+    public partial class ArcaneBookshelfSouthAddon : BaseAddonContainer
     {
         [Constructible]
-        public ArcaneBookshelfSouthAddon()
+        public ArcaneBookshelfSouthAddon() : base(0x2DEF)
         {
-            AddComponent(new AddonComponent(0x3087), 0, 0, 0);
-            AddComponent(new AddonComponent(0x3086), 0, 1, 0);
+            AddComponent(new LocalizedContainerComponent(0x21A4, 1031760), -1, 0, 0);
         }
 
-        public override BaseAddonDeed Deed => new ArcaneBookshelfSouthDeed();
+        public override BaseAddonContainerDeed Deed => new ArcaneBookshelfSouthDeed();
+        public override bool RetainDeedHue => true;
+        public override int DefaultGumpID => 0x107;
+        public override int DefaultDropSound => 0x42;
+        public override int LabelNumber => 1032420; // arcane bookshelf
     }
 
     [Serializable(0)]
-    public partial class ArcaneBookshelfSouthDeed : BaseAddonDeed
+    public partial class ArcaneBookshelfSouthDeed : BaseAddonContainerDeed
     {
         [Constructible]
         public ArcaneBookshelfSouthDeed()
         {
         }
 
-        public override BaseAddon Addon => new ArcaneBookshelfSouthAddon();
+        public override BaseAddonContainer Addon => new ArcaneBookshelfSouthAddon();
         public override int LabelNumber => 1072871; // arcane bookshelf (south)
     }
 }

Projects/UOContent/Items/Addons/ElvenDresserEastAddon.cs

@@ -1,27 +1,29 @@
 namespace Server.Items
 {
     [Serializable(0)]
-    public partial class ElvenDresserEastAddon : BaseAddon
+    public partial class ElvenDresserEastAddon : BaseAddonContainer
     {
         [Constructible]
-        public ElvenDresserEastAddon()
+        public ElvenDresserEastAddon() : base(0x30E4)
         {
-            AddComponent(new AddonComponent(0x30E4), 0, 0, 0);
-            AddComponent(new AddonComponent(0x30E3), 0, -1, 0);
+            AddComponent(new AddonContainerComponent(0x30E3), 0, -1, 0);
         }
 
-        public override BaseAddonDeed Deed => new ElvenDresserEastDeed();
+        public override BaseAddonContainerDeed Deed => new ElvenDresserEastDeed();
+        public override bool RetainDeedHue => true;
+        public override int DefaultGumpID => 0x51;
+        public override int DefaultDropSound => 0x42;
     }
 
     [Serializable(0)]
-    public partial class ElvenDresserEastDeed : BaseAddonDeed
+    public partial class ElvenDresserEastDeed : BaseAddonContainerDeed
     {
         [Constructible]
         public ElvenDresserEastDeed()
         {
         }
 
-        public override BaseAddon Addon => new ElvenDresserEastAddon();
+        public override BaseAddonContainer Addon => new ElvenDresserEastAddon();
         public override int LabelNumber => 1073388; // elven dresser (east)
     }
 }

Projects/UOContent/Items/Addons/ElvenDresserSouthAddon.cs

@@ -1,27 +1,29 @@
 namespace Server.Items
 {
     [Serializable(0)]
-    public partial class ElvenDresserSouthAddon : BaseAddon
+    public partial class ElvenDresserSouthAddon : BaseAddonContainer
     {
         [Constructible]
-        public ElvenDresserSouthAddon()
+        public ElvenDresserSouthAddon() : base(0x30E6)
         {
-            AddComponent(new AddonComponent(0x30E5), 0, 0, 0);
-            AddComponent(new AddonComponent(0x30E6), 1, 0, 0);
+            AddComponent(new AddonContainerComponent(0x30E5), -1, 0, 0);
         }
 
-        public override BaseAddonDeed Deed => new ElvenDresserSouthDeed();
+        public override BaseAddonContainerDeed Deed => new ElvenDresserSouthDeed();
+        public override bool RetainDeedHue => true;
+        public override int DefaultGumpID => 0x51;
+        public override int DefaultDropSound => 0x42;
     }
 
     [Serializable(0)]
-    public partial class ElvenDresserSouthDeed : BaseAddonDeed
+    public partial class ElvenDresserSouthDeed : BaseAddonContainerDeed
     {
         [Constructible]
         public ElvenDresserSouthDeed()
         {
         }
 
-        public override BaseAddon Addon => new ElvenDresserSouthAddon();
+        public override BaseAddonContainer Addon => new ElvenDresserSouthAddon();
         public override int LabelNumber => 1072864; // elven dresser (south)
     }
 }

Projects/UOContent/Items/Addons/ElvenForgeAddon.cs

@@ -9,6 +9,7 @@ namespace Server.Items
             AddComponent(new AddonComponent(0x2DD8), 0, 0, 0);
         }
 
+        public override int LabelNumber => 1072875; // elven forge
         public override BaseAddonDeed Deed => new ElvenForgeDeed();
     }
 
@@ -21,6 +22,6 @@ namespace Server.Items
         }
 
         public override BaseAddon Addon => new ElvenForgeAddon();
-        public override int LabelNumber => 1072875; // squirrel statue (east)
+        public override int LabelNumber => 1072875; // elven forge
     }
 }

Projects/UOContent/Items/Addons/ElvenLoveseatEastAddon.cs

@@ -6,8 +6,8 @@ namespace Server.Items
         [Constructible]
         public ElvenLoveseatEastAddon()
         {
-            AddComponent(new AddonComponent(0x3089), 0, 0, 0);
-            AddComponent(new AddonComponent(0x3088), 1, 0, 0);
+            AddComponent(new AddonComponent(0x308A), 0, 0, 0);
+            AddComponent(new AddonComponent(0x308B), 0, -1, 0);
         }
 
         public override BaseAddonDeed Deed => new ElvenLoveseatEastDeed();

Projects/UOContent/Items/Addons/ElvenLoveseatSouthAddon.cs

@@ -6,8 +6,8 @@ namespace Server.Items
         [Constructible]
         public ElvenLoveseatSouthAddon()
         {
-            AddComponent(new AddonComponent(0x308A), 0, 0, 0);
-            AddComponent(new AddonComponent(0x308B), 0, -1, 0);
+            AddComponent(new AddonComponent(0x3088), 0, 0, 0);
+            AddComponent(new AddonComponent(0x3089), -1, 0, 0);
         }
 
         public override BaseAddonDeed Deed => new ElvenLoveseatSouthDeed();

Projects/UOContent/Items/Addons/ElvenSpinningWheelEastAddon.cs

@@ -2,18 +2,28 @@ using System;
 
 namespace Server.Items
 {
+    public delegate void SpinCallback(ISpinningWheel sender, Mobile from, int hue);
+
+    public interface ISpinningWheel
+    {
+        bool Spinning { get; }
+        void BeginSpin(SpinCallback callback, Mobile from, int hue);
+    }
+
     [Serializable(0)]
-    public partial class ElvenSpinningwheelEastAddon : BaseAddon, ISpinningWheel
+    [TypeAlias("Server.Items.ElvenSpinningwheelEastAddon")]
+    public partial class ElvenSpinningWheelEastAddon : BaseAddon, ISpinningWheel
     {
         private Timer m_Timer;
 
         [Constructible]
-        public ElvenSpinningwheelEastAddon()
+        public ElvenSpinningWheelEastAddon()
         {
-            AddComponent(new AddonComponent(0x2DD9), 0, 0, 0);
+            AddComponent(new AddonComponent(0x2E3D), 0, 0, 0);
         }
 
-        public override BaseAddonDeed Deed => new ElvenSpinningwheelEastDeed();
+        public override int LabelNumber => 1031737; // elven spinning wheel
+        public override BaseAddonDeed Deed => new ElvenSpinningWheelEastDeed();
 
         public bool Spinning => m_Timer != null;
 
@@ -26,10 +36,9 @@ namespace Server.Items
             {
                 switch (c.ItemID)
                 {
-                    case 0x2DD9:
-                    case 0x101C:
-                    case 0x10A4:
-                        ++c.ItemID;
+                    case 0x2E3D:
+                    case 0x2E3F:
+                        --c.ItemID;
                         break;
                 }
             }
@@ -39,10 +48,9 @@ namespace Server.Items
         {
             switch (c.ItemID)
             {
-                case 0x2E3D:
-                case 0x101D:
-                case 0x10A5:
-                    --c.ItemID;
+                case 0x2E3C:
+                case 0x2E3E:
+                    ++c.ItemID;
                     break;
             }
         }
@@ -57,11 +65,9 @@ namespace Server.Items
             {
                 switch (c.ItemID)
                 {
-                    case 0x1016:
-                    case 0x101A:
-                    case 0x101D:
-                    case 0x10A5:
-                        --c.ItemID;
+                    case 0x2E3C:
+                    case 0x2E3E:
+                        ++c.ItemID;
                         break;
                 }
             }
@@ -74,9 +80,9 @@ namespace Server.Items
             private readonly SpinCallback m_Callback;
             private readonly Mobile m_From;
             private readonly int m_Hue;
-            private readonly ElvenSpinningwheelEastAddon m_Wheel;
+            private readonly ElvenSpinningWheelEastAddon m_Wheel;
 
-            public SpinTimer(ElvenSpinningwheelEastAddon wheel, SpinCallback callback, Mobile from, int hue) : base(
+            public SpinTimer(ElvenSpinningWheelEastAddon wheel, SpinCallback callback, Mobile from, int hue) : base(
                 TimeSpan.FromSeconds(3.0)
             )
             {
@@ -94,14 +100,16 @@ namespace Server.Items
     }
 
     [Serializable(0)]
-    public partial class ElvenSpinningwheelEastDeed : BaseAddonDeed
+    [TypeAlias("Server.Items.ElvenSpinningwheelEastDeed")]
+    public partial class ElvenSpinningWheelEastDeed : BaseAddonDeed
     {
         [Constructible]
-        public ElvenSpinningwheelEastDeed()
+        public ElvenSpinningWheelEastDeed()
         {
         }
 
-        public override BaseAddon Addon => new ElvenSpinningwheelEastAddon();
+        public override BaseAddon Addon => new ElvenSpinningWheelEastAddon();
         public override int LabelNumber => 1073393; // elven spinning wheel (east)
     }
 }
+

Projects/UOContent/Items/Addons/ElvenSpinningwheelSouthAddon.cs

@@ -3,17 +3,19 @@ using System;
 namespace Server.Items
 {
     [Serializable(0)]
-    public partial class ElvenSpinningwheelSouthAddon : BaseAddon, ISpinningWheel
+    [TypeAlias("Server.Items.ElvenSpinningwheelSouthAddon")]
+    public partial class ElvenSpinningWheelSouthAddon : BaseAddon, ISpinningWheel
     {
         private Timer m_Timer;
 
         [Constructible]
-        public ElvenSpinningwheelSouthAddon()
+        public ElvenSpinningWheelSouthAddon()
         {
-            AddComponent(new AddonComponent(0x2DDA), 0, 0, 0);
+            AddComponent(new AddonComponent(0x2E3F), 0, 0, 0);
         }
 
-        public override BaseAddonDeed Deed => new ElvenSpinningwheelSouthDeed();
+        public override int LabelNumber => 1031737; // elven spinning wheel
+        public override BaseAddonDeed Deed => new ElvenSpinningWheelSouthDeed();
 
         public bool Spinning => m_Timer != null;
 
@@ -26,11 +28,9 @@ namespace Server.Items
             {
                 switch (c.ItemID)
                 {
-                    case 0x1015:
-                    case 0x1019:
-                    case 0x101C:
-                    case 0x10A4:
-                        ++c.ItemID;
+                    case 0x2E3D:
+                    case 0x2E3F:
+                        --c.ItemID;
                         break;
                 }
             }
@@ -40,11 +40,9 @@ namespace Server.Items
         {
             switch (c.ItemID)
             {
-                case 0x1016:
-                case 0x101A:
-                case 0x101D:
-                case 0x10A5:
-                    --c.ItemID;
+                case 0x2E3C:
+                case 0x2E3E:
+                    ++c.ItemID;
                     break;
             }
         }
@@ -52,18 +50,15 @@ namespace Server.Items
         public void EndSpin(SpinCallback callback, Mobile from, int hue)
         {
             m_Timer?.Stop();
-
             m_Timer = null;
 
             foreach (var c in Components)
             {
                 switch (c.ItemID)
                 {
-                    case 0x1016:
-                    case 0x101A:
-                    case 0x101D:
-                    case 0x10A5:
-                        --c.ItemID;
+                    case 0x2E3C:
+                    case 0x2E3E:
+                        ++c.ItemID;
                         break;
                 }
             }
@@ -76,9 +71,9 @@ namespace Server.Items
             private readonly SpinCallback m_Callback;
             private readonly Mobile m_From;
             private readonly int m_Hue;
-            private readonly ElvenSpinningwheelSouthAddon m_Wheel;
+            private readonly ElvenSpinningWheelSouthAddon m_Wheel;
 
-            public SpinTimer(ElvenSpinningwheelSouthAddon wheel, SpinCallback callback, Mobile from, int hue) : base(
+            public SpinTimer(ElvenSpinningWheelSouthAddon wheel, SpinCallback callback, Mobile from, int hue) : base(
                 TimeSpan.FromSeconds(3.0)
             )
             {
@@ -96,14 +91,15 @@ namespace Server.Items
     }
 
     [Serializable(0)]
-    public partial class ElvenSpinningwheelSouthDeed : BaseAddonDeed
+    [TypeAlias("Server.Items.ElvenSpinningwheelSouthDeed")]
+    public partial class ElvenSpinningWheelSouthDeed : BaseAddonDeed
     {
         [Constructible]
-        public ElvenSpinningwheelSouthDeed()
+        public ElvenSpinningWheelSouthDeed()
         {
         }
 
-        public override BaseAddon Addon => new ElvenSpinningwheelSouthAddon();
-        public override int LabelNumber => 1072878; // spinning wheel (south)
+        public override BaseAddon Addon => new ElvenSpinningWheelSouthAddon();
+        public override int LabelNumber => 1072878; // elven spinning wheel (south)
     }
 }

Projects/UOContent/Items/Addons/ElvenWashbasinEastAddon.cs

@@ -1,27 +1,29 @@
 namespace Server.Items
 {
     [Serializable(0)]
-    public partial class ElvenWashBasinEastAddon : BaseAddon
+    public partial class ElvenWashBasinEastAddon : BaseAddonContainer
     {
         [Constructible]
-        public ElvenWashBasinEastAddon()
+        public ElvenWashBasinEastAddon() : base(0x30E0)
         {
-            AddComponent(new AddonComponent(0x30DF), 0, 0, 0);
-            AddComponent(new AddonComponent(0x30E0), 0, 1, 0);
+            AddComponent(new AddonContainerComponent(0x30DF), 0, -1, 0);
         }
 
-        public override BaseAddonDeed Deed => new ElvenWashBasinEastDeed();
+        public override BaseAddonContainerDeed Deed => new ElvenWashBasinEastDeed();
+        public override bool RetainDeedHue => true;
+        public override int DefaultGumpID => 0x0104;
+        public override int DefaultDropSound => 0x0042;
     }
 
     [Serializable(0)]
-    public partial class ElvenWashBasinEastDeed : BaseAddonDeed
+    public partial class ElvenWashBasinEastDeed : BaseAddonContainerDeed
     {
         [Constructible]
         public ElvenWashBasinEastDeed()
         {
         }
 
-        public override BaseAddon Addon => new ElvenWashBasinEastAddon();
+        public override BaseAddonContainer Addon => new ElvenWashBasinEastAddon();
         public override int LabelNumber => 1073387; // elven wash basin (east)
     }
 }

Projects/UOContent/Items/Addons/ElvenWashbasinSouthAddon.cs

@@ -1,27 +1,29 @@
 namespace Server.Items
 {
     [Serializable(0)]
-    public partial class ElvenWashBasinSouthAddon : BaseAddon
+    public partial class ElvenWashBasinSouthAddon : BaseAddonContainer
     {
         [Constructible]
-        public ElvenWashBasinSouthAddon()
+        public ElvenWashBasinSouthAddon() : base(0x30E2)
         {
-            AddComponent(new AddonComponent(0x30E1), 0, 0, 0);
-            AddComponent(new AddonComponent(0x30E2), 1, 0, 0);
+            AddComponent(new AddonContainerComponent(0x30E1), -1, 0, 0);
         }
 
-        public override BaseAddonDeed Deed => new ElvenWashBasinSouthDeed();
+        public override BaseAddonContainerDeed Deed => new ElvenWashBasinSouthDeed();
+        public override bool RetainDeedHue => true;
+        public override int DefaultGumpID => 0x0104;
+        public override int DefaultDropSound => 0x0042;
     }
 
     [Serializable(0)]
-    public partial class ElvenWashBasinSouthDeed : BaseAddonDeed
+    public partial class ElvenWashBasinSouthDeed : BaseAddonContainerDeed
     {
         [Constructible]
         public ElvenWashBasinSouthDeed()
         {
         }
 
-        public override BaseAddon Addon => new ElvenWashBasinSouthAddon();
+        public override BaseAddonContainer Addon => new ElvenWashBasinSouthAddon();
         public override int LabelNumber => 1072865; // elven wash basin (south)
     }
 }

Projects/UOContent/Items/Addons/OrnateElvenChestEastAddon.cs

@@ -0,0 +1,29 @@
+namespace Server.Items
+{
+    [Serializable(0)]
+    public partial class OrnateElvenChestEastAddon : BaseAddonContainer
+    {
+        [Constructible]
+        public OrnateElvenChestEastAddon() : base(0x309A)
+        {
+            AddComponent(new AddonContainerComponent(0x309B), 0, -1, 0);
+        }
+
+        public override BaseAddonContainerDeed Deed => new OrnateElvenChestEastDeed();
+        public override bool RetainDeedHue => true;
+        public override int DefaultGumpID => 0x10C;
+        public override int DefaultDropSound => 0x42;
+    }
+
+    [Serializable(0)]
+    public partial class OrnateElvenChestEastDeed : BaseAddonContainerDeed
+    {
+        [Constructible]
+        public OrnateElvenChestEastDeed()
+        {
+        }
+
+        public override BaseAddonContainer Addon => new OrnateElvenChestEastAddon();
+        public override int LabelNumber => 1073383; // ornate elven chest (east)
+    }
+}

Projects/UOContent/Items/Addons/OrnateElvenChestSouthAddon.cs

@@ -0,0 +1,29 @@
+namespace Server.Items
+{
+    [Serializable(0)]
+    public partial class OrnateElvenChestSouthAddon : BaseAddonContainer
+    {
+        [Constructible]
+        public OrnateElvenChestSouthAddon() : base(0x3098)
+        {
+            AddComponent(new AddonContainerComponent(0x3099), -1, 0, 0);
+        }
+
+        public override BaseAddonContainerDeed Deed => new OrnateElvenChestSouthDeed();
+        public override bool RetainDeedHue => true;
+        public override int DefaultGumpID => 0x10C;
+        public override int DefaultDropSound => 0x42;
+    }
+
+    [Serializable(0)]
+    public partial class OrnateElvenChestSouthDeed : BaseAddonContainerDeed
+    {
+        [Constructible]
+        public OrnateElvenChestSouthDeed()
+        {
+        }
+
+        public override BaseAddonContainer Addon => new OrnateElvenChestSouthAddon();
+        public override int LabelNumber => 1072862; // ornate elven chest (south)
+    }
+}

Projects/UOContent/Items/Addons/SpinningwheelEastAddon.cs

@@ -2,26 +2,20 @@ using System;
 
 namespace Server.Items
 {
-    public delegate void SpinCallback(ISpinningWheel sender, Mobile from, int hue);
-
-    public interface ISpinningWheel
-    {
-        bool Spinning { get; }
-        void BeginSpin(SpinCallback callback, Mobile from, int hue);
-    }
-
     [Serializable(0, false)]
-    public partial class SpinningwheelEastAddon : BaseAddon, ISpinningWheel
+    [TypeAlias("Server.Items.SpinningwheelEastAddon")]
+    public partial class SpinningWheelEastAddon : BaseAddon, ISpinningWheel
     {
         private Timer m_Timer;
 
         [Constructible]
-        public SpinningwheelEastAddon()
+        public SpinningWheelEastAddon()
         {
             AddComponent(new AddonComponent(0x1019), 0, 0, 0);
         }
 
-        public override BaseAddonDeed Deed => new SpinningwheelEastDeed();
+        public override int LabelNumber => 1024117; // spinning wheel
+        public override BaseAddonDeed Deed => new SpinningWheelEastDeed();
 
         public bool Spinning => m_Timer != null;
 
@@ -84,9 +78,9 @@ namespace Server.Items
             private readonly SpinCallback m_Callback;
             private readonly Mobile m_From;
             private readonly int m_Hue;
-            private readonly SpinningwheelEastAddon m_Wheel;
+            private readonly SpinningWheelEastAddon m_Wheel;
 
-            public SpinTimer(SpinningwheelEastAddon wheel, SpinCallback callback, Mobile from, int hue) : base(
+            public SpinTimer(SpinningWheelEastAddon wheel, SpinCallback callback, Mobile from, int hue) : base(
                 TimeSpan.FromSeconds(3.0)
             )
             {
@@ -104,14 +98,15 @@ namespace Server.Items
     }
 
     [Serializable(0, false)]
-    public partial class SpinningwheelEastDeed : BaseAddonDeed
+    [TypeAlias("Server.Items.SpinningwheelEastDeed")]
+    public partial class SpinningWheelEastDeed : BaseAddonDeed
     {
         [Constructible]
-        public SpinningwheelEastDeed()
+        public SpinningWheelEastDeed()
         {
         }
 
-        public override BaseAddon Addon => new SpinningwheelEastAddon();
-        public override int LabelNumber => 1044341; // spining wheel (east)
+        public override BaseAddon Addon => new SpinningWheelEastAddon();
+        public override int LabelNumber => 1044341; // spinning wheel (east)
     }
 }

Projects/UOContent/Items/Addons/SpinningwheelSouthAddon.cs

@@ -3,17 +3,19 @@ using System;
 namespace Server.Items
 {
     [Serializable(0, false)]
-    public partial class SpinningwheelSouthAddon : BaseAddon, ISpinningWheel
+    [TypeAlias("Server.Items.SpinningwheelSouthAddon")]
+    public partial class SpinningWheelSouthAddon : BaseAddon, ISpinningWheel
     {
         private Timer m_Timer;
 
         [Constructible]
-        public SpinningwheelSouthAddon()
+        public SpinningWheelSouthAddon()
         {
             AddComponent(new AddonComponent(0x1015), 0, 0, 0);
         }
 
-        public override BaseAddonDeed Deed => new SpinningwheelSouthDeed();
+        public override int LabelNumber => 1024117; // spinning wheel
+        public override BaseAddonDeed Deed => new SpinningWheelSouthDeed();
 
         public bool Spinning => m_Timer != null;
 
@@ -76,9 +78,9 @@ namespace Server.Items
             private readonly SpinCallback m_Callback;
             private readonly Mobile m_From;
             private readonly int m_Hue;
-            private readonly SpinningwheelSouthAddon m_Wheel;
+            private readonly SpinningWheelSouthAddon m_Wheel;
 
-            public SpinTimer(SpinningwheelSouthAddon wheel, SpinCallback callback, Mobile from, int hue) : base(
+            public SpinTimer(SpinningWheelSouthAddon wheel, SpinCallback callback, Mobile from, int hue) : base(
                 TimeSpan.FromSeconds(3.0)
             )
             {
@@ -96,14 +98,15 @@ namespace Server.Items
     }
 
     [Serializable(0, false)]
-    public partial class SpinningwheelSouthDeed : BaseAddonDeed
+    [TypeAlias("Server.Items.SpinningwheelSouthDeed")]
+    public partial class SpinningWheelSouthDeed : BaseAddonDeed
     {
         [Constructible]
-        public SpinningwheelSouthDeed()
+        public SpinningWheelSouthDeed()
         {
         }
 
-        public override BaseAddon Addon => new SpinningwheelSouthAddon();
-        public override int LabelNumber => 1044342; // spining wheel (south)
+        public override BaseAddon Addon => new SpinningWheelSouthAddon();
+        public override int LabelNumber => 1044342; // spinning wheel (south)
     }
 }