Route Eve surface refs through managed runtime client

This commit is contained in:
Meta Vens 2026-06-28 02:59:28 +01:00
commit c57b30712c
3 changed files with 17 additions and 9 deletions

View file

@ -5129,7 +5129,8 @@ static void RequireInventoryCargoItemDetailsUseEveSurface(string root)
!eveUnitySurfaceHost.Contains("ContainsStateRefs(surface)", StringComparison.Ordinal) ||
!eveUnitySurfaceHost.Contains("prop.Key.EndsWith(\"Ref\", StringComparison.Ordinal)", StringComparison.Ordinal) ||
!eveUnitySurfaceHost.Contains("CreateDefaultStateRefResolver()", StringComparison.Ordinal) ||
!eveUnitySurfaceHost.Contains("AetheriaRuntimeStateReader.CreateEveSurfaceStateRefResolver(", StringComparison.Ordinal) ||
!eveUnitySurfaceHost.Contains("AetheriaUnityRuntimeClientProvider", StringComparison.Ordinal) ||
!eveUnitySurfaceHost.Contains(".CreateEveSurfaceStateRefResolver()", StringComparison.Ordinal) ||
!runtimeEveSurfaceAdapter.Contains("public static EveSurfaceDocument ResolveStateRefs(", StringComparison.Ordinal) ||
!runtimeEveSurfaceAdapter.Contains("ResolvePropRefs(props, stateRefResolver)", StringComparison.Ordinal) ||
!runtimeEveSurfaceAdapter.Contains("ResolvePropRef(props, AetheriaRuntimeSurfaceStateRefs.Source, \"value\", stateRefResolver)", StringComparison.Ordinal) ||
@ -7359,7 +7360,8 @@ static void RequireClientTargetBootAuthority(string root)
var requiredPresenterSymbols = new[]
{
"AetheriaRuntimeStateBoot.Inspect(gameDataDirectory, stateFilePathOverride)",
"AetheriaRuntimeStateBoot.Inspect(",
"AetheriaUnityRuntimePaths.GameDataDirectory",
"!stateBoot.SupportsLocalStateFileRead",
"stateBoot.StateFileExists"
};
@ -13195,6 +13197,12 @@ static void RequireRuntimeStateReaderOwnsUnityStateAcquisition(string root)
"Unity Eve surface lowering still resolves state refs through the file reader instead of the shared AetheriaClient facade.");
}
if (eveUnitySurfaceHost.Contains("AetheriaRuntimeStateReader.CreateEveSurfaceStateRefResolver", StringComparison.Ordinal))
{
throw new InvalidOperationException(
"Unity Eve surface host still resolves default state refs through the file reader instead of the managed runtime client provider.");
}
var forbiddenDirectStoreSymbols = new Dictionary<string, string[]>
{
[actionGameManagerPath] = new[]

View file

@ -1,5 +1,4 @@
using System;
using System.IO;
using GameCult.Aetheria.State.Verse;
using GameCult.Eve.Surface;
using UnityEngine;
@ -163,8 +162,9 @@ namespace GameCult.Aetheria.EveRuntime
private AetheriaRuntimeStateBootReport ResolveStateBoot()
{
var gameDataDirectory = new DirectoryInfo(Path.Combine(Application.dataPath, "..", "GameData"));
return AetheriaRuntimeStateBoot.Inspect(gameDataDirectory, stateFilePathOverride);
return AetheriaRuntimeStateBoot.Inspect(
AetheriaUnityRuntimePaths.GameDataDirectory,
stateFilePathOverride);
}
private static VisualElement BuildError(string message)

View file

@ -1,6 +1,5 @@
using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using GameCult.Aetheria.State.Verse;
using GameCult.Eve.Surface;
@ -222,12 +221,13 @@ namespace GameCult.Aetheria.EveRuntime
private static Func<string, string> CreateDefaultStateRefResolver()
{
var gameDataDirectory = new DirectoryInfo(Path.Combine(Application.dataPath, "..", "GameData"));
var stateBoot = AetheriaRuntimeStateBoot.Inspect(gameDataDirectory, "");
var stateBoot = AetheriaRuntimeStateBoot.Inspect(AetheriaUnityRuntimePaths.GameDataDirectory, "");
if (!stateBoot.SupportsLocalStateFileRead || !stateBoot.StateFileExists)
return _ => "";
return AetheriaRuntimeStateReader.CreateEveSurfaceStateRefResolver(stateBoot.StateFilePath);
return AetheriaUnityRuntimeClientProvider
.ResolveClient(stateBoot, "unity-eve-surface-host")
.CreateEveSurfaceStateRefResolver();
}
}