Add named current typed state accessors

This commit is contained in:
Meta Vens 2026-06-29 09:43:35 +01:00
commit 06a3f8dab2
4 changed files with 170 additions and 19 deletions

View file

@ -1,7 +1,6 @@
using System;
using System.Linq;
using GameCult.Aetheria.State.Verse;
using GameCult.Mesh;
using TMPro;
using UniRx.Triggers;
using UnityEngine;
@ -28,7 +27,6 @@ public class ActionBarSlot : MonoBehaviour
if (ReferenceEquals(binding, value))
return;
binding?.Dispose();
binding = value;
if (binding == null)
{
@ -52,13 +50,12 @@ public class ActionBarSlot : MonoBehaviour
}
public abstract class ActionBarBinding : IDisposable
public abstract class ActionBarBinding
{
public Entity Entity { get; }
private readonly Func<AetheriaControl> _resolveControl;
protected ActionBarSlot Slot { get; }
protected GameSettings Settings { get; }
private CultMeshReactiveDocument<AetheriaRuntimeCatalogSnapshot> _catalog;
public abstract void Activate();
public abstract void Deactivate();
public abstract void Update();
@ -100,9 +97,10 @@ public abstract class ActionBarBinding : IDisposable
{
try
{
_catalog ??= AetheriaUnityRuntimeClientProvider
.ReactiveCatalogSnapshot("unity-action-bar");
return _catalog?.Current?.FindItem(item, x => x.ItemKey);
return AetheriaUnityRuntimeClientProvider
.RuntimeState()
.CurrentCatalog()
.FindItem(item, x => x.ItemKey);
}
catch (Exception ex)
{
@ -110,12 +108,6 @@ public abstract class ActionBarBinding : IDisposable
return null;
}
}
public virtual void Dispose()
{
_catalog?.Dispose();
_catalog = null;
}
}
public class ActionBarConsumableBinding : ActionBarBinding