diff --git a/Aetheria.State.Verify/Program.cs b/Aetheria.State.Verify/Program.cs index 558bfd2e2..b36f8ccda 100644 --- a/Aetheria.State.Verify/Program.cs +++ b/Aetheria.State.Verify/Program.cs @@ -4952,9 +4952,8 @@ static void RequireInventoryShipSettingsUseEveSurface(string root) "RequestEntityShutdownPerformance(", "latestCurrentEntity.EntityKey", "(float)latestCurrentEntity.ShutdownPerformance", - ".ReactiveDockingState()", - ".TryCurrent(", - "?.CurrentEntity" + "TryResolveObservedDockingIndex(out var dockingIndex)", + "dockingIndex.TryResolveCurrentEntityDocument(out currentEntity)" }; var missingSymbols = requiredSymbols @@ -6274,8 +6273,8 @@ static void RequireInventoryDropdownUseEveSurface(string root) "_observedEntityIndex.TryResolveEntityByRecordKey", "TryResolveObservedDockingIndex(out var dockingIndex)", "dockingIndex.TryResolveCurrentDockingBay(out var resolvedDockingBay)", - ".ReactiveDockingState()", - ".TryCurrent(", + "dockingIndex.ResolveStationRefit()", + "dockingIndex.TryResolveCurrentEntityKey(out currentEntityKey)", "LoadoutRestoreOptions" }; @@ -6335,11 +6334,14 @@ static void RequireInventoryDropdownUseEveSurface(string root) !source.Contains("TryResolveObservedDockingIndex(out var dockingIndex)", StringComparison.Ordinal) || !source.Contains("TryResolveCurrentDockingBay(out var dockingBay)", StringComparison.Ordinal) || !source.Contains("dockingIndex.TryResolveCurrentDockingBayRow(out dockingBay)", StringComparison.Ordinal) || + !source.Contains("dockingIndex.ResolveStationRefit()", StringComparison.Ordinal) || + !source.Contains("dockingIndex.TryResolveCurrentEntityKey(out currentEntityKey)", StringComparison.Ordinal) || !source.Contains("currentDockingBay.DockingBayIndex", StringComparison.Ordinal) || !source.Contains("ResolveStationRefit()?.DockParentEntityKey", StringComparison.Ordinal) || source.Contains("var hasDockingBay = TryGetTypedCurrentDockingBayFacade", StringComparison.Ordinal) || source.Contains("TryResolveCurrentDockingBayFacade", StringComparison.Ordinal) || - source.Contains("ResolveDockingState()?.CurrentDocking", StringComparison.Ordinal)) + source.Contains("ResolveDockingState()?.CurrentDocking", StringComparison.Ordinal) || + source.Contains("AetheriaClientReactiveDockingState _reactiveDockingState", StringComparison.Ordinal)) { throw new InvalidOperationException( "InventoryPanel dropdown must carry typed entity identity through the shared Eve surface and must project docking display state from StationRefitAsync docking-bay rows."); @@ -6347,13 +6349,15 @@ static void RequireInventoryDropdownUseEveSurface(string root) if (!inventoryMenu.Contains("TryResolveCurrentEntity(out var currentEntity)", StringComparison.Ordinal) || !inventoryMenu.Contains("TryResolveCurrentDockingBay(out var dockingBay)", StringComparison.Ordinal) || - !inventoryMenu.Contains(".ReactiveDockingState()", StringComparison.Ordinal) || - !inventoryMenu.Contains(".TryCurrent(", StringComparison.Ordinal) || !inventoryMenu.Contains("TryResolveObservedDockingIndex(out var dockingIndex)", StringComparison.Ordinal) || !inventoryMenu.Contains("dockingIndex.TryResolveCurrentDockingBay(out var resolvedDockingBay)", StringComparison.Ordinal) || + !inventoryMenu.Contains("dockingIndex.TryResolveCurrentEntityKey(out currentEntityKey)", StringComparison.Ordinal) || + !inventoryMenu.Contains("dockingIndex.TryResolveCurrentEntityDocument(out currentEntity)", StringComparison.Ordinal) || + !inventoryMenu.Contains("dockingIndex.ResolveStationRefit()", StringComparison.Ordinal) || inventoryMenu.Contains("TryGetTypedCurrentDockingBayFacade", StringComparison.Ordinal) || inventoryMenu.Contains("TryResolveCurrentEntityFacade", StringComparison.Ordinal) || inventoryMenu.Contains("ResolveDockingState()?.CurrentDocking", StringComparison.Ordinal) || + inventoryMenu.Contains("AetheriaClientReactiveDockingState _reactiveDockingState", StringComparison.Ordinal) || inventoryMenu.Contains("_observedEntityIndex.TryResolveDockingBayByRecordKey", StringComparison.Ordinal) || inventoryMenu.Contains("GameManager.TryGetObservedDockingBay(", StringComparison.Ordinal) || inventoryMenu.Contains("GameManager.DockingBay", StringComparison.Ordinal)) @@ -7059,8 +7063,7 @@ static void RequireMenuDockingUsesManagedTypedSnapshot(string root) Compact = CompactSource(entry.Source) }) .Where(entry => - !entry.Source.Contains(".ReactiveDockingState()", StringComparison.Ordinal) || - !entry.Source.Contains(".TryCurrent(", StringComparison.Ordinal) || + !HasManagedDockingSnapshotAccess(entry.Source) || entry.Source.Contains(".DockingState.Reactive()", StringComparison.Ordinal) || entry.Compact.Contains(CompactSource(".DockingState.Latest()"), StringComparison.Ordinal) || entry.Compact.Contains(CompactSource(".DockingState.TryLatest("), StringComparison.Ordinal)) @@ -7077,6 +7080,20 @@ static void RequireMenuDockingUsesManagedTypedSnapshot(string root) Console.WriteLine("Menu docking state: Unity menus read managed reactive typed docking snapshots"); } +static bool HasManagedDockingSnapshotAccess(string source) +{ + if (source.Contains(".ReactiveDockingState()", StringComparison.Ordinal) && + source.Contains(".TryCurrent(", StringComparison.Ordinal)) + { + return true; + } + + return source.Contains("AetheriaUnityObservedDockingIndex", StringComparison.Ordinal) && + source.Contains("TryResolveObservedDockingIndex(out var dockingIndex)", StringComparison.Ordinal) && + source.Contains("dockingIndex.TryResolveCurrent", StringComparison.Ordinal) && + !source.Contains("AetheriaClientReactiveDockingState _reactiveDockingState", StringComparison.Ordinal); +} + static void RequireUnitySharedDocumentAccessorErgonomics(string root) { var clientStatePath = Path.Combine( @@ -17060,8 +17077,8 @@ static void RequireDockedCurrentShipRequestAuthority(string root) } if (!inventoryPanel.Contains("TryResolveCurrentEntityKey(out var currentEntityKey)", StringComparison.Ordinal) || - !inventoryPanel.Contains(".ReactiveDockingState()", StringComparison.Ordinal) || - !inventoryPanel.Contains("snapshot?.CurrentEntityKey", StringComparison.Ordinal) || + !inventoryPanel.Contains("dockingIndex.TryResolveCurrentEntityKey(out currentEntityKey)", StringComparison.Ordinal) || + inventoryPanel.Contains("AetheriaClientReactiveDockingState _reactiveDockingState", StringComparison.Ordinal) || inventoryPanel.Contains("GameManager.CurrentEntity", StringComparison.Ordinal)) { throw new InvalidOperationException( diff --git a/Assets/Scripts/UI/Menu/InventoryMenu.cs b/Assets/Scripts/UI/Menu/InventoryMenu.cs index 9fd0e527a..506e7adca 100644 --- a/Assets/Scripts/UI/Menu/InventoryMenu.cs +++ b/Assets/Scripts/UI/Menu/InventoryMenu.cs @@ -36,7 +36,6 @@ public class InventoryMenu : MonoBehaviour private CultMeshReactiveDocument _playerSettings; private CultMeshReactiveDocument _currentEntity; private CultMeshReactiveDocument _stationRefit; - private AetheriaClientReactiveDockingState _reactiveDockingState; private int _inventoryEntityIndex = -1; private CultMeshReactiveDocument _inventory; private AetheriaUnityActionBarPresentation _actionBarPresentation; @@ -738,14 +737,15 @@ public class InventoryMenu : MonoBehaviour private bool TryResolveCurrentEntityKey(out string currentEntityKey) { currentEntityKey = ""; - currentEntityKey = ResolveDockingState()?.CurrentEntityKey ?? ""; - return !string.IsNullOrWhiteSpace(currentEntityKey); + return TryResolveObservedDockingIndex(out var dockingIndex) && + dockingIndex.TryResolveCurrentEntityKey(out currentEntityKey); } private bool TryResolveCurrentEntityDocument(out AetheriaRuntimeCurrentEntityDocument currentEntity) { - currentEntity = ResolveDockingState()?.CurrentEntity; - if (currentEntity == null) + currentEntity = null; + if (!TryResolveObservedDockingIndex(out var dockingIndex) || + !dockingIndex.TryResolveCurrentEntityDocument(out currentEntity)) { Debug.LogWarning("Failed to read Aetheria current entity for inventory ship settings."); return false; @@ -756,7 +756,9 @@ public class InventoryMenu : MonoBehaviour private AetheriaRuntimeStationRefitDocument ResolveStationRefit() { - return ResolveDockingState()?.StationRefit; + return TryResolveObservedDockingIndex(out var dockingIndex) + ? dockingIndex.ResolveStationRefit() + : null; } private bool TryResolveCurrentEntity(out Entity currentEntity) @@ -779,16 +781,6 @@ public class InventoryMenu : MonoBehaviour return dockingBay != null; } - private AetheriaClientDockingSnapshot ResolveDockingState() - { - _reactiveDockingState ??= ResolveClient().Aetheria().ReactiveDockingState(); - if (_reactiveDockingState.TryCurrent(out var docking)) - return docking; - - Debug.LogWarning("Failed to read Aetheria docking state for inventory menu."); - return null; - } - private bool TryResolveObservedDockingIndex(out AetheriaUnityObservedDockingIndex dockingIndex) { dockingIndex = null; @@ -947,14 +939,12 @@ public class InventoryMenu : MonoBehaviour _playerSettings?.Dispose(); _currentEntity?.Dispose(); _stationRefit?.Dispose(); - _reactiveDockingState?.Dispose(); _observedDockingIndex?.Dispose(); _inventory?.Dispose(); _catalog = null; _playerSettings = null; _currentEntity = null; _stationRefit = null; - _reactiveDockingState = null; _observedDockingIndex = null; _inventory = null; _inventoryEntityIndex = -1; diff --git a/Assets/Scripts/UI/Menu/InventoryPanel.cs b/Assets/Scripts/UI/Menu/InventoryPanel.cs index 5bb8e926c..30becb8bf 100644 --- a/Assets/Scripts/UI/Menu/InventoryPanel.cs +++ b/Assets/Scripts/UI/Menu/InventoryPanel.cs @@ -107,7 +107,6 @@ public class InventoryPanel : MonoBehaviour, IPointerClickHandler private CultMeshReactiveDocument _playerSettings; private CultMeshReactiveDocument _currentEntity; private CultMeshReactiveDocument _stationRefit; - private AetheriaClientReactiveDockingState _reactiveDockingState; private AetheriaRuntimeReactiveLoadoutSnapshotProjector _loadoutSnapshotProjector; private int _inventoryEntityIndex = -1; private CultMeshReactiveDocument _inventory; @@ -1126,9 +1125,8 @@ private void Update() private bool TryResolveCurrentEntityKey(out string currentEntityKey) { currentEntityKey = ""; - var snapshot = ResolveDockingState(); - currentEntityKey = snapshot?.CurrentEntityKey ?? ""; - return !string.IsNullOrWhiteSpace(currentEntityKey); + return TryResolveObservedDockingIndex(out var dockingIndex) && + dockingIndex.TryResolveCurrentEntityKey(out currentEntityKey); } private bool TryResolveCurrentDockingBayRow(out AetheriaRuntimeStationDockingBayRow dockingBay) @@ -1153,17 +1151,9 @@ private void Update() private AetheriaRuntimeStationRefitDocument ResolveStationRefit() { - return ResolveDockingState()?.StationRefit; - } - - private AetheriaClientDockingSnapshot ResolveDockingState() - { - _reactiveDockingState ??= ResolveClient().Aetheria().ReactiveDockingState(); - if (_reactiveDockingState.TryCurrent(out var docking)) - return docking; - - Debug.LogWarning("Failed to read Aetheria docking state for inventory panel."); - return null; + return TryResolveObservedDockingIndex(out var dockingIndex) + ? dockingIndex.ResolveStationRefit() + : null; } private bool TryResolveObservedDockingIndex(out AetheriaUnityObservedDockingIndex dockingIndex) @@ -1485,7 +1475,6 @@ private void Update() _playerSettings?.Dispose(); _currentEntity?.Dispose(); _stationRefit?.Dispose(); - _reactiveDockingState?.Dispose(); _loadoutSnapshotProjector?.Dispose(); _observedDockingIndex?.Dispose(); _inventory?.Dispose(); @@ -1493,7 +1482,6 @@ private void Update() _playerSettings = null; _currentEntity = null; _stationRefit = null; - _reactiveDockingState = null; _loadoutSnapshotProjector = null; _observedDockingIndex = null; _inventory = null;