fix: Optimizes OPL using string interpolation (#1041)

## Breaking Changes (New API) ObjectPropertyList supports the following API: ```cs list.Add(500000); list.Add(500001, stringArgument); list.Add("Some text"); list.Add($"Some text with {argument}"); list.Add(500002, $"{arg1}\t{arg2}"); ``` ## Notes 1. All API uses that require a formatter like this: ```cs list.Add(500002, "{0}\t{1}", arg1, arg2); ``` Should be changed to use string interpolation, for example: ```cs list.Add(500002, $"{arg1}\t{arg2}"); ``` 2. The following paradigm should no longer be used: ```cs list.Add(1061170, prop.ToString()); // strength requirement ~1_val~ ``` The new string interpolation API will avoid having to convert the argument to a string before writing it to the packet. Instead use the following: ```cs list.Add(1061170, $"{prop}"); // strength requirement ~1_val~ ``` ### Benchmarks ```cs | Method | Mean | Error | StdDev | Gen 0 | Allocated | |------------------------------- |---------:|--------:|--------:|-------:|----------:| | BenchmarkOldOPL | 241.0 ns | 0.56 ns | 0.47 ns | 0.0105 | 88 B | | BenchmarkStringInterpolatedOPL | 199.9 ns | 2.44 ns | 2.39 ns | - | - | ``` ### Changes - [X] Removes crash in STArray.Return when array is null. - [X] Fixes NPE in OPL when entity is null. Serial in packet will be 0 when entity is null. - [X] Fixes NPE in AosAttributes when Parent is null. - [X] Changes OPL to use string interpolation. - [X] Introduces `IPropertyList` to allow extending PropertyList for other uses.
2022-06-02 10:09:53 -07:00 · 2022-06-02 10:09:53 -07:00 · ecbee17690
commit ecbee17690
parent fe31470f05
227 changed files with 1426 additions and 1008 deletions
--- a/Projects/UOContent/Engines/Bulk
+++ b/Projects/UOContent/Engines/Bulk
@ -258,11 +258,11 @@ namespace Server.Engines.BulkOrders
            }
        }

-        public override void GetProperties(ObjectPropertyList list)
+        public override void GetProperties(IPropertyList list)
        {
            base.GetProperties(list);

-            list.Add(1062344, Entries.Count.ToString()); // Deeds in book: ~1_val~
+            list.Add(1062344, $"{Entries.Count}"); // Deeds in book: ~1_val~

            if (!string.IsNullOrEmpty(m_BookName))
            {
--- a/Projects/UOContent/Engines/Bulk
+++ b/Projects/UOContent/Engines/Bulk
@ -38,7 +38,7 @@ namespace Server.Engines.BulkOrders

        public override int LabelNumber => 1045151; // a bulk order deed

-        public override void GetProperties(ObjectPropertyList list)
+        public override void GetProperties(IPropertyList list)
        {
            base.GetProperties(list);

@ -54,11 +54,12 @@ namespace Server.Engines.BulkOrders
                list.Add(LargeBODGump.GetMaterialNumberFor(Material)); // All items must be made with x material.
            }

-            list.Add(1060656, AmountMax.ToString()); // amount to make: ~1_val~
+            list.Add(1060656, $"{AmountMax}"); // amount to make: ~1_val~

            for (var i = 0; i < _entries.Length; ++i)
            {
-                list.Add(1060658 + i, "#{0}\t{1}", _entries[i].Details.Number, _entries[i].Amount); // ~1_val~: ~2_val~
+                var entry = _entries[i];
+                list.Add(1060658 + i, $"#{entry.Details.Number}\t{entry.Amount}"); // ~1_val~: ~2_val~
            }
        }

--- a/Projects/UOContent/Engines/Bulk
+++ b/Projects/UOContent/Engines/Bulk
@ -61,7 +61,7 @@ namespace Server.Engines.BulkOrders

        public override int LabelNumber => 1045151; // a bulk order deed

-        public override void GetProperties(ObjectPropertyList list)
+        public override void GetProperties(IPropertyList list)
        {
            base.GetProperties(list);

@ -77,8 +77,8 @@ namespace Server.Engines.BulkOrders
                list.Add(SmallBODGump.GetMaterialNumberFor(Material)); // All items must be made with x material.
            }

-            list.Add(1060656, AmountMax.ToString()); // amount to make: ~1_val~
-            list.Add(1060658, "#{0}\t{1}", m_Number, m_AmountCur); // ~1_val~: ~2_val~
+            list.Add(1060656, $"{AmountMax}");                // amount to make: ~1_val~
+            list.Add(1060658, $"#{m_Number}\t{m_AmountCur}"); // ~1_val~: ~2_val~
        }

        public override void OnDoubleClick(Mobile from)
--- a/Projects/UOContent/Engines/CannedEvil/ChampionSpawn.cs
+++ b/Projects/UOContent/Engines/CannedEvil/ChampionSpawn.cs
@ -934,21 +934,22 @@ namespace Server.Engines.CannedEvil
            return new Point3D(X + x, Y + y, Z - 15);
        }

-        public override void AddNameProperty(ObjectPropertyList list)
+        public override void AddNameProperty(IPropertyList list)
        {
            list.Add("champion spawn");
        }

-        public override void GetProperties(ObjectPropertyList list)
+        public override void GetProperties(IPropertyList list)
        {
            base.GetProperties(list);

            if (m_Active)
            {
                list.Add(1060742); // active
-                list.Add(1060658, "Type\t{0}", m_Type); // ~1_val~: ~2_val~
-                list.Add(1060659, "Level\t{0}", Level); // ~1_val~: ~2_val~
-                list.Add(1060660, "Kills\t{0} of {1} ({2:F1}%)", m_Kills, MaxKills, 100.0 * ((double)m_Kills / MaxKills)); // ~1_val~: ~2_val~
+                list.Add(1060658, $"Type\t{m_Type}"); // ~1_val~: ~2_val~
+                list.Add(1060659, $"Level\t{Level}"); // ~1_val~: ~2_val~
+                var killRatio = 100.0 * ((double)m_Kills / MaxKills);
+                list.Add(1060660, $"Kills\t{m_Kills} of {MaxKills} ({killRatio:F1}%)"); // ~1_val~: ~2_val~
                //list.Add(1060661, "Spawn Range\t{0}", m_SpawnRange); // ~1_val~: ~2_val~
            }
            else
@ -961,11 +962,11 @@ namespace Server.Engines.CannedEvil
        {
            if (m_Active)
            {
-                LabelTo(from, "{0} (Active; Level: {1}; Kills: {2}/{3})", m_Type, Level, m_Kills, MaxKills);
+                LabelTo(from, $"{m_Type} (Active; Level: {Level}; Kills: {m_Kills}/{MaxKills})");
            }
            else
            {
-                LabelTo(from, "{0} (Inactive)", m_Type);
+                LabelTo(from, $"{m_Type} (Inactive)");
            }
        }

--- a/Projects/UOContent/Engines/ConPVP/Gumps/AcceptTeamGump.cs
+++ b/Projects/UOContent/Engines/ConPVP/Gumps/AcceptTeamGump.cs
@ -163,23 +163,20 @@ namespace Server.Engines.ConPVP
            AddBorderedText(35, y, 190, 20, $"Tiebreaker: {tieText}", LabelColor32, BlackColor32);
            y += 20;

-            var sdText = "Off";
+            string sdText;

            if (tourney.SuddenDeath > TimeSpan.Zero)
            {
-                sdText = $"{(int)tourney.SuddenDeath.TotalMinutes}:{tourney.SuddenDeath.Seconds:D2}";
-
-                if (tourney.SuddenDeathRounds > 0)
-                {
-                    sdText = $"{sdText} (first {tourney.SuddenDeathRounds} rounds)";
-                }
-                else
-                {
-                    sdText = $"{sdText} (all rounds)";
-                }
+                sdText = tourney.SuddenDeathRounds > 0 ?
+                    $"Sudden Death: {(int)tourney.SuddenDeath.TotalMinutes}:{tourney.SuddenDeath.Seconds:D2} (first {tourney.SuddenDeathRounds} rounds)" :
+                    $"Sudden Death: {(int)tourney.SuddenDeath.TotalMinutes}:{tourney.SuddenDeath.Seconds:D2} (all rounds)";
+            }
+            else
+            {
+                sdText = "Sudden Death: Off";
            }

-            AddBorderedText(35, y, 240, 20, $"Sudden Death: {sdText}", LabelColor32, BlackColor32);
+            AddBorderedText(35, y, 240, 20, sdText, LabelColor32, BlackColor32);
            y += 20;

            y += 6;
--- a/Projects/UOContent/Engines/ConPVP/Gumps/ConfirmSignupGump.cs
+++ b/Projects/UOContent/Engines/ConPVP/Gumps/ConfirmSignupGump.cs
@ -169,23 +169,20 @@ namespace Server.Engines.ConPVP
            AddBorderedText(35, y, 190, 20, $"Tiebreaker: {tieText}", LabelColor32, BlackColor32);
            y += 20;

-            var sdText = "Off";
+            string sdText;

            if (tourney.SuddenDeath > TimeSpan.Zero)
            {
-                sdText = $"{(int)tourney.SuddenDeath.TotalMinutes}:{tourney.SuddenDeath.Seconds:D2}";
-
-                if (tourney.SuddenDeathRounds > 0)
-                {
-                    sdText = $"{sdText} (first {tourney.SuddenDeathRounds} rounds)";
-                }
-                else
-                {
-                    sdText = $"{sdText} (all rounds)";
-                }
+                sdText = tourney.SuddenDeathRounds > 0 ?
+                    $"Sudden Death: {(int)tourney.SuddenDeath.TotalMinutes}:{tourney.SuddenDeath.Seconds:D2} (first {tourney.SuddenDeathRounds} rounds)" :
+                    $"Sudden Death: {(int)tourney.SuddenDeath.TotalMinutes}:{tourney.SuddenDeath.Seconds:D2} (all rounds)";
+            }
+            else
+            {
+                sdText = "Sudden Death: Off";
            }

-            AddBorderedText(35, y, 240, 20, $"Sudden Death: {sdText}", LabelColor32, BlackColor32);
+            AddBorderedText(35, y, 240, 20, sdText, LabelColor32, BlackColor32);
            y += 20;

            y += 6;
--- a/Projects/UOContent/Engines/ConPVP/Gumps/TournamentBracketGump.cs
+++ b/Projects/UOContent/Engines/ConPVP/Gumps/TournamentBracketGump.cs
@ -214,23 +214,20 @@ namespace Server.Engines.ConPVP
                        AddHtml(35, y, 190, 20, $"Tiebreaker: {tieText}");
                        y += 20;

-                        var sdText = "Off";
+                        string sdText;

                        if (tourney.SuddenDeath > TimeSpan.Zero)
                        {
-                            sdText = $"{(int)tourney.SuddenDeath.TotalMinutes}:{tourney.SuddenDeath.Seconds:D2}";
-
-                            if (tourney.SuddenDeathRounds > 0)
-                            {
-                                sdText = $"{sdText} (first {tourney.SuddenDeathRounds} rounds)";
-                            }
-                            else
-                            {
-                                sdText = $"{sdText} (all rounds)";
-                            }
+                            sdText = tourney.SuddenDeathRounds > 0 ?
+                                $"Sudden Death: {(int)tourney.SuddenDeath.TotalMinutes}:{tourney.SuddenDeath.Seconds:D2} (first {tourney.SuddenDeathRounds} rounds)" :
+                                $"Sudden Death: {(int)tourney.SuddenDeath.TotalMinutes}:{tourney.SuddenDeath.Seconds:D2} (all rounds)";
+                        }
+                        else
+                        {
+                            sdText = "Sudden Death: Off";
                        }

-                        AddHtml(35, y, 240, 20, $"Sudden Death: {sdText}");
+                        AddHtml(35, y, 240, 20, sdText);
                        y += 20;

                        y += 8;
--- a/Projects/UOContent/Engines/Factions/Items/Sigil.cs
+++ b/Projects/UOContent/Engines/Factions/Items/Sigil.cs
@ -128,7 +128,7 @@ namespace Server.Factions
            InvalidateProperties();
        }

-        public override void GetProperties(ObjectPropertyList list)
+        public override void GetProperties(IPropertyList list)
        {
            base.GetProperties(list);

--- a/Projects/UOContent/Engines/Factions/Items/Traps/FactionTrapRemovalKit.cs
+++ b/Projects/UOContent/Engines/Factions/Items/Traps/FactionTrapRemovalKit.cs
@ -30,12 +30,12 @@ namespace Server.Factions
            }
        }

-        public override void GetProperties(ObjectPropertyList list)
+        public override void GetProperties(IPropertyList list)
        {
            base.GetProperties(list);

            // NOTE: OSI does not list uses remaining; intentional difference
-            list.Add(1060584, Charges.ToString()); // uses remaining: ~1_val~
+            list.Add(1060584, $"{Charges}"); // uses remaining: ~1_val~
        }

        public override void Serialize(IGenericWriter writer)
--- a/Projects/UOContent/Engines/Factions/Mobiles/Guards/BaseFactionGuard.cs
+++ b/Projects/UOContent/Engines/Factions/Mobiles/Guards/BaseFactionGuard.cs
@ -308,7 +308,7 @@ namespace Server.Factions
            }
        }

-        public override void GetProperties(ObjectPropertyList list)
+        public override void GetProperties(IPropertyList list)
        {
            base.GetProperties(list);

--- a/Quests/Items/APersonalLetterAddressedToAhie.cs
+++ b/Quests/Items/APersonalLetterAddressedToAhie.cs
@ -15,7 +15,7 @@ namespace Server.Items

        public override bool Nontransferable => true;

-        public override void AddNameProperties(ObjectPropertyList list)
+        public override void AddNameProperties(IPropertyList list)
        {
            base.AddNameProperties(list);
            AddQuestItemProperty(list);
--- a/Quests/Items/AlchemistsBandage.cs
+++ b/Quests/Items/AlchemistsBandage.cs
@ -17,7 +17,7 @@ namespace Server.Items

        public override bool Nontransferable => true;

-        public override void AddNameProperties(ObjectPropertyList list)
+        public override void AddNameProperties(IPropertyList list)
        {
            base.AddNameProperties(list);
            AddQuestItemProperty(list);
--- a/Quests/Items/BasinOfCrystalClearWater.cs
+++ b/Quests/Items/BasinOfCrystalClearWater.cs
@ -13,7 +13,7 @@ namespace Server.Items

        public override bool Nontransferable => true;

-        public override void AddNameProperties(ObjectPropertyList list)
+        public override void AddNameProperties(IPropertyList list)
        {
            base.AddNameProperties(list);
            AddQuestItemProperty(list);
--- a/Projects/UOContent/Engines/ML
+++ b/Projects/UOContent/Engines/ML
@ -13,7 +13,7 @@ namespace Server.Items

        public override bool Nontransferable => true;

-        public override void AddNameProperties(ObjectPropertyList list)
+        public override void AddNameProperties(IPropertyList list)
        {
            base.AddNameProperties(list);
            AddQuestItemProperty(list);
--- a/Quests/Items/CompletedTuitionReimbursementForm.cs
+++ b/Quests/Items/CompletedTuitionReimbursementForm.cs
@ -13,7 +13,7 @@ namespace Server.Items

        public override bool Nontransferable => true;

-        public override void AddNameProperties(ObjectPropertyList list)
+        public override void AddNameProperties(IPropertyList list)
        {
            base.AddNameProperties(list);
            AddQuestItemProperty(list);
--- a/Quests/Items/CrateForSledge.cs
+++ b/Quests/Items/CrateForSledge.cs
@ -15,7 +15,7 @@ namespace Server.Items

        public override bool Nontransferable => true;

-        public override void AddNameProperties(ObjectPropertyList list)
+        public override void AddNameProperties(IPropertyList list)
        {
            base.AddNameProperties(list);
            AddQuestItemProperty(list);
--- a/Quests/Items/DreadSpiderSilk.cs
+++ b/Quests/Items/DreadSpiderSilk.cs
@ -17,7 +17,7 @@ namespace Server.Items

        public override bool Nontransferable => true;

-        public override void AddNameProperties(ObjectPropertyList list)
+        public override void AddNameProperties(IPropertyList list)
        {
            base.AddNameProperties(list);
            AddQuestItemProperty(list);
--- a/Quests/Items/FragmentOfAMapDelivery.cs
+++ b/Quests/Items/FragmentOfAMapDelivery.cs
@ -13,7 +13,7 @@ namespace Server.Items

        public override bool Nontransferable => true;

-        public override void AddNameProperties(ObjectPropertyList list)
+        public override void AddNameProperties(IPropertyList list)
        {
            base.AddNameProperties(list);
            AddQuestItemProperty(list);
--- a/Quests/Items/FriendsOfTheLibraryApplication.cs
+++ b/Quests/Items/FriendsOfTheLibraryApplication.cs
@ -13,7 +13,7 @@ namespace Server.Items

        public override bool Nontransferable => true;

-        public override void AddNameProperties(ObjectPropertyList list)
+        public override void AddNameProperties(IPropertyList list)
        {
            base.AddNameProperties(list);
            AddQuestItemProperty(list);
--- a/Quests/Items/GiftForArielle.cs
+++ b/Quests/Items/GiftForArielle.cs
@ -14,7 +14,7 @@ namespace Server.Items

        public override bool Nontransferable => true;

-        public override void AddNameProperties(ObjectPropertyList list)
+        public override void AddNameProperties(IPropertyList list)
        {
            base.AddNameProperties(list);
            AddQuestItemProperty(list);
--- a/Quests/Items/NotarizedApplication.cs
+++ b/Quests/Items/NotarizedApplication.cs
@ -13,7 +13,7 @@ namespace Server.Items

        public override bool Nontransferable => true;

-        public override void AddNameProperties(ObjectPropertyList list)
+        public override void AddNameProperties(IPropertyList list)
        {
            base.AddNameProperties(list);
            AddQuestItemProperty(list);
--- a/Quests/Items/OfficialSealingWax.cs
+++ b/Quests/Items/OfficialSealingWax.cs
@ -17,7 +17,7 @@ namespace Server.Items

        public override bool Nontransferable => true;

-        public override void AddNameProperties(ObjectPropertyList list)
+        public override void AddNameProperties(IPropertyList list)
        {
            base.AddNameProperties(list);
            AddQuestItemProperty(list);
--- a/Quests/Items/PortraitOfTheBride.cs
+++ b/Quests/Items/PortraitOfTheBride.cs
@ -13,7 +13,7 @@ namespace Server.Items

        public override bool Nontransferable => true;

-        public override void AddNameProperties(ObjectPropertyList list)
+        public override void AddNameProperties(IPropertyList list)
        {
            base.AddNameProperties(list);
            AddQuestItemProperty(list);
--- a/Quests/Items/PrismaticAmber.cs
+++ b/Quests/Items/PrismaticAmber.cs
@ -13,7 +13,7 @@ namespace Server.Items

        public override int LabelNumber => 1075299; // Prismatic Amber

-        public override void AddNameProperties(ObjectPropertyList list)
+        public override void AddNameProperties(IPropertyList list)
        {
            base.AddNameProperties(list);

--- a/Quests/Items/QuestGiverItem.cs
+++ b/Quests/Items/QuestGiverItem.cs
@ -27,7 +27,7 @@ namespace Server.Engines.MLQuests.Items
        public List<MLQuest> MLQuests => m_MLQuests ??
                                         (m_MLQuests = MLQuestSystem.FindQuestList(GetType()) ?? MLQuestSystem.EmptyList);

-        public override void AddNameProperties(ObjectPropertyList list)
+        public override void AddNameProperties(IPropertyList list)
        {
            base.AddNameProperties(list);

@ -105,7 +105,7 @@ namespace Server.Engines.MLQuests.Items
        {
        }

-        public override void AddNameProperties(ObjectPropertyList list)
+        public override void AddNameProperties(IPropertyList list)
        {
            base.AddNameProperties(list);

--- a/Quests/Items/ReginasLetter.cs
+++ b/Quests/Items/ReginasLetter.cs
@ -13,7 +13,7 @@ namespace Server.Items

        public override bool Nontransferable => true;

-        public override void AddNameProperties(ObjectPropertyList list)
+        public override void AddNameProperties(IPropertyList list)
        {
            base.AddNameProperties(list);
            AddQuestItemProperty(list);
--- a/Projects/UOContent/Engines/ML
+++ b/Projects/UOContent/Engines/ML
@ -13,7 +13,7 @@ namespace Server.Items

        public override bool Nontransferable => true;

-        public override void AddNameProperties(ObjectPropertyList list)
+        public override void AddNameProperties(IPropertyList list)
        {
            base.AddNameProperties(list);
            AddQuestItemProperty(list);
--- a/Quests/Items/SealedNotesForJamal.cs
+++ b/Quests/Items/SealedNotesForJamal.cs
@ -14,7 +14,7 @@ namespace Server.Items

        public override bool Nontransferable => true;

-        public override void AddNameProperties(ObjectPropertyList list)
+        public override void AddNameProperties(IPropertyList list)
        {
            base.AddNameProperties(list);
            AddQuestItemProperty(list);
--- a/Quests/Items/SealingWaxOrderAddressedToPetrus.cs
+++ b/Quests/Items/SealingWaxOrderAddressedToPetrus.cs
@ -13,7 +13,7 @@ namespace Server.Items

        public override bool Nontransferable => true;

-        public override void AddNameProperties(ObjectPropertyList list)
+        public override void AddNameProperties(IPropertyList list)
        {
            base.AddNameProperties(list);
            AddQuestItemProperty(list);
--- a/Quests/Items/SignedTuitionReimbursementForm.cs
+++ b/Quests/Items/SignedTuitionReimbursementForm.cs
@ -13,7 +13,7 @@ namespace Server.Items

        public override bool Nontransferable => true;

-        public override void AddNameProperties(ObjectPropertyList list)
+        public override void AddNameProperties(IPropertyList list)
        {
            base.AddNameProperties(list);
            AddQuestItemProperty(list);
--- a/Projects/UOContent/Engines/ML
+++ b/Projects/UOContent/Engines/ML
@ -13,7 +13,7 @@ namespace Server.Items

        public override bool Nontransferable => true;

-        public override void AddNameProperties(ObjectPropertyList list)
+        public override void AddNameProperties(IPropertyList list)
        {
            base.AddNameProperties(list);
            AddQuestItemProperty(list);
--- a/Quests/Items/TaintedTreeSample.cs
+++ b/Quests/Items/TaintedTreeSample.cs
@ -17,7 +17,7 @@ namespace Server.Items

        public override bool Nontransferable => true;

-        public override void AddNameProperties(ObjectPropertyList list)
+        public override void AddNameProperties(IPropertyList list)
        {
            base.AddNameProperties(list);
            AddQuestItemProperty(list);
--- a/Projects/UOContent/Engines/ML
+++ b/Projects/UOContent/Engines/ML
@ -71,7 +71,7 @@ namespace Server.Engines.MLQuests.Items
            return false;
        }

-        public override void GetProperties(ObjectPropertyList list)
+        public override void GetProperties(IPropertyList list)
        {
            base.GetProperties(list);

@ -179,7 +179,7 @@ namespace Server.Engines.MLQuests.Items
            return true;
        }

-        public override void GetProperties(ObjectPropertyList list)
+        public override void GetProperties(IPropertyList list)
        {
            base.GetProperties(list);

--- a/Quests/Items/TuitionReimbursementForm.cs
+++ b/Quests/Items/TuitionReimbursementForm.cs
@ -13,7 +13,7 @@ namespace Server.Items

        public override bool Nontransferable => true;

-        public override void AddNameProperties(ObjectPropertyList list)
+        public override void AddNameProperties(IPropertyList list)
        {
            base.AddNameProperties(list);
            AddQuestItemProperty(list);
--- a/Projects/UOContent/Engines/Plants/PlantItem.cs
+++ b/Projects/UOContent/Engines/Plants/PlantItem.cs
@ -248,7 +248,7 @@ namespace Server.Engines.Plants
            InvalidateProperties();
        }

-        public override void AddNameProperty(ObjectPropertyList list)
+        public override void AddNameProperty(IPropertyList list)
        {
            if (m_PlantStatus >= PlantStatus.DeadTwigs)
            {
--- a/Projects/UOContent/Engines/Plants/Seed.cs
+++ b/Projects/UOContent/Engines/Plants/Seed.cs
@ -124,7 +124,7 @@ namespace Server.Engines.Plants
            return hueInfo.IsBright() ? 1113491 : 1113490; // ~1_amount~ [bright] ~2_val~ seeds
        }

-        public override void AddNameProperty(ObjectPropertyList list)
+        public override void AddNameProperty(IPropertyList list)
        {
            list.Add(GetLabel(out var args), args);
        }
--- a/Projects/UOContent/Engines/Quests/Collector/Items/Obsidian.cs
+++ b/Projects/UOContent/Engines/Quests/Collector/Items/Obsidian.cs
@ -141,7 +141,7 @@ namespace Server.Engines.Quests.Collector

        public static string RandomName(Mobile from) => m_Names.RandomElement() ?? from.Name;

-        public override void AddNameProperty(ObjectPropertyList list)
+        public override void AddNameProperty(IPropertyList list)
        {
            if (m_Quantity < m_Partial)
            {
--- a/Projects/UOContent/Engines/Quests/Collector/Items/PaintedImage.cs
+++ b/Projects/UOContent/Engines/Quests/Collector/Items/PaintedImage.cs
@ -31,7 +31,7 @@ namespace Server.Engines.Quests.Collector
            }
        }

-        public override void AddNameProperty(ObjectPropertyList list)
+        public override void AddNameProperty(IPropertyList list)
        {
            var info = ImageTypeInfo.Get(m_Image);
            list.Add(1060847, $"#1055126\t#{info.Name}"); // a painted image of:
--- a/Projects/UOContent/Engines/Quests/Core/Items/HornOfRetreat.cs
+++ b/Projects/UOContent/Engines/Quests/Core/Items/HornOfRetreat.cs
@ -43,11 +43,11 @@ namespace Server.Engines.Quests

        public virtual bool ValidateUse(Mobile from) => true;

-        public override void GetProperties(ObjectPropertyList list)
+        public override void GetProperties(IPropertyList list)
        {
            base.GetProperties(list);

-            list.Add(1060741, m_Charges.ToString()); // charges: ~1_val~
+            list.Add(1060741, $"{m_Charges}"); // charges: ~1_val~
        }

        public override void OnDoubleClick(Mobile from)
--- a/Turmoil/Items/SchmendrickApprenticeCorpse.cs
+++ b/Turmoil/Items/SchmendrickApprenticeCorpse.cs
@ -70,7 +70,7 @@ namespace Server.Engines.Quests.Haven
            return new FacialHairInfo(Race.Human.RandomFacialHair(false), m_HairHue);
        }

-        public override void AddNameProperty(ObjectPropertyList list)
+        public override void AddNameProperty(IPropertyList list)
        {
            if (ItemID == 0x2006) // Corpse form
            {
--- a/Projects/UOContent/Engines/Quests/Uzeraan
+++ b/Projects/UOContent/Engines/Quests/Uzeraan
@ -108,7 +108,7 @@ namespace Server.Engines.Quests.Haven
        {
        }

-        public override void AddNameProperty(ObjectPropertyList list)
+        public override void AddNameProperty(IPropertyList list)
        {
            if (ItemID == 0x2006) // Corpse form
            {
--- a/Apprentice/Items/HagApprenticeCorpse.cs
+++ b/Apprentice/Items/HagApprenticeCorpse.cs
@ -39,7 +39,7 @@ namespace Server.Engines.Quests.Hag

        private static List<Item> GetEquipment() => new();

-        public override void AddNameProperty(ObjectPropertyList list)
+        public override void AddNameProperty(IPropertyList list)
        {
            list.Add("a charred corpse");
        }
--- a/Projects/UOContent/Engines/Spawners/BaseSpawner.cs
+++ b/Projects/UOContent/Engines/Spawners/BaseSpawner.cs
@ -353,11 +353,11 @@ namespace Server.Engines.Spawners
            from.SendGump(new SpawnerGump(this));
        }

-        public virtual void GetSpawnerProperties(ObjectPropertyList list)
+        public virtual void GetSpawnerProperties(IPropertyList list)
        {
        }

-        public override void GetProperties(ObjectPropertyList list)
+        public override void GetProperties(IPropertyList list)
        {
            base.GetProperties(list);

@ -365,18 +365,19 @@ namespace Server.Engines.Spawners
            {
                list.Add(1060742); // active

-                list.Add(1060656, m_Count.ToString()); // amount to make: ~1_val~
-                list.Add(1061169, m_HomeRange.ToString()); // range ~1_val~
-                list.Add(1050039, "walking range:\t{0}", m_WalkingRange); // ~1_NUMBER~ ~2_ITEMNAME~
-                list.Add(1053099, "group:\t{0}", m_Group); // ~1_oretype~: ~2_armortype~
-                list.Add(1060847, "team:\t{0}", m_Team); // ~1_val~ ~2_val~
-                list.Add(1063483, "delay:\t{0} to {1}", m_MinDelay, m_MaxDelay); // ~1_MATERIAL~: ~2_ITEMNAME~
+                list.Add(1060656, $"{m_Count}");                            // amount to make: ~1_val~
+                list.Add(1061169, $"{m_HomeRange}");                        // range ~1_val~
+                list.Add(1050039, $"walking range:\t{m_WalkingRange}");     // ~1_NUMBER~ ~2_ITEMNAME~
+                list.Add(1053099, $"group:\t{m_Group}");                    // ~1_oretype~: ~2_armortype~
+                list.Add(1060847, $"team:\t{m_Team}");                      // ~1_val~ ~2_val~
+                list.Add(1063483, $"delay:\t{m_MinDelay} to {m_MaxDelay}"); // ~1_MATERIAL~: ~2_ITEMNAME~

                GetSpawnerProperties(list);

                for (var i = 0; i < 6 && i < Entries.Count; ++i)
                {
-                    list.Add(1060658 + i, "\t{0}\t{1}", Entries[i].SpawnedName, CountSpawns(Entries[i]));
+                    var entry = Entries[i];
+                    list.Add(1060658 + i, $"\t{entry.SpawnedName}\t{CountSpawns(entry)}");
                }
            }
            else
@ -794,7 +795,7 @@ namespace Server.Engines.Spawners
            }
            else
            {
-                m_Timer?.Stop();
+                m_Timer.Stop();
                m_Timer.Delay = delay;
            }

--- a/Projects/UOContent/Engines/Spawners/RegionSpawner.cs
+++ b/Projects/UOContent/Engines/Spawners/RegionSpawner.cs
@ -88,13 +88,13 @@ namespace Server.Engines.Spawners
            json.SetProperty("region", options, SpawnRegion.Name);
        }

-        public override void GetSpawnerProperties(ObjectPropertyList list)
+        public override void GetSpawnerProperties(IPropertyList list)
        {
            base.GetSpawnerProperties(list);

            if (Running && m_SpawnRegion != null)
            {
-                list.Add(1076228, "region:\t{0}", m_SpawnRegion.Name); // ~1_DUMMY~ ~2_DUMMY~
+                list.Add(1076228, $"region:\t{m_SpawnRegion.Name}"); // ~1_DUMMY~ ~2_DUMMY~
            }
        }

--- a/Projects/UOContent/Engines/Treasures
+++ b/Projects/UOContent/Engines/Treasures
@ -113,7 +113,7 @@ namespace Server.Items
            set { }
        }

-        public override void GetProperties(ObjectPropertyList list)
+        public override void GetProperties(IPropertyList list)
        {
            base.GetProperties(list);

@ -122,7 +122,7 @@ namespace Server.Items
                TextDefinition.AddTo(list, m_Label);
            }

-            list.Add(1060584, m_UsesRemaining.ToString()); // uses remaining: ~1_val~
+            list.Add(1060584, $"{m_UsesRemaining}"); // uses remaining: ~1_val~
        }

        public override void OnDoubleClick(Mobile from)
--- a/Projects/UOContent/Engines/Treasures
+++ b/Projects/UOContent/Engines/Treasures
@ -713,7 +713,7 @@ namespace Server.Items
            Utility.Intern(ref m_UrnName);
        }

-        public override void AddNameProperty(ObjectPropertyList list)
+        public override void AddNameProperty(IPropertyList list)
        {
            list.Add(1070935, m_UrnName); // Ancient Urn of ~1_name~
        }
@ -772,7 +772,7 @@ namespace Server.Items
            Utility.Intern(ref m_SwordsName);
        }

-        public override void AddNameProperty(ObjectPropertyList list)
+        public override void AddNameProperty(IPropertyList list)
        {
            list.Add(1070936, m_SwordsName); // Honorable Swords of ~1_name~
        }
--- a/Projects/UOContent/Engines/Veteran
+++ b/Projects/UOContent/Engines/Veteran
@ -128,7 +128,7 @@ namespace Server.Mobiles
            DisplayPaperdollTo(from);
        }

-        public override void GetProperties(ObjectPropertyList list)
+        public override void GetProperties(IPropertyList list)
        {
            base.GetProperties(list);

@ -496,7 +496,7 @@ namespace Server.Mobiles
            }
        }

-        public override void GetProperties(ObjectPropertyList list)
+        public override void GetProperties(IPropertyList list)
        {
            base.GetProperties(list);

--- a/Projects/UOContent/Engines/Veteran
+++ b/Projects/UOContent/Engines/Veteran
@ -71,7 +71,7 @@ namespace Server.Items
            }
        }

-        public override void GetProperties(ObjectPropertyList list)
+        public override void GetProperties(IPropertyList list)
        {
            base.GetProperties(list);