ingame ui safety checks/deferrals

pandinocoder · pandinocoder · commit b45ecb904ebc · 2025-02-20T13:28:36.000+01:00
diff --git a/Intersect.Client.Core/Core/Input.cs b/Intersect.Client.Core/Core/Input.cs
@@ -119,7 +119,7 @@ public static void OnKeyPressed(Keys modifier, Keys key)
                 return;
             }
 
-            if (Interface.Interface.GameUi is not { } gameUi)
+            if (!Interface.Interface.HasInGameUI)
             {
                 return;
             }
@@ -244,6 +244,11 @@ public static void OnKeyPressed(Keys modifier, Keys key)
                     break;
 
                 case GameStates.InGame:
+                    if (!Interface.Interface.HasInGameUI)
+                    {
+                        break;
+                    }
+
                     switch (control)
                     {
                         case Control.Block:
@@ -273,47 +278,47 @@ public static void OnKeyPressed(Keys modifier, Keys key)
                             break;
 
                         case Control.Enter:
-                            if (canFocusChat && Interface.Interface.GameUi != default)
+                            if (canFocusChat)
                             {
                                 Interface.Interface.GameUi.FocusChat = true;
                                 consumeKey = true;
                             }
                             continue;
 
                         case Control.OpenInventory:
-                            Interface.Interface.GameUi?.GameMenu?.ToggleInventoryWindow();
+                            Interface.Interface.GameUi.GameMenu?.ToggleInventoryWindow();
                             break;
 
                         case Control.OpenQuests:
-                            Interface.Interface.GameUi?.GameMenu?.ToggleQuestsWindow();
+                            Interface.Interface.GameUi.GameMenu?.ToggleQuestsWindow();
                             break;
 
                         case Control.OpenCharacterInfo:
-                            Interface.Interface.GameUi?.GameMenu?.ToggleCharacterWindow();
+                            Interface.Interface.GameUi.GameMenu?.ToggleCharacterWindow();
                             break;
 
                         case Control.OpenParties:
-                            Interface.Interface.GameUi?.GameMenu?.TogglePartyWindow();
+                            Interface.Interface.GameUi.GameMenu?.TogglePartyWindow();
                             break;
 
                         case Control.OpenSpells:
-                            Interface.Interface.GameUi?.GameMenu?.ToggleSpellsWindow();
+                            Interface.Interface.GameUi.GameMenu?.ToggleSpellsWindow();
                             break;
 
                         case Control.OpenFriends:
-                            _ = (Interface.Interface.GameUi?.GameMenu?.ToggleFriendsWindow());
+                            _ = (Interface.Interface.GameUi.GameMenu?.ToggleFriendsWindow());
                             break;
 
                         case Control.OpenSettings:
-                            Interface.Interface.GameUi?.EscapeMenu?.OpenSettingsWindow();
+                            Interface.Interface.GameUi.EscapeMenu?.OpenSettingsWindow();
                             break;
 
                         case Control.OpenAdminPanel:
                             PacketSender.SendOpenAdminWindow();
                             break;
 
                         case Control.OpenGuild:
-                            _ = Interface.Interface.GameUi?.GameMenu?.ToggleGuildWindow();
+                            _ = Interface.Interface.GameUi.GameMenu?.ToggleGuildWindow();
                             break;
                     }
                     break;
diff --git a/Intersect.Client.Core/Entities/Player.cs b/Intersect.Client.Core/Entities/Player.cs
@@ -295,7 +295,7 @@ public override bool Update()
             }
         }
 
-        if (TargetBox == default && this == Globals.Me && Interface.Interface.GameUi != default)
+        if (TargetBox == default && this == Globals.Me && Interface.Interface.HasInGameUI)
         {
             // If for WHATEVER reason the box hasn't been created, create it.
             TargetBox = new EntityBox(Interface.Interface.GameUi.GameCanvas, EntityType.Player, null);
@@ -318,7 +318,7 @@ public override bool Update()
         StatusWindow?.Update();
 
         // Hide our Guild window if we're not in a guild!
-        if (this == Globals.Me && string.IsNullOrEmpty(Guild) && Interface.Interface.GameUi != null)
+        if (this == Globals.Me && string.IsNullOrEmpty(Guild) && Interface.Interface.HasInGameUI)
         {
             Interface.Interface.GameUi.HideGuildWindow();
         }
@@ -363,7 +363,7 @@ public override void Load(EntityPacket? packet)
             }
         }
 
-        if (this == Globals.Me && TargetBox == null && Interface.Interface.GameUi != null)
+        if (this == Globals.Me && TargetBox == null && Interface.Interface.HasInGameUI)
         {
             TargetBox = new EntityBox(Interface.Interface.GameUi.GameCanvas, EntityType.Player, null);
             TargetBox.Hide();
@@ -1584,10 +1584,15 @@ out var activeBinding
             castInput = slotIndex;
         }
 
+        if (!Interface.Interface.HasInGameUI)
+        {
+            return;
+
+        }
         // ReSharper disable once InvertIf
-        if (0 <= castInput && castInput < Interface.Interface.GameUi?.Hotbar?.Items?.Count && mLastHotbarUseTime[castInput] < Timing.Global.Milliseconds)
+        if (0 <= castInput && castInput < Interface.Interface.GameUi.Hotbar?.Items?.Count && mLastHotbarUseTime[castInput] < Timing.Global.Milliseconds)
         {
-            Interface.Interface.GameUi?.Hotbar?.Items?[castInput]?.Activate();
+            Interface.Interface.GameUi.Hotbar?.Items?[castInput]?.Activate();
             mLastHotbarUseTime[castInput] = Timing.Global.Milliseconds + mHotbarUseDelay;
         }
     }
diff --git a/Intersect.Client.Core/Interface/Interface.cs b/Intersect.Client.Core/Interface/Interface.cs
@@ -43,6 +43,10 @@ public static partial class Interface
 
     public static bool SetupHandlers { get; set; }
 
+    public static bool HasInGameUI => _uiInGame != null;
+
+    public static bool HasMainMenuUI => _uiMainMenu != null;
+
     public static GameInterface GameUi
     {
         get
diff --git a/Intersect.Client.Core/Networking/PacketHandler.cs b/Intersect.Client.Core/Networking/PacketHandler.cs
@@ -609,7 +609,9 @@ public void HandlePacket(IPacketSender packetSender, Intersect.Network.Packets.S
     //AnnouncementPacket
     public void HandlePacket(IPacketSender packetSender, AnnouncementPacket packet)
     {
-        Interface.Interface.GameUi.AnnouncementWindow.ShowAnnouncement(packet.Message, packet.Duration);
+        Interface.Interface.EnqueueInGame(
+            gameInterface => gameInterface.AnnouncementWindow.ShowAnnouncement(packet.Message, packet.Duration)
+        );
     }
 
     //ActionMsgPackets
@@ -914,17 +916,19 @@ public void HandlePacket(IPacketSender packetSender, MapEntityStatusPacket packe
 
             entity.SortStatuses();
 
-            if (Interface.Interface.GameUi != null)
+            if (!Interface.Interface.HasInGameUI)
             {
-                //If its you or your target, update the entity box.
-                if (en.Id == Globals.Me.Id && Interface.Interface.GameUi.PlayerStatusWindow != null)
-                {
-                    Interface.Interface.GameUi.PlayerStatusWindow.ShouldUpdateStatuses = true;
-                }
-                else if (en.Id == Globals.Me.TargetId && Globals.Me.TargetBox != null)
-                {
-                    Globals.Me.TargetBox.ShouldUpdateStatuses = true;
-                }
+                continue;
+            }
+
+            //If its you or your target, update the entity box.
+            if (en.Id == Globals.Me.Id && Interface.Interface.GameUi.PlayerStatusWindow != null)
+            {
+                Interface.Interface.GameUi.PlayerStatusWindow.ShouldUpdateStatuses = true;
+            }
+            else if (en.Id == Globals.Me.TargetId && Globals.Me.TargetBox != null)
+            {
+                Globals.Me.TargetBox.ShouldUpdateStatuses = true;
             }
         }
     }
@@ -999,17 +1003,19 @@ public void HandlePacket(IPacketSender packetSender, EntityVitalsPacket packet)
 
         en.SortStatuses();
 
-        if (Interface.Interface.GameUi != null)
+        if (!Interface.Interface.HasInGameUI)
         {
-            //If its you or your target, update the entity box.
-            if (id == Globals.Me.Id && Interface.Interface.GameUi.PlayerStatusWindow != null)
-            {
-                Interface.Interface.GameUi.PlayerStatusWindow.ShouldUpdateStatuses = true;
-            }
-            else if (id == Globals.Me.TargetId && Globals.Me.TargetBox != null)
-            {
-                Globals.Me.TargetBox.ShouldUpdateStatuses = true;
-            }
+            return;
+        }
+
+        //If its you or your target, update the entity box.
+        if (id == Globals.Me.Id && Interface.Interface.GameUi.PlayerStatusWindow != null)
+        {
+            Interface.Interface.GameUi.PlayerStatusWindow.ShouldUpdateStatuses = true;
+        }
+        else if (id == Globals.Me.TargetId && Globals.Me.TargetBox != null)
+        {
+            Globals.Me.TargetBox.ShouldUpdateStatuses = true;
         }
     }
 
@@ -1399,7 +1405,7 @@ public void HandlePacket(IPacketSender packetSender, CharacterCreationPacket pac
     //AdminPanelPacket
     public void HandlePacket(IPacketSender packetSender, AdminPanelPacket packet)
     {
-        Interface.Interface.GameUi.NotifyOpenAdminWindow();
+        Interface.Interface.EnqueueInGame(gameInterface => gameInterface.NotifyOpenAdminWindow());
     }
 
     //SpellCastPacket
@@ -1691,7 +1697,7 @@ public void HandlePacket(IPacketSender packetSender, HidePicturePacket packet)
     //ShopPacket
     public void HandlePacket(IPacketSender packetSender, ShopPacket packet)
     {
-        if (Interface.Interface.GameUi == null)
+        if (!Interface.Interface.HasInGameUI)
         {
             throw new ArgumentNullException(nameof(Interface.Interface.GameUi));
         }
@@ -1705,12 +1711,12 @@ public void HandlePacket(IPacketSender packetSender, ShopPacket packet)
         {
             Globals.GameShop = new ShopBase();
             Globals.GameShop.Load(packet.ShopData);
-            Interface.Interface.GameUi.NotifyOpenShop();
+            Interface.Interface.EnqueueInGame(gameInterface => gameInterface.NotifyOpenShop());
         }
         else
         {
             Globals.GameShop = null;
-            Interface.Interface.GameUi.NotifyCloseShop();
+            Interface.Interface.EnqueueInGame(gameInterface => gameInterface.NotifyCloseShop());
         }
     }
 
@@ -1721,11 +1727,11 @@ public void HandlePacket(IPacketSender packetSender, CraftingTablePacket packet)
         {
             Globals.ActiveCraftingTable = new CraftingTableBase();
             Globals.ActiveCraftingTable.Load(packet.TableData);
-            Interface.Interface.GameUi.NotifyOpenCraftingTable(packet.JournalMode);
+            Interface.Interface.EnqueueInGame(gameInterface => gameInterface.NotifyOpenCraftingTable(packet.JournalMode));
         }
         else
         {
-            Interface.Interface.GameUi.NotifyCloseCraftingTable();
+            Interface.Interface.EnqueueInGame(gameInterface => gameInterface.NotifyCloseCraftingTable());
         }
     }
 
@@ -1741,11 +1747,11 @@ public void HandlePacket(IPacketSender packetSender, BankPacket packet)
                 HandlePacket(itm);
             }
             Globals.BankSlotCount = packet.Slots;
-            Interface.Interface.GameUi.NotifyOpenBank();
+            Interface.Interface.EnqueueInGame(gameInterface => gameInterface.NotifyOpenBank());
         }
         else
         {
-            Interface.Interface.GameUi.NotifyCloseBank();
+            Interface.Interface.EnqueueInGame(gameInterface => gameInterface.NotifyCloseBank());
         }
     }
 
@@ -2021,11 +2027,11 @@ public void HandlePacket(IPacketSender packetSender, TradePacket packet)
                 }
             }
 
-            Interface.Interface.GameUi.NotifyOpenTrading(packet.TradePartner);
+            Interface.Interface.EnqueueInGame(gameInterface => gameInterface.NotifyOpenTrading(packet.TradePartner));
         }
         else
         {
-            Interface.Interface.GameUi.NotifyCloseTrading();
+            Interface.Interface.EnqueueInGame(gameInterface => gameInterface.NotifyCloseTrading());
         }
     }
 
@@ -2100,11 +2106,11 @@ public void HandlePacket(IPacketSender packetSender, BagPacket packet)
         if (!packet.Close)
         {
             Globals.BagSlots = new Item[packet.Slots];
-            Interface.Interface.GameUi.NotifyOpenBag();
+            Interface.Interface.EnqueueInGame(gameInterface => gameInterface.NotifyOpenBag());
         }
         else
         {
-            Interface.Interface.GameUi.NotifyCloseBag();
+            Interface.Interface.EnqueueInGame(gameInterface => gameInterface.NotifyCloseBag());
         }
     }
 
@@ -2156,7 +2162,12 @@ public void HandlePacket(IPacketSender packetSender, FriendsPacket packet)
             Globals.Me?.Friends.Add(f);
         }
 
-        Interface.Interface.GameUi?.NotifyUpdateFriendsList();
+        if (!Interface.Interface.HasInGameUI)
+        {
+            return;
+        }
+
+        Interface.Interface.EnqueueInGame(gameInterface => gameInterface.NotifyUpdateFriendsList());
     }
 
     //FriendRequestPacket
@@ -2316,7 +2327,7 @@ public void HandlePacket(IPacketSender packetSender, GuildPacket packet)
         if (hasUpdates)
         {
             Globals.Me.GuildMembers = updatedGuildMembers;
-            Interface.Interface.GameUi.NotifyUpdateGuildList();
+            Interface.Interface.EnqueueInGame(gameInterface => gameInterface.NotifyUpdateGuildList());
         }
     }
 
diff --git a/Intersect.Client.Core/Plugins/Helpers/ClientLifecycleHelper.cs b/Intersect.Client.Core/Plugins/Helpers/ClientLifecycleHelper.cs
@@ -30,8 +30,7 @@ internal ClientLifecycleHelper(IClientPluginContext context) : base(context)
     }
 
     /// <inheritdoc />
-    public IMutableInterface Interface =>
-        Client.Interface.Interface.MenuUi ?? Client.Interface.Interface.GameUi as IMutableInterface;
+    public IMutableInterface Interface => Client.Interface.Interface.CurrentInterface;
 
     /// <inheritdoc />
     public void OnLifecycleChangeState(GameStates state)

Original file line number	Diff line number	Diff line change
`@@ -295,7 +295,7 @@ public override bool Update()`
`295`	`295`	`}`
`296`	`296`	`}`
`297`	`297`
`298`		`- if (TargetBox == default && this == Globals.Me && Interface.Interface.GameUi != default)`
	`298`	`+ if (TargetBox == default && this == Globals.Me && Interface.Interface.HasInGameUI)`
`299`	`299`	`{`
`300`	`300`	`// If for WHATEVER reason the box hasn't been created, create it.`
`301`	`301`	`TargetBox = new EntityBox(Interface.Interface.GameUi.GameCanvas, EntityType.Player, null);`
`@@ -318,7 +318,7 @@ public override bool Update()`
`318`	`318`	`StatusWindow?.Update();`
`319`	`319`
`320`	`320`	`// Hide our Guild window if we're not in a guild!`
`321`		`- if (this == Globals.Me && string.IsNullOrEmpty(Guild) && Interface.Interface.GameUi != null)`
	`321`	`+ if (this == Globals.Me && string.IsNullOrEmpty(Guild) && Interface.Interface.HasInGameUI)`
`322`	`322`	`{`
`323`	`323`	`Interface.Interface.GameUi.HideGuildWindow();`
`324`	`324`	`}`
`@@ -363,7 +363,7 @@ public override void Load(EntityPacket? packet)`
`363`	`363`	`}`
`364`	`364`	`}`
`365`	`365`
`366`		`- if (this == Globals.Me && TargetBox == null && Interface.Interface.GameUi != null)`
	`366`	`+ if (this == Globals.Me && TargetBox == null && Interface.Interface.HasInGameUI)`
`367`	`367`	`{`
`368`	`368`	`TargetBox = new EntityBox(Interface.Interface.GameUi.GameCanvas, EntityType.Player, null);`
`369`	`369`	`TargetBox.Hide();`
`@@ -1584,10 +1584,15 @@ out var activeBinding`
`1584`	`1584`	`castInput = slotIndex;`
`1585`	`1585`	`}`
`1586`	`1586`
	`1587`	`+ if (!Interface.Interface.HasInGameUI)`
	`1588`	`+ {`
	`1589`	`+ return;`
	`1590`	`+`
	`1591`	`+ }`
`1587`	`1592`	`// ReSharper disable once InvertIf`
`1588`		`- if (0 <= castInput && castInput < Interface.Interface.GameUi?.Hotbar?.Items?.Count && mLastHotbarUseTime[castInput] < Timing.Global.Milliseconds)`
	`1593`	`+ if (0 <= castInput && castInput < Interface.Interface.GameUi.Hotbar?.Items?.Count && mLastHotbarUseTime[castInput] < Timing.Global.Milliseconds)`
`1589`	`1594`	`{`
`1590`		`- Interface.Interface.GameUi?.Hotbar?.Items?[castInput]?.Activate();`
	`1595`	`+ Interface.Interface.GameUi.Hotbar?.Items?[castInput]?.Activate();`
`1591`	`1596`	`mLastHotbarUseTime[castInput] = Timing.Global.Milliseconds + mHotbarUseDelay;`
`1592`	`1597`	`}`
`1593`	`1598`	`}`
Original file line number	Diff line number	Diff line change
`@@ -43,6 +43,10 @@ public static partial class Interface`
`43`	`43`
`44`	`44`	`public static bool SetupHandlers { get; set; }`
`45`	`45`
	`46`	`+ public static bool HasInGameUI => _uiInGame != null;`
	`47`	`+`
	`48`	`+ public static bool HasMainMenuUI => _uiMainMenu != null;`
	`49`	`+`
`46`	`50`	`public static GameInterface GameUi`
`47`	`51`	`{`
`48`	`52`	`get`
Original file line number	Diff line number	Diff line change
`@@ -609,7 +609,9 @@ public void HandlePacket(IPacketSender packetSender, Intersect.Network.Packets.S`
`609`	`609`	`//AnnouncementPacket`
`610`	`610`	`public void HandlePacket(IPacketSender packetSender, AnnouncementPacket packet)`
`611`	`611`	`{`
`612`		`- Interface.Interface.GameUi.AnnouncementWindow.ShowAnnouncement(packet.Message, packet.Duration);`
	`612`	`+ Interface.Interface.EnqueueInGame(`
	`613`	`+ gameInterface => gameInterface.AnnouncementWindow.ShowAnnouncement(packet.Message, packet.Duration)`
	`614`	`+ );`
`613`	`615`	`}`
`614`	`616`
`615`	`617`	`//ActionMsgPackets`
`@@ -914,17 +916,19 @@ public void HandlePacket(IPacketSender packetSender, MapEntityStatusPacket packe`
`914`	`916`
`915`	`917`	`entity.SortStatuses();`
`916`	`918`
`917`		`- if (Interface.Interface.GameUi != null)`
	`919`	`+ if (!Interface.Interface.HasInGameUI)`
`918`	`920`	`{`
`919`		`- //If its you or your target, update the entity box.`
`920`		`- if (en.Id == Globals.Me.Id && Interface.Interface.GameUi.PlayerStatusWindow != null)`
`921`		`- {`
`922`		`- Interface.Interface.GameUi.PlayerStatusWindow.ShouldUpdateStatuses = true;`
`923`		`- }`
`924`		`- else if (en.Id == Globals.Me.TargetId && Globals.Me.TargetBox != null)`
`925`		`- {`
`926`		`- Globals.Me.TargetBox.ShouldUpdateStatuses = true;`
`927`		`- }`
	`921`	`+ continue;`
	`922`	`+ }`
	`923`	`+`
	`924`	`+ //If its you or your target, update the entity box.`
	`925`	`+ if (en.Id == Globals.Me.Id && Interface.Interface.GameUi.PlayerStatusWindow != null)`
	`926`	`+ {`
	`927`	`+ Interface.Interface.GameUi.PlayerStatusWindow.ShouldUpdateStatuses = true;`
	`928`	`+ }`
	`929`	`+ else if (en.Id == Globals.Me.TargetId && Globals.Me.TargetBox != null)`
	`930`	`+ {`
	`931`	`+ Globals.Me.TargetBox.ShouldUpdateStatuses = true;`
`928`	`932`	`}`
`929`	`933`	`}`
`930`	`934`	`}`
`@@ -999,17 +1003,19 @@ public void HandlePacket(IPacketSender packetSender, EntityVitalsPacket packet)`
`999`	`1003`
`1000`	`1004`	`en.SortStatuses();`
`1001`	`1005`
`1002`		`- if (Interface.Interface.GameUi != null)`
	`1006`	`+ if (!Interface.Interface.HasInGameUI)`
`1003`	`1007`	`{`
`1004`		`- //If its you or your target, update the entity box.`
`1005`		`- if (id == Globals.Me.Id && Interface.Interface.GameUi.PlayerStatusWindow != null)`
`1006`		`- {`
`1007`		`- Interface.Interface.GameUi.PlayerStatusWindow.ShouldUpdateStatuses = true;`
`1008`		`- }`
`1009`		`- else if (id == Globals.Me.TargetId && Globals.Me.TargetBox != null)`
`1010`		`- {`
`1011`		`- Globals.Me.TargetBox.ShouldUpdateStatuses = true;`
`1012`		`- }`
	`1008`	`+ return;`
	`1009`	`+ }`
	`1010`	`+`
	`1011`	`+ //If its you or your target, update the entity box.`
	`1012`	`+ if (id == Globals.Me.Id && Interface.Interface.GameUi.PlayerStatusWindow != null)`
	`1013`	`+ {`
	`1014`	`+ Interface.Interface.GameUi.PlayerStatusWindow.ShouldUpdateStatuses = true;`
	`1015`	`+ }`
	`1016`	`+ else if (id == Globals.Me.TargetId && Globals.Me.TargetBox != null)`
	`1017`	`+ {`
	`1018`	`+ Globals.Me.TargetBox.ShouldUpdateStatuses = true;`
`1013`	`1019`	`}`
`1014`	`1020`	`}`
`1015`	`1021`
`@@ -1399,7 +1405,7 @@ public void HandlePacket(IPacketSender packetSender, CharacterCreationPacket pac`
`1399`	`1405`	`//AdminPanelPacket`
`1400`	`1406`	`public void HandlePacket(IPacketSender packetSender, AdminPanelPacket packet)`
`1401`	`1407`	`{`
`1402`		`- Interface.Interface.GameUi.NotifyOpenAdminWindow();`
	`1408`	`+ Interface.Interface.EnqueueInGame(gameInterface => gameInterface.NotifyOpenAdminWindow());`
`1403`	`1409`	`}`
`1404`	`1410`
`1405`	`1411`	`//SpellCastPacket`
`@@ -1691,7 +1697,7 @@ public void HandlePacket(IPacketSender packetSender, HidePicturePacket packet)`
`1691`	`1697`	`//ShopPacket`
`1692`	`1698`	`public void HandlePacket(IPacketSender packetSender, ShopPacket packet)`
`1693`	`1699`	`{`
`1694`		`- if (Interface.Interface.GameUi == null)`
	`1700`	`+ if (!Interface.Interface.HasInGameUI)`
`1695`	`1701`	`{`
`1696`	`1702`	`throw new ArgumentNullException(nameof(Interface.Interface.GameUi));`
`1697`	`1703`	`}`
`@@ -1705,12 +1711,12 @@ public void HandlePacket(IPacketSender packetSender, ShopPacket packet)`
`1705`	`1711`	`{`
`1706`	`1712`	`Globals.GameShop = new ShopBase();`
`1707`	`1713`	`Globals.GameShop.Load(packet.ShopData);`
`1708`		`- Interface.Interface.GameUi.NotifyOpenShop();`
	`1714`	`+ Interface.Interface.EnqueueInGame(gameInterface => gameInterface.NotifyOpenShop());`
`1709`	`1715`	`}`
`1710`	`1716`	`else`
`1711`	`1717`	`{`
`1712`	`1718`	`Globals.GameShop = null;`
`1713`		`- Interface.Interface.GameUi.NotifyCloseShop();`
	`1719`	`+ Interface.Interface.EnqueueInGame(gameInterface => gameInterface.NotifyCloseShop());`
`1714`	`1720`	`}`
`1715`	`1721`	`}`
`1716`	`1722`
`@@ -1721,11 +1727,11 @@ public void HandlePacket(IPacketSender packetSender, CraftingTablePacket packet)`
`1721`	`1727`	`{`
`1722`	`1728`	`Globals.ActiveCraftingTable = new CraftingTableBase();`
`1723`	`1729`	`Globals.ActiveCraftingTable.Load(packet.TableData);`
`1724`		`- Interface.Interface.GameUi.NotifyOpenCraftingTable(packet.JournalMode);`
	`1730`	`+ Interface.Interface.EnqueueInGame(gameInterface => gameInterface.NotifyOpenCraftingTable(packet.JournalMode));`
`1725`	`1731`	`}`
`1726`	`1732`	`else`
`1727`	`1733`	`{`
`1728`		`- Interface.Interface.GameUi.NotifyCloseCraftingTable();`
	`1734`	`+ Interface.Interface.EnqueueInGame(gameInterface => gameInterface.NotifyCloseCraftingTable());`
`1729`	`1735`	`}`
`1730`	`1736`	`}`
`1731`	`1737`
`@@ -1741,11 +1747,11 @@ public void HandlePacket(IPacketSender packetSender, BankPacket packet)`
`1741`	`1747`	`HandlePacket(itm);`
`1742`	`1748`	`}`
`1743`	`1749`	`Globals.BankSlotCount = packet.Slots;`
`1744`		`- Interface.Interface.GameUi.NotifyOpenBank();`
	`1750`	`+ Interface.Interface.EnqueueInGame(gameInterface => gameInterface.NotifyOpenBank());`
`1745`	`1751`	`}`
`1746`	`1752`	`else`
`1747`	`1753`	`{`
`1748`		`- Interface.Interface.GameUi.NotifyCloseBank();`
	`1754`	`+ Interface.Interface.EnqueueInGame(gameInterface => gameInterface.NotifyCloseBank());`
`1749`	`1755`	`}`
`1750`	`1756`	`}`
`1751`	`1757`
`@@ -2021,11 +2027,11 @@ public void HandlePacket(IPacketSender packetSender, TradePacket packet)`
`2021`	`2027`	`}`
`2022`	`2028`	`}`
`2023`	`2029`
`2024`		`- Interface.Interface.GameUi.NotifyOpenTrading(packet.TradePartner);`
	`2030`	`+ Interface.Interface.EnqueueInGame(gameInterface => gameInterface.NotifyOpenTrading(packet.TradePartner));`
`2025`	`2031`	`}`
`2026`	`2032`	`else`
`2027`	`2033`	`{`
`2028`		`- Interface.Interface.GameUi.NotifyCloseTrading();`
	`2034`	`+ Interface.Interface.EnqueueInGame(gameInterface => gameInterface.NotifyCloseTrading());`
`2029`	`2035`	`}`
`2030`	`2036`	`}`
`2031`	`2037`
`@@ -2100,11 +2106,11 @@ public void HandlePacket(IPacketSender packetSender, BagPacket packet)`
`2100`	`2106`	`if (!packet.Close)`
`2101`	`2107`	`{`
`2102`	`2108`	`Globals.BagSlots = new Item[packet.Slots];`
`2103`		`- Interface.Interface.GameUi.NotifyOpenBag();`
	`2109`	`+ Interface.Interface.EnqueueInGame(gameInterface => gameInterface.NotifyOpenBag());`
`2104`	`2110`	`}`
`2105`	`2111`	`else`
`2106`	`2112`	`{`
`2107`		`- Interface.Interface.GameUi.NotifyCloseBag();`
	`2113`	`+ Interface.Interface.EnqueueInGame(gameInterface => gameInterface.NotifyCloseBag());`
`2108`	`2114`	`}`
`2109`	`2115`	`}`
`2110`	`2116`
`@@ -2156,7 +2162,12 @@ public void HandlePacket(IPacketSender packetSender, FriendsPacket packet)`
`2156`	`2162`	`Globals.Me?.Friends.Add(f);`
`2157`	`2163`	`}`
`2158`	`2164`
`2159`		`- Interface.Interface.GameUi?.NotifyUpdateFriendsList();`
	`2165`	`+ if (!Interface.Interface.HasInGameUI)`
	`2166`	`+ {`
	`2167`	`+ return;`
	`2168`	`+ }`
	`2169`	`+`
	`2170`	`+ Interface.Interface.EnqueueInGame(gameInterface => gameInterface.NotifyUpdateFriendsList());`
`2160`	`2171`	`}`
`2161`	`2172`
`2162`	`2173`	`//FriendRequestPacket`
`@@ -2316,7 +2327,7 @@ public void HandlePacket(IPacketSender packetSender, GuildPacket packet)`
`2316`	`2327`	`if (hasUpdates)`
`2317`	`2328`	`{`
`2318`	`2329`	`Globals.Me.GuildMembers = updatedGuildMembers;`
`2319`		`- Interface.Interface.GameUi.NotifyUpdateGuildList();`
	`2330`	`+ Interface.Interface.EnqueueInGame(gameInterface => gameInterface.NotifyUpdateGuildList());`
`2320`	`2331`	`}`
`2321`	`2332`	`}`
`2322`	`2333`
Original file line number	Diff line number	Diff line change
`@@ -30,8 +30,7 @@ internal ClientLifecycleHelper(IClientPluginContext context) : base(context)`
`30`	`30`	`}`
`31`	`31`
`32`	`32`	`/// <inheritdoc />`
`33`		`- public IMutableInterface Interface =>`
`34`		`- Client.Interface.Interface.MenuUi ?? Client.Interface.Interface.GameUi as IMutableInterface;`
	`33`	`+ public IMutableInterface Interface => Client.Interface.Interface.CurrentInterface;`
`35`	`34`
`36`	`35`	`/// <inheritdoc />`
`37`	`36`	`public void OnLifecycleChangeState(GameStates state)`