Use generic current state documents
This commit is contained in:
parent
033acd17e6
commit
3048b52058
10 changed files with 73 additions and 115 deletions
|
|
@ -171,8 +171,8 @@ public sealed class AetheriaUnityObservedDockingIndex : IDisposable
|
|||
if (state == null)
|
||||
return false;
|
||||
|
||||
var currentEntity = state.Current.LatestEntity();
|
||||
var currentDocking = state.Current.LatestDocking();
|
||||
var currentEntity = state.Latest<AetheriaRuntimeCurrentEntityDocument>();
|
||||
var currentDocking = state.Latest<AetheriaRuntimeCurrentDockingDocument>();
|
||||
var stationRefit = state.LatestStationRefit();
|
||||
if (currentDocking == null || stationRefit == null)
|
||||
return false;
|
||||
|
|
|
|||
|
|
@ -164,7 +164,7 @@ public class DaemonRuntimeDocumentTests
|
|||
.GetAwaiter()
|
||||
.GetResult();
|
||||
|
||||
var currentEntity = client.State.Current.LatestEntity();
|
||||
var currentEntity = client.State.Latest<AetheriaRuntimeCurrentEntityDocument>();
|
||||
var latestFrame = client.State.LatestDaemonFrame();
|
||||
var catalog = client.State.LatestCatalog();
|
||||
var playerSettings = client.State.Settings.LatestPlayer();
|
||||
|
|
@ -213,9 +213,9 @@ public class DaemonRuntimeDocumentTests
|
|||
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.Current.ReactiveZone();
|
||||
using var currentEntityDocumentReactive = client.State.Current.ReactiveEntity();
|
||||
using var currentDockingReactive = client.State.Current.ReactiveDocking();
|
||||
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.Details.Reactive<AetheriaRuntimeZoneDetailsDocument>(0);
|
||||
using var selectedObjectReactive = client.State.Details.Reactive<AetheriaRuntimeSelectedObjectDocument>(0);
|
||||
|
|
@ -226,7 +226,7 @@ public class DaemonRuntimeDocumentTests
|
|||
using var renderSplatsViewportReactive = client.State.Viewports.Reactive<AetheriaRuntimeRenderSplatsViewportDocument>(viewport);
|
||||
using var playerHudCatalog = client.State.Reactive<AetheriaRuntimeCatalogSnapshot>();
|
||||
using var playerHudSettings = client.State.Reactive<AetheriaRuntimePlayerSettingsDocument>();
|
||||
using var playerHudEntity = client.State.Current.ReactiveEntity();
|
||||
using var playerHudEntity = client.State.Reactive<AetheriaRuntimeCurrentEntityDocument>();
|
||||
var gameSurface = client.State.LatestGameSurface();
|
||||
var gameTuiSurface = client.State.LatestGameTuiSurface();
|
||||
var editorSurface = client.State.LatestEditorSurface();
|
||||
|
|
@ -404,7 +404,7 @@ public class DaemonRuntimeDocumentTests
|
|||
.GetResult();
|
||||
|
||||
var aetheria = verse.Aetheria();
|
||||
var currentEntity = aetheria.Current.LatestEntity();
|
||||
var currentEntity = aetheria.Latest<AetheriaRuntimeCurrentEntityDocument>();
|
||||
var latestFrameDocument = verse.Document<AetheriaRuntimeDaemonFrameDocument>(
|
||||
AetheriaRuntimeVerseRecordKeys.DaemonFrameLatest);
|
||||
using var latestFrameReactive = latestFrameDocument.Reactive();
|
||||
|
|
|
|||
|
|
@ -359,7 +359,7 @@ public class SchematicDisplay : MonoBehaviour
|
|||
{
|
||||
try
|
||||
{
|
||||
_currentEntity = ResolveClient().State.Current.ReactiveEntity();
|
||||
_currentEntity = ResolveClient().State.Reactive<AetheriaRuntimeCurrentEntityDocument>();
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -966,8 +966,7 @@ public class InventoryMenu : MonoBehaviour
|
|||
{
|
||||
_currentEntity = ResolveClient()
|
||||
.State
|
||||
.Current
|
||||
.ReactiveEntity();
|
||||
.Reactive<AetheriaRuntimeCurrentEntityDocument>();
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -1505,8 +1505,7 @@ private void Update()
|
|||
{
|
||||
_currentEntity = ResolveClient()
|
||||
.State
|
||||
.Current
|
||||
.ReactiveEntity();
|
||||
.Reactive<AetheriaRuntimeCurrentEntityDocument>();
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -175,7 +175,7 @@ public class MenuPanel : MonoBehaviour
|
|||
docking = null;
|
||||
try
|
||||
{
|
||||
docking = ResolveClient().State.Current.LatestDocking();
|
||||
docking = ResolveClient().State.Latest<AetheriaRuntimeCurrentDockingDocument>();
|
||||
return docking != null;
|
||||
}
|
||||
catch (Exception ex)
|
||||
|
|
|
|||
|
|
@ -323,8 +323,7 @@ public class SectorRenderer : MonoBehaviour, IBeginDragHandler, IDragHandler, IS
|
|||
{
|
||||
_currentZone ??= ResolveClient()
|
||||
.State
|
||||
.Current
|
||||
.ReactiveZone();
|
||||
.Reactive<AetheriaRuntimeCurrentZoneDocument>();
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -537,7 +537,7 @@ public class TradeMenu : MonoBehaviour
|
|||
docking = null;
|
||||
try
|
||||
{
|
||||
docking = ResolveClient().State.Current.LatestDocking();
|
||||
docking = ResolveClient().State.Latest<AetheriaRuntimeCurrentDockingDocument>();
|
||||
return docking != null;
|
||||
}
|
||||
catch (Exception ex)
|
||||
|
|
|
|||
Loading…
Reference in a new issue