From ca8b5858a2029ebe05ad4364acdeac4d6ea5c8f5 Mon Sep 17 00:00:00 2001 From: Meta Vens Date: Mon, 29 Jun 2026 11:36:38 +0100 Subject: [PATCH] Read menu docking through current typed state --- Aetheria.State.Verify/Program.cs | 47 +++++++++++----- .../AetheriaUnityGameplaySceneWiring.cs | 2 - Assets/Scripts/UI/Menu/MenuPanel.cs | 36 +++++------- Assets/Scripts/UI/Menu/TradeMenu.cs | 55 ++++++++----------- 4 files changed, 68 insertions(+), 72 deletions(-) diff --git a/Aetheria.State.Verify/Program.cs b/Aetheria.State.Verify/Program.cs index addfc4701..c55be6e12 100644 --- a/Aetheria.State.Verify/Program.cs +++ b/Aetheria.State.Verify/Program.cs @@ -4807,13 +4807,10 @@ static void RequireRuntimeMenuTabsUseEveSurface(string root) "new AetheriaRuntimeSurfaceTree(", "new AetheriaRuntimeSurfaceCommandTemplate(", "ResolveVisibleTabs(", - "SetObservedEntityIndex(AetheriaUnityObservedEntityIndex observedEntityIndex)", - "private AetheriaUnityObservedEntityIndex _observedEntityIndex;", - "private AetheriaUnityObservedDockingIndex _observedDockingIndex;", - "dockingIndex.TryResolveCurrentDocking(out var docking)", + "TryResolveCurrentDocking(out var docking)", + ".RuntimeState(\"unity-runtime-menu-tabs\")", + ".CurrentDockingState()", "docking.IsDocked", - "TryResolveObservedDockingIndex(out AetheriaUnityObservedDockingIndex dockingIndex)", - "new AetheriaUnityObservedDockingIndex(_observedEntityIndex)", "GetTabLabel(", "ToRuntimeTabKey(", "NormalizeTabKey(tab.ToString())", @@ -4874,6 +4871,11 @@ static void RequireRuntimeMenuTabsUseEveSurface(string root) ".ReactiveCurrentDocking(\"unity-runtime-menu-tabs\")", "docking = _currentDocking.Current", "AetheriaRuntimeObservedDockingState", + "SetObservedEntityIndex(AetheriaUnityObservedEntityIndex observedEntityIndex)", + "private AetheriaUnityObservedEntityIndex _observedEntityIndex;", + "private AetheriaUnityObservedDockingIndex _observedDockingIndex;", + "TryResolveObservedDockingIndex(out AetheriaUnityObservedDockingIndex dockingIndex)", + "new AetheriaUnityObservedDockingIndex(_observedEntityIndex)", "ComposeTabSurface(", "ProjectTabSurfaceState(", "ProjectTabSurface(", @@ -4900,7 +4902,7 @@ static void RequireRuntimeMenuTabsUseEveSurface(string root) source.Contains("private AetheriaClientDockingSnapshot ResolveCurrentDocking()", StringComparison.Ordinal)) { throw new InvalidOperationException( - "MenuPanel tab visibility must read managed typed current-docking state instead of direct docking caches or ActionGameManager observed adapters."); + "MenuPanel tab visibility must read current typed docking state directly instead of direct docking caches, ActionGameManager observed adapters, or Unity observed docking index bridges."); } if (File.Exists(legacyMenuTabsSurfaceBuilderPath)) @@ -5787,13 +5789,9 @@ static void RequireTradeCargoSelectorUseEveSurface(string root) "AetheriaRuntimeTradeCargoSelectorSurfaceCommands.TryRead(request, out var command)", "AetheriaRuntimeTradeCargoSelectorCommandKind.Close", "AetheriaRuntimeTradeCargoSelectorCommandKind.Select", - "SetObservedEntityIndex(AetheriaUnityObservedEntityIndex observedEntityIndex)", - "private AetheriaUnityObservedEntityIndex _observedEntityIndex;", - "private AetheriaUnityObservedDockingIndex _observedDockingIndex;", - "TryResolveObservedDockingIndex(out AetheriaUnityObservedDockingIndex dockingIndex)", - "new AetheriaUnityObservedDockingIndex(_observedEntityIndex)", - "dockingIndex.StationRefitSnapshot()", - "dockingIndex.TryResolveCurrentDocking(out docking)", + ".RuntimeState(\"unity-trade\")", + ".CurrentStationRefit()", + ".CurrentDockingState()", "SetTargetCargo(", "selection.EntityKey", "OwnedQuantity", @@ -5836,6 +5834,14 @@ static void RequireTradeCargoSelectorUseEveSurface(string root) "AetheriaRuntimeTradeCargoSelectorSurfaceBuilder.Compose(", "_cargoSelectorSurfaceProjection", "AetheriaRuntimeObservedDockingState", + "SetObservedEntityIndex(AetheriaUnityObservedEntityIndex observedEntityIndex)", + "private AetheriaUnityObservedEntityIndex _observedEntityIndex;", + "private AetheriaUnityObservedDockingIndex _observedDockingIndex;", + "TryResolveObservedDockingIndex(out AetheriaUnityObservedDockingIndex dockingIndex)", + "new AetheriaUnityObservedDockingIndex(_observedEntityIndex)", + "dockingIndex.StationRefitSnapshot()", + "dockingIndex.TryResolveCurrentDocking(out docking)", + "ClearClientCaches()", "ResolveClient().State.CurrentDocking()", "CultMeshReactiveDocument _currentDocking", ".ReactiveCurrentDocking(\"unity-trade\")", @@ -7413,7 +7419,7 @@ static void RequireMenuDockingUsesManagedTypedSnapshot(string root) if (directDockingOffenders.Count > 0) { throw new InvalidOperationException( - "Unity menu docking reads must share AetheriaUnityObservedDockingIndex instead of owning duplicate reactive docking/refit documents: " + + "Unity menu docking reads must use current typed state or the Unity observed docking bridge when entity objects are required; do not own duplicate reactive docking/refit documents: " + string.Join(", ", directDockingOffenders)); } @@ -7422,6 +7428,17 @@ 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(".CurrentStationRefit()", StringComparison.Ordinal)) && + !source.Contains("AetheriaClientReactiveDockingState _reactiveDockingState", StringComparison.Ordinal) && + !source.Contains("CultMeshReactiveDocument", StringComparison.Ordinal) && + !source.Contains("CultMeshReactiveDocument", StringComparison.Ordinal)) + { + return true; + } + if (source.Contains("AetheriaUnityObservedDockingIndex", StringComparison.Ordinal) && source.Contains("TryResolveObservedDockingIndex(out var dockingIndex)", StringComparison.Ordinal) && source.Contains("dockingIndex.TryResolveCurrent", StringComparison.Ordinal) && diff --git a/Assets/Scripts/Gameplay/AetheriaUnityGameplaySceneWiring.cs b/Assets/Scripts/Gameplay/AetheriaUnityGameplaySceneWiring.cs index 1e63a4423..1dc2511e9 100644 --- a/Assets/Scripts/Gameplay/AetheriaUnityGameplaySceneWiring.cs +++ b/Assets/Scripts/Gameplay/AetheriaUnityGameplaySceneWiring.cs @@ -136,8 +136,6 @@ public sealed class AetheriaUnityGameplaySceneWiring public void ConfigureObservedEntityIndex(AetheriaUnityObservedEntityIndex observedEntityIndex) { - Menu?.SetObservedEntityIndex(observedEntityIndex); - TradeMenu?.SetObservedEntityIndex(observedEntityIndex); Inventory?.SetObservedEntityIndex(observedEntityIndex); ShipPanel?.SetObservedEntityIndex(observedEntityIndex); TargetShipPanel?.SetObservedEntityIndex(observedEntityIndex); diff --git a/Assets/Scripts/UI/Menu/MenuPanel.cs b/Assets/Scripts/UI/Menu/MenuPanel.cs index cc362cd60..9f9a4fbf1 100644 --- a/Assets/Scripts/UI/Menu/MenuPanel.cs +++ b/Assets/Scripts/UI/Menu/MenuPanel.cs @@ -34,21 +34,9 @@ public class MenuPanel : MonoBehaviour private MenuTabBinding _current; private UIDocument _tabSurfaceDocument; private readonly AetheriaEveUnitySurfaceChrome _tabSurfaceChrome = new AetheriaEveUnitySurfaceChrome(); - private AetheriaUnityObservedEntityIndex _observedEntityIndex; - private AetheriaUnityObservedDockingIndex _observedDockingIndex; public MenuTab CurrentTab { get; private set; } - public void SetObservedEntityIndex(AetheriaUnityObservedEntityIndex observedEntityIndex) - { - if (!ReferenceEquals(_observedEntityIndex, observedEntityIndex)) - { - _observedDockingIndex = null; - } - - _observedEntityIndex = observedEntityIndex; - } - public void ShowTab(MenuTab tab) { gameObject.SetActive(true); @@ -108,8 +96,6 @@ public class MenuPanel : MonoBehaviour AetheriaEveUnitySurfaceHost.DestroyDocument(_tabSurfaceDocument); _tabSurfaceDocument = null; } - - _observedDockingIndex = null; } private void RenderTabSurface() @@ -162,8 +148,7 @@ public class MenuPanel : MonoBehaviour private MenuTabBinding[] ResolveVisibleTabs() { - var isDocked = TryResolveObservedDockingIndex(out var dockingIndex) && - dockingIndex.TryResolveCurrentDocking(out var docking) && + var isDocked = TryResolveCurrentDocking(out var docking) && docking.IsDocked; return _tabs.Values .Where(tabBinding => !tabBinding.RequireDock || isDocked) @@ -172,14 +157,21 @@ public class MenuPanel : MonoBehaviour .ToArray(); } - private bool TryResolveObservedDockingIndex(out AetheriaUnityObservedDockingIndex dockingIndex) + private static bool TryResolveCurrentDocking(out AetheriaRuntimeCurrentDockingDocument docking) { - dockingIndex = null; - if (_observedEntityIndex == null) + docking = null; + try + { + docking = AetheriaUnityRuntimeClientProvider + .RuntimeState("unity-runtime-menu-tabs") + .CurrentDockingState(); + return docking != null; + } + catch (Exception ex) + { + Debug.LogWarning($"Failed to read Aetheria runtime docking for menu tabs: {ex.Message}"); return false; - - dockingIndex = _observedDockingIndex ??= new AetheriaUnityObservedDockingIndex(_observedEntityIndex); - return true; + } } private static string GetTabLabel(MenuTabBinding tabBinding) diff --git a/Assets/Scripts/UI/Menu/TradeMenu.cs b/Assets/Scripts/UI/Menu/TradeMenu.cs index cd003dc2d..8aeefc5e2 100644 --- a/Assets/Scripts/UI/Menu/TradeMenu.cs +++ b/Assets/Scripts/UI/Menu/TradeMenu.cs @@ -36,8 +36,6 @@ public class TradeMenu : MonoBehaviour private UIDocument _filterSurfaceDocument; private UIDocument _rowActionSurfaceDocument; private UIDocument _tradeItemSurfaceDocument; - private AetheriaUnityObservedEntityIndex _observedEntityIndex; - private AetheriaUnityObservedDockingIndex _observedDockingIndex; private readonly AetheriaEveUnitySurfaceChrome _cargoSelectorSurfaceChrome = PanelChrome(360f, 420f, Align.FlexEnd); private readonly AetheriaEveUnitySurfaceChrome _filterSurfaceChrome = PanelChrome(420f, 520f, Align.FlexStart); private readonly AetheriaEveUnitySurfaceChrome _rowActionSurfaceChrome = PanelChrome(320f, 360f, Align.FlexStart); @@ -51,16 +49,6 @@ public class TradeMenu : MonoBehaviour public EquippedCargoBay Inventory { get; set; } - public void SetObservedEntityIndex(AetheriaUnityObservedEntityIndex observedEntityIndex) - { - if (!ReferenceEquals(_observedEntityIndex, observedEntityIndex)) - { - _observedDockingIndex = null; - } - - _observedEntityIndex = observedEntityIndex; - } - private void OnEnable() { if (!TryResolveCurrentDocking(out var docking) || @@ -514,26 +502,34 @@ public class TradeMenu : MonoBehaviour private AetheriaRuntimeStationRefitDocument StationRefitSnapshot() { - return TryResolveObservedDockingIndex(out var dockingIndex) - ? dockingIndex.StationRefitSnapshot() - : null; + try + { + return AetheriaUnityRuntimeClientProvider + .RuntimeState("unity-trade") + .CurrentStationRefit(); + } + catch (Exception ex) + { + Debug.LogWarning($"Failed to read Aetheria station refit for trade menu: {ex.Message}"); + return null; + } } private bool TryResolveCurrentDocking(out AetheriaRuntimeCurrentDockingDocument docking) { docking = null; - return TryResolveObservedDockingIndex(out var dockingIndex) && - dockingIndex.TryResolveCurrentDocking(out docking); - } - - private bool TryResolveObservedDockingIndex(out AetheriaUnityObservedDockingIndex dockingIndex) - { - dockingIndex = null; - if (_observedEntityIndex == null) + try + { + docking = AetheriaUnityRuntimeClientProvider + .RuntimeState("unity-trade") + .CurrentDockingState(); + return docking != null; + } + catch (Exception ex) + { + Debug.LogWarning($"Failed to read Aetheria runtime docking for trade menu: {ex.Message}"); return false; - - dockingIndex = _observedDockingIndex ??= new AetheriaUnityObservedDockingIndex(_observedEntityIndex); - return true; + } } private bool TryResolveStationRefitCargoTarget( @@ -581,11 +577,6 @@ public class TradeMenu : MonoBehaviour } } - private void ClearClientCaches() - { - _observedDockingIndex = null; - } - private AetheriaRuntimeCatalogSnapshot CatalogSnapshot() { try @@ -1258,8 +1249,6 @@ public class TradeMenu : MonoBehaviour private void OnDestroy() { - ClearClientCaches(); - if (_cargoSelectorSurfaceDocument != null) { AetheriaEveUnitySurfaceHost.DestroyDocument(_cargoSelectorSurfaceDocument);