From 0fa7a9f15ab78ba14d67fd89c38f7a39dbe1d4d4 Mon Sep 17 00:00:00 2001 From: Meta Vens Date: Sat, 27 Jun 2026 18:01:12 +0100 Subject: [PATCH] Build document registries through CultMesh --- Aetheria.State.Verify/Program.cs | 15 ++--- Aetheria.State/AetheriaDocumentRegistry.cs | 59 +------------------ .../Runtime/AetheriaRuntimeVerseClient.cs | 38 +----------- 3 files changed, 11 insertions(+), 101 deletions(-) diff --git a/Aetheria.State.Verify/Program.cs b/Aetheria.State.Verify/Program.cs index 5729bd996..5b0135730 100644 --- a/Aetheria.State.Verify/Program.cs +++ b/Aetheria.State.Verify/Program.cs @@ -6883,7 +6883,7 @@ static void RequireVerseHostSettingsAuthority(string root) string.Join(", ", missingVerseDiscoveryHostSymbols)); } - if (!registry.Contains("CultNetDocumentBinding.ForDocument", StringComparison.Ordinal) || + if (!registry.Contains("CultMesh.CreateCultNetDocumentRegistry(DocumentTypes, registry)", StringComparison.Ordinal) || !registry.Contains("typeof(AetheriaVerseHostSettings)", StringComparison.Ordinal)) { throw new InvalidOperationException( @@ -8705,12 +8705,8 @@ static void RequireDaemonVersePublication(string root) var requiredDaemonRegistrySymbols = new[] { - "CultNetDocumentBinding.ForDocument(registry)", - "CultNetDocumentBinding.ForDocument(registry)", - "CultNetDocumentBinding.ForDocument(registry)", - "CultNetDocumentBinding.ForDocument(registry)", - "CultNetDocumentBinding.ForDocument(registry)", - "CultNetDocumentBinding.ForDocument(registry)", + "CultMesh.CreateCultCacheDocumentRegistry(DocumentTypes)", + "CultMesh.CreateCultNetDocumentRegistry(DocumentTypes, registry)", "typeof(AetheriaRuntimeDaemonProviderAdvertisementDocument)", "typeof(AetheriaRuntimeDaemonHealthDocument)", "typeof(AetheriaRuntimeDaemonCommandBoundaryDocument)", @@ -9235,7 +9231,9 @@ static void RequireAetheriaRuntimeVerseClientContract(string root) "WatchRecord", "CultMeshMutableStatePointer", "CultMesh.MutableStatePointer(", - "CultNetDocumentBinding.ForDocument(registry)", + "CultMesh.CreateCultCacheDocumentRegistry(RuntimeDocumentTypes)", + "CultMesh.CreateCultNetDocumentRegistry(RuntimeDocumentTypes, registry)", + "typeof(EveSurfaceState)", "GetDaemonGameTuiSurfaceAsync()", "GetDaemonEditorTuiSurfaceAsync()", "WatchDaemonGameTuiSurfaces()", @@ -9470,7 +9468,6 @@ static void RequireTypedEveCommandBodies(string root) "SubmitEveCommandAsync(", "ReadObservedEveCommands(", "EveCommandKey(", - "CultNetDocumentBinding.ForDocument", "typeof(AetheriaRuntimeEveCommandDocument)", "SubmitPlayerSettingsCommand(", "command.PlayerSettings.PlayerName", diff --git a/Aetheria.State/AetheriaDocumentRegistry.cs b/Aetheria.State/AetheriaDocumentRegistry.cs index 685b1920d..c3c1a9303 100644 --- a/Aetheria.State/AetheriaDocumentRegistry.cs +++ b/Aetheria.State/AetheriaDocumentRegistry.cs @@ -1,6 +1,7 @@ using Aetheria.State.Documents; using GameCult.Caching; using GameCult.Aetheria.State.Verse; +using GameCult.Mesh; using GameCult.Networking; namespace Aetheria.State; @@ -9,67 +10,13 @@ public static class AetheriaDocumentRegistry { public static CultDocumentRegistry CreateCultCacheRegistry() { - var registry = new CultDocumentRegistry(); - foreach (var documentType in DocumentTypes) - { - registry.GetRequired(documentType); - } - - return registry; + return CultMesh.CreateCultCacheDocumentRegistry(DocumentTypes); } public static CultNetDocumentRegistry CreateCultNetRegistry(CultDocumentRegistry? cacheRegistry = null) { var registry = cacheRegistry ?? CreateCultCacheRegistry(); - return new CultNetDocumentRegistry( - registry, - new[] - { - CultNetDocumentBinding.ForDocument(registry), - CultNetDocumentBinding.ForDocument(registry), - CultNetDocumentBinding.ForDocument(registry), - CultNetDocumentBinding.ForDocument(registry), - CultNetDocumentBinding.ForDocument(registry), - CultNetDocumentBinding.ForDocument(registry), - CultNetDocumentBinding.ForDocument(registry), - CultNetDocumentBinding.ForDocument(registry), - CultNetDocumentBinding.ForDocument(registry), - CultNetDocumentBinding.ForDocument(registry), - CultNetDocumentBinding.ForDocument(registry), - CultNetDocumentBinding.ForDocument(registry), - CultNetDocumentBinding.ForDocument(registry), - CultNetDocumentBinding.ForDocument(registry), - CultNetDocumentBinding.ForDocument(registry), - CultNetDocumentBinding.ForDocument(registry), - CultNetDocumentBinding.ForDocument(registry), - CultNetDocumentBinding.ForDocument(registry), - CultNetDocumentBinding.ForDocument(registry), - CultNetDocumentBinding.ForDocument(registry), - CultNetDocumentBinding.ForDocument(registry), - CultNetDocumentBinding.ForDocument(registry), - CultNetDocumentBinding.ForDocument(registry), - CultNetDocumentBinding.ForDocument(registry), - CultNetDocumentBinding.ForDocument(registry), - CultNetDocumentBinding.ForDocument(registry), - CultNetDocumentBinding.ForDocument(registry), - CultNetDocumentBinding.ForDocument(registry), - CultNetDocumentBinding.ForDocument(registry), - CultNetDocumentBinding.ForDocument(registry), - CultNetDocumentBinding.ForDocument(registry), - CultNetDocumentBinding.ForDocument(registry), - CultNetDocumentBinding.ForDocument(registry), - CultNetDocumentBinding.ForDocument(registry), - CultNetDocumentBinding.ForDocument(registry), - CultNetDocumentBinding.ForDocument(registry), - CultNetDocumentBinding.ForDocument(registry), - CultNetDocumentBinding.ForDocument(registry), - CultNetDocumentBinding.ForDocument(registry), - CultNetDocumentBinding.ForDocument(registry), - CultNetDocumentBinding.ForDocument(registry), - CultNetDocumentBinding.ForDocument(registry), - CultNetDocumentBinding.ForDocument(registry), - CultNetDocumentBinding.ForDocument(registry) - }); + return CultMesh.CreateCultNetDocumentRegistry(DocumentTypes, registry); } public static IReadOnlyList DocumentTypes { get; } = diff --git a/Packages/org.gamecult.aetheria.state/Runtime/AetheriaRuntimeVerseClient.cs b/Packages/org.gamecult.aetheria.state/Runtime/AetheriaRuntimeVerseClient.cs index 3a17b3a79..83f0fb8ea 100644 --- a/Packages/org.gamecult.aetheria.state/Runtime/AetheriaRuntimeVerseClient.cs +++ b/Packages/org.gamecult.aetheria.state/Runtime/AetheriaRuntimeVerseClient.cs @@ -107,47 +107,13 @@ namespace GameCult.Aetheria.State.Verse public static CultDocumentRegistry CreateCultCacheRegistry() { - var registry = new CultDocumentRegistry(); - foreach (var documentType in RuntimeDocumentTypes) - { - registry.GetRequired(documentType); - } - - return registry; + return CultMesh.CreateCultCacheDocumentRegistry(RuntimeDocumentTypes); } public static CultNetDocumentRegistry CreateCultNetRegistry(CultDocumentRegistry? cacheRegistry = null) { var registry = cacheRegistry ?? CreateCultCacheRegistry(); - return new CultNetDocumentRegistry( - registry, - new[] - { - CultNetDocumentBinding.ForDocument(registry), - CultNetDocumentBinding.ForDocument(registry), - CultNetDocumentBinding.ForDocument(registry), - CultNetDocumentBinding.ForDocument(registry), - CultNetDocumentBinding.ForDocument(registry), - CultNetDocumentBinding.ForDocument(registry), - CultNetDocumentBinding.ForDocument(registry), - CultNetDocumentBinding.ForDocument(registry), - CultNetDocumentBinding.ForDocument(registry), - CultNetDocumentBinding.ForDocument(registry), - CultNetDocumentBinding.ForDocument(registry), - CultNetDocumentBinding.ForDocument(registry), - CultNetDocumentBinding.ForDocument(registry), - CultNetDocumentBinding.ForDocument(registry), - CultNetDocumentBinding.ForDocument(registry), - CultNetDocumentBinding.ForDocument(registry), - CultNetDocumentBinding.ForDocument(registry), - CultNetDocumentBinding.ForDocument(registry), - CultNetDocumentBinding.ForDocument(registry), - CultNetDocumentBinding.ForDocument(registry), - CultNetDocumentBinding.ForDocument(registry), - CultNetDocumentBinding.ForDocument(registry), - CultNetDocumentBinding.ForDocument(registry), - CultNetDocumentBinding.ForDocument(registry) - }); + return CultMesh.CreateCultNetDocumentRegistry(RuntimeDocumentTypes, registry); } }