diff --git a/Aetheria.State.Verify/Program.cs b/Aetheria.State.Verify/Program.cs index d26cfb13d..448fb8fd4 100644 --- a/Aetheria.State.Verify/Program.cs +++ b/Aetheria.State.Verify/Program.cs @@ -4808,8 +4808,7 @@ static void RequireRuntimeMenuTabsUseEveSurface(string root) "new AetheriaRuntimeSurfaceCommandTemplate(", "ResolveVisibleTabs(", "TryResolveCurrentDocking(out var docking)", - ".RuntimeState(\"unity-runtime-menu-tabs\")", - ".CurrentDockingState()", + "AetheriaUnityRuntimeClientProvider.CurrentDockingState(\"unity-runtime-menu-tabs\")", "docking.IsDocked", "GetTabLabel(", "ToRuntimeTabKey(", @@ -4917,8 +4916,7 @@ static void RequireRuntimeMenuTabsUseEveSurface(string root) "private bool TryResolveDockedLocalStory(out LocationStory story)", "SetObservedEntityIndex(AetheriaUnityObservedEntityIndex observedEntityIndex)", "CurrentDockingSnapshot()", - ".RuntimeState(\"unity-local-menu\")", - ".CurrentDockingState()", + "AetheriaUnityRuntimeClientProvider.CurrentDockingState(\"unity-local-menu\")", "docking.IsDocked", "_observedEntityIndex.TryResolveDockingBayByRecordKey(", "docking.DockParentEntityKey", @@ -5800,7 +5798,7 @@ static void RequireTradeCargoSelectorUseEveSurface(string root) "AetheriaRuntimeTradeCargoSelectorCommandKind.Select", ".RuntimeState(\"unity-trade\")", ".CurrentStationRefit()", - ".CurrentDockingState()", + "AetheriaUnityRuntimeClientProvider.CurrentDockingState(\"unity-trade\")", "SetTargetCargo(", "selection.EntityKey", "OwnedQuantity", @@ -7438,8 +7436,7 @@ static void RequireMenuDockingUsesManagedTypedSnapshot(string root) static bool HasManagedDockingSnapshotAccess(string source) { if (source.Contains("AetheriaUnityRuntimeClientProvider", StringComparison.Ordinal) && - source.Contains("RuntimeState(", StringComparison.Ordinal) && - (source.Contains(".CurrentDockingState()", StringComparison.Ordinal) || + (source.Contains("CurrentDockingState(\"", StringComparison.Ordinal) || source.Contains(".CurrentStationRefit()", StringComparison.Ordinal)) && !source.Contains("AetheriaClientReactiveDockingState _reactiveDockingState", StringComparison.Ordinal) && !source.Contains("CultMeshReactiveDocument", StringComparison.Ordinal) && @@ -13345,8 +13342,7 @@ static void RequireMainMenuContinueRunState(string root) "_loadoutItemFactory.CreateLoadoutItem", "ResolveDockParent = ResolveDockParentFromCurrentDocking", "CurrentDockingSnapshot()", - ".RuntimeState(\"unity-action-game-manager\")", - ".CurrentDockingState()", + "AetheriaUnityRuntimeClientProvider.CurrentDockingState(\"unity-action-game-manager\")", "IsCurrentEntityObservedUndocked(", "private AetheriaUnityCurrentEntityBinder CurrentEntityBinder =>", "private readonly AetheriaUnityCurrentEntityPresentation _currentEntityPresentation", @@ -16465,6 +16461,8 @@ static void RequireRuntimeStateReaderOwnsUnityStateAcquisition(string root) "private static AetheriaClient ResolveClient(AetheriaRuntimeStateBootReport stateBoot, string runtimeId = \"\")", "private static AetheriaClient RuntimeClient(string runtimeId = \"\")", "public static AetheriaClientState RuntimeState(string runtimeId = \"\")", + "public static AetheriaRuntimeCurrentDockingDocument CurrentDockingState(string runtimeId = \"\")", + "public static AetheriaRuntimeCurrentDockingDocument CurrentDockingState(", "public static AetheriaControl Control(string runtimeId = \"\")", "public static AetheriaUi Ui(string runtimeId = \"\")", "public static AetheriaUi Ui(", diff --git a/Assets/Scripts/Gameplay/ActionGameManager.cs b/Assets/Scripts/Gameplay/ActionGameManager.cs index 356e7ed35..e3f942b52 100644 --- a/Assets/Scripts/Gameplay/ActionGameManager.cs +++ b/Assets/Scripts/Gameplay/ActionGameManager.cs @@ -385,9 +385,7 @@ public class ActionGameManager : MonoBehaviour { try { - return AetheriaUnityRuntimeClientProvider - .RuntimeState("unity-action-game-manager") - .CurrentDockingState(); + return AetheriaUnityRuntimeClientProvider.CurrentDockingState("unity-action-game-manager"); } catch (Exception ex) { diff --git a/Assets/Scripts/Gameplay/AetheriaUnityRuntimeClientProvider.cs b/Assets/Scripts/Gameplay/AetheriaUnityRuntimeClientProvider.cs index 994476254..45721246b 100644 --- a/Assets/Scripts/Gameplay/AetheriaUnityRuntimeClientProvider.cs +++ b/Assets/Scripts/Gameplay/AetheriaUnityRuntimeClientProvider.cs @@ -80,6 +80,18 @@ public static class AetheriaUnityRuntimeClientProvider return RuntimeClient(stateBoot, runtimeId).State; } + public static AetheriaRuntimeCurrentDockingDocument CurrentDockingState(string runtimeId = "") + { + return RuntimeState(runtimeId).CurrentDockingState(); + } + + public static AetheriaRuntimeCurrentDockingDocument CurrentDockingState( + AetheriaRuntimeStateBootReport stateBoot, + string runtimeId = "") + { + return RuntimeState(stateBoot, runtimeId).CurrentDockingState(); + } + public static AetheriaControl Control(string runtimeId = "") { return RuntimeClient(runtimeId).Control; diff --git a/Assets/Scripts/UI/Menu/LocalMenu.cs b/Assets/Scripts/UI/Menu/LocalMenu.cs index 57e340921..2eafd5d23 100644 --- a/Assets/Scripts/UI/Menu/LocalMenu.cs +++ b/Assets/Scripts/UI/Menu/LocalMenu.cs @@ -221,9 +221,7 @@ public class LocalMenu : MonoBehaviour { try { - return AetheriaUnityRuntimeClientProvider - .RuntimeState("unity-local-menu") - .CurrentDockingState(); + return AetheriaUnityRuntimeClientProvider.CurrentDockingState("unity-local-menu"); } catch (Exception ex) { diff --git a/Assets/Scripts/UI/Menu/MenuPanel.cs b/Assets/Scripts/UI/Menu/MenuPanel.cs index 9f9a4fbf1..e552d9554 100644 --- a/Assets/Scripts/UI/Menu/MenuPanel.cs +++ b/Assets/Scripts/UI/Menu/MenuPanel.cs @@ -162,9 +162,7 @@ public class MenuPanel : MonoBehaviour docking = null; try { - docking = AetheriaUnityRuntimeClientProvider - .RuntimeState("unity-runtime-menu-tabs") - .CurrentDockingState(); + docking = AetheriaUnityRuntimeClientProvider.CurrentDockingState("unity-runtime-menu-tabs"); return docking != null; } catch (Exception ex) diff --git a/Assets/Scripts/UI/Menu/TradeMenu.cs b/Assets/Scripts/UI/Menu/TradeMenu.cs index 8aeefc5e2..6eba1b369 100644 --- a/Assets/Scripts/UI/Menu/TradeMenu.cs +++ b/Assets/Scripts/UI/Menu/TradeMenu.cs @@ -520,9 +520,7 @@ public class TradeMenu : MonoBehaviour docking = null; try { - docking = AetheriaUnityRuntimeClientProvider - .RuntimeState("unity-trade") - .CurrentDockingState(); + docking = AetheriaUnityRuntimeClientProvider.CurrentDockingState("unity-trade"); return docking != null; } catch (Exception ex)