GameCult/Aetheria
Watch
9
0
Fork
You've already forked Aetheria
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use typed docking documents in Unity docking index

Browse source
This commit is contained in:
Meta Vens 2026-06-28 16:00:52 +01:00
commit d54af47ff5
2 changed files with 33 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

23
Aetheria.State.Verify/Program.cs
View file

@ -7157,8 +7157,13 @@ static bool HasManagedDockingSnapshotAccess(string source)
}
if (source.Contains("AetheriaRuntimeObservedDockingState", StringComparison.Ordinal) &&
source.Contains("ResolveClient().State.CurrentDocking()", StringComparison.Ordinal) &&
!source.Contains("AetheriaUnityObservedDockingIndex", StringComparison.Ordinal) &&
source.Contains("var state = _resolveClient()?.State;", StringComparison.Ordinal) &&
source.Contains("state.Current.LatestEntity()", StringComparison.Ordinal) &&
source.Contains("state.Current.LatestDocking()", StringComparison.Ordinal) &&
source.Contains("state.LatestStationRefit()", StringComparison.Ordinal) &&
!source.Contains("State?.CurrentDocking()", StringComparison.Ordinal) &&
!source.Contains(".State.CurrentDocking()", StringComparison.Ordinal) &&
!source.Contains("ResolveClient().State.CurrentDocking()", StringComparison.Ordinal) &&
!source.Contains("TryResolveObservedDockingIndex(out var dockingIndex)", StringComparison.Ordinal) &&
!source.Contains("AetheriaClientReactiveDockingState _dockingState", StringComparison.Ordinal) &&
!source.Contains(".ReactiveDockingState()", StringComparison.Ordinal))
@ -7176,7 +7181,12 @@ static bool HasManagedDockingSnapshotAccess(string source)
return source.Contains("public sealed class AetheriaUnityObservedDockingIndex", StringComparison.Ordinal) &&
source.Contains("AetheriaRuntimeObservedDockingState", StringComparison.Ordinal) &&
source.Contains("_resolveClient()?.State?.CurrentDocking()", StringComparison.Ordinal) &&
source.Contains("var state = _resolveClient()?.State;", StringComparison.Ordinal) &&
source.Contains("state.Current.LatestEntity()", StringComparison.Ordinal) &&
source.Contains("state.Current.LatestDocking()", StringComparison.Ordinal) &&
source.Contains("state.LatestStationRefit()", 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) &&
@ -12729,7 +12739,10 @@ static void RequireMainMenuContinueRunState(string root)
{
"public sealed class AetheriaUnityObservedDockingIndex",
"AetheriaRuntimeObservedDockingState",
"_resolveClient()?.State?.CurrentDocking()",
"var state = _resolveClient()?.State;",
"state.Current.LatestEntity()",
"state.Current.LatestDocking()",
"state.LatestStationRefit()",
"public bool IsEntityUndocked(Entity entity)",
"public bool TryResolveDockingBay(",
"out AetheriaRuntimeCurrentDockingDocument docking",
@ -12751,6 +12764,8 @@ static void RequireMainMenuContinueRunState(string root)
"CultMeshReactiveDocument<AetheriaRuntimeCurrentEntityDocument> _currentEntity",
"CultMeshReactiveDocument<AetheriaRuntimeCurrentDockingDocument> _currentDocking",
"CultMeshReactiveDocument<AetheriaRuntimeStationRefitDocument> _stationRefit",
"State?.CurrentDocking()",
".State.CurrentDocking()",
"state.ReactiveEntity()",
"state.ReactiveDocking()",
"state.ReactiveStationRefit()"

15
Assets/Scripts/Gameplay/AetheriaUnityObservedDockingIndex.cs
View file

@ -167,7 +167,20 @@ public sealed class AetheriaUnityObservedDockingIndex : IDisposable
docking = null;
try
{
docking = _resolveClient()?.State?.CurrentDocking();
var state = _resolveClient()?.State;
if (state == null)
return false;
var currentEntity = state.Current.LatestEntity();
var currentDocking = state.Current.LatestDocking();
var stationRefit = state.LatestStationRefit();
if (currentDocking == null || stationRefit == null)
return false;
docking = new AetheriaRuntimeObservedDockingState(
currentEntity,
currentDocking,
stationRefit);
return docking != null;
}
catch