From 8b718d0da9c2164be963a53d550a2b9f3f4c936f Mon Sep 17 00:00:00 2001 From: Meta Vens Date: Mon, 29 Jun 2026 11:41:32 +0100 Subject: [PATCH] Map inventory docking from typed state --- Aetheria.State.Verify/Program.cs | 15 +++++---- Assets/Scripts/UI/Menu/InventoryMenu.cs | 41 ++++++++---------------- Assets/Scripts/UI/Menu/InventoryPanel.cs | 35 ++++++-------------- 3 files changed, 30 insertions(+), 61 deletions(-) diff --git a/Aetheria.State.Verify/Program.cs b/Aetheria.State.Verify/Program.cs index c55be6e12..4e087f94d 100644 --- a/Aetheria.State.Verify/Program.cs +++ b/Aetheria.State.Verify/Program.cs @@ -6483,8 +6483,7 @@ static void RequireInventoryDropdownUseEveSurface(string root) "TryResolveStationRefitEntity(string entityKey", "SetObservedEntityIndex(AetheriaUnityObservedEntityIndex observedEntityIndex)", "_observedEntityIndex.TryResolveEntityByRecordKey", - "TryResolveObservedDockingIndex(out var dockingIndex)", - "dockingIndex.TryResolveCurrentDockingBay(out var resolvedDockingBay)", + "_observedEntityIndex.TryResolveDockingBayByRecordKey", "StationRefitSnapshot", "currentEntityKey = CurrentEntitySnapshot()?.EntityKey ?? \"\"", "LoadoutRestoreOptions" @@ -6548,13 +6547,14 @@ static void RequireInventoryDropdownUseEveSurface(string root) !inventoryDropdownSurfaceBuilder.Contains("entityKey: entity.EntityKey", StringComparison.Ordinal) || !source.Contains("TryResolveStationRefitEntity(selection.EntityKey", StringComparison.Ordinal) || !source.Contains("TryResolveCurrentDockingBayRow(out var currentDockingBay)", StringComparison.Ordinal) || - !source.Contains("TryResolveObservedDockingIndex(out var dockingIndex)", StringComparison.Ordinal) || !source.Contains("TryResolveCurrentDockingBay(out var dockingBay)", StringComparison.Ordinal) || - !source.Contains("dockingIndex.TryResolveCurrentDockingBay(out var resolvedDockingBay)", StringComparison.Ordinal) || + !source.Contains("_observedEntityIndex.TryResolveDockingBayByRecordKey", StringComparison.Ordinal) || !source.Contains("StationRefitSnapshot", StringComparison.Ordinal) || !source.Contains("currentEntityKey = CurrentEntitySnapshot()?.EntityKey ?? \"\"", StringComparison.Ordinal) || !source.Contains("currentDockingBay.DockingBayIndex", StringComparison.Ordinal) || !source.Contains("StationRefitSnapshot()?.DockParentEntityKey", StringComparison.Ordinal) || + source.Contains("TryResolveObservedDockingIndex(out var dockingIndex)", StringComparison.Ordinal) || + source.Contains("dockingIndex.TryResolveCurrentDockingBay", StringComparison.Ordinal) || source.Contains("var hasDockingBay = TryGetTypedCurrentDockingBayFacade", StringComparison.Ordinal) || source.Contains("TryResolveCurrentDockingBayFacade", StringComparison.Ordinal) || source.Contains("ResolveDockingState()?.CurrentDocking", StringComparison.Ordinal) || @@ -6566,16 +6566,17 @@ static void RequireInventoryDropdownUseEveSurface(string root) if (!inventoryMenu.Contains("TryResolveCurrentEntity(out var currentEntity)", StringComparison.Ordinal) || !inventoryMenu.Contains("TryResolveCurrentDockingBay(out var dockingBay)", StringComparison.Ordinal) || - !inventoryMenu.Contains("TryResolveObservedDockingIndex(out var dockingIndex)", StringComparison.Ordinal) || - !inventoryMenu.Contains("dockingIndex.TryResolveCurrentDockingBay(out var resolvedDockingBay)", StringComparison.Ordinal) || + !inventoryMenu.Contains("_observedEntityIndex.TryResolveEntityByRecordKey(currentEntityKey, out currentEntity)", StringComparison.Ordinal) || + !inventoryMenu.Contains("_observedEntityIndex.TryResolveDockingBayByRecordKey", StringComparison.Ordinal) || !inventoryMenu.Contains("currentEntityKey = CurrentEntitySnapshot()?.EntityKey ?? \"\"", StringComparison.Ordinal) || !inventoryMenu.Contains("currentEntity = CurrentEntitySnapshot();", StringComparison.Ordinal) || !inventoryMenu.Contains("StationRefitSnapshot", StringComparison.Ordinal) || + inventoryMenu.Contains("TryResolveObservedDockingIndex(out var dockingIndex)", StringComparison.Ordinal) || + inventoryMenu.Contains("dockingIndex.TryResolveCurrentDockingBay", 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)) { diff --git a/Assets/Scripts/UI/Menu/InventoryMenu.cs b/Assets/Scripts/UI/Menu/InventoryMenu.cs index 64a9e5b28..4d30a4d81 100644 --- a/Assets/Scripts/UI/Menu/InventoryMenu.cs +++ b/Assets/Scripts/UI/Menu/InventoryMenu.cs @@ -32,7 +32,6 @@ public class InventoryMenu : MonoBehaviour private UIDocument _equippedItemDetailsSurfaceDocument; private AetheriaUnityActionBarPresentation _actionBarPresentation; private AetheriaUnityObservedEntityIndex _observedEntityIndex; - private AetheriaUnityObservedDockingIndex _observedDockingIndex; private readonly AetheriaEveUnitySurfaceChrome _shipSettingsSurfaceChrome = PanelChrome(360f, 420f); private readonly AetheriaEveUnitySurfaceChrome _cargoItemDetailsSurfaceChrome = PanelChrome(420f, 520f); private readonly AetheriaEveUnitySurfaceChrome _equippedItemDetailsSurfaceChrome = PanelChrome(460f, 560f); @@ -58,11 +57,6 @@ public class InventoryMenu : MonoBehaviour public void SetObservedEntityIndex(AetheriaUnityObservedEntityIndex observedEntityIndex) { - if (!ReferenceEquals(_observedEntityIndex, observedEntityIndex)) - { - _observedDockingIndex = null; - } - _observedEntityIndex = observedEntityIndex; } // private int2 _dragCellOffset; @@ -737,33 +731,31 @@ public class InventoryMenu : MonoBehaviour private bool TryResolveCurrentEntity(out Entity currentEntity) { currentEntity = null; - return TryResolveObservedDockingIndex(out var dockingIndex) && - dockingIndex.TryResolveCurrentEntity(out currentEntity); + var currentEntityKey = CurrentEntitySnapshot()?.EntityKey ?? ""; + return _observedEntityIndex != null && + !string.IsNullOrWhiteSpace(currentEntityKey) && + _observedEntityIndex.TryResolveEntityByRecordKey(currentEntityKey, out currentEntity); } private bool TryResolveCurrentDockingBay(out EquippedCargoBay dockingBay) { dockingBay = null; - if (!TryResolveObservedDockingIndex(out var dockingIndex) || - !dockingIndex.TryResolveCurrentDockingBay(out var resolvedDockingBay)) + var refit = StationRefitSnapshot(); + if (refit?.IsDocked != true || + refit.DockingBayIndex < 0 || + string.IsNullOrWhiteSpace(refit.DockParentEntityKey) || + _observedEntityIndex == null || + !_observedEntityIndex.TryResolveDockingBayByRecordKey( + refit.DockParentEntityKey, + refit.DockingBayIndex, + out dockingBay)) { return false; } - dockingBay = resolvedDockingBay; return dockingBay != null; } - private bool TryResolveObservedDockingIndex(out AetheriaUnityObservedDockingIndex dockingIndex) - { - dockingIndex = null; - if (_observedEntityIndex == null) - return false; - - dockingIndex = _observedDockingIndex ??= new AetheriaUnityObservedDockingIndex(_observedEntityIndex); - return true; - } - private bool TryResolveCargoBay(EquippedCargoBay cargoBay, out string entityKey, out int cargoIndex) { return TryResolveEquippedItem(cargoBay, out entityKey, out cargoIndex); @@ -894,11 +886,6 @@ public class InventoryMenu : MonoBehaviour } } - private void ClearClientCaches() - { - _observedDockingIndex = null; - } - private AetheriaRuntimeCurrentEntityDocument CurrentEntitySnapshot() { try @@ -1081,8 +1068,6 @@ public class InventoryMenu : MonoBehaviour private void OnDestroy() { - ClearClientCaches(); - if (_shipSettingsSurfaceDocument != null) { AetheriaEveUnitySurfaceHost.DestroyDocument(_shipSettingsSurfaceDocument); diff --git a/Assets/Scripts/UI/Menu/InventoryPanel.cs b/Assets/Scripts/UI/Menu/InventoryPanel.cs index 658e9cf7c..1599653c6 100644 --- a/Assets/Scripts/UI/Menu/InventoryPanel.cs +++ b/Assets/Scripts/UI/Menu/InventoryPanel.cs @@ -74,7 +74,6 @@ public class InventoryPanel : MonoBehaviour, IPointerClickHandler private RectTransform _firstRect; private AetheriaUnityDragSession _dragSession; private AetheriaUnityObservedEntityIndex _observedEntityIndex; - private AetheriaUnityObservedDockingIndex _observedDockingIndex; public ItemInstance FakeItem; public Shape FakeOccupancy; @@ -88,11 +87,6 @@ public class InventoryPanel : MonoBehaviour, IPointerClickHandler public void SetObservedEntityIndex(AetheriaUnityObservedEntityIndex observedEntityIndex) { - if (!ReferenceEquals(_observedEntityIndex, observedEntityIndex)) - { - _observedDockingIndex = null; - } - _observedEntityIndex = observedEntityIndex; } @@ -1139,26 +1133,22 @@ private void Update() private bool TryResolveCurrentDockingBay(out EquippedCargoBay dockingBay) { dockingBay = null; - if (!TryResolveObservedDockingIndex(out var dockingIndex) || - !dockingIndex.TryResolveCurrentDockingBay(out var resolvedDockingBay)) + var refit = StationRefitSnapshot(); + if (refit?.IsDocked != true || + refit.DockingBayIndex < 0 || + string.IsNullOrWhiteSpace(refit.DockParentEntityKey) || + _observedEntityIndex == null || + !_observedEntityIndex.TryResolveDockingBayByRecordKey( + refit.DockParentEntityKey, + refit.DockingBayIndex, + out dockingBay)) { return false; } - dockingBay = resolvedDockingBay; return dockingBay != null; } - private bool TryResolveObservedDockingIndex(out AetheriaUnityObservedDockingIndex dockingIndex) - { - dockingIndex = null; - if (_observedEntityIndex == null) - return false; - - dockingIndex = _observedDockingIndex ??= new AetheriaUnityObservedDockingIndex(_observedEntityIndex); - return true; - } - private bool TryResolveStationRefitEntity(string entityKey, int optionIndex, out Entity entity) { entity = null; @@ -1450,11 +1440,6 @@ private void Update() } } - private void ClearClientCaches() - { - _observedDockingIndex = null; - } - private AetheriaRuntimeCurrentEntityDocument CurrentEntitySnapshot() { try @@ -1625,8 +1610,6 @@ private void Update() private void OnDestroy() { - ClearClientCaches(); - if (_dropdownSurfaceDocument != null) { AetheriaEveUnitySurfaceHost.DestroyDocument(_dropdownSurfaceDocument);