From 071c1febbd24258a4968a6d1e4a5f655759f7efe Mon Sep 17 00:00:00 2001 From: Meta Vens Date: Mon, 29 Jun 2026 10:24:52 +0100 Subject: [PATCH] Sample trade menu through current typed access --- Aetheria.State.Verify/Program.cs | 43 ++++++++++++++++++----------- Assets/Scripts/UI/Menu/TradeMenu.cs | 33 +++++++--------------- 2 files changed, 37 insertions(+), 39 deletions(-) diff --git a/Aetheria.State.Verify/Program.cs b/Aetheria.State.Verify/Program.cs index c1405c6d6..fe16d2dbe 100644 --- a/Aetheria.State.Verify/Program.cs +++ b/Aetheria.State.Verify/Program.cs @@ -7921,33 +7921,44 @@ static void RequireUnitySharedDocumentAccessorErgonomics(string root) "UI", "Menu", "TradeMenu.cs")); - var requiredTradeMenuSharedDocumentSymbols = new[] { "private void OnDestroy()" }; + var compactTradeMenu = CompactSource(tradeMenu); + var requiredTradeMenuSharedDocumentSymbols = new[] + { + ".RuntimeState(\"unity-trade\").CurrentCatalog()", + ".RuntimeState(\"unity-trade\").CurrentPlayerSettings()", + "private void OnDestroy()" + }; var missingTradeMenuSharedDocumentSymbols = requiredTradeMenuSharedDocumentSymbols - .Where(symbol => !tradeMenu.Contains(symbol, StringComparison.Ordinal)) + .Where(symbol => !compactTradeMenu.Contains(symbol, StringComparison.Ordinal) && + !tradeMenu.Contains(symbol, StringComparison.Ordinal)) .ToArray(); if (missingTradeMenuSharedDocumentSymbols.Length > 0) { throw new InvalidOperationException( - "TradeMenu should bind shared catalog/settings through managed reactive Aetheria documents with menu lifetime disposal: " + + "TradeMenu should sample shared catalog/settings through named current typed Aetheria documents: " + string.Join(", ", missingTradeMenuSharedDocumentSymbols)); } - RequireReactiveTypedDocumentAccess( - tradeMenu, - "TradeMenu", - "AetheriaRuntimeCatalogSnapshot", - "_catalog", + var forbiddenTradeMenuSharedDocumentSymbols = new[] + { + "CultMeshReactiveDocument<", ".ReactiveCatalogSnapshot(\"unity-trade\")", - "AetheriaRuntimeCatalogSession", - "ResolveClient().State.ObserveCatalog()"); - RequireReactiveTypedDocumentAccess( - tradeMenu, - "TradeMenu", - "AetheriaRuntimePlayerSettingsDocument", - "_playerSettings", ".ReactivePlayerSettingsDocument(\"unity-trade\")", + "AetheriaRuntimeCatalogSession", "AetheriaRuntimePlayerSettingsSession", - ".ObservePlayer()"); + "ResolveClient().State.ObserveCatalog()", + ".ObservePlayer()", + "_catalog?.Dispose()", + "_playerSettings?.Dispose()" + } + .Where(symbol => tradeMenu.Contains(symbol, StringComparison.Ordinal)) + .ToArray(); + if (forbiddenTradeMenuSharedDocumentSymbols.Length > 0) + { + throw new InvalidOperationException( + "TradeMenu still routes catalog/settings through wrapper/session/reactive handles instead of current typed documents: " + + string.Join(", ", forbiddenTradeMenuSharedDocumentSymbols)); + } var inventoryMenu = File.ReadAllText(Path.Combine( root, diff --git a/Assets/Scripts/UI/Menu/TradeMenu.cs b/Assets/Scripts/UI/Menu/TradeMenu.cs index 170d73f52..cd003dc2d 100644 --- a/Assets/Scripts/UI/Menu/TradeMenu.cs +++ b/Assets/Scripts/UI/Menu/TradeMenu.cs @@ -6,7 +6,6 @@ using System.Text.RegularExpressions; using GameCult.Aetheria.EveRuntime; using GameCult.Aetheria.State.Verse; using GameCult.Eve.Surface; -using GameCult.Mesh; using TMPro; using UnityEngine; using UnityEngine.UI; @@ -37,8 +36,6 @@ public class TradeMenu : MonoBehaviour private UIDocument _filterSurfaceDocument; private UIDocument _rowActionSurfaceDocument; private UIDocument _tradeItemSurfaceDocument; - private CultMeshReactiveDocument _catalog; - private CultMeshReactiveDocument _playerSettings; private AetheriaUnityObservedEntityIndex _observedEntityIndex; private AetheriaUnityObservedDockingIndex _observedDockingIndex; private readonly AetheriaEveUnitySurfaceChrome _cargoSelectorSurfaceChrome = PanelChrome(360f, 420f, Align.FlexEnd); @@ -586,47 +583,37 @@ public class TradeMenu : MonoBehaviour private void ClearClientCaches() { - _catalog?.Dispose(); - _playerSettings?.Dispose(); - _catalog = null; - _playerSettings = null; _observedDockingIndex = null; } private AetheriaRuntimeCatalogSnapshot CatalogSnapshot() { - if (_catalog != null) - return _catalog.Current; - try { - _catalog = AetheriaUnityRuntimeClientProvider - .ReactiveCatalogSnapshot("unity-trade"); + return AetheriaUnityRuntimeClientProvider + .RuntimeState("unity-trade") + .CurrentCatalog(); } catch (Exception ex) { - Debug.LogWarning($"Failed to bind Aetheria runtime catalog for trade menu: {ex.Message}"); + Debug.LogWarning($"Failed to read Aetheria runtime catalog for trade menu: {ex.Message}"); + return null; } - - return _catalog?.Current; } private AetheriaRuntimePlayerSettingsDocument PlayerSettingsSnapshot() { - if (_playerSettings != null) - return _playerSettings.Current; - try { - _playerSettings = AetheriaUnityRuntimeClientProvider - .ReactivePlayerSettingsDocument("unity-trade"); + return AetheriaUnityRuntimeClientProvider + .RuntimeState("unity-trade") + .CurrentPlayerSettings(); } catch (Exception ex) { - Debug.LogWarning($"Failed to bind Aetheria player settings for trade menu: {ex.Message}"); + Debug.LogWarning($"Failed to read Aetheria player settings for trade menu: {ex.Message}"); + return null; } - - return _playerSettings?.Current; } private string ResolveManufacturerName(AetheriaRuntimeCatalogItem item)