diff --git a/Aetheria.State.Verify/Program.cs b/Aetheria.State.Verify/Program.cs index 05948faa9..a77c8493c 100644 --- a/Aetheria.State.Verify/Program.cs +++ b/Aetheria.State.Verify/Program.cs @@ -7327,8 +7327,8 @@ static void RequireUnitySharedDocumentAccessorErgonomics(string root) var requiredActionBarSymbols = new[] { "public abstract class ActionBarBinding : IDisposable", - "AetheriaRuntimeCatalogSession _catalog", - "Client.State.ObserveCatalog()", + "CultMeshReactiveDocument _catalog", + "Client.State.ReactiveCatalog()", "_catalog?.Current?.FindItem(item, x => x.ItemKey)", "binding?.Dispose()", "private void OnDestroy()" @@ -7343,11 +7343,11 @@ static void RequireUnitySharedDocumentAccessorErgonomics(string root) string.Join(", ", missingActionBarSymbols)); } - if (actionBarSlot.Contains("CultMeshReactiveDocument _catalog", StringComparison.Ordinal) || - actionBarSlot.Contains("Client.State.ReactiveCatalog()", StringComparison.Ordinal)) + if (actionBarSlot.Contains("AetheriaRuntimeCatalogSession _catalog", StringComparison.Ordinal) || + actionBarSlot.Contains("Client.State.ObserveCatalog()", StringComparison.Ordinal)) { throw new InvalidOperationException( - "ActionBarSlot still owns the raw catalog CultMesh document instead of AetheriaRuntimeCatalogSession."); + "ActionBarSlot still routes through AetheriaRuntimeCatalogSession instead of its managed reactive typed catalog document."); } var schematicDisplay = File.ReadAllText(Path.Combine( diff --git a/Assets/Scripts/Gameplay/ActionBarSlot.cs b/Assets/Scripts/Gameplay/ActionBarSlot.cs index 5ab133853..d772477a5 100644 --- a/Assets/Scripts/Gameplay/ActionBarSlot.cs +++ b/Assets/Scripts/Gameplay/ActionBarSlot.cs @@ -1,6 +1,7 @@ using System; using System.Linq; using GameCult.Aetheria.State.Verse; +using GameCult.Mesh; using TMPro; using UniRx.Triggers; using UnityEngine; @@ -57,7 +58,7 @@ public abstract class ActionBarBinding : IDisposable protected AetheriaClient Client { get; } protected ActionBarSlot Slot { get; } protected GameSettings Settings { get; } - private AetheriaRuntimeCatalogSession _catalog; + private CultMeshReactiveDocument _catalog; public abstract void Activate(); public abstract void Deactivate(); public abstract void Update(); @@ -94,7 +95,7 @@ public abstract class ActionBarBinding : IDisposable try { - _catalog ??= Client.State.ObserveCatalog(); + _catalog ??= Client.State.ReactiveCatalog(); return _catalog?.Current?.FindItem(item, x => x.ItemKey); } catch (Exception ex)