diff --git a/Aetheria.State.Verify/Program.cs b/Aetheria.State.Verify/Program.cs index 7b7c027e3..1a946e84c 100644 --- a/Aetheria.State.Verify/Program.cs +++ b/Aetheria.State.Verify/Program.cs @@ -3538,7 +3538,9 @@ static void RequireMainMenuSettingsCommands(string root) { "SendKnownAetheriaEveCommand(request, \"player-settings\")", "AetheriaRuntimeMainMenuCommandKind.PlayerSettingsCommand", - ".Ui.SurfaceCommandAsync(request, \"unity-main-menu\")", + "AetheriaUnityRuntimeClientProvider", + ".Ui(stateBoot, \"unity-main-menu\")", + ".SurfaceCommandAsync(request, \"unity-main-menu\")", "stateBoot.StateFilePath", "\"unity-main-menu\"" }; @@ -4220,11 +4222,11 @@ static void RequireRuntimeInputScreenUsesEveSurface(string root) "AetheriaEveUnitySurfaceHost.RenderRuntime(", "AetheriaEveUnitySurfaceHost.Hide(_surfaceDocument)", "UIDocument", - ".Ui.InputSettingsAsync(command, body, \"unity-input-screen\")", + ".Ui(RequireLocalStateBoot(), \"unity-input-screen\")", + ".InputSettingsAsync(command, body, \"unity-input-screen\")", "AetheriaRuntimeInputSettingsCommandBody", "AetheriaRuntimeEveCommandKind.SetBindingOverride", "AetheriaRuntimeEveCommandKind.SetActionBarEnabled", - "RuntimeClient(", "RequireLocalStateBoot()", "AetheriaUnityRuntimeClientProvider", ".Reactive(", @@ -4370,7 +4372,9 @@ static void RequireRuntimeInputScreenUsesEveSurface(string root) var requiredInputSettingsSubmitSymbols = new[] { "SendInputSettingsCommand(", - ".Ui.InputSettingsAsync(", + "AetheriaUnityRuntimeClientProvider", + ".Ui(RequireLocalStateBoot(), \"unity-input-screen\")", + ".InputSettingsAsync(", "AetheriaRuntimeEveCommandKind.SetBindingOverride", "AetheriaRuntimeEveCommandKind.SetActionBarEnabled" }; @@ -9830,7 +9834,8 @@ static void RequireVerseSettingsShellAndBridge(string root) "AetheriaRuntimeMainMenuCommandKind.VerseHostCommand", "RequestClientTargetCommand(request)", "SendKnownAetheriaEveCommand(request, \"Verse-host\")", - ".Ui.SurfaceCommandAsync(request, \"unity-main-menu\")", + ".Ui(stateBoot, \"unity-main-menu\")", + ".SurfaceCommandAsync(request, \"unity-main-menu\")", "AetheriaState.At(AetheriaUnityRuntimePaths.GameDataDirectory)", ".ClientTarget", "AetheriaRuntimeClientTargetSurfaceCommands.TryRequest(" @@ -16328,6 +16333,8 @@ static void RequireRuntimeStateReaderOwnsUnityStateAcquisition(string root) "public static AetheriaClient RuntimeClient(string runtimeId = \"\")", "public static AetheriaClientState RuntimeState(string runtimeId = \"\")", "public static AetheriaControl Control(string runtimeId = \"\")", + "public static AetheriaUi Ui(string runtimeId = \"\")", + "public static AetheriaUi Ui(", "public static CultMeshReactiveDocument Reactive(string runtimeId = \"\")", "public static CultMeshReactiveDocument Reactive(", "public static AetheriaClient CurrentClientForStateFile(string stateFilePath)", @@ -18234,7 +18241,8 @@ static void RequireInventoryLoadoutSaveRequestAuthority(string root) ".CreateLoadoutTemplate(targetEntityKey ?? \"\")", ".Reactive(\"unity-inventory\")", "_loadoutFrame?.Dispose()", - ".Ui.SaveLoadoutTemplateAsync(loadout, \"unity-inventory\")" + ".Ui(\"unity-inventory\")", + ".SaveLoadoutTemplateAsync(loadout, \"unity-inventory\")" }; var missingInventoryPanelSymbols = requiredInventoryPanelSymbols .Where(symbol => !inventoryPanel.Contains(symbol, StringComparison.Ordinal)) @@ -18247,10 +18255,12 @@ static void RequireInventoryLoadoutSaveRequestAuthority(string root) } if (inventoryPanel.Contains("AetheriaRuntimeDaemonFrameSession _loadoutFrame", StringComparison.Ordinal) || - inventoryPanel.Contains(".ObserveDaemonFrame()", StringComparison.Ordinal)) + inventoryPanel.Contains(".ObserveDaemonFrame()", StringComparison.Ordinal) || + inventoryPanel.Contains("AetheriaUnityRuntimeClientProvider.RuntimeClient(\"unity-inventory\")", StringComparison.Ordinal) || + inventoryPanel.Contains(".Ui.SaveLoadoutTemplateAsync(loadout, \"unity-inventory\")", StringComparison.Ordinal)) { throw new InvalidOperationException( - "InventoryPanel still routes loadout snapshots through AetheriaRuntimeDaemonFrameSession instead of a managed reactive typed daemon-frame document."); + "InventoryPanel must use managed reactive typed daemon-frame state and the provider-native UI command handle."); } RequireReactiveTypedDocumentAccess( diff --git a/Assets/Scripts/Gameplay/AetheriaUnityRuntimeClientProvider.cs b/Assets/Scripts/Gameplay/AetheriaUnityRuntimeClientProvider.cs index 03e1eb06f..2c67e91fb 100644 --- a/Assets/Scripts/Gameplay/AetheriaUnityRuntimeClientProvider.cs +++ b/Assets/Scripts/Gameplay/AetheriaUnityRuntimeClientProvider.cs @@ -93,6 +93,18 @@ public static class AetheriaUnityRuntimeClientProvider return RuntimeClient(stateBoot, runtimeId).Control; } + public static AetheriaUi Ui(string runtimeId = "") + { + return RuntimeClient(runtimeId).Ui; + } + + public static AetheriaUi Ui( + AetheriaRuntimeStateBootReport stateBoot, + string runtimeId = "") + { + return RuntimeClient(stateBoot, runtimeId).Ui; + } + public static CultMeshReactiveDocument Reactive(string runtimeId = "") where TDocument : class { diff --git a/Assets/Scripts/UI/InputScreen/InputDisplayLayout.cs b/Assets/Scripts/UI/InputScreen/InputDisplayLayout.cs index f0c869420..825dd9536 100644 --- a/Assets/Scripts/UI/InputScreen/InputDisplayLayout.cs +++ b/Assets/Scripts/UI/InputScreen/InputDisplayLayout.cs @@ -344,8 +344,8 @@ public class InputDisplayLayout : MonoBehaviour try { var submitted = AetheriaUnityRuntimeClientProvider - .RuntimeClient(RequireLocalStateBoot(), "unity-input-screen") - .Ui.InputSettingsAsync(command, body, "unity-input-screen") + .Ui(RequireLocalStateBoot(), "unity-input-screen") + .InputSettingsAsync(command, body, "unity-input-screen") .GetAwaiter() .GetResult(); diff --git a/Assets/Scripts/UI/MainMenu.cs b/Assets/Scripts/UI/MainMenu.cs index 86e2c14da..992202788 100644 --- a/Assets/Scripts/UI/MainMenu.cs +++ b/Assets/Scripts/UI/MainMenu.cs @@ -428,8 +428,8 @@ public class MainMenu : MonoBehaviour try { var submitted = AetheriaUnityRuntimeClientProvider - .RuntimeClient(stateBoot, "unity-main-menu") - .Ui.SurfaceCommandAsync(request, "unity-main-menu") + .Ui(stateBoot, "unity-main-menu") + .SurfaceCommandAsync(request, "unity-main-menu") .GetAwaiter() .GetResult(); diff --git a/Assets/Scripts/UI/Menu/InventoryPanel.cs b/Assets/Scripts/UI/Menu/InventoryPanel.cs index a84996fcb..5be54b1eb 100644 --- a/Assets/Scripts/UI/Menu/InventoryPanel.cs +++ b/Assets/Scripts/UI/Menu/InventoryPanel.cs @@ -1079,13 +1079,13 @@ private void Update() try { - var client = AetheriaUnityRuntimeClientProvider.RuntimeClient("unity-inventory"); var loadout = CreateLoadoutTemplate(targetEntityKey); if (loadout?.RootEntity == null || string.IsNullOrWhiteSpace(loadout.RootEntity.Hull?.ItemKey ?? "")) return; - var submitted = client - .Ui.SaveLoadoutTemplateAsync(loadout, "unity-inventory") + var submitted = AetheriaUnityRuntimeClientProvider + .Ui("unity-inventory") + .SaveLoadoutTemplateAsync(loadout, "unity-inventory") .GetAwaiter() .GetResult();