GameCult/Aetheria
Watch
9
0
Fork
You've already forked Aetheria
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Flatten Aetheria CultMesh reactive access

Browse source
This commit is contained in:
Meta Vens 2026-06-29 02:42:08 +01:00
commit 0830588cbb
26 changed files with 306 additions and 405 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Assets/Scripts/Gameplay/ActionBarSlot.cs
View file

@ -95,7 +95,7 @@ public abstract class ActionBarBinding : IDisposable
try
{
_catalog ??= Client.State.Reactive<AetheriaRuntimeCatalogSnapshot>();
_catalog ??= Client.State.Document<AetheriaRuntimeCatalogSnapshot>().Reactive();
return _catalog?.Current?.FindItem(item, x => x.ItemKey);
}
catch (Exception ex)

6
Assets/Scripts/Gameplay/AetheriaDaemonObserver.cs
View file

@ -131,9 +131,9 @@ public sealed class AetheriaDaemonObserver : MonoBehaviour
return;
}
_daemonFrame ??= state.Reactive<AetheriaRuntimeDaemonFrameDocument>();
_daemonFrame ??= state.Document<AetheriaRuntimeDaemonFrameDocument>().Reactive();
_daemonSoaView ??= TryReactive<AetheriaRuntimeDaemonSoaViewDocument>(state);
_zoneRender ??= state.Reactive<AetheriaRuntimeZoneRenderDocument>();
_zoneRender ??= state.Document<AetheriaRuntimeZoneRenderDocument>().Reactive();
}
private static CultMeshReactiveDocument<TDocument> TryReactive<TDocument>(
@ -142,7 +142,7 @@ public sealed class AetheriaDaemonObserver : MonoBehaviour
{
try
{
return state.Reactive<TDocument>();
return state.Document<TDocument>().Reactive();
}
catch (System.Collections.Generic.KeyNotFoundException)
{

4
Assets/Scripts/Gameplay/AetheriaUnityGameplayBootShell.cs
View file

@ -37,11 +37,11 @@ public sealed class AetheriaUnityGameplayBootShell
var aetheria = AetheriaUnityRuntimeClientProvider.ResolveClient(stateBoot.StateFilePath, stateBoot.RuntimeId)
.State;
using var runtimeCatalogDocument = aetheria.Reactive<AetheriaRuntimeCatalogSnapshot>();
using var runtimeCatalogDocument = aetheria.Document<AetheriaRuntimeCatalogSnapshot>().Reactive();
var runtimeCatalog = runtimeCatalogDocument.Current;
if (runtimeCatalog == null)
throw new InvalidOperationException("Aetheria typed runtime catalog is required before gameplay boot.");
using var sectorMapDocument = aetheria.Reactive<AetheriaRuntimeSectorMapDocument>();
using var sectorMapDocument = aetheria.Document<AetheriaRuntimeSectorMapDocument>().Reactive();
var sectorMap = sectorMapDocument.Current;
if (sectorMap == null)
throw new InvalidOperationException("Aetheria typed sector map is required before gameplay boot.");

6
Assets/Scripts/Gameplay/AetheriaUnityObservedDockingIndex.cs
View file

@ -193,9 +193,9 @@ public sealed class AetheriaUnityObservedDockingIndex : IDisposable
if (state == null)
return;
_currentEntity ??= state.Reactive<AetheriaRuntimeCurrentEntityDocument>();
_currentDocking ??= state.Reactive<AetheriaRuntimeCurrentDockingDocument>();
_stationRefit ??= state.Reactive<AetheriaRuntimeStationRefitDocument>();
_currentEntity ??= state.Document<AetheriaRuntimeCurrentEntityDocument>().Reactive();
_currentDocking ??= state.Document<AetheriaRuntimeCurrentDockingDocument>().Reactive();
_stationRefit ??= state.Document<AetheriaRuntimeStationRefitDocument>().Reactive();
}
public void Dispose()

3
Assets/Scripts/Gameplay/AetheriaUnityObservedTargetQuery.cs
View file

@ -99,8 +99,7 @@ public sealed class AetheriaUnityObservedTargetQuery : IDisposable
try
{
_zoneContacts = _resolveClient()
?.State
.Reactive<AetheriaRuntimeZoneContactsDocument>();
?.State.Document<AetheriaRuntimeZoneContactsDocument>().Reactive();
return _zoneContacts?.Current;
}
catch

4
Assets/Scripts/Gameplay/AetheriaUnityRenderSplatViewportSource.cs
View file

@ -118,8 +118,8 @@ public sealed class AetheriaUnityRenderSplatViewportSource : MonoBehaviour
{
var nextRenderSplatsViewport = ResolveClient()
.State
.Viewports
.Reactive<AetheriaRuntimeRenderSplatsViewportDocument>(viewport);
.Document<AetheriaRuntimeRenderSplatsViewportDocument>(viewport)
.Reactive();
ClearViewportDocument();
_viewport = viewport;
_renderSplatsViewport = nextRenderSplatsViewport;

3
Assets/Scripts/Gameplay/AetheriaUnityRuntimeClientProvider.cs
View file

@ -95,8 +95,7 @@ public static class AetheriaUnityRuntimeClientProvider
try
{
_playerSettingsDocument ??= ResolveClient(AetheriaUnityRuntimePaths.RuntimeStateFilePath)
.State
.Reactive<AetheriaRuntimePlayerSettingsDocument>();
.State.Document<AetheriaRuntimePlayerSettingsDocument>().Reactive();
var stored = _playerSettingsDocument.Current;
if (stored == null)

76
Assets/Scripts/Tests/DaemonRuntimeDocumentTests.cs
View file

@ -197,39 +197,39 @@ public class DaemonRuntimeDocumentTests
.GetAwaiter()
.GetResult();
using var currentEntityReactive = client.State
.ReactiveAsync<AetheriaRuntimeCurrentEntityDocument>()
.Document<AetheriaRuntimeCurrentEntityDocument>()
.ReactiveAsync()
.GetAwaiter()
.GetResult();
using var zoneRenderReactive = client.State
.Reactive<AetheriaRuntimeZoneRenderDocument>();
using var zoneRenderReactive = client.State.Document<AetheriaRuntimeZoneRenderDocument>().Reactive();
var observedAuthoritativeFrame = ReadLatest(client.State.Document<AetheriaRuntimeDaemonFrameDocument>());
using var catalogReactive = client.State.Reactive<AetheriaRuntimeCatalogSnapshot>();
using var daemonFrameReactive = client.State.Reactive<AetheriaRuntimeDaemonFrameDocument>();
using var daemonSoaViewReactive = client.State.Reactive<AetheriaRuntimeDaemonSoaViewDocument>();
using var catalogReactive = client.State.Document<AetheriaRuntimeCatalogSnapshot>().Reactive();
using var daemonFrameReactive = client.State.Document<AetheriaRuntimeDaemonFrameDocument>().Reactive();
using var daemonSoaViewReactive = client.State.Document<AetheriaRuntimeDaemonSoaViewDocument>().Reactive();
Assert.IsTrue(AetheriaRuntimeObservedDaemonState.TryCreateCurrent(
daemonFrameReactive,
daemonSoaViewReactive,
zoneRenderReactive,
out var observed));
using var loadoutTemplatesReactive = client.State.Reactive<AetheriaRuntimeLoadoutTemplatesDocument>();
using var sectorMapReactive = client.State.Reactive<AetheriaRuntimeSectorMapDocument>();
using var playerSettingsReactive = client.State.Reactive<AetheriaRuntimePlayerSettingsDocument>();
using var verseHostSettingsReactive = client.State.Reactive<AetheriaRuntimeVerseHostSettingsDocument>();
using var zoneContactsReactive = client.State.Reactive<AetheriaRuntimeZoneContactsDocument>();
using var currentZoneReactive = client.State.Reactive<AetheriaRuntimeCurrentZoneDocument>();
using var currentEntityDocumentReactive = client.State.Reactive<AetheriaRuntimeCurrentEntityDocument>();
using var currentDockingReactive = client.State.Reactive<AetheriaRuntimeCurrentDockingDocument>();
using var stationRefitReactive = client.State.Reactive<AetheriaRuntimeStationRefitDocument>();
using var zoneDetailsReactive = client.State.Reactive<AetheriaRuntimeZoneDetailsDocument>(0);
using var selectedObjectReactive = client.State.Reactive<AetheriaRuntimeSelectedObjectDocument>(0);
using var inventoryReactive = client.State.Reactive<AetheriaRuntimeInventoryDocument>(0);
using var mapViewportReactive = client.State.Reactive<AetheriaRuntimeRtsViewportDocument>(viewport);
using var objectsViewportReactive = client.State.Reactive<AetheriaRuntimeObjectsViewportDocument>(viewport);
using var gravityViewportReactive = client.State.Reactive<AetheriaRuntimeGravityViewportDocument>(viewport);
using var renderSplatsViewportReactive = client.State.Reactive<AetheriaRuntimeRenderSplatsViewportDocument>(viewport);
using var playerHudCatalog = client.State.Reactive<AetheriaRuntimeCatalogSnapshot>();
using var playerHudSettings = client.State.Reactive<AetheriaRuntimePlayerSettingsDocument>();
using var playerHudEntity = client.State.Reactive<AetheriaRuntimeCurrentEntityDocument>();
using var loadoutTemplatesReactive = client.State.Document<AetheriaRuntimeLoadoutTemplatesDocument>().Reactive();
using var sectorMapReactive = client.State.Document<AetheriaRuntimeSectorMapDocument>().Reactive();
using var playerSettingsReactive = client.State.Document<AetheriaRuntimePlayerSettingsDocument>().Reactive();
using var verseHostSettingsReactive = client.State.Document<AetheriaRuntimeVerseHostSettingsDocument>().Reactive();
using var zoneContactsReactive = client.State.Document<AetheriaRuntimeZoneContactsDocument>().Reactive();
using var currentZoneReactive = client.State.Document<AetheriaRuntimeCurrentZoneDocument>().Reactive();
using var currentEntityDocumentReactive = client.State.Document<AetheriaRuntimeCurrentEntityDocument>().Reactive();
using var currentDockingReactive = client.State.Document<AetheriaRuntimeCurrentDockingDocument>().Reactive();
using var stationRefitReactive = client.State.Document<AetheriaRuntimeStationRefitDocument>().Reactive();
using var zoneDetailsReactive = client.State.Document<AetheriaRuntimeZoneDetailsDocument>(0).Reactive();
using var selectedObjectReactive = client.State.Document<AetheriaRuntimeSelectedObjectDocument>(0).Reactive();
using var inventoryReactive = client.State.Document<AetheriaRuntimeInventoryDocument>(0).Reactive();
using var mapViewportReactive = client.State.Document<AetheriaRuntimeRtsViewportDocument>(viewport).Reactive();
using var objectsViewportReactive = client.State.Document<AetheriaRuntimeObjectsViewportDocument>(viewport).Reactive();
using var gravityViewportReactive = client.State.Document<AetheriaRuntimeGravityViewportDocument>(viewport).Reactive();
using var renderSplatsViewportReactive = client.State.Document<AetheriaRuntimeRenderSplatsViewportDocument>(viewport).Reactive();
using var playerHudCatalog = client.State.Document<AetheriaRuntimeCatalogSnapshot>().Reactive();
using var playerHudSettings = client.State.Document<AetheriaRuntimePlayerSettingsDocument>().Reactive();
using var playerHudEntity = client.State.Document<AetheriaRuntimeCurrentEntityDocument>().Reactive();
var gameSurface = ReadLatest(client.State.Document<global::Aetheria.State.Documents.EveSurfaceState>(AetheriaClientEveSurface.Game));
var gameTuiSurface = ReadLatest(client.State.Document<global::Aetheria.State.Documents.EveSurfaceState>(AetheriaClientEveSurface.GameTui));
var editorSurface = ReadLatest(client.State.Document<global::Aetheria.State.Documents.EveSurfaceState>(AetheriaClientEveSurface.Editor));
@ -245,10 +245,10 @@ public class DaemonRuntimeDocumentTests
currentDockingReactive,
stationRefitReactive,
out var observedDocking));
using var reactiveGameSurface = client.State.Reactive<global::Aetheria.State.Documents.EveSurfaceState>(AetheriaClientEveSurface.Game);
using var reactiveGameTuiSurface = client.State.Reactive<global::Aetheria.State.Documents.EveSurfaceState>(AetheriaClientEveSurface.GameTui);
using var reactiveEditorSurface = client.State.Reactive<global::Aetheria.State.Documents.EveSurfaceState>(AetheriaClientEveSurface.Editor);
using var reactiveEditorTuiSurface = client.State.Reactive<global::Aetheria.State.Documents.EveSurfaceState>(AetheriaClientEveSurface.EditorTui);
using var reactiveGameSurface = client.State.Document<global::Aetheria.State.Documents.EveSurfaceState>(AetheriaClientEveSurface.Game).Reactive();
using var reactiveGameTuiSurface = client.State.Document<global::Aetheria.State.Documents.EveSurfaceState>(AetheriaClientEveSurface.GameTui).Reactive();
using var reactiveEditorSurface = client.State.Document<global::Aetheria.State.Documents.EveSurfaceState>(AetheriaClientEveSurface.Editor).Reactive();
using var reactiveEditorTuiSurface = client.State.Document<global::Aetheria.State.Documents.EveSurfaceState>(AetheriaClientEveSurface.EditorTui).Reactive();
Assert.AreEqual("aetheria.current.entity", client.State.CurrentEntity.DocumentId);
Assert.AreSame(client.State.CurrentEntity, client.State.Document<AetheriaRuntimeCurrentEntityDocument>());
@ -2221,9 +2221,9 @@ public class DaemonRuntimeDocumentTests
.OpenAsync(statePath, "unity-observer-test", pullOnOpen: true)
.GetAwaiter()
.GetResult();
using var observedFrame = client.State.Reactive<AetheriaRuntimeDaemonFrameDocument>();
using var observedSoaView = client.State.Reactive<AetheriaRuntimeDaemonSoaViewDocument>();
using var observedZoneRender = client.State.Reactive<AetheriaRuntimeZoneRenderDocument>();
using var observedFrame = client.State.Document<AetheriaRuntimeDaemonFrameDocument>().Reactive();
using var observedSoaView = client.State.Document<AetheriaRuntimeDaemonSoaViewDocument>().Reactive();
using var observedZoneRender = client.State.Document<AetheriaRuntimeZoneRenderDocument>().Reactive();
Assert.IsTrue(AetheriaRuntimeObservedDaemonState.TryCreateCurrent(
observedFrame,
observedSoaView,
@ -2279,9 +2279,9 @@ public class DaemonRuntimeDocumentTests
.OpenAsync(statePath, "unity-reactive-observer-test", pullOnOpen: true)
.GetAwaiter()
.GetResult();
using var observedFrame = client.State.Reactive<AetheriaRuntimeDaemonFrameDocument>();
using var observedSoaView = client.State.Reactive<AetheriaRuntimeDaemonSoaViewDocument>();
using var observedZoneRender = client.State.Reactive<AetheriaRuntimeZoneRenderDocument>();
using var observedFrame = client.State.Document<AetheriaRuntimeDaemonFrameDocument>().Reactive();
using var observedSoaView = client.State.Document<AetheriaRuntimeDaemonSoaViewDocument>().Reactive();
using var observedZoneRender = client.State.Document<AetheriaRuntimeZoneRenderDocument>().Reactive();
var observed = AetheriaRuntimeObservedDaemonState.TryCreateCurrent(
observedFrame,
observedSoaView,
@ -2326,9 +2326,9 @@ public class DaemonRuntimeDocumentTests
.OpenAsync(statePath, "unity-frame-only-observer-test", pullOnOpen: true)
.GetAwaiter()
.GetResult();
using var observedFrame = client.State.Reactive<AetheriaRuntimeDaemonFrameDocument>();
using var observedSoaView = client.State.Reactive<AetheriaRuntimeDaemonSoaViewDocument>();
using var observedZoneRender = client.State.Reactive<AetheriaRuntimeZoneRenderDocument>();
using var observedFrame = client.State.Document<AetheriaRuntimeDaemonFrameDocument>().Reactive();
using var observedSoaView = client.State.Document<AetheriaRuntimeDaemonSoaViewDocument>().Reactive();
using var observedZoneRender = client.State.Document<AetheriaRuntimeZoneRenderDocument>().Reactive();
Assert.IsTrue(AetheriaRuntimeObservedDaemonState.TryCreateCurrent(
observedFrame,
observedSoaView,

3
Assets/Scripts/Tests/StarbridgePlayerSeatDocumentTests.cs
View file

@ -82,8 +82,7 @@ public class StarbridgePlayerSeatDocumentTests
var handle = client.Document<AetheriaRuntimeStarbridgePlayerSeatDocument>(
AetheriaRuntimeVerseRecordKeys.StarbridgePlayerSeat(seat.SeatId));
using var reactive = handle.Reactive();
using var aetheriaSeat = client.State
.Reactive<AetheriaRuntimeStarbridgePlayerSeatDocument>(seat.SeatId);
using var aetheriaSeat = client.State.Document<AetheriaRuntimeStarbridgePlayerSeatDocument>(seat.SeatId).Reactive();
Assert.AreEqual("seat-support", handle.Latest().SeatId);
Assert.AreEqual(

6
Assets/Scripts/UI/HUD/SchematicDisplay.cs
View file

@ -326,7 +326,7 @@ public class SchematicDisplay : MonoBehaviour
try
{
_catalog = ResolveClient().State.Reactive<AetheriaRuntimeCatalogSnapshot>();
_catalog = ResolveClient().State.Document<AetheriaRuntimeCatalogSnapshot>().Reactive();
}
catch (Exception ex)
{
@ -342,7 +342,7 @@ public class SchematicDisplay : MonoBehaviour
{
try
{
_playerSettings = ResolveClient().State.Reactive<AetheriaRuntimePlayerSettingsDocument>();
_playerSettings = ResolveClient().State.Document<AetheriaRuntimePlayerSettingsDocument>().Reactive();
}
catch (Exception ex)
{
@ -359,7 +359,7 @@ public class SchematicDisplay : MonoBehaviour
{
try
{
_currentEntity = ResolveClient().State.Reactive<AetheriaRuntimeCurrentEntityDocument>();
_currentEntity = ResolveClient().State.Document<AetheriaRuntimeCurrentEntityDocument>().Reactive();
}
catch (Exception ex)
{

3
Assets/Scripts/UI/InputScreen/InputDisplayLayout.cs
View file

@ -393,8 +393,7 @@ public class InputDisplayLayout : MonoBehaviour
try
{
_playerSettings = ResolveClient()
.State
.Reactive<AetheriaRuntimePlayerSettingsDocument>();
.State.Document<AetheriaRuntimePlayerSettingsDocument>().Reactive();
}
catch (Exception ex)
{

9
Assets/Scripts/UI/MainMenu.cs
View file

@ -151,8 +151,7 @@ public class MainMenu : MonoBehaviour
try
{
_sectorMap ??= ResolveClient(stateBoot)
.State
.Reactive<AetheriaRuntimeSectorMapDocument>();
.State.Document<AetheriaRuntimeSectorMapDocument>().Reactive();
return _sectorMap?.Current;
}
catch (Exception ex)
@ -170,8 +169,7 @@ public class MainMenu : MonoBehaviour
try
{
_playerSettings ??= ResolveClient(stateBoot)
.State
.Reactive<AetheriaRuntimePlayerSettingsDocument>();
.State.Document<AetheriaRuntimePlayerSettingsDocument>().Reactive();
return _playerSettings?.Current;
}
catch (Exception ex)
@ -189,8 +187,7 @@ public class MainMenu : MonoBehaviour
try
{
_verseHostSettings ??= ResolveClient(stateBoot)
.State
.Reactive<AetheriaRuntimeVerseHostSettingsDocument>();
.State.Document<AetheriaRuntimeVerseHostSettingsDocument>().Reactive();
return _verseHostSettings?.Current;
}
catch (Exception ex)

15
Assets/Scripts/UI/Menu/InventoryMenu.cs
View file

@ -965,8 +965,7 @@ public class InventoryMenu : MonoBehaviour
try
{
_currentEntity = ResolveClient()
.State
.Reactive<AetheriaRuntimeCurrentEntityDocument>();
.State.Document<AetheriaRuntimeCurrentEntityDocument>().Reactive();
}
catch (Exception ex)
{
@ -984,8 +983,7 @@ public class InventoryMenu : MonoBehaviour
try
{
_stationRefit = ResolveClient()
.State
.Reactive<AetheriaRuntimeStationRefitDocument>();
.State.Document<AetheriaRuntimeStationRefitDocument>().Reactive();
}
catch (Exception ex)
{
@ -1004,8 +1002,8 @@ public class InventoryMenu : MonoBehaviour
{
var nextInventory = ResolveClient()
.State
.Details
.Reactive<AetheriaRuntimeInventoryDocument>(entityIndex);
.Document<AetheriaRuntimeInventoryDocument>(entityIndex)
.Reactive();
_inventory?.Dispose();
_inventoryEntityIndex = entityIndex;
_inventory = nextInventory;
@ -1077,7 +1075,7 @@ public class InventoryMenu : MonoBehaviour
try
{
_catalog = ResolveClient().State.Reactive<AetheriaRuntimeCatalogSnapshot>();
_catalog = ResolveClient().State.Document<AetheriaRuntimeCatalogSnapshot>().Reactive();
}
catch (Exception ex)
{
@ -1095,8 +1093,7 @@ public class InventoryMenu : MonoBehaviour
try
{
_playerSettings = ResolveClient()
.State
.Reactive<AetheriaRuntimePlayerSettingsDocument>();
.State.Document<AetheriaRuntimePlayerSettingsDocument>().Reactive();
}
catch (Exception ex)
{

18
Assets/Scripts/UI/Menu/InventoryPanel.cs
View file

@ -1504,8 +1504,7 @@ private void Update()
try
{
_currentEntity = ResolveClient()
.State
.Reactive<AetheriaRuntimeCurrentEntityDocument>();
.State.Document<AetheriaRuntimeCurrentEntityDocument>().Reactive();
}
catch (Exception ex)
{
@ -1523,8 +1522,7 @@ private void Update()
try
{
_stationRefit = ResolveClient()
.State
.Reactive<AetheriaRuntimeStationRefitDocument>();
.State.Document<AetheriaRuntimeStationRefitDocument>().Reactive();
}
catch (Exception ex)
{
@ -1550,8 +1548,7 @@ private void Update()
try
{
_loadoutFrame = ResolveClient()
.State
.Reactive<AetheriaRuntimeDaemonFrameDocument>();
.State.Document<AetheriaRuntimeDaemonFrameDocument>().Reactive();
}
catch (Exception ex)
{
@ -1570,8 +1567,8 @@ private void Update()
{
var nextInventory = ResolveClient()
.State
.Details
.Reactive<AetheriaRuntimeInventoryDocument>(entityIndex);
.Document<AetheriaRuntimeInventoryDocument>(entityIndex)
.Reactive();
_inventory?.Dispose();
_inventoryEntityIndex = entityIndex;
_inventory = nextInventory;
@ -1591,7 +1588,7 @@ private void Update()
try
{
_catalog = ResolveClient().State.Reactive<AetheriaRuntimeCatalogSnapshot>();
_catalog = ResolveClient().State.Document<AetheriaRuntimeCatalogSnapshot>().Reactive();
}
catch (Exception ex)
{
@ -1609,8 +1606,7 @@ private void Update()
try
{
_playerSettings = ResolveClient()
.State
.Reactive<AetheriaRuntimePlayerSettingsDocument>();
.State.Document<AetheriaRuntimePlayerSettingsDocument>().Reactive();
}
catch (Exception ex)
{

11
Assets/Scripts/UI/Menu/MapRenderer.cs
View file

@ -131,12 +131,12 @@ public class MapRenderer : MonoBehaviour
ClearViewportCaches();
_objectsViewport = client
.State
.Viewports
.Reactive<AetheriaRuntimeObjectsViewportDocument>(viewport);
.Document<AetheriaRuntimeObjectsViewportDocument>(viewport)
.Reactive();
_renderSplatsViewport = client
.State
.Viewports
.Reactive<AetheriaRuntimeRenderSplatsViewportDocument>(viewport);
.Document<AetheriaRuntimeRenderSplatsViewportDocument>(viewport)
.Reactive();
var objectsViewport = _objectsViewport?.Current;
var zoneName = string.IsNullOrWhiteSpace(objectsViewport?.ZoneName)
@ -319,8 +319,7 @@ public class MapRenderer : MonoBehaviour
try
{
_playerSettings ??= ResolveClient()
.State
.Reactive<AetheriaRuntimePlayerSettingsDocument>();
.State.Document<AetheriaRuntimePlayerSettingsDocument>().Reactive();
return _playerSettings?.Current?.ShowAsteroidsInMinimap ?? false;
}
catch (Exception ex)

2
Assets/Scripts/UI/Menu/MenuPanel.cs
View file

@ -180,7 +180,7 @@ public class MenuPanel : MonoBehaviour
docking = null;
try
{
_currentDocking ??= ResolveClient().State.Reactive<AetheriaRuntimeCurrentDockingDocument>();
_currentDocking ??= ResolveClient().State.Document<AetheriaRuntimeCurrentDockingDocument>().Reactive();
docking = _currentDocking.Current;
return docking != null;
}

3
Assets/Scripts/UI/Menu/SectorMap.cs
View file

@ -222,8 +222,7 @@ public class SectorMap : MonoBehaviour
private void EnsureSectorMapLoaded()
{
_sectorMapDocument ??= ResolveClient()
.State
.Reactive<AetheriaRuntimeSectorMapDocument>();
.State.Document<AetheriaRuntimeSectorMapDocument>().Reactive();
_sectorMap = _sectorMapDocument?.Current;
if (_sectorMapLoaded)

15
Assets/Scripts/UI/Menu/SectorRenderer.cs
View file

@ -175,8 +175,7 @@ public class SectorRenderer : MonoBehaviour, IBeginDragHandler, IDragHandler, IS
try
{
_sectorMap ??= ResolveClient()
.State
.Reactive<AetheriaRuntimeSectorMapDocument>();
.State.Document<AetheriaRuntimeSectorMapDocument>().Reactive();
var sectorMap = _sectorMap?.Current;
return (sectorMap?.Zones ?? Array.Empty<AetheriaRuntimeSectorMapZone>())
.FirstOrDefault(zone => zone.ZoneIndex == zoneIndex);
@ -205,8 +204,8 @@ public class SectorRenderer : MonoBehaviour, IBeginDragHandler, IDragHandler, IS
{
var nextZoneDetails = ResolveClient()
.State
.Details
.Reactive<AetheriaRuntimeZoneDetailsDocument>(zoneIndex);
.Document<AetheriaRuntimeZoneDetailsDocument>(zoneIndex)
.Reactive();
_zoneDetails?.Dispose();
_zoneDetailsIndex = zoneIndex;
_zoneDetails = nextZoneDetails;
@ -232,7 +231,7 @@ public class SectorRenderer : MonoBehaviour, IBeginDragHandler, IDragHandler, IS
try
{
_catalog = ResolveClient().State.Reactive<AetheriaRuntimeCatalogSnapshot>();
_catalog = ResolveClient().State.Document<AetheriaRuntimeCatalogSnapshot>().Reactive();
}
catch (Exception ex)
{
@ -250,8 +249,7 @@ public class SectorRenderer : MonoBehaviour, IBeginDragHandler, IDragHandler, IS
try
{
_playerSettings = ResolveClient()
.State
.Reactive<AetheriaRuntimePlayerSettingsDocument>();
.State.Document<AetheriaRuntimePlayerSettingsDocument>().Reactive();
}
catch (Exception ex)
{
@ -322,8 +320,7 @@ public class SectorRenderer : MonoBehaviour, IBeginDragHandler, IDragHandler, IS
try
{
_currentZone ??= ResolveClient()
.State
.Reactive<AetheriaRuntimeCurrentZoneDocument>();
.State.Document<AetheriaRuntimeCurrentZoneDocument>().Reactive();
}
catch (Exception ex)
{

9
Assets/Scripts/UI/Menu/TradeMenu.cs
View file

@ -518,7 +518,7 @@ public class TradeMenu : MonoBehaviour
try
{
_stationRefit = ResolveClient().State.Reactive<AetheriaRuntimeStationRefitDocument>();
_stationRefit = ResolveClient().State.Document<AetheriaRuntimeStationRefitDocument>().Reactive();
}
catch (Exception ex)
{
@ -533,7 +533,7 @@ public class TradeMenu : MonoBehaviour
docking = null;
try
{
_currentDocking ??= ResolveClient().State.Reactive<AetheriaRuntimeCurrentDockingDocument>();
_currentDocking ??= ResolveClient().State.Document<AetheriaRuntimeCurrentDockingDocument>().Reactive();
docking = _currentDocking.Current;
return docking != null;
}
@ -627,7 +627,7 @@ public class TradeMenu : MonoBehaviour
try
{
_catalog = ResolveClient().State.Reactive<AetheriaRuntimeCatalogSnapshot>();
_catalog = ResolveClient().State.Document<AetheriaRuntimeCatalogSnapshot>().Reactive();
}
catch (Exception ex)
{
@ -645,8 +645,7 @@ public class TradeMenu : MonoBehaviour
try
{
_playerSettings = ResolveClient()
.State
.Reactive<AetheriaRuntimePlayerSettingsDocument>();
.State.Document<AetheriaRuntimePlayerSettingsDocument>().Reactive();
}
catch (Exception ex)
{

3
Assets/Scripts/Zone Display/VolumeCloudRenderer.cs
View file

@ -102,8 +102,7 @@ public class VolumeCloudRenderer : EffectBase
try
{
_playerSettings = ResolveClient()
.State
.Reactive<AetheriaRuntimePlayerSettingsDocument>();
.State.Document<AetheriaRuntimePlayerSettingsDocument>().Reactive();
}
catch (Exception ex)
{

8
Assets/Scripts/Zone Display/ZoneRenderer.cs
View file

@ -1208,7 +1208,7 @@ public class ZoneRenderer : MonoBehaviour
try
{
_catalog = ResolveClient().State.Reactive<AetheriaRuntimeCatalogSnapshot>();
_catalog = ResolveClient().State.Document<AetheriaRuntimeCatalogSnapshot>().Reactive();
}
catch (Exception ex)
{
@ -1225,7 +1225,7 @@ public class ZoneRenderer : MonoBehaviour
try
{
_zoneContacts = ResolveClient().State.Reactive<AetheriaRuntimeZoneContactsDocument>();
_zoneContacts = ResolveClient().State.Document<AetheriaRuntimeZoneContactsDocument>().Reactive();
}
catch (Exception ex)
{
@ -1245,8 +1245,8 @@ public class ZoneRenderer : MonoBehaviour
{
var nextObjectsViewport = ResolveClient()
.State
.Viewports
.Reactive<AetheriaRuntimeObjectsViewportDocument>(viewportBounds);
.Document<AetheriaRuntimeObjectsViewportDocument>(viewportBounds)
.Reactive();
_objectsViewport?.Dispose();
_objectsViewportBounds = viewportBounds;
_objectsViewport = nextObjectsViewport;