From 7521f59a23e6505e9ed818381f0bb6b8fe48ff9f Mon Sep 17 00:00:00 2001 From: Meta Vens Date: Sun, 28 Jun 2026 13:57:58 +0100 Subject: [PATCH] Centralize trade menu catalog settings access --- Aetheria.State.Verify/Program.cs | 25 +++++++++++++++++++++---- Assets/Scripts/UI/Menu/TradeMenu.cs | 9 ++++----- 2 files changed, 25 insertions(+), 9 deletions(-) diff --git a/Aetheria.State.Verify/Program.cs b/Aetheria.State.Verify/Program.cs index 1e9c56d16..e2a8884fa 100644 --- a/Aetheria.State.Verify/Program.cs +++ b/Aetheria.State.Verify/Program.cs @@ -7449,11 +7449,11 @@ static void RequireUnitySharedDocumentAccessorErgonomics(string root) "TradeMenu.cs")); var requiredTradeMenuSharedDocumentSymbols = new[] { - "CultMeshReactiveDocument _catalog", - "CultMeshReactiveDocument _playerSettings", - "ResolveClient().State.ReactiveCatalog()", + "AetheriaRuntimeCatalogSession _catalog", + "AetheriaRuntimePlayerSettingsSession _playerSettings", + "ResolveClient().State.ObserveCatalog()", ".Settings", - ".ReactivePlayer()", + ".ObservePlayer()", "_catalog?.Dispose()", "_playerSettings?.Dispose()", "_catalog?.Current", @@ -7470,6 +7470,23 @@ static void RequireUnitySharedDocumentAccessorErgonomics(string root) string.Join(", ", missingTradeMenuSharedDocumentSymbols)); } + var forbiddenTradeMenuSharedDocumentSymbols = new[] + { + "CultMeshReactiveDocument _catalog", + "CultMeshReactiveDocument _playerSettings", + "ResolveClient().State.ReactiveCatalog()", + ".ReactivePlayer()" + }; + var tradeMenuRawDocumentHits = forbiddenTradeMenuSharedDocumentSymbols + .Where(symbol => tradeMenu.Contains(symbol, StringComparison.Ordinal)) + .ToArray(); + if (tradeMenuRawDocumentHits.Length > 0) + { + throw new InvalidOperationException( + "TradeMenu still owns raw catalog/settings CultMesh documents instead of managed sessions: " + + string.Join(", ", tradeMenuRawDocumentHits)); + } + var inventoryMenu = File.ReadAllText(Path.Combine( root, "Assets", diff --git a/Assets/Scripts/UI/Menu/TradeMenu.cs b/Assets/Scripts/UI/Menu/TradeMenu.cs index b2fbb2e4c..11ca7c324 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; @@ -38,8 +37,8 @@ public class TradeMenu : MonoBehaviour private UIDocument _rowActionSurfaceDocument; private UIDocument _tradeItemSurfaceDocument; private string _clientStatePath = ""; - private CultMeshReactiveDocument _catalog; - private CultMeshReactiveDocument _playerSettings; + private AetheriaRuntimeCatalogSession _catalog; + private AetheriaRuntimePlayerSettingsSession _playerSettings; private AetheriaUnityObservedEntityIndex _observedEntityIndex; private AetheriaUnityObservedDockingIndex _observedDockingIndex; private readonly AetheriaEveUnitySurfaceChrome _cargoSelectorSurfaceChrome = PanelChrome(360f, 420f, Align.FlexEnd); @@ -634,7 +633,7 @@ public class TradeMenu : MonoBehaviour try { - _catalog = ResolveClient().State.ReactiveCatalog(); + _catalog = ResolveClient().State.ObserveCatalog(); } catch (Exception ex) { @@ -654,7 +653,7 @@ public class TradeMenu : MonoBehaviour _playerSettings = ResolveClient() .State .Settings - .ReactivePlayer(); + .ObservePlayer(); } catch (Exception ex) {