Update

Author: IntoTheDev

Tag.cs

@@ -1,11 +1,20 @@
+#if ODIN_INSPECTOR
+using Sirenix.OdinInspector;
+#endif
 using System.Collections.Generic;
 using UnityEngine;
 
 namespace ToolBox.Tags
 {
-	[CreateAssetMenu(menuName = "ToolBox/Tagging/Tag")]
+	[CreateAssetMenu(menuName = "ToolBox/MultiTags/Tag")]
+#if ODIN_INSPECTOR
+	[AssetSelector, Required]
+#endif
 	public sealed class Tag : ScriptableObject
 	{
+#if ODIN_INSPECTOR
+		[ShowInInspector, ReadOnly]
+#endif
 		private HashSet<int> _entities = new HashSet<int>();
 
 		public void Add(int entity) =>

TagExtensions.cs

@@ -14,7 +14,7 @@ public static void AddTag(this GameObject entity, Tag tag)
 			if (taggable == null)
 				taggable = entity.AddComponent<Taggable>();
 
-			taggable.Add(tag);
+			taggable.AddTagInEditor(tag);
 #endif
 		}
 
@@ -28,7 +28,7 @@ public static void RemoveTag(this GameObject entity, Tag tag)
 			if (taggable == null)
 				taggable = entity.AddComponent<Taggable>();
 
-			taggable.Remove(tag);
+			taggable.RemoveTagInEditor(tag);
 #endif
 		}
 
@@ -50,7 +50,7 @@ public static void AddTags(this GameObject entity, Tag[] tags)
 				var tag = tags[i];
 				tag.Add(hash);
 #if UNITY_EDITOR
-				taggable.Add(tag);
+				taggable.AddTagInEditor(tag);
 #endif
 			}
 		}
@@ -70,7 +70,7 @@ public static void RemoveTags(this GameObject entity, Tag[] tags)
 				var tag = tags[i];
 				tag.Remove(hash);
 #if UNITY_EDITOR
-				taggable.Remove(tag);
+				taggable.RemoveTagInEditor(tag);
 #endif
 			}
 		}

Taggable.cs

@@ -1,67 +1,73 @@
+#if ODIN_INSPECTOR
+using Sirenix.OdinInspector;
+#endif
 #if UNITY_EDITOR
 using UnityEditor;
 #endif
 using UnityEngine;
 
 namespace ToolBox.Tags
 {
-	[DisallowMultipleComponent, DefaultExecutionOrder(-150)]
+	[DisallowMultipleComponent, DefaultExecutionOrder(-9000), ExecuteInEditMode]
 	public sealed class Taggable : MonoBehaviour
 	{
+#if ODIN_INSPECTOR
+		[Required, AssetList]
+#endif
 		[SerializeField] private Tag[] _tags = default;
 
-		private Tag[] _all = null;
+		private static Tag[] _all = null;
 		private int _hash = 0;
 
 		private void Awake()
 		{
 #if UNITY_EDITOR
-			_all = Resources.FindObjectsOfTypeAll<Tag>();
-
-			if (_tags == null)
-				_tags = new Tag[0];
+			SetupEditorData();
 #endif
 
 			_hash = gameObject.GetHashCode();
-			
-			for (int i = 0; i < _tags.Length; i++)
-				_tags[i].Add(_hash);
+			AddAll();
 		}
 
-		private void OnEnable()
+		private void OnDestroy() =>
+			RemoveAll();
+
+		private void AddAll()
 		{
 			for (int i = 0; i < _tags.Length; i++)
 				_tags[i].Add(_hash);
 		}
 
-		private void OnDisable()
+		private void RemoveAll()
 		{
 			for (int i = 0; i < _tags.Length; i++)
 				_tags[i].Remove(_hash);
 		}
 
 #if UNITY_EDITOR
-		public void Add(Tag tag)
+		public void AddTagInEditor(Tag tag)
 		{
 			if (!ArrayUtility.Contains(_tags, tag))
 				ArrayUtility.Add(ref _tags, tag);
 		}
 
-		public void Remove(Tag tag)
+		public void RemoveTagInEditor(Tag tag)
 		{
 			if (ArrayUtility.Contains(_tags, tag))
 				ArrayUtility.Remove(ref _tags, tag);
 		}
 
+		// Handle Inspector Changes
 		private void OnValidate()
 		{
-			if (!Application.isPlaying || _all == null)
-				return;
-
+			SetupEditorData();
 			var obj = gameObject;
+			AddAll();
 
-			foreach (var tag in _all)
+			for (int i = 0; i < _all.Length; i++)
 			{
+				var tag = _all[i];
+
 				if (ArrayUtility.Contains(_tags, tag))
 				{
 					if (!obj.HasTag(tag))
@@ -74,6 +80,18 @@ private void OnValidate()
 				}
 			}
 		}
+
+		private void SetupEditorData()
+		{
+			if (_all == null)
+				_all = Resources.FindObjectsOfTypeAll<Tag>();
+
+			if (_tags == null)
+				_tags = new Tag[0];
+
+			if (_hash == 0)
+				_hash = gameObject.GetHashCode();
+		}
 #endif
 	}
 }

TagsContainer.cs

@@ -1,9 +1,14 @@
-using Sirenix.OdinInspector;
+#if ODIN_INSPECTOR
+using Sirenix.OdinInspector;
+#endif
 using UnityEngine;
 
 namespace ToolBox.Tags
 {
-	[CreateAssetMenu(menuName = "ToolBox/Tagging/Tags Container"), AssetSelector]
+	[CreateAssetMenu(menuName = "ToolBox/MultiTags/Tags Container")]
+#if ODIN_INSPECTOR
+	[AssetSelector, Required]
+#endif
 	public sealed class TagsContainer : ScriptableObject
 	{
 		[SerializeField] private Tag[] _tags = null;