From a035a55fc384556662f665e4052231097056f65e Mon Sep 17 00:00:00 2001 From: Meta Vens Date: Sun, 28 Jun 2026 13:13:07 +0100 Subject: [PATCH] Remove Aetheria client state alias --- Aetheria.State.Verify/Program.cs | 86 +++++++++---------- Assets/Scripts/Gameplay/ActionBarSlot.cs | 2 +- .../Gameplay/AetheriaDaemonObserver.cs | 2 +- .../AetheriaUnityGameplayBootShell.cs | 2 +- .../AetheriaUnityObservedDockingIndex.cs | 2 +- .../AetheriaUnityObservedTargetQuery.cs | 2 +- .../AetheriaUnityRenderSplatViewportSource.cs | 2 +- .../AetheriaUnityRuntimeClientProvider.cs | 2 +- .../Tests/DaemonRuntimeDocumentTests.cs | 26 +++--- .../StarbridgePlayerSeatDocumentTests.cs | 4 +- Assets/Scripts/UI/HUD/SchematicDisplay.cs | 6 +- .../UI/InputScreen/InputDisplayLayout.cs | 2 +- Assets/Scripts/UI/MainMenu.cs | 6 +- Assets/Scripts/UI/Menu/InventoryMenu.cs | 10 +-- Assets/Scripts/UI/Menu/InventoryPanel.cs | 12 +-- Assets/Scripts/UI/Menu/MapRenderer.cs | 6 +- Assets/Scripts/UI/Menu/SectorMap.cs | 2 +- Assets/Scripts/UI/Menu/SectorRenderer.cs | 10 +-- Assets/Scripts/UI/Menu/TradeMenu.cs | 4 +- .../Zone Display/VolumeCloudRenderer.cs | 2 +- Assets/Scripts/Zone Display/ZoneRenderer.cs | 6 +- .../Runtime/AetheriaClient.cs | 2 - 22 files changed, 98 insertions(+), 100 deletions(-) diff --git a/Aetheria.State.Verify/Program.cs b/Aetheria.State.Verify/Program.cs index 5aeaa6d12..bd2f0b1ce 100644 --- a/Aetheria.State.Verify/Program.cs +++ b/Aetheria.State.Verify/Program.cs @@ -2452,7 +2452,7 @@ static void RequireDaemonRenderQueryAuthority(string root) "foreach (var beltPose in _daemonAsteroidBeltPoses)", "beltPose.InstancePoses ?? Array.Empty()", "private void RefreshDaemonContactRows()", - ".Aetheria()", + ".State", ".ReactiveZoneContacts()", "private void RefreshDaemonCompassMarkers()", "private void RefreshDaemonVisibleEntityInstances()", @@ -4215,7 +4215,7 @@ static void RequireRuntimeInputScreenUsesEveSurface(string root) "AetheriaRuntimeEveCommandKind.SetActionBarEnabled", "AetheriaClient", "AetheriaUnityRuntimeClientProvider.ResolveClient(", - ".Aetheria()", + ".State", ".Settings", ".ReactivePlayer()", "CultMeshReactiveDocument _playerSettings", @@ -4543,7 +4543,7 @@ static void RequireSectorMapZoneDetailsUseEveSurface(string root) "AetheriaRuntimeZoneDetailsSurfaceBuilder.Project(", "ProjectZoneDetailsSurfaceState(", "AetheriaUnityRuntimeClientProvider.ResolveClient(", - ".Aetheria()", + ".State", ".ReactiveSectorMap()", ".Details", ".ReactiveZone(zoneIndex)", @@ -6989,8 +6989,8 @@ static void RequireInventoryValidationUsesManagedTypedDocuments(string root) ".Latest()", ".Latest()", ".Details.LatestInventory(entityIndex)", - ".Aetheria().Current.Entity.LatestAsync()", - ".Aetheria().StationRefit.LatestAsync()", + ".State.Current.Entity.LatestAsync()", + ".State.StationRefit.LatestAsync()", ".Details.Inventory(entityIndex).LatestAsync()" } .Select(CompactSource) @@ -7210,9 +7210,9 @@ static void RequireUnitySharedDocumentAccessorErgonomics(string root) var forbiddenCompactedSymbols = new[] { - ".Aetheria().Catalog.Latest()", - ".Aetheria().Settings.Player.Latest()", - ".Aetheria().Settings.VerseHost.Latest()" + ".State.Catalog.Latest()", + ".State.Settings.Player.Latest()", + ".State.Settings.VerseHost.Latest()" } .Select(CompactSource) .ToArray(); @@ -7243,7 +7243,7 @@ static void RequireUnitySharedDocumentAccessorErgonomics(string root) { "public abstract class ActionBarBinding : IDisposable", "CultMeshReactiveDocument _catalog", - "Client.Aetheria().ReactiveCatalog()", + "Client.State.ReactiveCatalog()", "_catalog?.Current?.FindItem(item, x => x.ItemKey)", "binding?.Dispose()", "private void OnDestroy()" @@ -7269,7 +7269,7 @@ static void RequireUnitySharedDocumentAccessorErgonomics(string root) { "CultMeshReactiveDocument _catalog", "CultMeshReactiveDocument _playerSettings", - "ResolveClient().Aetheria().ReactiveCatalog()", + "ResolveClient().State.ReactiveCatalog()", ".Settings", ".ReactivePlayer()", "_catalog?.Dispose()", @@ -7368,7 +7368,7 @@ static void RequireUnitySharedDocumentAccessorErgonomics(string root) { "CultMeshReactiveDocument _catalog", "CultMeshReactiveDocument _playerSettings", - "ResolveClient().Aetheria().ReactiveCatalog()", + "ResolveClient().State.ReactiveCatalog()", ".Settings", ".ReactivePlayer()", "_catalog?.Dispose()", @@ -7398,7 +7398,7 @@ static void RequireUnitySharedDocumentAccessorErgonomics(string root) { "CultMeshReactiveDocument _catalog", "CultMeshReactiveDocument _playerSettings", - "ResolveClient().Aetheria().ReactiveCatalog()", + "ResolveClient().State.ReactiveCatalog()", ".Settings", ".ReactivePlayer()", "_catalog?.Dispose()", @@ -7428,7 +7428,7 @@ static void RequireUnitySharedDocumentAccessorErgonomics(string root) { "CultMeshReactiveDocument _catalog", "CultMeshReactiveDocument _playerSettings", - "ResolveClient().Aetheria().ReactiveCatalog()", + "ResolveClient().State.ReactiveCatalog()", ".Settings", ".ReactivePlayer()", "_catalog?.Dispose()", @@ -7458,7 +7458,7 @@ static void RequireUnitySharedDocumentAccessorErgonomics(string root) { "CultMeshReactiveDocument _catalog", "CultMeshReactiveDocument _playerSettings", - "ResolveClient().Aetheria().ReactiveCatalog()", + "ResolveClient().State.ReactiveCatalog()", ".Settings", ".ReactivePlayer()", "_catalog?.Dispose()", @@ -7487,8 +7487,8 @@ static void RequireUnitySharedDocumentAccessorErgonomics(string root) { "CultMeshReactiveDocument _catalog", "CultMeshReactiveDocument _zoneContacts", - "ResolveClient().Aetheria().ReactiveCatalog()", - "ResolveClient().Aetheria().ReactiveZoneContacts()", + "ResolveClient().State.ReactiveCatalog()", + "ResolveClient().State.ReactiveZoneContacts()", "_catalog?.Dispose()", "_zoneContacts?.Dispose()", "_catalog?.Current", @@ -7588,11 +7588,11 @@ static void RequireUnityViewportAndMapReadsUseManagedAccessors(string root) var forbiddenCompactedSymbols = new[] { - ".Aetheria().SectorMap.LatestAsync()", - ".Aetheria().ZoneContacts.LatestAsync()", - ".Aetheria().Current.Entity.LatestAsync()", - ".Aetheria().Viewports.Objects(", - ".Aetheria().Viewports.RenderSplats(", + ".State.SectorMap.LatestAsync()", + ".State.ZoneContacts.LatestAsync()", + ".State.Current.Entity.LatestAsync()", + ".State.Viewports.Objects(", + ".State.Viewports.RenderSplats(", ".Details.Zone(zoneIndex).LatestAsync()" } .Select(CompactSource) @@ -7790,16 +7790,16 @@ static void RequireAetheriaManagedStateAccessorsCoverDomainDocuments(string root }; var forbiddenCompactedSymbols = new[] { - ".Aetheria().Catalog.LatestAsync()", - ".Aetheria().Settings.Player.LatestAsync()", - ".Aetheria().Settings.VerseHost.LatestAsync()", - ".Aetheria().Current.Entity.LatestAsync()", - ".Aetheria().Viewports.Objects(", - ".Aetheria().Details.Zone(", - ".Aetheria().Details.Inventory(", - ".Aetheria().Starbridge.PlayerSeat(", - ".Aetheria().DockingState.Latest(", - ".Aetheria().DockingState.Reactive(", + ".State.Catalog.LatestAsync()", + ".State.Settings.Player.LatestAsync()", + ".State.Settings.VerseHost.LatestAsync()", + ".State.Current.Entity.LatestAsync()", + ".State.Viewports.Objects(", + ".State.Details.Zone(", + ".State.Details.Inventory(", + ".State.Starbridge.PlayerSeat(", + ".State.DockingState.Latest(", + ".State.DockingState.Reactive(", "AetheriaRuntimeObservedDaemonState.ReadAsync(", ".State.Daemon.LatestFrame.LatestAsync()", ".State.Daemon.LatestSoaView.LatestAsync()", @@ -8389,7 +8389,7 @@ static void RequireClientTargetBootAuthority(string root) "!stateBoot.SupportsLocalStateFileRead", "stateBoot.StateFileExists", "AetheriaUnityRuntimeClientProvider.ResolveClient(stateBoot.StateFilePath, stateBoot.RuntimeId)", - ".Aetheria()", + ".State", ".ReactiveCatalog()", "runtimeCatalogDocument.Current", ".ReactiveSectorMap()", @@ -8442,7 +8442,7 @@ static void RequireClientTargetBootAuthority(string root) "CurrentStateBoot()", "ResolveSectorMap(AetheriaRuntimeStateBootReport stateBoot)", "AetheriaClient", - ".Aetheria()", + ".State", ".ReactiveSectorMap()", "ResolveVerseHostSettings(AetheriaRuntimeStateBootReport stateBoot)", "AetheriaState.At(AetheriaUnityRuntimePaths.GameDataDirectory)", @@ -11956,7 +11956,7 @@ static void RequireMainMenuContinueRunState(string root) { "ResolveSectorMap", "AetheriaClient", - ".Aetheria()", + ".State", ".ReactiveSectorMap()", "ContinueGame()", "SceneManager.LoadScene(\"ARPG\")" @@ -12291,7 +12291,7 @@ static void RequireMainMenuContinueRunState(string root) "private bool TryQueryEntityTarget(", "AetheriaRuntimeZoneContactRow", "AetheriaRuntimeZoneTargetRow", - ".Aetheria()", + ".State", ".ReactiveZoneContacts()", "_zoneContacts?.Current", "_zoneContacts?.Dispose()", @@ -13273,7 +13273,7 @@ static void RequireUnityObserverDoesNotTickLocalSimulation(string root) "private bool TryQueryEntityTarget(", "AetheriaRuntimeZoneContactRow", "AetheriaRuntimeZoneTargetRow", - ".Aetheria()", + ".State", ".ReactiveZoneContacts()", "_zoneContacts?.Current", "_zoneContacts?.Dispose()", @@ -13409,7 +13409,7 @@ static void RequireUnityObserverDoesNotTickLocalSimulation(string root) !mapRenderer.Contains(".Settings", StringComparison.Ordinal) || !mapRenderer.Contains(".ReactivePlayer()", StringComparison.Ordinal) || !sectorRenderer.Contains("AetheriaUnityRuntimeClientProvider.ResolveClient(", StringComparison.Ordinal) || - !sectorRenderer.Contains(".Aetheria()", StringComparison.Ordinal) || + !sectorRenderer.Contains(".State", StringComparison.Ordinal) || !sectorRenderer.Contains(".ReactiveSectorMap()", StringComparison.Ordinal) || !sectorRenderer.Contains(".Details", StringComparison.Ordinal) || !sectorRenderer.Contains(".ReactiveZone(zoneIndex)", StringComparison.Ordinal) || @@ -13418,7 +13418,7 @@ static void RequireUnityObserverDoesNotTickLocalSimulation(string root) !sectorRenderer.Contains(".ReactiveCatalog()", StringComparison.Ordinal) || !sectorRenderer.Contains(".ReactivePlayer()", StringComparison.Ordinal) || !sectorMap.Contains("AetheriaUnityRuntimeClientProvider.ResolveClient(", StringComparison.Ordinal) || - !sectorMap.Contains(".Aetheria()", StringComparison.Ordinal) || + !sectorMap.Contains(".State", StringComparison.Ordinal) || !sectorMap.Contains(".ReactiveSectorMap()", StringComparison.Ordinal) || !sectorRenderer.Contains("AetheriaRuntimeZoneDetailsSurfaceBuilder.ProjectDaemonZone(", StringComparison.Ordinal)) { @@ -14062,7 +14062,7 @@ static void RequireUnityObserverDoesNotTickLocalSimulation(string root) { "TryStartDaemonObservedGame", "ResolveSectorMap(stateBoot)", - ".Aetheria()", + ".State", ".ReactiveSectorMap()", "sectorMap.FrameId", "SceneManager.LoadScene(\"ARPG\")" @@ -14943,7 +14943,7 @@ static void RequireRuntimeStateReaderOwnsUnityStateAcquisition(string root) "public AetheriaUnityGameplayBootResult Boot()", "AetheriaRuntimeStateBoot.Inspect(AetheriaUnityRuntimePaths.GameDataDirectory)", "AetheriaUnityRuntimeClientProvider.ResolveClient(stateBoot.StateFilePath, stateBoot.RuntimeId)", - ".Aetheria()", + ".State", ".ReactiveCatalog()", "runtimeCatalogDocument.Current", ".ReactiveSectorMap()", @@ -14981,7 +14981,7 @@ static void RequireRuntimeStateReaderOwnsUnityStateAcquisition(string root) "RuntimeClients.TryGetValue(cacheKey, out var runtimeClient)", "RuntimeClients[cacheKey] = runtimeClient", "AetheriaClient", - ".Aetheria()", + ".State", ".Settings", ".ReactivePlayer()", "_playerSettingsDocument.Current", @@ -15091,7 +15091,6 @@ static void RequireRuntimeStateReaderOwnsUnityStateAcquisition(string root) var requiredManagedClientConnectionSymbols = new[] { "public AetheriaClientState State => _state;", - "public AetheriaClientState Aetheria() => State;", "using var frame = State.ReactiveDaemonFrame();", "using var soaView = TryReactiveDaemonSoaView();", "using var zoneRender = State.ReactiveZoneRender();", @@ -15108,6 +15107,7 @@ static void RequireRuntimeStateReaderOwnsUnityStateAcquisition(string root) } if (aetheriaClient.Contains("State.ReactiveObservedDaemon()", StringComparison.Ordinal) || + aetheriaClient.Contains("Aetheria() => State", StringComparison.Ordinal) || aetheriaClient.Contains("observedState.TryCurrent(out var current)", StringComparison.Ordinal)) { throw new InvalidOperationException( @@ -15312,7 +15312,7 @@ static void RequireRuntimeStateReaderOwnsUnityStateAcquisition(string root) if (!mainMenu.Contains("AetheriaClient", StringComparison.Ordinal) || !mainMenu.Contains("ResolveSectorMap(AetheriaRuntimeStateBootReport stateBoot)", StringComparison.Ordinal) || - !mainMenu.Contains(".Aetheria()", StringComparison.Ordinal) || + !mainMenu.Contains(".State", StringComparison.Ordinal) || !mainMenu.Contains(".ReactiveSectorMap()", StringComparison.Ordinal) || !mainMenu.Contains(".ReactivePlayer()", StringComparison.Ordinal)) { diff --git a/Assets/Scripts/Gameplay/ActionBarSlot.cs b/Assets/Scripts/Gameplay/ActionBarSlot.cs index ec11ef4c3..d772477a5 100644 --- a/Assets/Scripts/Gameplay/ActionBarSlot.cs +++ b/Assets/Scripts/Gameplay/ActionBarSlot.cs @@ -95,7 +95,7 @@ public abstract class ActionBarBinding : IDisposable try { - _catalog ??= Client.Aetheria().ReactiveCatalog(); + _catalog ??= Client.State.ReactiveCatalog(); return _catalog?.Current?.FindItem(item, x => x.ItemKey); } catch (Exception ex) diff --git a/Assets/Scripts/Gameplay/AetheriaDaemonObserver.cs b/Assets/Scripts/Gameplay/AetheriaDaemonObserver.cs index e5dd97abb..296d1187e 100644 --- a/Assets/Scripts/Gameplay/AetheriaDaemonObserver.cs +++ b/Assets/Scripts/Gameplay/AetheriaDaemonObserver.cs @@ -142,7 +142,7 @@ public sealed class AetheriaDaemonObserver : MonoBehaviour private bool TryResolveReactiveObservedDaemonDocuments() { - var state = ResolveClient()?.Aetheria(); + var state = ResolveClient()?.State; if (state == null) return false; diff --git a/Assets/Scripts/Gameplay/AetheriaUnityGameplayBootShell.cs b/Assets/Scripts/Gameplay/AetheriaUnityGameplayBootShell.cs index 86b305c03..76a7b44c9 100644 --- a/Assets/Scripts/Gameplay/AetheriaUnityGameplayBootShell.cs +++ b/Assets/Scripts/Gameplay/AetheriaUnityGameplayBootShell.cs @@ -35,7 +35,7 @@ public sealed class AetheriaUnityGameplayBootShell } var aetheria = AetheriaUnityRuntimeClientProvider.ResolveClient(stateBoot.StateFilePath, stateBoot.RuntimeId) - .Aetheria(); + .State; using var runtimeCatalogDocument = aetheria.ReactiveCatalog(); var runtimeCatalog = runtimeCatalogDocument.Current; if (runtimeCatalog == null) diff --git a/Assets/Scripts/Gameplay/AetheriaUnityObservedDockingIndex.cs b/Assets/Scripts/Gameplay/AetheriaUnityObservedDockingIndex.cs index ff34fbd4f..6d71a4732 100644 --- a/Assets/Scripts/Gameplay/AetheriaUnityObservedDockingIndex.cs +++ b/Assets/Scripts/Gameplay/AetheriaUnityObservedDockingIndex.cs @@ -182,7 +182,7 @@ public sealed class AetheriaUnityObservedDockingIndex : IDisposable { try { - var state = _resolveClient()?.Aetheria(); + var state = _ResolveClient()?.State; if (state == null) return false; diff --git a/Assets/Scripts/Gameplay/AetheriaUnityObservedTargetQuery.cs b/Assets/Scripts/Gameplay/AetheriaUnityObservedTargetQuery.cs index 6b4309c51..d68f73b9c 100644 --- a/Assets/Scripts/Gameplay/AetheriaUnityObservedTargetQuery.cs +++ b/Assets/Scripts/Gameplay/AetheriaUnityObservedTargetQuery.cs @@ -99,7 +99,7 @@ public sealed class AetheriaUnityObservedTargetQuery : IDisposable try { _zoneContacts = _resolveClient() - ?.Aetheria() + ?.State .ReactiveZoneContacts(); return _zoneContacts?.Current; } diff --git a/Assets/Scripts/Gameplay/AetheriaUnityRenderSplatViewportSource.cs b/Assets/Scripts/Gameplay/AetheriaUnityRenderSplatViewportSource.cs index 29027dd22..f8b18c7db 100644 --- a/Assets/Scripts/Gameplay/AetheriaUnityRenderSplatViewportSource.cs +++ b/Assets/Scripts/Gameplay/AetheriaUnityRenderSplatViewportSource.cs @@ -117,7 +117,7 @@ public sealed class AetheriaUnityRenderSplatViewportSource : MonoBehaviour try { var nextRenderSplatsViewport = ResolveClient() - .Aetheria() + .State .Viewports .ReactiveRenderSplats(viewport); ClearViewportDocument(); diff --git a/Assets/Scripts/Gameplay/AetheriaUnityRuntimeClientProvider.cs b/Assets/Scripts/Gameplay/AetheriaUnityRuntimeClientProvider.cs index 04aa39405..6899e743d 100644 --- a/Assets/Scripts/Gameplay/AetheriaUnityRuntimeClientProvider.cs +++ b/Assets/Scripts/Gameplay/AetheriaUnityRuntimeClientProvider.cs @@ -95,7 +95,7 @@ public static class AetheriaUnityRuntimeClientProvider try { _playerSettingsDocument ??= ResolveClient(AetheriaUnityRuntimePaths.RuntimeStateFilePath) - .Aetheria() + .State .Settings .ReactivePlayer(); diff --git a/Assets/Scripts/Tests/DaemonRuntimeDocumentTests.cs b/Assets/Scripts/Tests/DaemonRuntimeDocumentTests.cs index dc20da86e..f6a40a467 100644 --- a/Assets/Scripts/Tests/DaemonRuntimeDocumentTests.cs +++ b/Assets/Scripts/Tests/DaemonRuntimeDocumentTests.cs @@ -164,16 +164,16 @@ public class DaemonRuntimeDocumentTests .GetAwaiter() .GetResult(); - var currentEntity = client.Aetheria().Current.LatestEntity(); - var latestFrame = client.Aetheria().LatestDaemonFrame(); - var catalog = client.Aetheria().LatestCatalog(); - var playerSettings = client.Aetheria().Settings.LatestPlayer(); - var verseHostSettings = client.Aetheria().Settings.LatestVerseHost(); - var currentEntityByType = client.Aetheria() + var currentEntity = client.State.Current.LatestEntity(); + var latestFrame = client.State.LatestDaemonFrame(); + var catalog = client.State.LatestCatalog(); + var playerSettings = client.State.Settings.LatestPlayer(); + var verseHostSettings = client.State.Settings.LatestVerseHost(); + var currentEntityByType = client.State .LatestAsync() .GetAwaiter() .GetResult(); - var latestFrameByType = client.Aetheria() + var latestFrameByType = client.State .LatestAsync() .GetAwaiter() .GetResult(); @@ -184,13 +184,13 @@ public class DaemonRuntimeDocumentTests MaxX = 100, MaxY = 100 }; - var objectsViewport = client.Aetheria() + var objectsViewport = client.State .Viewports .LatestObjects(viewport); - var zoneDetails = client.Aetheria() + var zoneDetails = client.State .Details .LatestZone(0); - var inventory = client.Aetheria() + var inventory = client.State .Details .LatestInventory(0); var currentEntityFromClientType = client.State @@ -317,9 +317,9 @@ public class DaemonRuntimeDocumentTests .GetAwaiter() .GetResult(); - var player = client.Aetheria().Settings.LatestPlayer(); - var verseHost = client.Aetheria().Settings.LatestVerseHost(); - var catalog = client.Aetheria().LatestCatalog(); + var player = client.State.Settings.LatestPlayer(); + var verseHost = client.State.Settings.LatestVerseHost(); + var catalog = client.State.LatestCatalog(); Assert.AreEqual(AetheriaRuntimeCatalogSnapshot.SchemaId, client.State.Catalog.Sources.Last().SchemaId); Assert.IsNotNull(catalog); diff --git a/Assets/Scripts/Tests/StarbridgePlayerSeatDocumentTests.cs b/Assets/Scripts/Tests/StarbridgePlayerSeatDocumentTests.cs index 475e95a01..37549845b 100644 --- a/Assets/Scripts/Tests/StarbridgePlayerSeatDocumentTests.cs +++ b/Assets/Scripts/Tests/StarbridgePlayerSeatDocumentTests.cs @@ -79,13 +79,13 @@ public class StarbridgePlayerSeatDocumentTests var handle = client.Document( AetheriaRuntimeVerseRecordKeys.StarbridgePlayerSeat(seat.SeatId)); var aetheriaStarbridge = client - .Aetheria() + .State .Starbridge; using var reactive = handle.Reactive(); using var aetheriaReactive = aetheriaStarbridge.ReactivePlayerSeat(seat.SeatId); Assert.AreEqual("seat-support", handle.Latest().SeatId); - Assert.AreEqual("seat-support", client.Aetheria().Starbridge.LatestPlayerSeat(seat.SeatId).SeatId); + Assert.AreEqual("seat-support", client.State.Starbridge.LatestPlayerSeat(seat.SeatId).SeatId); Assert.AreEqual("item:cockpit:support", reactive.Current.CockpitItemKey); Assert.AreEqual("item:cockpit:support", aetheriaReactive.Current.CockpitItemKey); Assert.AreEqual("entity:pod:support", reactive.Current.EscapePodEntityKey); diff --git a/Assets/Scripts/UI/HUD/SchematicDisplay.cs b/Assets/Scripts/UI/HUD/SchematicDisplay.cs index c7f8637db..51673a4bb 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 = ResolveClient().Aetheria().ReactiveCatalog(); + _catalog = ResolveClient().State.ReactiveCatalog(); } catch (Exception ex) { @@ -344,7 +344,7 @@ public class SchematicDisplay : MonoBehaviour try { _playerSettings = ResolveClient() - .Aetheria() + .State .Settings .ReactivePlayer(); } @@ -363,7 +363,7 @@ public class SchematicDisplay : MonoBehaviour try { _currentEntity = ResolveClient() - .Aetheria() + .State .Current .ReactiveEntity(); } diff --git a/Assets/Scripts/UI/InputScreen/InputDisplayLayout.cs b/Assets/Scripts/UI/InputScreen/InputDisplayLayout.cs index 1615a2998..b014b1cc0 100644 --- a/Assets/Scripts/UI/InputScreen/InputDisplayLayout.cs +++ b/Assets/Scripts/UI/InputScreen/InputDisplayLayout.cs @@ -393,7 +393,7 @@ public class InputDisplayLayout : MonoBehaviour try { _playerSettings = ResolveClient() - .Aetheria() + .State .Settings .ReactivePlayer(); } diff --git a/Assets/Scripts/UI/MainMenu.cs b/Assets/Scripts/UI/MainMenu.cs index edea6dcee..808c10936 100644 --- a/Assets/Scripts/UI/MainMenu.cs +++ b/Assets/Scripts/UI/MainMenu.cs @@ -151,7 +151,7 @@ public class MainMenu : MonoBehaviour try { _sectorMap ??= ResolveClient(stateBoot) - .Aetheria() + .State .ReactiveSectorMap(); return _sectorMap?.Current; } @@ -170,7 +170,7 @@ public class MainMenu : MonoBehaviour try { _playerSettings ??= ResolveClient(stateBoot) - .Aetheria() + .State .Settings .ReactivePlayer(); return _playerSettings?.Current; @@ -190,7 +190,7 @@ public class MainMenu : MonoBehaviour try { _verseHostSettings ??= ResolveClient(stateBoot) - .Aetheria() + .State .Settings .ReactiveVerseHost(); return _verseHostSettings?.Current; diff --git a/Assets/Scripts/UI/Menu/InventoryMenu.cs b/Assets/Scripts/UI/Menu/InventoryMenu.cs index 506e7adca..e80ec50a5 100644 --- a/Assets/Scripts/UI/Menu/InventoryMenu.cs +++ b/Assets/Scripts/UI/Menu/InventoryMenu.cs @@ -958,7 +958,7 @@ public class InventoryMenu : MonoBehaviour try { _currentEntity = ResolveClient() - .Aetheria() + .State .Current .ReactiveEntity(); } @@ -978,7 +978,7 @@ public class InventoryMenu : MonoBehaviour try { _stationRefit = ResolveClient() - .Aetheria() + .State .ReactiveStationRefit(); } catch (Exception ex) @@ -997,7 +997,7 @@ public class InventoryMenu : MonoBehaviour try { var nextInventory = ResolveClient() - .Aetheria() + .State .Details .ReactiveInventory(entityIndex); _inventory?.Dispose(); @@ -1071,7 +1071,7 @@ public class InventoryMenu : MonoBehaviour try { - _catalog = ResolveClient().Aetheria().ReactiveCatalog(); + _catalog = ResolveClient().State.ReactiveCatalog(); } catch (Exception ex) { @@ -1089,7 +1089,7 @@ public class InventoryMenu : MonoBehaviour try { _playerSettings = ResolveClient() - .Aetheria() + .State .Settings .ReactivePlayer(); } diff --git a/Assets/Scripts/UI/Menu/InventoryPanel.cs b/Assets/Scripts/UI/Menu/InventoryPanel.cs index 8cb44a599..37a3a1992 100644 --- a/Assets/Scripts/UI/Menu/InventoryPanel.cs +++ b/Assets/Scripts/UI/Menu/InventoryPanel.cs @@ -1496,7 +1496,7 @@ private void Update() try { _currentEntity = ResolveClient() - .Aetheria() + .State .Current .ReactiveEntity(); } @@ -1516,7 +1516,7 @@ private void Update() try { _stationRefit = ResolveClient() - .Aetheria() + .State .ReactiveStationRefit(); } catch (Exception ex) @@ -1543,7 +1543,7 @@ private void Update() try { _loadoutFrame = ResolveClient() - .Aetheria() + .State .ReactiveDaemonFrame(); } catch (Exception ex) @@ -1562,7 +1562,7 @@ private void Update() try { var nextInventory = ResolveClient() - .Aetheria() + .State .Details .ReactiveInventory(entityIndex); _inventory?.Dispose(); @@ -1584,7 +1584,7 @@ private void Update() try { - _catalog = ResolveClient().Aetheria().ReactiveCatalog(); + _catalog = ResolveClient().State.ReactiveCatalog(); } catch (Exception ex) { @@ -1602,7 +1602,7 @@ private void Update() try { _playerSettings = ResolveClient() - .Aetheria() + .State .Settings .ReactivePlayer(); } diff --git a/Assets/Scripts/UI/Menu/MapRenderer.cs b/Assets/Scripts/UI/Menu/MapRenderer.cs index 8112c5696..986441c5c 100644 --- a/Assets/Scripts/UI/Menu/MapRenderer.cs +++ b/Assets/Scripts/UI/Menu/MapRenderer.cs @@ -130,11 +130,11 @@ public class MapRenderer : MonoBehaviour var viewport = ResolveViewportBounds(); ClearViewportCaches(); _objectsViewport = client - .Aetheria() + .State .Viewports .ReactiveObjects(viewport); _renderSplatsViewport = client - .Aetheria() + .State .Viewports .ReactiveRenderSplats(viewport); @@ -319,7 +319,7 @@ public class MapRenderer : MonoBehaviour try { _playerSettings ??= ResolveClient() - .Aetheria() + .State .Settings .ReactivePlayer(); return _playerSettings?.Current?.ShowAsteroidsInMinimap ?? false; diff --git a/Assets/Scripts/UI/Menu/SectorMap.cs b/Assets/Scripts/UI/Menu/SectorMap.cs index c1ff3d974..8b313fb78 100644 --- a/Assets/Scripts/UI/Menu/SectorMap.cs +++ b/Assets/Scripts/UI/Menu/SectorMap.cs @@ -222,7 +222,7 @@ public class SectorMap : MonoBehaviour private void EnsureSectorMapLoaded() { _sectorMapDocument ??= ResolveClient() - .Aetheria() + .State .ReactiveSectorMap(); _sectorMap = _sectorMapDocument.Current; diff --git a/Assets/Scripts/UI/Menu/SectorRenderer.cs b/Assets/Scripts/UI/Menu/SectorRenderer.cs index 8b70df942..37f9afae1 100644 --- a/Assets/Scripts/UI/Menu/SectorRenderer.cs +++ b/Assets/Scripts/UI/Menu/SectorRenderer.cs @@ -175,7 +175,7 @@ public class SectorRenderer : MonoBehaviour, IBeginDragHandler, IDragHandler, IS try { _sectorMap ??= ResolveClient() - .Aetheria() + .State .ReactiveSectorMap(); var sectorMap = _sectorMap.Current; return (sectorMap?.Zones ?? Array.Empty()) @@ -204,7 +204,7 @@ public class SectorRenderer : MonoBehaviour, IBeginDragHandler, IDragHandler, IS try { var nextZoneDetails = ResolveClient() - .Aetheria() + .State .Details .ReactiveZone(zoneIndex); _zoneDetails?.Dispose(); @@ -232,7 +232,7 @@ public class SectorRenderer : MonoBehaviour, IBeginDragHandler, IDragHandler, IS try { - _catalog = ResolveClient().Aetheria().ReactiveCatalog(); + _catalog = ResolveClient().State.ReactiveCatalog(); } catch (Exception ex) { @@ -250,7 +250,7 @@ public class SectorRenderer : MonoBehaviour, IBeginDragHandler, IDragHandler, IS try { _playerSettings = ResolveClient() - .Aetheria() + .State .Settings .ReactivePlayer(); } @@ -323,7 +323,7 @@ public class SectorRenderer : MonoBehaviour, IBeginDragHandler, IDragHandler, IS try { _currentZone ??= ResolveClient() - .Aetheria() + .State .Current .ReactiveZone(); } diff --git a/Assets/Scripts/UI/Menu/TradeMenu.cs b/Assets/Scripts/UI/Menu/TradeMenu.cs index 26beccd8c..b2fbb2e4c 100644 --- a/Assets/Scripts/UI/Menu/TradeMenu.cs +++ b/Assets/Scripts/UI/Menu/TradeMenu.cs @@ -634,7 +634,7 @@ public class TradeMenu : MonoBehaviour try { - _catalog = ResolveClient().Aetheria().ReactiveCatalog(); + _catalog = ResolveClient().State.ReactiveCatalog(); } catch (Exception ex) { @@ -652,7 +652,7 @@ public class TradeMenu : MonoBehaviour try { _playerSettings = ResolveClient() - .Aetheria() + .State .Settings .ReactivePlayer(); } diff --git a/Assets/Scripts/Zone Display/VolumeCloudRenderer.cs b/Assets/Scripts/Zone Display/VolumeCloudRenderer.cs index 77eb5224c..e593a8871 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 = ResolveClient() - .Aetheria() + .State .Settings .ReactivePlayer(); } diff --git a/Assets/Scripts/Zone Display/ZoneRenderer.cs b/Assets/Scripts/Zone Display/ZoneRenderer.cs index 0ef823a95..f02c19b11 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 = ResolveClient().Aetheria().ReactiveCatalog(); + _catalog = ResolveClient().State.ReactiveCatalog(); } catch (Exception ex) { @@ -1225,7 +1225,7 @@ public class ZoneRenderer : MonoBehaviour try { - _zoneContacts = ResolveClient().Aetheria().ReactiveZoneContacts(); + _zoneContacts = ResolveClient().State.ReactiveZoneContacts(); } catch (Exception ex) { @@ -1244,7 +1244,7 @@ public class ZoneRenderer : MonoBehaviour try { var nextObjectsViewport = ResolveClient() - .Aetheria() + .State .Viewports .ReactiveObjects(viewportBounds); _objectsViewport?.Dispose(); diff --git a/Packages/org.gamecult.aetheria.state/Runtime/AetheriaClient.cs b/Packages/org.gamecult.aetheria.state/Runtime/AetheriaClient.cs index 9b7cb8f15..4ef69d40a 100644 --- a/Packages/org.gamecult.aetheria.state/Runtime/AetheriaClient.cs +++ b/Packages/org.gamecult.aetheria.state/Runtime/AetheriaClient.cs @@ -37,8 +37,6 @@ namespace GameCult.Aetheria.State.Verse public AetheriaUi Ui => _ui; public AetheriaClientState State => _state; - public AetheriaClientState Aetheria() => State; - internal AetheriaRuntimeDaemonOperationsClient Operations => _operations; public static async Task OpenAsync(