diff --git a/Aetheria.State.Verify/Program.cs b/Aetheria.State.Verify/Program.cs
index be501a9ee..e1be105c1 100644
--- a/Aetheria.State.Verify/Program.cs
+++ b/Aetheria.State.Verify/Program.cs
@@ -12095,10 +12095,10 @@ static void RequireAetheriaRuntimeVerseClientContract(string root)
"BootstrapLoadoutTemplatesDocument()",
"BootstrapPlayerSettingsDocument()",
"BootstrapVerseHostSettingsDocument()",
- "AetheriaRuntimeBootstrapDocuments.RuntimeCatalog(StatePath)",
- "AetheriaRuntimeBootstrapDocuments.LoadoutTemplates(StatePath)",
- "AetheriaRuntimeBootstrapDocuments.PlayerSettings(StatePath)",
- "AetheriaRuntimeBootstrapDocuments.VerseHostSettings(StatePath)"
+ "return AetheriaRuntimeCatalogStore.OpenReadOnly(StatePath);",
+ "AetheriaRuntimeCatalogStore.ReadLoadoutTemplates(StatePath)",
+ "AetheriaRuntimeCatalogStore.ReadPlayerSettings(StatePath)",
+ "AetheriaRuntimeCatalogStore.ReadVerseHostSettings(StatePath)"
};
var missingClientBootstrapSymbols = requiredClientBootstrapSymbols
.Where(symbol => !client.Contains(symbol, StringComparison.Ordinal))
@@ -12114,10 +12114,7 @@ static void RequireAetheriaRuntimeVerseClientContract(string root)
{
"return Task.FromResult(AetheriaRuntimeCatalogStore.ReadPlayerSettings(StatePath));",
"return Task.FromResult(AetheriaRuntimeCatalogStore.ReadVerseHostSettings(StatePath));",
- "AetheriaRuntimeCatalogStore.OpenReadOnly(StatePath)",
- "AetheriaRuntimeCatalogStore.ReadLoadoutTemplates(StatePath)",
- "AetheriaRuntimeCatalogStore.ReadPlayerSettings(StatePath)",
- "AetheriaRuntimeCatalogStore.ReadVerseHostSettings(StatePath)",
+ "public static class AetheriaRuntimeBootstrapDocuments",
"ReadRuntimeCatalogSnapshot()",
"ReadLoadoutTemplatesDocument()",
"ReadPlayerSettingsDocument()",
diff --git a/GameCult.Aetheria.State.Unity.csproj b/GameCult.Aetheria.State.Unity.csproj
index 304ffe0e2..0b0db4484 100644
--- a/GameCult.Aetheria.State.Unity.csproj
+++ b/GameCult.Aetheria.State.Unity.csproj
@@ -83,7 +83,6 @@
-
diff --git a/Packages/org.gamecult.aetheria.state/Runtime/AetheriaRuntimeBootstrapDocuments.cs b/Packages/org.gamecult.aetheria.state/Runtime/AetheriaRuntimeBootstrapDocuments.cs
deleted file mode 100644
index 3b3421aeb..000000000
--- a/Packages/org.gamecult.aetheria.state/Runtime/AetheriaRuntimeBootstrapDocuments.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-namespace GameCult.Aetheria.State.Verse
-{
- public static class AetheriaRuntimeBootstrapDocuments
- {
- public static AetheriaRuntimeCatalogSnapshot RuntimeCatalog(string statePath)
- {
- return AetheriaRuntimeCatalogStore.OpenReadOnly(statePath);
- }
-
- public static AetheriaRuntimeLoadoutTemplatesDocument LoadoutTemplates(string statePath)
- {
- return new AetheriaRuntimeLoadoutTemplatesDocument(
- AetheriaRuntimeCatalogStore.ReadLoadoutTemplates(statePath));
- }
-
- public static AetheriaRuntimePlayerSettingsDocument PlayerSettings(string statePath)
- {
- return AetheriaRuntimePlayerSettingsDocument.FromSnapshot(
- AetheriaRuntimeCatalogStore.ReadPlayerSettings(statePath));
- }
-
- public static AetheriaRuntimeVerseHostSettingsDocument VerseHostSettings(string statePath)
- {
- return AetheriaRuntimeVerseHostSettingsDocument.FromSnapshot(
- AetheriaRuntimeCatalogStore.ReadVerseHostSettings(statePath));
- }
- }
-}
diff --git a/Packages/org.gamecult.aetheria.state/Runtime/AetheriaRuntimeBootstrapDocuments.cs.meta b/Packages/org.gamecult.aetheria.state/Runtime/AetheriaRuntimeBootstrapDocuments.cs.meta
deleted file mode 100644
index e738ea8c5..000000000
--- a/Packages/org.gamecult.aetheria.state/Runtime/AetheriaRuntimeBootstrapDocuments.cs.meta
+++ /dev/null
@@ -1,2 +0,0 @@
-fileFormatVersion: 2
-guid: 2cbb2fbe4bd64f4ab8fb3183b59b42d3
diff --git a/Packages/org.gamecult.aetheria.state/Runtime/AetheriaRuntimeVerseClient.cs b/Packages/org.gamecult.aetheria.state/Runtime/AetheriaRuntimeVerseClient.cs
index d6ac6396d..b57ca92b3 100644
--- a/Packages/org.gamecult.aetheria.state/Runtime/AetheriaRuntimeVerseClient.cs
+++ b/Packages/org.gamecult.aetheria.state/Runtime/AetheriaRuntimeVerseClient.cs
@@ -649,22 +649,25 @@ namespace GameCult.Aetheria.State.Verse
private AetheriaRuntimeCatalogSnapshot BootstrapRuntimeCatalogSnapshot()
{
- return AetheriaRuntimeBootstrapDocuments.RuntimeCatalog(StatePath);
+ return AetheriaRuntimeCatalogStore.OpenReadOnly(StatePath);
}
private AetheriaRuntimeLoadoutTemplatesDocument BootstrapLoadoutTemplatesDocument()
{
- return AetheriaRuntimeBootstrapDocuments.LoadoutTemplates(StatePath);
+ return new AetheriaRuntimeLoadoutTemplatesDocument(
+ AetheriaRuntimeCatalogStore.ReadLoadoutTemplates(StatePath));
}
private AetheriaRuntimePlayerSettingsDocument BootstrapPlayerSettingsDocument()
{
- return AetheriaRuntimeBootstrapDocuments.PlayerSettings(StatePath);
+ return AetheriaRuntimePlayerSettingsDocument.FromSnapshot(
+ AetheriaRuntimeCatalogStore.ReadPlayerSettings(StatePath));
}
private AetheriaRuntimeVerseHostSettingsDocument BootstrapVerseHostSettingsDocument()
{
- return AetheriaRuntimeBootstrapDocuments.VerseHostSettings(StatePath);
+ return AetheriaRuntimeVerseHostSettingsDocument.FromSnapshot(
+ AetheriaRuntimeCatalogStore.ReadVerseHostSettings(StatePath));
}
}
}