From b09b7b43e00592895b843206896b7a22d11ee4a1 Mon Sep 17 00:00:00 2001 From: Meta Vens Date: Mon, 29 Jun 2026 06:41:03 +0100 Subject: [PATCH] Remove dead target client resolver --- Aetheria.State.Verify/Program.cs | 30 +++++++++++++++++++ Assets/Scripts/Gameplay/ActionGameManager.cs | 3 +- .../AetheriaUnityGameplaySceneWiring.cs | 4 +-- .../AetheriaUnityTargetPresentation.cs | 1 - 4 files changed, 32 insertions(+), 6 deletions(-) diff --git a/Aetheria.State.Verify/Program.cs b/Aetheria.State.Verify/Program.cs index d9fea9b52..b1c99d211 100644 --- a/Aetheria.State.Verify/Program.cs +++ b/Aetheria.State.Verify/Program.cs @@ -13663,6 +13663,21 @@ static void RequireMainMenuContinueRunState(string root) string.Join(", ", missingTargetPresentationSymbols)); } + var forbiddenTargetPresentationSymbols = new[] + { + "Func", + "ResolveClient" + }; + var targetPresentationAccessHits = forbiddenTargetPresentationSymbols + .Where(symbol => targetPresentation.Contains(symbol, StringComparison.Ordinal)) + .ToArray(); + if (targetPresentationAccessHits.Length > 0) + { + throw new InvalidOperationException( + "AetheriaUnityTargetPresentation must consume observed typed target data, not hold a runtime client resolver: " + + string.Join(", ", targetPresentationAccessHits)); + } + var requiredPilotFrameControllerSymbols = new[] { "public sealed class AetheriaUnityPilotFrameController", @@ -13883,6 +13898,21 @@ static void RequireMainMenuContinueRunState(string root) string.Join(", ", missingGameplaySceneWiringSymbols)); } + var forbiddenGameplaySceneWiringSymbols = new[] + { + "Func resolveClient", + "presentation.ResolveClient = resolveClient" + }; + var gameplaySceneWiringAccessHits = forbiddenGameplaySceneWiringSymbols + .Where(symbol => gameplaySceneWiring.Contains(symbol, StringComparison.Ordinal)) + .ToArray(); + if (gameplaySceneWiringAccessHits.Length > 0) + { + throw new InvalidOperationException( + "AetheriaUnityGameplaySceneWiring must wire typed observed target query delegates instead of passing runtime client resolvers: " + + string.Join(", ", gameplaySceneWiringAccessHits)); + } + var forbiddenGameplaySymbols = new[] { "if (run == null ||\r\n run.CurrentZoneIndex < 0 ||\r\n run.CurrentZoneEntityIndex < 0)", diff --git a/Assets/Scripts/Gameplay/ActionGameManager.cs b/Assets/Scripts/Gameplay/ActionGameManager.cs index a39af27ac..ec50bbc55 100644 --- a/Assets/Scripts/Gameplay/ActionGameManager.cs +++ b/Assets/Scripts/Gameplay/ActionGameManager.cs @@ -314,8 +314,7 @@ public class ActionGameManager : MonoBehaviour _targetPresentation, boot.RuntimeCatalog, _observedEntityIndex, - ObservedTargetQuery, - () => ResolveDaemonObserver()?.Client); + ObservedTargetQuery); SceneWiring.ConfigureInventoryDragSession(_dragSession); SceneWiring.ConfigureActionBarPresentation( _actionBarPresentation, diff --git a/Assets/Scripts/Gameplay/AetheriaUnityGameplaySceneWiring.cs b/Assets/Scripts/Gameplay/AetheriaUnityGameplaySceneWiring.cs index 085c2a917..1e63a4423 100644 --- a/Assets/Scripts/Gameplay/AetheriaUnityGameplaySceneWiring.cs +++ b/Assets/Scripts/Gameplay/AetheriaUnityGameplaySceneWiring.cs @@ -79,8 +79,7 @@ public sealed class AetheriaUnityGameplaySceneWiring AetheriaUnityTargetPresentation presentation, AetheriaRuntimeCatalogSnapshot runtimeCatalog, AetheriaUnityObservedEntityIndex observedEntityIndex, - AetheriaUnityObservedTargetQuery observedTargetQuery, - Func resolveClient) + AetheriaUnityObservedTargetQuery observedTargetQuery) { if (presentation == null) return; @@ -95,7 +94,6 @@ public sealed class AetheriaUnityGameplaySceneWiring presentation.TargetVisibilityFill = TargetVisibilityFill; presentation.VisibilityToTargetFill = VisibilityToTargetFill; presentation.TargetShieldsFill = TargetShieldsFill; - presentation.ResolveClient = resolveClient; presentation.ResolveEntity = daemonEntityIndex => observedEntityIndex != null && observedEntityIndex.TryResolveEntityByDaemonIndex(daemonEntityIndex, out var entity) diff --git a/Assets/Scripts/Gameplay/AetheriaUnityTargetPresentation.cs b/Assets/Scripts/Gameplay/AetheriaUnityTargetPresentation.cs index b59d32ddb..0fd7d7991 100644 --- a/Assets/Scripts/Gameplay/AetheriaUnityTargetPresentation.cs +++ b/Assets/Scripts/Gameplay/AetheriaUnityTargetPresentation.cs @@ -29,7 +29,6 @@ public sealed class AetheriaUnityTargetPresentation public Image VisibilityToTargetFill { get; set; } public Image TargetShieldsFill { get; set; } public AetheriaRuntimeCatalogSnapshot RuntimeCatalog { get; set; } - public Func ResolveClient { get; set; } public Func ResolveEntity { get; set; } public Func ResolveTarget { get; set; } public Func ResolveInfoGathered { get; set; }