diff --git a/Aetheria.State.Verify/Program.cs b/Aetheria.State.Verify/Program.cs index 0ecf920dd..cb48376db 100644 --- a/Aetheria.State.Verify/Program.cs +++ b/Aetheria.State.Verify/Program.cs @@ -9281,7 +9281,7 @@ static void RequireAetheriaRuntimeVerseClientContract(string root) "OpenRuntimeCatalog()", "GetPlayerSettingsAsync()", "VerseHostSettingsAsync()", - "GetLoadoutTemplatesAsync()", + "AetheriaRuntimeLoadoutTemplatesDocument", "CreateEveSurfaceStateRefResolver(", "AetheriaRuntimeStateReader.CreateEveSurfaceCultMeshStateRefResolver(", "SubmitDaemonCommandAsync(", @@ -14568,8 +14568,9 @@ static void RequireInventoryLoadoutRestoreRequestAuthority(string root) !rtsProjection.Contains("ProjectLoadoutRestoreOptions(", StringComparison.Ordinal) || !rtsProjection.Contains("AetheriaRuntimeDaemonTradeItemQueries.TryProjectLoadoutTemplatePrice(", StringComparison.Ordinal) || !rtsProjection.Contains("credits >= price", StringComparison.Ordinal) || - !client.Contains("GetLoadoutTemplatesAsync()", StringComparison.Ordinal) || - !verseClient.Contains("ProjectStationRefit(frame, loadoutTemplates, catalog)", StringComparison.Ordinal)) + !client.Contains("State.LoadoutTemplates.LatestAsync()", StringComparison.Ordinal) || + !verseClient.Contains("var loadoutTemplates = await loadoutTemplatesDocument.LatestAsync()", StringComparison.Ordinal) || + !verseClient.Contains("ProjectStationRefit(frame, loadoutTemplates.Templates, catalog)", StringComparison.Ordinal)) { throw new InvalidOperationException( "StationRefitAsync must publish typed loadout restore options with shared runtime pricing and daemon-target identity."); diff --git a/Packages/org.gamecult.aetheria.state/Runtime/AetheriaClient.cs b/Packages/org.gamecult.aetheria.state/Runtime/AetheriaClient.cs index 5906f4412..ce8edc312 100644 --- a/Packages/org.gamecult.aetheria.state/Runtime/AetheriaClient.cs +++ b/Packages/org.gamecult.aetheria.state/Runtime/AetheriaClient.cs @@ -154,10 +154,11 @@ namespace GameCult.Aetheria.State.Verse return document.ToSnapshot(); } - public Task> LoadoutTemplatesAsync() + public async Task> LoadoutTemplatesAsync() { ThrowIfDisposed(); - return _verse.GetLoadoutTemplatesAsync(); + var document = await State.LoadoutTemplates.LatestAsync().ConfigureAwait(false); + return document.Templates; } public async Task LoadoutTemplateAsync(string entityKey) diff --git a/Packages/org.gamecult.aetheria.state/Runtime/AetheriaClientState.cs b/Packages/org.gamecult.aetheria.state/Runtime/AetheriaClientState.cs index b6bd98dff..69b4dc6c6 100644 --- a/Packages/org.gamecult.aetheria.state/Runtime/AetheriaClientState.cs +++ b/Packages/org.gamecult.aetheria.state/Runtime/AetheriaClientState.cs @@ -16,6 +16,7 @@ namespace GameCult.Aetheria.State.Verse CultMeshDocumentHandle latestFrame, CultMeshDocumentHandle latestSoaView, CultMeshDocumentHandle catalog, + CultMeshDocumentHandle loadoutTemplates, CultMeshDocumentHandle playerSettings, CultMeshDocumentHandle verseHostSettings, CultMeshDocumentHandle currentZone, @@ -40,6 +41,7 @@ namespace GameCult.Aetheria.State.Verse LatestFrame = latestFrame ?? throw new ArgumentNullException(nameof(latestFrame)); LatestSoaView = latestSoaView ?? throw new ArgumentNullException(nameof(latestSoaView)); Catalog = catalog ?? throw new ArgumentNullException(nameof(catalog)); + LoadoutTemplates = loadoutTemplates ?? throw new ArgumentNullException(nameof(loadoutTemplates)); Settings = new AetheriaClientSettingsState(playerSettings, verseHostSettings); Current = new AetheriaClientCurrentState(currentZone, currentEntity, currentDocking); ZoneContacts = zoneContacts ?? throw new ArgumentNullException(nameof(zoneContacts)); @@ -65,6 +67,7 @@ namespace GameCult.Aetheria.State.Verse LatestFrame, LatestSoaView, Catalog, + LoadoutTemplates, Settings.Player, Settings.VerseHost, Current.Zone, @@ -84,6 +87,8 @@ namespace GameCult.Aetheria.State.Verse public CultMeshDocumentHandle Catalog { get; } + public CultMeshDocumentHandle LoadoutTemplates { get; } + public AetheriaClientSettingsState Settings { get; } public AetheriaClientCurrentState Current { get; } diff --git a/Packages/org.gamecult.aetheria.state/Runtime/AetheriaRuntimeCatalogSnapshot.cs b/Packages/org.gamecult.aetheria.state/Runtime/AetheriaRuntimeCatalogSnapshot.cs index 677646bc8..0eb1da8ea 100644 --- a/Packages/org.gamecult.aetheria.state/Runtime/AetheriaRuntimeCatalogSnapshot.cs +++ b/Packages/org.gamecult.aetheria.state/Runtime/AetheriaRuntimeCatalogSnapshot.cs @@ -95,6 +95,19 @@ namespace GameCult.Aetheria.State.Verse } } + public sealed class AetheriaRuntimeLoadoutTemplatesDocument + { + public const string SchemaId = "gamecult.aetheria.loadout_templates.v1"; + + public AetheriaRuntimeLoadoutTemplatesDocument( + IReadOnlyList? templates = null) + { + Templates = templates ?? Array.Empty(); + } + + public IReadOnlyList Templates { get; } + } + public sealed class AetheriaRuntimeCatalogItem { public AetheriaRuntimeCatalogItem( diff --git a/Packages/org.gamecult.aetheria.state/Runtime/AetheriaRuntimeVerseClient.cs b/Packages/org.gamecult.aetheria.state/Runtime/AetheriaRuntimeVerseClient.cs index 8d52367a3..44beae7cd 100644 --- a/Packages/org.gamecult.aetheria.state/Runtime/AetheriaRuntimeVerseClient.cs +++ b/Packages/org.gamecult.aetheria.state/Runtime/AetheriaRuntimeVerseClient.cs @@ -282,12 +282,6 @@ namespace GameCult.Aetheria.State.Verse return Task.FromResult(AetheriaRuntimeCatalogStore.ReadVerseHostSettings(StatePath)); } - public Task> GetLoadoutTemplatesAsync() - { - ThrowIfDisposed(); - return Task.FromResult(AetheriaRuntimeCatalogStore.ReadLoadoutTemplates(StatePath)); - } - public async Task GetObservedDaemonStateAsync() { ThrowIfDisposed(); @@ -728,17 +722,25 @@ namespace GameCult.Aetheria.State.Verse var frameChanges = WatchLatestFrames() .Where(change => change.Document != null) .Select(change => change.Document!); + var catalogDocument = CatalogDocument( + "aetheria.catalog.runtime", + () => Task.FromResult(OpenRuntimeCatalog()), + AetheriaRuntimeCatalogSnapshot.SchemaId, + CultMesh.ProjectionSource("catalog:aetheria.runtime")); + var loadoutTemplatesDocument = CatalogDocument( + "aetheria.catalog.loadout_templates", + () => Task.FromResult(new AetheriaRuntimeLoadoutTemplatesDocument( + AetheriaRuntimeCatalogStore.ReadLoadoutTemplates(StatePath))), + AetheriaRuntimeLoadoutTemplatesDocument.SchemaId, + CultMesh.ProjectionSource("catalog:aetheria.loadout_templates")); return new AetheriaClientState( Document( AetheriaRuntimeVerseRecordKeys.DaemonFrameLatest), Document( AetheriaRuntimeVerseRecordKeys.DaemonSoaViewLatest), - CatalogDocument( - "aetheria.catalog.runtime", - () => Task.FromResult(OpenRuntimeCatalog()), - AetheriaRuntimeCatalogSnapshot.SchemaId, - CultMesh.ProjectionSource("catalog:aetheria.runtime")), + catalogDocument, + loadoutTemplatesDocument, CatalogDocument( "aetheria.settings.player", () => Task.FromResult(AetheriaRuntimePlayerSettingsDocument.FromSnapshot( @@ -879,9 +881,9 @@ namespace GameCult.Aetheria.State.Verse async Task ProjectStationRefitAsync( AetheriaRuntimeDaemonFrameDocument frame) { - var loadoutTemplates = await GetLoadoutTemplatesAsync().ConfigureAwait(false); - var catalog = OpenRuntimeCatalog(); - return AetheriaRuntimeRtsProjection.ProjectStationRefit(frame, loadoutTemplates, catalog); + var loadoutTemplates = await loadoutTemplatesDocument.LatestAsync().ConfigureAwait(false); + var catalog = await catalogDocument.LatestAsync().ConfigureAwait(false); + return AetheriaRuntimeRtsProjection.ProjectStationRefit(frame, loadoutTemplates.Templates, catalog); } async Task ProjectStarbridgeSummaryAsync(