From 16c6211d4ac058097fdec17a0417b05d37f0951b Mon Sep 17 00:00:00 2001 From: Meta Vens Date: Sun, 28 Jun 2026 15:55:14 +0100 Subject: [PATCH] Use typed docking documents in trade menu --- Aetheria.State.Verify/Program.cs | 9 ++++++--- Assets/Scripts/UI/Menu/TradeMenu.cs | 25 ++++++++++++++++++------- 2 files changed, 24 insertions(+), 10 deletions(-) diff --git a/Aetheria.State.Verify/Program.cs b/Aetheria.State.Verify/Program.cs index 30728941c..94525b2b5 100644 --- a/Aetheria.State.Verify/Program.cs +++ b/Aetheria.State.Verify/Program.cs @@ -5686,9 +5686,9 @@ static void RequireTradeCargoSelectorUseEveSurface(string root) "AetheriaRuntimeTradeCargoSelectorCommandKind.Close", "AetheriaRuntimeTradeCargoSelectorCommandKind.Select", "SetObservedEntityIndex(AetheriaUnityObservedEntityIndex observedEntityIndex)", - "AetheriaRuntimeObservedDockingState", - "ResolveClient().State.CurrentDocking()", - "docking.Refit", + "AetheriaRuntimeCurrentDockingDocument", + "ResolveClient().State.Current.LatestDocking()", + "ResolveClient().State.LatestStationRefit()", "SetTargetCargo(", "selection.EntityKey", "OwnedQuantity", @@ -5727,6 +5727,9 @@ static void RequireTradeCargoSelectorUseEveSurface(string root) "ProjectTradeCargoSelectorSurfaceState(", "ProjectTradeCargoSelectorSurface(", "_cargoSelectorSurfaceProjection", + "AetheriaRuntimeObservedDockingState", + "ResolveClient().State.CurrentDocking()", + "docking.Refit", "GameManager.DockedEntity.Children", "GameManager.CurrentEntity.Parent.Children", "GameManager.DockingBay", diff --git a/Assets/Scripts/UI/Menu/TradeMenu.cs b/Assets/Scripts/UI/Menu/TradeMenu.cs index 2b2e3ffae..51911668d 100644 --- a/Assets/Scripts/UI/Menu/TradeMenu.cs +++ b/Assets/Scripts/UI/Menu/TradeMenu.cs @@ -60,7 +60,7 @@ public class TradeMenu : MonoBehaviour private void OnEnable() { - if (!TryResolveObservedDocking(out var docking) || + if (!TryResolveCurrentDocking(out var docking) || docking.IsDocked != true || string.IsNullOrWhiteSpace(docking.DockParentEntityKey) || docking.DockingBayIndex < 0) @@ -498,7 +498,7 @@ public class TradeMenu : MonoBehaviour private bool TryResolveCurrentDockingTargetEntityKey(out string targetEntityKey) { targetEntityKey = ""; - if (!TryResolveObservedDocking(out var docking) || + if (!TryResolveCurrentDocking(out var docking) || docking.IsDocked != true || string.IsNullOrWhiteSpace(docking.DockParentEntityKey)) { @@ -514,18 +514,29 @@ public class TradeMenu : MonoBehaviour if (_stationRefit != null) return _stationRefit; - _stationRefit = TryResolveObservedDocking(out var docking) - ? docking.Refit - : null; + _stationRefit = TryResolveStationRefit(); return _stationRefit; } - private bool TryResolveObservedDocking(out AetheriaRuntimeObservedDockingState docking) + private AetheriaRuntimeStationRefitDocument TryResolveStationRefit() + { + try + { + return ResolveClient().State.LatestStationRefit(); + } + catch (Exception ex) + { + Debug.LogWarning($"Failed to read Aetheria station refit state for trade menu: {ex.Message}"); + return null; + } + } + + private bool TryResolveCurrentDocking(out AetheriaRuntimeCurrentDockingDocument docking) { docking = null; try { - docking = ResolveClient().State.CurrentDocking(); + docking = ResolveClient().State.Current.LatestDocking(); return docking != null; } catch (Exception ex)