From 7714d855831fd4f6cbde123dec02d4b6c4655236 Mon Sep 17 00:00:00 2001 From: Meta Vens Date: Mon, 29 Jun 2026 05:38:44 +0100 Subject: [PATCH] Build equipped item details directly --- Aetheria.State.Verify/Program.cs | 16 ++++++++-- Assets/Scripts/UI/Menu/InventoryMenu.cs | 29 +++++++------------ ...untimeEquippedItemDetailsSurfaceBuilder.cs | 28 +++++++++++++++++- 3 files changed, 51 insertions(+), 22 deletions(-) diff --git a/Aetheria.State.Verify/Program.cs b/Aetheria.State.Verify/Program.cs index a9e115035..11f7b9d6d 100644 --- a/Aetheria.State.Verify/Program.cs +++ b/Aetheria.State.Verify/Program.cs @@ -5412,8 +5412,9 @@ static void RequireInventoryEquippedItemDetailsUseEveSurface(string root) "HandleEquippedItemDetailsSurfaceCommand(", "AetheriaEveUnitySurfaceHost.RenderRuntime(", "AetheriaEveUnitySurfaceHost.Hide(_equippedItemDetailsSurfaceDocument)", - "AetheriaRuntimeEquippedItemDetailsSurfaceBuilder.Build(ComposeEquippedItemDetailsSurface(", - "AetheriaRuntimeEquippedItemDetailsSurfaceBuilder.Compose(", + "AetheriaRuntimeEquippedItemDetailsSurfaceBuilder.Build(", + "BuildEquippedItemTitle(item, typedItem)", + "ResolveManufacturerName(typedItem)", "ComposeEquippedItemObservation(", "ComposeEquippedItemTemperatureControls(", "ComposeEquippedItemWeaponGroupControls(", @@ -5460,6 +5461,7 @@ static void RequireInventoryEquippedItemDetailsUseEveSurface(string root) "new EveUiToolkitSurfaceLowerer()", "host.AddComponent", "new AetheriaRuntimeEquippedItemDetailsSurfaceState(", + "ComposeEquippedItemDetailsSurface(", "ProjectEquippedItemDetailsSurfaceState(", "ProjectEquippedItemBehaviorSections(", "ProjectEquippedItemBehaviorMetric(", @@ -5480,6 +5482,7 @@ static void RequireInventoryEquippedItemDetailsUseEveSurface(string root) "ProjectEquippedItemObservation(", "ProjectEquippedItemTemperatureControls(", "ProjectEquippedItemWeaponGroupControls(", + "AetheriaRuntimeEquippedItemDetailsSurfaceBuilder.Compose(", "AetheriaRuntimeEquippedItemDetailsSurfaceBuilder.Project(" }; var forbiddenHits = forbiddenSymbols @@ -5536,7 +5539,7 @@ static void RequireInventoryEquippedItemDetailsUseEveSurface(string root) "public const string ToggleOverrideShutdown = \"aetheria.inventory.equipped_item_details.override_shutdown.toggle\"", "public const string SetTargetTemperature = \"aetheria.inventory.equipped_item_details.target_temperature.set\"", "public const string ToggleWeaponGroup = \"aetheria.inventory.equipped_item_details.weapon_group.toggle\"", - "public static AetheriaRuntimeEquippedItemDetailsSurfaceState Compose(", + "private static AetheriaRuntimeEquippedItemDetailsSurfaceState ComposeState(", "ProjectBehaviorSections(", "ProjectBehaviorMetric(", "AetheriaRuntimeDaemonItemStatQueries.ItemStatRef(", @@ -5561,6 +5564,13 @@ static void RequireInventoryEquippedItemDetailsUseEveSurface(string root) string.Join(", ", missingBuilderSymbols)); } + if (equippedItemSurfaceBuilder.Contains("public static AetheriaRuntimeEquippedItemDetailsSurfaceState Compose(", StringComparison.Ordinal) || + equippedItemSurfaceBuilder.Contains("public static AetheriaRuntimeEquippedItemDetailsSurfaceState Project(", StringComparison.Ordinal)) + { + throw new InvalidOperationException( + "Runtime equipped item detail composition must stay behind Build(...); do not re-expose Compose/Project as the public equipped item details surface path."); + } + var forbiddenBuilderActionBarSymbols = new[] { "AetheriaRuntimeEquippedItemActionBarSlot", diff --git a/Assets/Scripts/UI/Menu/InventoryMenu.cs b/Assets/Scripts/UI/Menu/InventoryMenu.cs index 9ec66a547..200f4ca92 100644 --- a/Assets/Scripts/UI/Menu/InventoryMenu.cs +++ b/Assets/Scripts/UI/Menu/InventoryMenu.cs @@ -332,7 +332,17 @@ public class InventoryMenu : MonoBehaviour transform, _equippedItemDetailsSurfaceDocument, "Aetheria Inventory Equipped Item Details Surface", - AetheriaRuntimeEquippedItemDetailsSurfaceBuilder.Build(ComposeEquippedItemDetailsSurface(item, typedItem)), + AetheriaRuntimeEquippedItemDetailsSurfaceBuilder.Build( + typedItem, + ComposeEquippedItemObservation(item), + BuildEquippedItemTitle(item, typedItem), + ResolveManufacturerName(typedItem), + FormatValue, + FormatTemperature, + ComposeEquippedItemTemperatureControls(item).ToArray(), + item.GetBehavior() != null + ? ComposeEquippedItemWeaponGroupControls(item).ToArray() + : Array.Empty()), HandleEquippedItemDetailsSurfaceCommand, _equippedItemDetailsSurfaceChrome, sortingOrder: 1002); @@ -417,23 +427,6 @@ public class InventoryMenu : MonoBehaviour }; } - private AetheriaRuntimeEquippedItemDetailsSurfaceState ComposeEquippedItemDetailsSurface( - EquippedItem item, - AetheriaRuntimeCatalogItem typedItem) - { - var hasWeapon = item.GetBehavior() != null; - - return AetheriaRuntimeEquippedItemDetailsSurfaceBuilder.Compose( - typedItem, - ComposeEquippedItemObservation(item), - BuildEquippedItemTitle(item, typedItem), - ResolveManufacturerName(typedItem), - FormatValue, - FormatTemperature, - ComposeEquippedItemTemperatureControls(item).ToArray(), - hasWeapon ? ComposeEquippedItemWeaponGroupControls(item).ToArray() : Array.Empty()); - } - private static AetheriaRuntimeEquippedItemObservation ComposeEquippedItemObservation(EquippedItem item) { var equippableItem = item?.EquippableItem; diff --git a/Packages/org.gamecult.aetheria.state/Runtime/AetheriaRuntimeEquippedItemDetailsSurfaceBuilder.cs b/Packages/org.gamecult.aetheria.state/Runtime/AetheriaRuntimeEquippedItemDetailsSurfaceBuilder.cs index 47c09ea28..0e60445e5 100644 --- a/Packages/org.gamecult.aetheria.state/Runtime/AetheriaRuntimeEquippedItemDetailsSurfaceBuilder.cs +++ b/Packages/org.gamecult.aetheria.state/Runtime/AetheriaRuntimeEquippedItemDetailsSurfaceBuilder.cs @@ -159,7 +159,33 @@ namespace GameCult.Aetheria.State.Verse public const string SetTargetTemperature = "aetheria.inventory.equipped_item_details.target_temperature.set"; public const string ToggleWeaponGroup = "aetheria.inventory.equipped_item_details.weapon_group.toggle"; - public static AetheriaRuntimeEquippedItemDetailsSurfaceState Compose( + public static AetheriaRuntimeSurfaceDocument Build( + AetheriaRuntimeCatalogItem typedItem, + AetheriaRuntimeEquippedItemObservation item, + string title, + string manufacturer, + Func formatValue, + Func formatTemperature, + IReadOnlyList temperatureControls, + IReadOnlyList weaponGroupControls, + DateTime updatedAtUtc = default(DateTime), + long version = 1) + { + return Build( + ComposeState( + typedItem, + item, + title, + manufacturer, + formatValue, + formatTemperature, + temperatureControls, + weaponGroupControls, + updatedAtUtc), + version); + } + + private static AetheriaRuntimeEquippedItemDetailsSurfaceState ComposeState( AetheriaRuntimeCatalogItem typedItem, AetheriaRuntimeEquippedItemObservation item, string title,