com.wallstop-studios.unity-helpers 2.0.0-rc75.2 → 2.0.0-rc75.4

package/Runtime/Tags/EffectHandle.cs

@@ -1,7 +1,7 @@
 namespace WallstopStudios.UnityHelpers.Tags
 {
     using System;
-    using Core.DataStructure.Adapters;
+    using System.Threading;
     using Core.Extension;
 
     [Serializable]
@@ -10,16 +10,18 @@
             IComparable<EffectHandle>,
             IComparable
     {
+        private static long Id;
+
         public readonly AttributeEffect effect;
 
-        public readonly KGuid id;
+        public readonly long id;
 
         public static EffectHandle CreateInstance(AttributeEffect effect)
         {
-            return new EffectHandle(Guid.NewGuid(), effect);
+            return new EffectHandle(Interlocked.Increment(ref Id), effect);
         }
 
-        private EffectHandle(KGuid id, AttributeEffect effect)
+        private EffectHandle(long id, AttributeEffect effect)
         {
             this.id = id;
             this.effect = effect;

package/Runtime/Tags/EffectHandler.cs

@@ -1,9 +1,9 @@
 namespace WallstopStudios.UnityHelpers.Tags
 {
+    using System;
     using System.Collections.Generic;
     using System.Linq;
     using Core.Attributes;
-    using Core.DataStructure.Adapters;
     using Core.Extension;
     using Core.Helper;
     using UnityEngine;
@@ -13,7 +13,10 @@
     [RequireComponent(typeof(TagHandler))]
     public sealed class EffectHandler : MonoBehaviour
     {
-        [SiblingComponent()]
+        public event Action<EffectHandle> OnEffectApplied;
+        public event Action<EffectHandle> OnEffectRemoved;
+
+        [SiblingComponent]
         private TagHandler _tagHandler;
 
         [SiblingComponent(optional = true)]
@@ -26,11 +29,11 @@
         > _instancedCosmeticEffects = new();
 
         // Stores expiration time of duration effects (We store by Id because it's much cheaper to iterate Guids than it is EffectHandles
-        private readonly Dictionary<KGuid, float> _effectExpirations = new();
-        private readonly Dictionary<KGuid, EffectHandle> _effectHandlesById = new();
+        private readonly Dictionary<long, float> _effectExpirations = new();
+        private readonly Dictionary<long, EffectHandle> _effectHandlesById = new();
 
         // Used only to save allocations in Update()
-        private readonly List<KGuid> _expiredEffectIds = new();
+        private readonly List<long> _expiredEffectIds = new();
         private readonly List<EffectHandle> _appliedEffects = new();
 
         private bool _initialized;
@@ -77,7 +80,7 @@
                     && (effect.resetDurationOnReapplication || !_appliedEffects.Contains(handle))
                 )
                 {
-                    KGuid handleId = handle.id;
+                    long handleId = handle.id;
                     _effectExpirations[handleId] = Time.time + effect.duration;
                     _effectHandlesById[handleId] = handle;
                 }
@@ -123,10 +126,11 @@
                 _ = _tagHandler.ForceRemoveTags(handle);
             }
 
-            KGuid handleId = handle.id;
+            long handleId = handle.id;
             _ = _effectExpirations.Remove(handleId);
             _ = _effectHandlesById.Remove(handleId);
             InternalRemoveCosmeticEffects(handle);
+            OnEffectRemoved?.Invoke(handle);
         }
 
         private void InternalApplyEffect(EffectHandle handle)
@@ -142,7 +146,7 @@
             {
                 if (effect.resetDurationOnReapplication || !exists)
                 {
-                    KGuid handleId = handle.id;
+                    long handleId = handle.id;
                     _effectExpirations[handleId] = Time.time + effect.duration;
                     _effectHandlesById[handleId] = handle;
                 }
@@ -170,6 +174,8 @@
                     attributesComponent.ForceApplyAttributeModifications(handle);
                 }
             }
+
+            OnEffectApplied?.Invoke(handle);
         }
 
         private void InternalApplyEffect(AttributeEffect effect)
@@ -360,7 +366,7 @@
 
             _expiredEffectIds.Clear();
             float currentTime = Time.time;
-            foreach (KeyValuePair<KGuid, float> entry in _effectExpirations)
+            foreach (KeyValuePair<long, float> entry in _effectExpirations)
             {
                 if (entry.Value < currentTime)
                 {
@@ -368,7 +374,7 @@
                 }
             }
 
-            foreach (KGuid expiredHandleId in _expiredEffectIds)
+            foreach (long expiredHandleId in _expiredEffectIds)
             {
                 if (_effectHandlesById.TryGetValue(expiredHandleId, out EffectHandle expiredHandle))
                 {

package/Runtime/Tags/TagHandler.cs

@@ -2,20 +2,23 @@
 {
     using System;
     using System.Collections.Generic;
-    using Core.DataStructure.Adapters;
     using Core.Extension;
     using UnityEngine;
 
     [DisallowMultipleComponent]
     public sealed class TagHandler : MonoBehaviour
     {
+        public event Action<string> OnTagAdded;
+        public event Action<string> OnTagRemoved;
+        public event Action<string, uint> OnTagCountChanged;
+
         public IReadOnlyCollection<string> Tags => _tagCount.Keys;
 
         [SerializeField]
         private List<string> _initialEffectTags = new();
 
         private readonly Dictionary<string, uint> _tagCount = new(StringComparer.Ordinal);
-        private readonly Dictionary<KGuid, EffectHandle> _effectHandles = new();
+        private readonly Dictionary<long, EffectHandle> _effectHandles = new();
 
         private void Awake()
         {
@@ -78,7 +81,7 @@
 
         public void ForceApplyTags(EffectHandle handle)
         {
-            KGuid id = handle.id;
+            long id = handle.id;
             if (!_effectHandles.TryAdd(id, handle))
             {
                 return;
@@ -97,7 +100,7 @@
 
         public bool ForceRemoveTags(EffectHandle handle)
         {
-            KGuid id = handle.id;
+            long id = handle.id;
             if (!_effectHandles.Remove(id, out EffectHandle appliedHandle))
             {
                 return false;
@@ -113,7 +116,19 @@
 
         private void InternalApplyTag(string effectTag)
         {
-            _ = _tagCount.AddOrUpdate(effectTag, _ => 1U, (_, existing) => existing + 1);
+            uint currentCount = _tagCount.AddOrUpdate(
+                effectTag,
+                _ => 1U,
+                (_, existing) => existing + 1
+            );
+            if (currentCount == 1)
+            {
+                OnTagAdded?.Invoke(effectTag);
+            }
+            else
+            {
+                OnTagCountChanged?.Invoke(effectTag, currentCount);
+            }
         }
 
         private void InternalRemoveTag(string effectTag)
@@ -131,10 +146,12 @@
             if (count == 0)
             {
                 _ = _tagCount.Remove(effectTag);
+                OnTagRemoved?.Invoke(effectTag);
             }
             else
             {
                 _tagCount[effectTag] = count;
+                OnTagCountChanged?.Invoke(effectTag, count);
             }
         }
     }

package/Runtime/Utils/RuntimeSingleton.cs

@@ -39,6 +39,12 @@
                     return null;
                 }
 
+                _instance = FindAnyObjectByType<T>(FindObjectsInactive.Exclude);
+                if (_instance != null)
+                {
+                    return _instance;
+                }
+
                 Type type = typeof(T);
                 GameObject instance = new($"{type.Name}-Singleton", type);
                 if (

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "com.wallstop-studios.unity-helpers",
-  "version": "2.0.0-rc75.2",
+  "version": "2.0.0-rc75.4",
   "displayName": "Unity Helpers",
   "description": "Various Unity Helper Library",
   "dependencies": {},
@@ -65,6 +65,8 @@
 
 
 
+
+