diff --git a/Aetheria.State.Verify/Program.cs b/Aetheria.State.Verify/Program.cs index da2ddd06e..5602218d7 100644 --- a/Aetheria.State.Verify/Program.cs +++ b/Aetheria.State.Verify/Program.cs @@ -2565,8 +2565,8 @@ static void RequireDaemonRenderQueryAuthority(string root) "CultMeshReactiveDocument _currentEntity", "ResolveCatalog()", "ResolveCurrentEntityHudStatus()", - ".Reactive(\"unity-schematic-display\")", - ".Reactive(\"unity-schematic-display\")", + ".ReactiveCatalogSnapshot(\"unity-schematic-display\")", + ".ReactivePlayerSettingsDocument(\"unity-schematic-display\")", ".ReactiveCurrentEntity(\"unity-schematic-display\")", "return _currentEntity?.Current?.Hud ?? new AetheriaRuntimeCurrentEntityHudStatus();", "_currentEntity?.Dispose()", @@ -4231,7 +4231,7 @@ static void RequireRuntimeInputScreenUsesEveSurface(string root) "AetheriaRuntimeEveCommandKind.SetActionBarEnabled", "RequireLocalStateBoot()", "AetheriaUnityRuntimeClientProvider", - ".Reactive(", + ".ReactivePlayerSettingsDocument(", "action.ApplyBindingOverride", "new InputAction(\"Aetheria Input Capture\")", "AetheriaRuntimeInputSettingsSurfaceBuilder.IsSupportedCapturePath(", @@ -4255,7 +4255,7 @@ static void RequireRuntimeInputScreenUsesEveSurface(string root) "InputDisplayLayout", "AetheriaRuntimePlayerSettingsDocument", "_playerSettings", - ".Reactive(", + ".ReactivePlayerSettingsDocument(", "AetheriaRuntimePlayerSettingsSession", ".ObservePlayer()"); @@ -4624,7 +4624,7 @@ static void RequireSectorMapZoneDetailsUseEveSurface(string root) "SectorRenderer", "AetheriaRuntimeCatalogSnapshot", "_catalog", - ".Reactive(\"unity-sector-renderer\")", + ".ReactiveCatalogSnapshot(\"unity-sector-renderer\")", "AetheriaRuntimeCatalogSession", "ResolveClient().State.ObserveCatalog()"); RequireReactiveTypedDocumentAccess( @@ -4632,7 +4632,7 @@ static void RequireSectorMapZoneDetailsUseEveSurface(string root) "SectorRenderer", "AetheriaRuntimePlayerSettingsDocument", "_playerSettings", - ".Reactive(\"unity-sector-renderer\")", + ".ReactivePlayerSettingsDocument(\"unity-sector-renderer\")", "AetheriaRuntimePlayerSettingsSession", ".ObservePlayer()"); @@ -7561,7 +7561,7 @@ static void RequireUnitySharedDocumentAccessorErgonomics(string root) "public abstract class ActionBarBinding : IDisposable", "CultMeshReactiveDocument _catalog", "AetheriaUnityRuntimeClientProvider", - ".Reactive(\"unity-action-bar\")", + ".ReactiveCatalogSnapshot(\"unity-action-bar\")", "_catalog?.Current?.FindItem(item, x => x.ItemKey)", "binding?.Dispose()", "private void OnDestroy()" @@ -7578,7 +7578,7 @@ static void RequireUnitySharedDocumentAccessorErgonomics(string root) if (actionBarSlot.Contains("AetheriaRuntimeCatalogSession _catalog", StringComparison.Ordinal) || actionBarSlot.Contains("Client.State.ObserveCatalog()", StringComparison.Ordinal) || - actionBarSlot.Contains("Client.State.Reactive()", StringComparison.Ordinal)) + actionBarSlot.Contains("Client.State.ReactiveCatalogSnapshot()", StringComparison.Ordinal)) { throw new InvalidOperationException( "ActionBarSlot still routes through client/session catalog plumbing instead of its managed reactive typed catalog document."); @@ -7602,8 +7602,8 @@ static void RequireUnitySharedDocumentAccessorErgonomics(string root) "CultMeshReactiveDocument _catalog", "CultMeshReactiveDocument _playerSettings", "CultMeshReactiveDocument _currentEntity", - ".Reactive(\"unity-schematic-display\")", - ".Reactive(\"unity-schematic-display\")", + ".ReactiveCatalogSnapshot(\"unity-schematic-display\")", + ".ReactivePlayerSettingsDocument(\"unity-schematic-display\")", ".ReactiveCurrentEntity(\"unity-schematic-display\")", "_catalog?.Dispose()", "_playerSettings?.Dispose()", @@ -7658,7 +7658,7 @@ static void RequireUnitySharedDocumentAccessorErgonomics(string root) var requiredVolumeCloudSymbols = new[] { "CultMeshReactiveDocument _playerSettings", - ".Reactive(\"unity-volume-cloud-renderer\")", + ".ReactivePlayerSettingsDocument(\"unity-volume-cloud-renderer\")", "_playerSettings?.Dispose()", "_playerSettings?.Current" }; @@ -7766,7 +7766,7 @@ static void RequireUnitySharedDocumentAccessorErgonomics(string root) "MapRenderer", "AetheriaRuntimePlayerSettingsDocument", "_playerSettings", - ".Reactive(\"unity-map-renderer\")", + ".ReactivePlayerSettingsDocument(\"unity-map-renderer\")", "AetheriaRuntimePlayerSettingsSession", ".ObservePlayer()"); @@ -7826,7 +7826,7 @@ static void RequireUnitySharedDocumentAccessorErgonomics(string root) "MainMenu", "AetheriaRuntimePlayerSettingsDocument", "_playerSettings", - ".Reactive(", + ".ReactivePlayerSettingsDocument(", "AetheriaRuntimePlayerSettingsSession", ".ObservePlayer()"); RequireReactiveTypedDocumentAccess( @@ -7861,7 +7861,7 @@ static void RequireUnitySharedDocumentAccessorErgonomics(string root) "TradeMenu", "AetheriaRuntimeCatalogSnapshot", "_catalog", - ".Reactive(\"unity-trade\")", + ".ReactiveCatalogSnapshot(\"unity-trade\")", "AetheriaRuntimeCatalogSession", "ResolveClient().State.ObserveCatalog()"); RequireReactiveTypedDocumentAccess( @@ -7869,7 +7869,7 @@ static void RequireUnitySharedDocumentAccessorErgonomics(string root) "TradeMenu", "AetheriaRuntimePlayerSettingsDocument", "_playerSettings", - ".Reactive(\"unity-trade\")", + ".ReactivePlayerSettingsDocument(\"unity-trade\")", "AetheriaRuntimePlayerSettingsSession", ".ObservePlayer()"); @@ -7896,7 +7896,7 @@ static void RequireUnitySharedDocumentAccessorErgonomics(string root) "InventoryMenu", "AetheriaRuntimeCatalogSnapshot", "_catalog", - ".Reactive(\"unity-inventory-menu\")", + ".ReactiveCatalogSnapshot(\"unity-inventory-menu\")", "AetheriaRuntimeCatalogSession", "ResolveClient().State.ObserveCatalog()"); RequireReactiveTypedDocumentAccess( @@ -7904,7 +7904,7 @@ static void RequireUnitySharedDocumentAccessorErgonomics(string root) "InventoryMenu", "AetheriaRuntimePlayerSettingsDocument", "_playerSettings", - ".Reactive(\"unity-inventory-menu\")", + ".ReactivePlayerSettingsDocument(\"unity-inventory-menu\")", "AetheriaRuntimePlayerSettingsSession", ".ObservePlayer()"); @@ -7934,7 +7934,7 @@ static void RequireUnitySharedDocumentAccessorErgonomics(string root) "InventoryPanel", "AetheriaRuntimeCatalogSnapshot", "_catalog", - ".Reactive(\"unity-inventory\")", + ".ReactiveCatalogSnapshot(\"unity-inventory\")", "AetheriaRuntimeCatalogSession", "ResolveClient().State.ObserveCatalog()"); RequireReactiveTypedDocumentAccess( @@ -7942,7 +7942,7 @@ static void RequireUnitySharedDocumentAccessorErgonomics(string root) "InventoryPanel", "AetheriaRuntimePlayerSettingsDocument", "_playerSettings", - ".Reactive(\"unity-inventory\")", + ".ReactivePlayerSettingsDocument(\"unity-inventory\")", "AetheriaRuntimePlayerSettingsSession", ".ObservePlayer()"); @@ -8012,7 +8012,7 @@ static void RequireUnitySharedDocumentAccessorErgonomics(string root) "SectorRenderer", "AetheriaRuntimeCatalogSnapshot", "_catalog", - ".Reactive(\"unity-sector-renderer\")", + ".ReactiveCatalogSnapshot(\"unity-sector-renderer\")", "AetheriaRuntimeCatalogSession", "ResolveClient().State.ObserveCatalog()"); RequireReactiveTypedDocumentAccess( @@ -8020,7 +8020,7 @@ static void RequireUnitySharedDocumentAccessorErgonomics(string root) "SectorRenderer", "AetheriaRuntimePlayerSettingsDocument", "_playerSettings", - ".Reactive(\"unity-sector-renderer\")", + ".ReactivePlayerSettingsDocument(\"unity-sector-renderer\")", "AetheriaRuntimePlayerSettingsSession", ".ObservePlayer()"); @@ -8079,7 +8079,7 @@ static void RequireUnitySharedDocumentAccessorErgonomics(string root) "ZoneRenderer", "AetheriaRuntimeCatalogSnapshot", "_catalog", - ".Reactive(\"unity-zone-renderer\")", + ".ReactiveCatalogSnapshot(\"unity-zone-renderer\")", "AetheriaRuntimeCatalogSession", "ResolveClient().State.ObserveCatalog()"); @@ -8331,6 +8331,10 @@ static void RequireAetheriaManagedStateAccessorsCoverDomainDocuments(string root "public CultMeshReactiveDocument ReactiveCurrentEntity()", "public CultMeshDocumentHandle StationRefitDocument()", "public CultMeshReactiveDocument ReactiveStationRefit()", + "public CultMeshDocumentHandle CatalogSnapshot()", + "public CultMeshReactiveDocument ReactiveCatalogSnapshot()", + "public CultMeshDocumentHandle PlayerSettingsDocument()", + "public CultMeshReactiveDocument ReactivePlayerSettingsDocument()", "public static bool TryResolveEveSurface(", "public CultMeshDocumentHandle? EveSurfaceDocument(", "public CultMeshReactiveDocument? ReactiveEveSurface(", @@ -9299,7 +9303,7 @@ static void RequireClientTargetBootAuthority(string root) "!stateBoot.SupportsLocalStateFileRead", "stateBoot.StateFileExists", "AetheriaUnityRuntimeClientProvider.RuntimeState(stateBoot, stateBoot.RuntimeId)", - ".Reactive()", + ".ReactiveCatalogSnapshot()", "runtimeCatalogDocument.Current", ".Reactive()", "sectorMapDocument.Current", @@ -12042,7 +12046,7 @@ static void RequireAetheriaRuntimeVerseClientContract(string root) "StarbridgeSummaryAsync", "CultMeshReactiveDocument? managedDaemonFrame = null;", "managedDaemonFrame = state.Reactive();", - "managedCatalog = state.Reactive();", + "managedCatalog = state.ReactiveCatalogSnapshot();", "managedLoadoutTemplates = state.Reactive();", "managedStarbridgeScenario = state.Reactive();", "managedStarbridgeSession = state.Reactive();", @@ -12215,7 +12219,7 @@ static void RequireAetheriaRuntimeVerseClientContract(string root) "_eveStateRefFrame ??= Reactive()", "_eveStateRefHealth ??= Reactive()", "_eveStateRefCommandBoundary ??= Reactive()", - "_eveStateRefCatalog ??= Reactive()", + "_eveStateRefCatalog ??= ReactiveCatalogSnapshot()", "() => _eveStateRefFrame.Current", "() => _eveStateRefHealth.Current", "() => _eveStateRefCommandBoundary.Current", @@ -14728,13 +14732,13 @@ static void RequireUnityObserverDoesNotTickLocalSimulation(string root) if (!mapRenderer.Contains("AetheriaUnityRuntimeClientProvider", StringComparison.Ordinal) || !compactMapRenderer.Contains(".Reactive(viewport,\"unity-map-renderer\")", StringComparison.Ordinal) || !compactMapRenderer.Contains(".Reactive(viewport,\"unity-map-renderer\")", StringComparison.Ordinal) || - !compactMapRenderer.Contains(".Reactive(\"unity-map-renderer\")", StringComparison.Ordinal) || + !compactMapRenderer.Contains(".ReactivePlayerSettingsDocument(\"unity-map-renderer\")", StringComparison.Ordinal) || !sectorRenderer.Contains("AetheriaUnityRuntimeClientProvider", StringComparison.Ordinal) || !compactSectorRenderer.Contains(".Reactive(\"unity-sector-renderer\")", StringComparison.Ordinal) || !compactSectorRenderer.Contains(".Reactive(zoneIndex,\"unity-sector-renderer\")", StringComparison.Ordinal) || !sectorRenderer.Contains(".Current", StringComparison.Ordinal) || - !compactSectorRenderer.Contains(".Reactive(\"unity-sector-renderer\")", StringComparison.Ordinal) || - !compactSectorRenderer.Contains(".Reactive(\"unity-sector-renderer\")", StringComparison.Ordinal) || + !compactSectorRenderer.Contains(".ReactiveCatalogSnapshot(\"unity-sector-renderer\")", StringComparison.Ordinal) || + !compactSectorRenderer.Contains(".ReactivePlayerSettingsDocument(\"unity-sector-renderer\")", StringComparison.Ordinal) || !sectorMap.Contains("AetheriaUnityRuntimeClientProvider", StringComparison.Ordinal) || !compactSectorMap.Contains(".Reactive(\"unity-sector-map\")", StringComparison.Ordinal) || !sectorRenderer.Contains("AetheriaRuntimeZoneDetailsSurfaceBuilder.Facts(", StringComparison.Ordinal)) @@ -16297,7 +16301,7 @@ static void RequireRuntimeStateReaderOwnsUnityStateAcquisition(string root) "public AetheriaUnityGameplayBootResult Boot()", "AetheriaRuntimeStateBoot.Inspect(AetheriaUnityRuntimePaths.GameDataDirectory)", "AetheriaUnityRuntimeClientProvider.RuntimeState(stateBoot, stateBoot.RuntimeId)", - ".Reactive()", + ".ReactiveCatalogSnapshot()", "runtimeCatalogDocument.Current", ".Reactive()", "sectorMapDocument.Current", @@ -16347,6 +16351,8 @@ static void RequireRuntimeStateReaderOwnsUnityStateAcquisition(string root) "public static CultMeshReactiveDocument ReactiveCurrentDocking(", "public static CultMeshReactiveDocument ReactiveCurrentEntity(", "public static CultMeshReactiveDocument ReactiveStationRefit(", + "public static CultMeshReactiveDocument ReactiveCatalogSnapshot(", + "public static CultMeshReactiveDocument ReactivePlayerSettingsDocument(", "public static CultMeshReactiveDocument Reactive(", "AetheriaClientEveSurface surface", "public static CultMeshReactiveDocument ReactiveEveSurface(", @@ -16357,7 +16363,7 @@ static void RequireRuntimeStateReaderOwnsUnityStateAcquisition(string root) "RuntimeClients[cacheKey] = runtimeClient", "AetheriaClient", ".State", - "Reactive()", + "ReactivePlayerSettingsDocument()", "_playerSettingsDocument.Current", "_playerSettingsDocument?.Dispose()", "OpenAsync(", @@ -16838,7 +16844,7 @@ static void RequireRuntimeStateReaderOwnsUnityStateAcquisition(string root) !mainMenu.Contains("ResolveSectorMap(AetheriaRuntimeStateBootReport stateBoot)", StringComparison.Ordinal) || !mainMenu.Contains("PrepareDocumentAccess(stateBoot)", StringComparison.Ordinal) || !mainMenu.Contains(".Reactive(", StringComparison.Ordinal) || - !mainMenu.Contains(".Reactive(", StringComparison.Ordinal)) + !mainMenu.Contains(".ReactivePlayerSettingsDocument(", StringComparison.Ordinal)) { throw new InvalidOperationException( "MainMenu must read menu state through provider-native managed typed documents."); @@ -16865,7 +16871,7 @@ static void RequireRuntimeStateReaderOwnsUnityStateAcquisition(string root) var requiredGameplayBootSymbols = new[] { - ".Reactive()", + ".ReactiveCatalogSnapshot()", "runtimeCatalogDocument.Current", ".Reactive()", "sectorMapDocument.Current", diff --git a/Assets/Scripts/Gameplay/ActionBarSlot.cs b/Assets/Scripts/Gameplay/ActionBarSlot.cs index a7b9bc90e..7ebf638ff 100644 --- a/Assets/Scripts/Gameplay/ActionBarSlot.cs +++ b/Assets/Scripts/Gameplay/ActionBarSlot.cs @@ -101,7 +101,7 @@ public abstract class ActionBarBinding : IDisposable try { _catalog ??= AetheriaUnityRuntimeClientProvider - .Reactive("unity-action-bar"); + .ReactiveCatalogSnapshot("unity-action-bar"); return _catalog?.Current?.FindItem(item, x => x.ItemKey); } catch (Exception ex) diff --git a/Assets/Scripts/Gameplay/AetheriaUnityGameplayBootShell.cs b/Assets/Scripts/Gameplay/AetheriaUnityGameplayBootShell.cs index 339bd754c..531ddab8d 100644 --- a/Assets/Scripts/Gameplay/AetheriaUnityGameplayBootShell.cs +++ b/Assets/Scripts/Gameplay/AetheriaUnityGameplayBootShell.cs @@ -36,7 +36,7 @@ public sealed class AetheriaUnityGameplayBootShell } var runtimeState = AetheriaUnityRuntimeClientProvider.RuntimeState(stateBoot, stateBoot.RuntimeId); - using var runtimeCatalogDocument = runtimeState.Reactive(); + using var runtimeCatalogDocument = runtimeState.ReactiveCatalogSnapshot(); var runtimeCatalog = runtimeCatalogDocument.Current; if (runtimeCatalog == null) throw new InvalidOperationException("Aetheria typed runtime catalog is required before gameplay boot."); diff --git a/Assets/Scripts/Gameplay/AetheriaUnityRuntimeClientProvider.cs b/Assets/Scripts/Gameplay/AetheriaUnityRuntimeClientProvider.cs index fa8782307..2da9d6cd2 100644 --- a/Assets/Scripts/Gameplay/AetheriaUnityRuntimeClientProvider.cs +++ b/Assets/Scripts/Gameplay/AetheriaUnityRuntimeClientProvider.cs @@ -150,6 +150,32 @@ public static class AetheriaUnityRuntimeClientProvider return RuntimeState(stateBoot, runtimeId).ReactiveStationRefit(); } + public static CultMeshReactiveDocument ReactiveCatalogSnapshot( + string runtimeId = "") + { + return RuntimeState(runtimeId).ReactiveCatalogSnapshot(); + } + + public static CultMeshReactiveDocument ReactiveCatalogSnapshot( + AetheriaRuntimeStateBootReport stateBoot, + string runtimeId = "") + { + return RuntimeState(stateBoot, runtimeId).ReactiveCatalogSnapshot(); + } + + public static CultMeshReactiveDocument ReactivePlayerSettingsDocument( + string runtimeId = "") + { + return RuntimeState(runtimeId).ReactivePlayerSettingsDocument(); + } + + public static CultMeshReactiveDocument ReactivePlayerSettingsDocument( + AetheriaRuntimeStateBootReport stateBoot, + string runtimeId = "") + { + return RuntimeState(stateBoot, runtimeId).ReactivePlayerSettingsDocument(); + } + public static CultMeshReactiveDocument Reactive( AetheriaRuntimeStateBootReport stateBoot, string runtimeId = "") @@ -257,7 +283,7 @@ public static class AetheriaUnityRuntimeClientProvider { try { - _playerSettingsDocument ??= Reactive(); + _playerSettingsDocument ??= ReactivePlayerSettingsDocument(); var stored = _playerSettingsDocument.Current; if (stored == null) diff --git a/Assets/Scripts/Tests/DaemonRuntimeDocumentTests.cs b/Assets/Scripts/Tests/DaemonRuntimeDocumentTests.cs index abf5f8082..4014840de 100644 --- a/Assets/Scripts/Tests/DaemonRuntimeDocumentTests.cs +++ b/Assets/Scripts/Tests/DaemonRuntimeDocumentTests.cs @@ -203,7 +203,7 @@ public class DaemonRuntimeDocumentTests .GetResult(); using var zoneRenderReactive = client.State.Reactive(); var observedAuthoritativeFrame = ReadLatest(client.State.Document()); - using var catalogReactive = client.State.Reactive(); + using var catalogReactive = client.State.ReactiveCatalogSnapshot(); using var daemonFrameReactive = client.State.Reactive(); using var daemonSoaViewReactive = client.State.Reactive(); Assert.IsTrue(AetheriaRuntimeDaemonRenderView.TryCreateCurrent( @@ -213,7 +213,7 @@ public class DaemonRuntimeDocumentTests out var observed)); using var loadoutTemplatesReactive = client.State.Reactive(); using var sectorMapReactive = client.State.Reactive(); - using var playerSettingsReactive = client.State.Reactive(); + using var playerSettingsReactive = client.State.ReactivePlayerSettingsDocument(); using var verseHostSettingsReactive = client.State.Reactive(); using var zoneContactsReactive = client.State.Reactive(); using var currentZoneReactive = client.State.Reactive(); @@ -227,8 +227,8 @@ public class DaemonRuntimeDocumentTests using var objectsViewportReactive = client.State.Reactive(viewport); using var gravityViewportReactive = client.State.Reactive(viewport); using var renderSplatsViewportReactive = client.State.Reactive(viewport); - using var playerHudCatalog = client.State.Reactive(); - using var playerHudSettings = client.State.Reactive(); + using var playerHudCatalog = client.State.ReactiveCatalogSnapshot(); + using var playerHudSettings = client.State.ReactivePlayerSettingsDocument(); using var playerHudEntity = client.State.ReactiveCurrentEntity(); var gameSurface = ReadLatest(client.State.Document(AetheriaClientEveSurface.Game)); var gameTuiSurface = ReadLatest(client.State.Document(AetheriaClientEveSurface.GameTui)); diff --git a/Assets/Scripts/UI/HUD/SchematicDisplay.cs b/Assets/Scripts/UI/HUD/SchematicDisplay.cs index 969c440e9..fc1116dd4 100644 --- a/Assets/Scripts/UI/HUD/SchematicDisplay.cs +++ b/Assets/Scripts/UI/HUD/SchematicDisplay.cs @@ -326,7 +326,7 @@ public class SchematicDisplay : MonoBehaviour try { _catalog = AetheriaUnityRuntimeClientProvider - .Reactive("unity-schematic-display"); + .ReactiveCatalogSnapshot("unity-schematic-display"); } catch (Exception ex) { @@ -343,7 +343,7 @@ public class SchematicDisplay : MonoBehaviour try { _playerSettings = AetheriaUnityRuntimeClientProvider - .Reactive("unity-schematic-display"); + .ReactivePlayerSettingsDocument("unity-schematic-display"); } catch (Exception ex) { diff --git a/Assets/Scripts/UI/InputScreen/InputDisplayLayout.cs b/Assets/Scripts/UI/InputScreen/InputDisplayLayout.cs index 825dd9536..cecb729ae 100644 --- a/Assets/Scripts/UI/InputScreen/InputDisplayLayout.cs +++ b/Assets/Scripts/UI/InputScreen/InputDisplayLayout.cs @@ -389,7 +389,7 @@ public class InputDisplayLayout : MonoBehaviour try { _playerSettings = AetheriaUnityRuntimeClientProvider - .Reactive( + .ReactivePlayerSettingsDocument( RequireLocalStateBoot(), "unity-input-screen"); } diff --git a/Assets/Scripts/UI/MainMenu.cs b/Assets/Scripts/UI/MainMenu.cs index 992202788..4811064b7 100644 --- a/Assets/Scripts/UI/MainMenu.cs +++ b/Assets/Scripts/UI/MainMenu.cs @@ -170,7 +170,7 @@ public class MainMenu : MonoBehaviour { PrepareDocumentAccess(stateBoot); _playerSettings ??= AetheriaUnityRuntimeClientProvider - .Reactive(stateBoot, "unity-main-menu"); + .ReactivePlayerSettingsDocument(stateBoot, "unity-main-menu"); return _playerSettings?.Current; } catch (Exception ex) diff --git a/Assets/Scripts/UI/Menu/InventoryMenu.cs b/Assets/Scripts/UI/Menu/InventoryMenu.cs index f70682e67..55d2af012 100644 --- a/Assets/Scripts/UI/Menu/InventoryMenu.cs +++ b/Assets/Scripts/UI/Menu/InventoryMenu.cs @@ -1042,7 +1042,7 @@ public class InventoryMenu : MonoBehaviour try { _catalog = AetheriaUnityRuntimeClientProvider - .Reactive("unity-inventory-menu"); + .ReactiveCatalogSnapshot("unity-inventory-menu"); } catch (Exception ex) { @@ -1060,7 +1060,7 @@ public class InventoryMenu : MonoBehaviour try { _playerSettings = AetheriaUnityRuntimeClientProvider - .Reactive("unity-inventory-menu"); + .ReactivePlayerSettingsDocument("unity-inventory-menu"); } catch (Exception ex) { diff --git a/Assets/Scripts/UI/Menu/InventoryPanel.cs b/Assets/Scripts/UI/Menu/InventoryPanel.cs index b5ef9117f..85b2724a9 100644 --- a/Assets/Scripts/UI/Menu/InventoryPanel.cs +++ b/Assets/Scripts/UI/Menu/InventoryPanel.cs @@ -1574,7 +1574,7 @@ private void Update() try { _catalog = AetheriaUnityRuntimeClientProvider - .Reactive("unity-inventory"); + .ReactiveCatalogSnapshot("unity-inventory"); } catch (Exception ex) { @@ -1592,7 +1592,7 @@ private void Update() try { _playerSettings = AetheriaUnityRuntimeClientProvider - .Reactive("unity-inventory"); + .ReactivePlayerSettingsDocument("unity-inventory"); } catch (Exception ex) { diff --git a/Assets/Scripts/UI/Menu/MapRenderer.cs b/Assets/Scripts/UI/Menu/MapRenderer.cs index 5afa70f9f..b646e79db 100644 --- a/Assets/Scripts/UI/Menu/MapRenderer.cs +++ b/Assets/Scripts/UI/Menu/MapRenderer.cs @@ -313,7 +313,7 @@ public class MapRenderer : MonoBehaviour try { _playerSettings ??= AetheriaUnityRuntimeClientProvider - .Reactive("unity-map-renderer"); + .ReactivePlayerSettingsDocument("unity-map-renderer"); return _playerSettings?.Current?.ShowAsteroidsInMinimap ?? false; } catch (Exception ex) diff --git a/Assets/Scripts/UI/Menu/SectorRenderer.cs b/Assets/Scripts/UI/Menu/SectorRenderer.cs index 124da209d..5703dfd37 100644 --- a/Assets/Scripts/UI/Menu/SectorRenderer.cs +++ b/Assets/Scripts/UI/Menu/SectorRenderer.cs @@ -224,7 +224,7 @@ public class SectorRenderer : MonoBehaviour, IBeginDragHandler, IDragHandler, IS try { _catalog = AetheriaUnityRuntimeClientProvider - .Reactive("unity-sector-renderer"); + .ReactiveCatalogSnapshot("unity-sector-renderer"); } catch (Exception ex) { @@ -242,7 +242,7 @@ public class SectorRenderer : MonoBehaviour, IBeginDragHandler, IDragHandler, IS try { _playerSettings = AetheriaUnityRuntimeClientProvider - .Reactive("unity-sector-renderer"); + .ReactivePlayerSettingsDocument("unity-sector-renderer"); } catch (Exception ex) { diff --git a/Assets/Scripts/UI/Menu/TradeMenu.cs b/Assets/Scripts/UI/Menu/TradeMenu.cs index 01b453ce7..2431e5cbc 100644 --- a/Assets/Scripts/UI/Menu/TradeMenu.cs +++ b/Assets/Scripts/UI/Menu/TradeMenu.cs @@ -617,7 +617,7 @@ public class TradeMenu : MonoBehaviour try { _catalog = AetheriaUnityRuntimeClientProvider - .Reactive("unity-trade"); + .ReactiveCatalogSnapshot("unity-trade"); } catch (Exception ex) { @@ -635,7 +635,7 @@ public class TradeMenu : MonoBehaviour try { _playerSettings = AetheriaUnityRuntimeClientProvider - .Reactive("unity-trade"); + .ReactivePlayerSettingsDocument("unity-trade"); } catch (Exception ex) { diff --git a/Assets/Scripts/Zone Display/VolumeCloudRenderer.cs b/Assets/Scripts/Zone Display/VolumeCloudRenderer.cs index 5cc4750a0..dd2417997 100644 --- a/Assets/Scripts/Zone Display/VolumeCloudRenderer.cs +++ b/Assets/Scripts/Zone Display/VolumeCloudRenderer.cs @@ -102,7 +102,7 @@ public class VolumeCloudRenderer : EffectBase try { _playerSettings = AetheriaUnityRuntimeClientProvider - .Reactive("unity-volume-cloud-renderer"); + .ReactivePlayerSettingsDocument("unity-volume-cloud-renderer"); } catch (Exception ex) { diff --git a/Assets/Scripts/Zone Display/ZoneRenderer.cs b/Assets/Scripts/Zone Display/ZoneRenderer.cs index eabf88a3f..cb4897aa8 100644 --- a/Assets/Scripts/Zone Display/ZoneRenderer.cs +++ b/Assets/Scripts/Zone Display/ZoneRenderer.cs @@ -1208,7 +1208,7 @@ public class ZoneRenderer : MonoBehaviour try { _catalog = AetheriaUnityRuntimeClientProvider - .Reactive("unity-zone-renderer"); + .ReactiveCatalogSnapshot("unity-zone-renderer"); } catch (Exception ex) { diff --git a/Packages/org.gamecult.aetheria.state/Runtime/AetheriaClientState.cs b/Packages/org.gamecult.aetheria.state/Runtime/AetheriaClientState.cs index 90de70eeb..4781d0fea 100644 --- a/Packages/org.gamecult.aetheria.state/Runtime/AetheriaClientState.cs +++ b/Packages/org.gamecult.aetheria.state/Runtime/AetheriaClientState.cs @@ -223,6 +223,26 @@ namespace GameCult.Aetheria.State.Verse return StationRefitDocument().Reactive(); } + public CultMeshDocumentHandle CatalogSnapshot() + { + return Catalog; + } + + public CultMeshReactiveDocument ReactiveCatalogSnapshot() + { + return CatalogSnapshot().Reactive(); + } + + public CultMeshDocumentHandle PlayerSettingsDocument() + { + return PlayerSettings; + } + + public CultMeshReactiveDocument ReactivePlayerSettingsDocument() + { + return PlayerSettingsDocument().Reactive(); + } + public static bool TryResolveEveSurface( string? surfaceId, out AetheriaClientEveSurface surface) @@ -363,7 +383,7 @@ namespace GameCult.Aetheria.State.Verse _eveStateRefFrame ??= Reactive(); _eveStateRefHealth ??= Reactive(); _eveStateRefCommandBoundary ??= Reactive(); - _eveStateRefCatalog ??= Reactive(); + _eveStateRefCatalog ??= ReactiveCatalogSnapshot(); return AetheriaRuntimeStateRefResolver.CreateEveSurfaceCultMeshStateRefResolver( () => _eveStateRefFrame.Current, diff --git a/Packages/org.gamecult.aetheria.state/Runtime/AetheriaRuntimeVerseClient.cs b/Packages/org.gamecult.aetheria.state/Runtime/AetheriaRuntimeVerseClient.cs index 37d27b755..fa0aa3f24 100644 --- a/Packages/org.gamecult.aetheria.state/Runtime/AetheriaRuntimeVerseClient.cs +++ b/Packages/org.gamecult.aetheria.state/Runtime/AetheriaRuntimeVerseClient.cs @@ -498,7 +498,7 @@ namespace GameCult.Aetheria.State.Verse AetheriaRuntimeVerseRecordKeys.StarbridgePlayerSeat(seatId))); managedDaemonFrame = state.Reactive(); - managedCatalog = state.Reactive(); + managedCatalog = state.ReactiveCatalogSnapshot(); managedLoadoutTemplates = state.Reactive(); managedStarbridgeScenario = state.Reactive(); managedStarbridgeSession = state.Reactive();