Sample docking state from reactive documents

This commit is contained in:
Meta Vens 2026-06-29 00:44:55 +01:00
commit 195b434702
2 changed files with 52 additions and 31 deletions

View file

@ -7248,15 +7248,18 @@ static bool HasManagedDockingSnapshotAccess(string source)
return source.Contains("public sealed class AetheriaUnityObservedDockingIndex", StringComparison.Ordinal) &&
source.Contains("AetheriaRuntimeObservedDockingState", StringComparison.Ordinal) &&
source.Contains("var state = _resolveClient()?.State;", StringComparison.Ordinal) &&
source.Contains("state.Latest<AetheriaRuntimeCurrentEntityDocument>()", StringComparison.Ordinal) &&
source.Contains("state.Latest<AetheriaRuntimeCurrentDockingDocument>()", StringComparison.Ordinal) &&
source.Contains("state.Latest<AetheriaRuntimeStationRefitDocument>()", StringComparison.Ordinal) &&
source.Contains("CultMeshReactiveDocument<AetheriaRuntimeCurrentEntityDocument> _currentEntity", StringComparison.Ordinal) &&
source.Contains("CultMeshReactiveDocument<AetheriaRuntimeCurrentDockingDocument> _currentDocking", StringComparison.Ordinal) &&
source.Contains("CultMeshReactiveDocument<AetheriaRuntimeStationRefitDocument> _stationRefit", StringComparison.Ordinal) &&
source.Contains("AetheriaRuntimeObservedDockingState.TryCreateCurrent(", StringComparison.Ordinal) &&
source.Contains("state.Reactive<AetheriaRuntimeCurrentEntityDocument>()", StringComparison.Ordinal) &&
source.Contains("state.Reactive<AetheriaRuntimeCurrentDockingDocument>()", StringComparison.Ordinal) &&
source.Contains("state.Reactive<AetheriaRuntimeStationRefitDocument>()", StringComparison.Ordinal) &&
!source.Contains("State?.CurrentDocking()", StringComparison.Ordinal) &&
!source.Contains(".State.CurrentDocking()", StringComparison.Ordinal) &&
!source.Contains("CultMeshReactiveDocument<AetheriaRuntimeCurrentEntityDocument> _currentEntity", StringComparison.Ordinal) &&
!source.Contains("CultMeshReactiveDocument<AetheriaRuntimeCurrentDockingDocument> _currentDocking", StringComparison.Ordinal) &&
!source.Contains("CultMeshReactiveDocument<AetheriaRuntimeStationRefitDocument> _stationRefit", StringComparison.Ordinal) &&
!source.Contains("state.Latest<AetheriaRuntimeCurrentEntityDocument>()", StringComparison.Ordinal) &&
!source.Contains("state.Latest<AetheriaRuntimeCurrentDockingDocument>()", StringComparison.Ordinal) &&
!source.Contains("state.Latest<AetheriaRuntimeStationRefitDocument>()", StringComparison.Ordinal) &&
!source.Contains("AetheriaClientReactiveDockingState _dockingState", StringComparison.Ordinal) &&
!source.Contains(".ReactiveDockingState()", StringComparison.Ordinal);
}
@ -13015,10 +13018,13 @@ static void RequireMainMenuContinueRunState(string root)
{
"public sealed class AetheriaUnityObservedDockingIndex",
"AetheriaRuntimeObservedDockingState",
"var state = _resolveClient()?.State;",
"state.Latest<AetheriaRuntimeCurrentEntityDocument>()",
"state.Latest<AetheriaRuntimeCurrentDockingDocument>()",
"state.Latest<AetheriaRuntimeStationRefitDocument>()",
"CultMeshReactiveDocument<AetheriaRuntimeCurrentEntityDocument> _currentEntity",
"CultMeshReactiveDocument<AetheriaRuntimeCurrentDockingDocument> _currentDocking",
"CultMeshReactiveDocument<AetheriaRuntimeStationRefitDocument> _stationRefit",
"AetheriaRuntimeObservedDockingState.TryCreateCurrent(",
"state.Reactive<AetheriaRuntimeCurrentEntityDocument>()",
"state.Reactive<AetheriaRuntimeCurrentDockingDocument>()",
"state.Reactive<AetheriaRuntimeStationRefitDocument>()",
"public bool IsEntityUndocked(Entity entity)",
"public bool TryResolveDockingBay(",
"out AetheriaRuntimeCurrentDockingDocument docking",
@ -13037,14 +13043,14 @@ static void RequireMainMenuContinueRunState(string root)
var forbiddenObservedDockingSymbols = new[]
{
"CultMeshReactiveDocument<AetheriaRuntimeCurrentEntityDocument> _currentEntity",
"CultMeshReactiveDocument<AetheriaRuntimeCurrentDockingDocument> _currentDocking",
"CultMeshReactiveDocument<AetheriaRuntimeStationRefitDocument> _stationRefit",
"state.Latest<AetheriaRuntimeCurrentEntityDocument>()",
"state.Latest<AetheriaRuntimeCurrentDockingDocument>()",
"state.Latest<AetheriaRuntimeStationRefitDocument>()",
"new AetheriaRuntimeObservedDockingState(",
"State?.CurrentDocking()",
".State.CurrentDocking()",
"ReactiveEntity()",
"ReactiveDocking()",
"state.Reactive<AetheriaRuntimeStationRefitDocument>()"
"ReactiveDocking()"
};
var observedDockingHits = forbiddenObservedDockingSymbols
.Where(symbol => observedDockingIndex.Contains(symbol, StringComparison.Ordinal))

View file

@ -4,11 +4,15 @@
using System;
using GameCult.Aetheria.State.Verse;
using GameCult.Mesh;
public sealed class AetheriaUnityObservedDockingIndex : IDisposable
{
private readonly Func<AetheriaClient> _resolveClient;
private readonly AetheriaUnityObservedEntityIndex _observedEntityIndex;
private CultMeshReactiveDocument<AetheriaRuntimeCurrentEntityDocument> _currentEntity;
private CultMeshReactiveDocument<AetheriaRuntimeCurrentDockingDocument> _currentDocking;
private CultMeshReactiveDocument<AetheriaRuntimeStationRefitDocument> _stationRefit;
public AetheriaUnityObservedDockingIndex(
Func<AetheriaClient> resolveClient,
@ -167,21 +171,12 @@ public sealed class AetheriaUnityObservedDockingIndex : IDisposable
docking = null;
try
{
var state = _resolveClient()?.State;
if (state == null)
return false;
var currentEntity = state.Latest<AetheriaRuntimeCurrentEntityDocument>();
var currentDocking = state.Latest<AetheriaRuntimeCurrentDockingDocument>();
var stationRefit = state.Latest<AetheriaRuntimeStationRefitDocument>();
if (currentDocking == null || stationRefit == null)
return false;
docking = new AetheriaRuntimeObservedDockingState(
currentEntity,
currentDocking,
stationRefit);
return docking != null;
EnsureDockingDocuments();
return AetheriaRuntimeObservedDockingState.TryCreateCurrent(
_currentEntity,
_currentDocking,
_stationRefit,
out docking);
}
catch
{
@ -189,7 +184,27 @@ public sealed class AetheriaUnityObservedDockingIndex : IDisposable
}
}
private void EnsureDockingDocuments()
{
if (_currentEntity != null && _currentDocking != null && _stationRefit != null)
return;
var state = _resolveClient()?.State;
if (state == null)
return;
_currentEntity ??= state.Reactive<AetheriaRuntimeCurrentEntityDocument>();
_currentDocking ??= state.Reactive<AetheriaRuntimeCurrentDockingDocument>();
_stationRefit ??= state.Reactive<AetheriaRuntimeStationRefitDocument>();
}
public void Dispose()
{
_currentEntity?.Dispose();
_currentEntity = null;
_currentDocking?.Dispose();
_currentDocking = null;
_stationRefit?.Dispose();
_stationRefit = null;
}
}