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

fix: Optimizes gump relay info (Prep for Static Gumps) (#1698)

Browse source
This commit is contained in:
Kamron Batman 2024-03-07 20:54:53 -08:00 • committed by GitHub
parent 50fcee12dc
commit cfe9e04c78
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
220 changed files with 364 additions and 402 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Projects/UOContent/Items/Special/8th Anniversary Items/Dawn's Music Box/DawnsMusicBoxGump.cs
View file

@ -66,7 +66,7 @@ public class DawnsMusicBoxGump : Gump
AddHtmlLocalized(44, y - 2, 213, 20, 1075207, 0x7FFF); // Stop Song
}
public override void OnResponse(NetState sender, RelayInfo info)
public override void OnResponse(NetState sender, in RelayInfo info)
{
if (m_Box?.Deleted != false)
{

2
Projects/UOContent/Items/Special/Broken Furniture Collection/BrokenBed.cs
View file

@ -86,7 +86,7 @@ public partial class BrokenBedDeed : BaseAddonDeed
AddHtmlLocalized(44, 71, 213, 20, 1075387, 0x7FFF); // East
}
public override void OnResponse(NetState sender, RelayInfo info)
public override void OnResponse(NetState sender, in RelayInfo info)
{
if (_deed?.Deleted != false || info.ButtonID == 0)
{

2
Projects/UOContent/Items/Special/Broken Furniture Collection/BrokenVanity.cs
View file

@ -81,7 +81,7 @@ public partial class BrokenVanityDeed : BaseAddonDeed
AddHtmlLocalized(44, 71, 213, 20, 1075387, 0x7FFF); // East
}
public override void OnResponse(NetState sender, RelayInfo info)
public override void OnResponse(NetState sender, in RelayInfo info)
{
if (_deed?.Deleted != false || info.ButtonID == 0)
{

2
Projects/UOContent/Items/Special/Gifts/HearthOfHomeFire.cs
View file

@ -80,7 +80,7 @@ public partial class HearthOfHomeFireDeed : BaseAddonDeed
AddButton(185, 35, 0x868, 0x869, 2); // East
}
public override void OnResponse(NetState sender, RelayInfo info)
public override void OnResponse(NetState sender, in RelayInfo info)
{
if (_deed.Deleted || info.ButtonID == 0)
{

2
Projects/UOContent/Items/Special/Heritage Items/Curtains.cs
View file

@ -133,7 +133,7 @@ public partial class CurtainsDeed : BaseAddonDeed
AddHtmlLocalized(44, 71, 213, 20, 1075387, 0x7FFF); // East
}
public override void OnResponse(NetState sender, RelayInfo info)
public override void OnResponse(NetState sender, in RelayInfo info)
{
if (_deed?.Deleted != false || info.ButtonID == 0)
{

2
Projects/UOContent/Items/Special/Heritage Items/HangingAxes.cs
View file

@ -81,7 +81,7 @@ public partial class HangingAxesDeed : BaseAddonDeed
AddHtmlLocalized(44, 71, 213, 20, 1075387, 0x7FFF); // East
}
public override void OnResponse(NetState sender, RelayInfo info)
public override void OnResponse(NetState sender, in RelayInfo info)
{
if (m_Deed?.Deleted != false || info.ButtonID == 0)
{

2
Projects/UOContent/Items/Special/Heritage Items/HangingSwords.cs
View file

@ -81,7 +81,7 @@ public partial class HangingSwordsDeed : BaseAddonDeed
AddHtmlLocalized(44, 71, 213, 20, 1075387, 0x7FFF); // East
}
public override void OnResponse(NetState sender, RelayInfo info)
public override void OnResponse(NetState sender, in RelayInfo info)
{
if (m_Deed?.Deleted != false || info.ButtonID == 0)
{

2
Projects/UOContent/Items/Special/Heritage Items/HouseLadder.cs
View file

@ -135,7 +135,7 @@ public partial class HouseLadderDeed : BaseAddonDeed
AddHtmlLocalized(44, 215, 213, 20, 1075390, 0x7FFF); // West
}
public override void OnResponse(NetState sender, RelayInfo info)
public override void OnResponse(NetState sender, in RelayInfo info)
{
if (_deed?.Deleted != false || info.ButtonID is 0 or < 1 or > 8)
{

2
Projects/UOContent/Items/Special/Heritage Items/Statue.cs
View file

@ -83,7 +83,7 @@ public partial class StoneStatueDeed : BaseAddonDeed
AddHtmlLocalized(44, 71, 213, 20, 1075387, 0x7FFF); // East
}
public override void OnResponse(NetState sender, RelayInfo info)
public override void OnResponse(NetState sender, in RelayInfo info)
{
if (_deed?.Deleted != false || info.ButtonID == 0)
{

2
Projects/UOContent/Items/Special/Heritage Items/UnmadeBed.cs
View file

@ -85,7 +85,7 @@ public partial class UnmadeBedDeed : BaseAddonDeed
AddHtmlLocalized(44, 71, 213, 20, 1075387, 0x7FFF); // East
}
public override void OnResponse(NetState sender, RelayInfo info)
public override void OnResponse(NetState sender, in RelayInfo info)
{
if (_deed?.Deleted != false || info.ButtonID == 0)
{

2
Projects/UOContent/Items/Special/Heritage Items/Vanity.cs
View file

@ -82,7 +82,7 @@ public partial class VanityDeed : BaseAddonContainerDeed
AddHtmlLocalized(44, 71, 213, 20, 1075387, 0x7FFF); // East
}
public override void OnResponse(NetState sender, RelayInfo info)
public override void OnResponse(NetState sender, in RelayInfo info)
{
if (_deed?.Deleted != false || info.ButtonID == 0)
{

2
Projects/UOContent/Items/Special/Heritage Items/WoodenCoffin.cs
View file

@ -93,7 +93,7 @@ public partial class WoodenCoffinDeed : BaseAddonDeed
AddHtmlLocalized(44, 71, 213, 20, 1075387, 0x7FFF); // East
}
public override void OnResponse(NetState sender, RelayInfo info)
public override void OnResponse(NetState sender, in RelayInfo info)
{
if (_deed?.Deleted != false || info.ButtonID == 0)
{

2
Projects/UOContent/Items/Special/Holiday/HolidayPottedPlant.cs
View file

@ -77,7 +77,7 @@ public partial class PottedPlantDeed : Item
AddButton(295, 50, 0x845, 0x846, 5);
}
public override void OnResponse(NetState sender, RelayInfo info)
public override void OnResponse(NetState sender, in RelayInfo info)
{
if (_deed?.Deleted != false)
{

2
Projects/UOContent/Items/Special/Holiday/SnowStatue.cs
View file

@ -106,7 +106,7 @@ public partial class SnowStatueDeed : Item
AddButton(275, 50, 0x845, 0x846, 4);
}
public override void OnResponse(NetState sender, RelayInfo info)
public override void OnResponse(NetState sender, in RelayInfo info)
{
if (_deed?.Deleted != false)
{

4
Projects/UOContent/Items/Special/Holiday/Wreath.cs
View file

@ -127,7 +127,7 @@ public partial class WreathAddon : Item, IDyable, IAddon
AddButton(20, 125, 0xFA5, 0xFA7, 0);
}
public override void OnResponse(NetState sender, RelayInfo info)
public override void OnResponse(NetState sender, in RelayInfo info)
{
if (_addon.Deleted)
{
@ -286,7 +286,7 @@ public partial class WreathDeed : Item
AddButton(145, 35, 0x868, 0x869, 2);
}
public override void OnResponse(NetState sender, RelayInfo info)
public override void OnResponse(NetState sender, in RelayInfo info)
{
if (_deed.Deleted)
{

2
Projects/UOContent/Items/Special/House Raffle/HouseRaffleManagementGump.cs
View file

@ -164,7 +164,7 @@ public class HouseRaffleManagementGump : Gump
[MethodImpl(MethodImplOptions.AggressiveInlining)]
public string Color(string text, int color) => $"<BASEFONT COLOR=#{color:X6}>{text}</BASEFONT>";
public override void OnResponse(NetState sender, RelayInfo info)
public override void OnResponse(NetState sender, in RelayInfo info)
{
var from = sender.Mobile;
var buttonId = info.ButtonID;

2
Projects/UOContent/Items/Special/MonsterStatuette.cs
View file

@ -256,7 +256,7 @@ public partial class MonsterStatuette : Item, IRewardItem
AddHtmlLocalized(190, 55, 100, 35, 1011012); // CANCEL
}
public override void OnResponse(NetState sender, RelayInfo info)
public override void OnResponse(NetState sender, in RelayInfo info)
{
var from = sender.Mobile;

10
Projects/UOContent/Items/Special/SoulStone.cs
View file

@ -315,7 +315,7 @@ public partial class SoulStone : Item, ISecurable
}
}
public override void OnResponse(NetState sender, RelayInfo info)
public override void OnResponse(NetState sender, in RelayInfo info)
{
if (info.ButtonID == 0 || !_stone.IsEmpty)
{
@ -406,7 +406,7 @@ public partial class SoulStone : Item, ISecurable
AddHtmlLocalized(45, 412, 450, 20, 1060051, 0x7FFF); // CANCEL
}
public override void OnResponse(NetState sender, RelayInfo info)
public override void OnResponse(NetState sender, in RelayInfo info)
{
if (info.ButtonID == 0 || !_stone.IsEmpty)
{
@ -552,7 +552,7 @@ public partial class SoulStone : Item, ISecurable
AddHtmlLocalized(45, 412, 450, 20, 1060051, 0x7FFF); // CANCEL
}
public override void OnResponse(NetState sender, RelayInfo info)
public override void OnResponse(NetState sender, in RelayInfo info)
{
if (info.ButtonID == 0 || _stone.IsEmpty)
{
@ -767,7 +767,7 @@ public partial class SoulStone : Item, ISecurable
AddHtmlLocalized(45, 412, 450, 20, 1060051, 0x7FFF); // CANCEL
}
public override void OnResponse(NetState sender, RelayInfo info)
public override void OnResponse(NetState sender, in RelayInfo info)
{
if (info.ButtonID == 0 || _stone.IsEmpty)
{
@ -813,7 +813,7 @@ public partial class SoulStone : Item, ISecurable
AddHtmlLocalized(45, 412, 450, 20, 1060051, 0x7FFF); // CANCEL
}
public override void OnResponse(NetState sender, RelayInfo info)
public override void OnResponse(NetState sender, in RelayInfo info)
{
if (info.ButtonID == 0)
{

2
Projects/UOContent/Items/Special/Special Scrolls/SpecialScroll.cs
View file

@ -120,7 +120,7 @@ public abstract partial class SpecialScroll : Item
}
}
public override void OnResponse(NetState state, RelayInfo info)
public override void OnResponse(NetState state, in RelayInfo info)
{
if (info.ButtonID == 1)
{

2
Projects/UOContent/Items/Special/Veteran Rewards/AnkhOfSacrifice.cs
View file

@ -129,7 +129,7 @@ public partial class AnkhOfSacrificeComponent : AddonComponent
{
}
public override void OnResponse(NetState state, RelayInfo info)
public override void OnResponse(NetState state, in RelayInfo info)
{
var from = state.Mobile;

4
Projects/UOContent/Items/Special/Veteran Rewards/Banner.cs
View file

@ -193,7 +193,7 @@ public partial class BannerDeed : Item, IRewardItem
}
}
public override void OnResponse(NetState sender, RelayInfo info)
public override void OnResponse(NetState sender, in RelayInfo info)
{
if (_banner?.Deleted != false)
{
@ -324,7 +324,7 @@ public partial class BannerDeed : Item, IRewardItem
AddButton(145, 35, 0x868, 0x869, (int)Buttons.South);
}
public override void OnResponse(NetState sender, RelayInfo info)
public override void OnResponse(NetState sender, in RelayInfo info)
{
if (m_Banner?.Deleted != false || m_House == null)
{

2
Projects/UOContent/Items/Special/Veteran Rewards/Brazier.cs
View file

@ -176,7 +176,7 @@ public partial class RewardBrazierDeed : Item, IRewardItem
AddButton(115, 50, 0x845, 0x846, 0x19BB);
}
public override void OnResponse(NetState sender, RelayInfo info)
public override void OnResponse(NetState sender, in RelayInfo info)
{
if (_brazier?.Deleted != false)
{

2
Projects/UOContent/Items/Special/Veteran Rewards/Cannon.cs
View file

@ -339,7 +339,7 @@ public partial class CannonAddon : BaseAddon
AddHtmlLocalized(195, 109, 120, 20, 1076197, 0x7FFF); // Recharge
}
public override void OnResponse(NetState state, RelayInfo info)
public override void OnResponse(NetState state, in RelayInfo info)
{
if (_cannon?.Deleted == false && info.ButtonID == (int)Buttons.Recharge)
{

4
Projects/UOContent/Items/Special/Veteran Rewards/DecorativeShield.cs
View file

@ -191,7 +191,7 @@ public partial class DecorativeShieldDeed : Item, IRewardItem
}
}
public override void OnResponse(NetState sender, RelayInfo info)
public override void OnResponse(NetState sender, in RelayInfo info)
{
if (_shield?.Deleted != false ||
info.ButtonID is < Start or > End ||
@ -316,7 +316,7 @@ public partial class DecorativeShieldDeed : Item, IRewardItem
AddButton(145, 35, 0x867, 0x869, (int)Buttons.South);
}
public override void OnResponse(NetState sender, RelayInfo info)
public override void OnResponse(NetState sender, in RelayInfo info)
{
if (_shield?.Deleted != false || _house == null)
{

4
Projects/UOContent/Items/Special/Veteran Rewards/HangingSkeleton.cs
View file

@ -178,7 +178,7 @@ public partial class HangingSkeletonDeed : Item, IRewardItem
AddButton(390, 50, 0x845, 0x846, 0x1B7F);
}
public override void OnResponse(NetState sender, RelayInfo info)
public override void OnResponse(NetState sender, in RelayInfo info)
{
if (_deed?.Deleted != false || info.ButtonID != 0x1A03 && info.ButtonID != 0x1A05 &&
info.ButtonID != 0x1A09 && info.ButtonID != 0x1B1E && info.ButtonID != 0x1B7F)
@ -303,7 +303,7 @@ public partial class HangingSkeletonDeed : Item, IRewardItem
AddButton(145, 35, 0x868, 0x869, (int)Buttons.South);
}
public override void OnResponse(NetState sender, RelayInfo info)
public override void OnResponse(NetState sender, in RelayInfo info)
{
if (_skeleton?.Deleted != false || _house == null)
{

2
Projects/UOContent/Items/Special/Veteran Rewards/PottedCactus.cs
View file

@ -107,7 +107,7 @@ public partial class PottedCactusDeed : Item, IRewardItem
AddButton(355, 50, 0x845, 0x846, 0x1E13);
}
public override void OnResponse(NetState sender, RelayInfo info)
public override void OnResponse(NetState sender, in RelayInfo info)
{
if (_deed?.Deleted != false || info.ButtonID is < 0x1E0F or > 0x1E14)
{

2
Projects/UOContent/Items/Special/Veteran Rewards/StoneAnkh.cs
View file

@ -172,7 +172,7 @@ public partial class StoneAnkhDeed : BaseAddonDeed, IRewardItem
AddButton(145, 35, 0x867, 0x869, (int)Buttons.East); // East
}
public override void OnResponse(NetState sender, RelayInfo info)
public override void OnResponse(NetState sender, in RelayInfo info)
{
if (_deed?.Deleted != false || info.ButtonID == (int)Buttons.Cancel)
{

2
Projects/UOContent/Items/Special/Veteran Rewards/WallBanner.cs
View file

@ -466,7 +466,7 @@ public partial class WallBannerDeed : BaseAddonDeed, IRewardItem
AddButton(70, 205, 0x8AF, 0x8AF, 0, GumpButtonType.Page, 4);
}
public override void OnResponse(NetState sender, RelayInfo info)
public override void OnResponse(NetState sender, in RelayInfo info)
{
if (_wallBanner?.Deleted != false || info.ButtonID is <= 0 or >= 31)
{

8
Projects/UOContent/Items/Special/Veteran Rewards/WeaponEngravingTool.cs
View file

@ -217,7 +217,7 @@ public partial class WeaponEngravingTool : Item, IUsesRemaining, IRewardItem
AddTextEntry(75, 245, 350, 40, 0x0, (int)Buttons.Text, "");
}
public override void OnResponse(NetState state, RelayInfo info)
public override void OnResponse(NetState state, in RelayInfo info)
{
if (_tool?.Deleted != false || _target?.Deleted != false)
{
@ -237,7 +237,7 @@ public partial class WeaponEngravingTool : Item, IUsesRemaining, IRewardItem
return;
}
if (string.IsNullOrEmpty(relay.Text))
if (string.IsNullOrEmpty(relay))
{
_target.EngravedText = null;
state.Mobile.SendLocalizedMessage(1072362); // You remove the engraving from the object.
@ -245,7 +245,7 @@ public partial class WeaponEngravingTool : Item, IUsesRemaining, IRewardItem
else
{
_target.EngravedText =
Utility.FixHtml(relay.Text.Length > 64 ? relay.Text[..64] : relay.Text);
Utility.FixHtml(relay.Length > 64 ? relay[..64] : relay);
state.Mobile.SendLocalizedMessage(1072361); // You engraved the object.
_target.InvalidateProperties();
_tool.UsesRemaining -= 1;
@ -299,7 +299,7 @@ public partial class WeaponEngravingTool : Item, IUsesRemaining, IRewardItem
AddHtmlLocalized(40, 109, 100, 20, 1060051, 0x7FFF); // CANCEL
}
public override void OnResponse(NetState state, RelayInfo info)
public override void OnResponse(NetState state, in RelayInfo info)
{
if (_engraver?.Deleted != false || info.ButtonID != (int)Buttons.Confirm)
{