Update the new data extensions with safer code

Add new SortedList extensions to help sort list in direct calls
Add new Dictionary serializer

Author: CoderGamester

Editor/EnumSelectorPropertyDrawer.cs

@@ -18,32 +18,28 @@ namespace GameLoversEditor
 	/// {
 	/// }
 	/// </summary>
-	public abstract class EnumSelectorPropertyDrawer<T> : PropertyDrawer 
+	public abstract class EnumSelectorPropertyDrawer<T> : PropertyDrawer
 		where T : Enum
 	{
-		private static readonly Dictionary<Type, string[]> _sortedEnums = new Dictionary<Type, string[]>();
-	 
+		private static readonly Dictionary<Type, GUIContent[]> _sortedEnums = new Dictionary<Type, GUIContent[]>();
+
 		private bool _errorFound;
-	 
+
 		/// <inheritdoc />
 		public override void OnGUI(Rect position, SerializedProperty property, GUIContent label)
 		{
 			EditorGUI.BeginProperty(position, label, property);
 
 			var enumType = typeof(T);
 			var enumValues = GetSortedEnumConstants(enumType);
-			var selectionWidth = Mathf.Clamp(EditorGUIUtility.labelWidth, EditorGUIUtility.labelWidth, position.width * 0.5f);
-			var selectionRect = new Rect(position.x + position.width - selectionWidth, position.y, selectionWidth, position.height);
 			var selectionProperty = property.FindPropertyRelative("_selection");
 			var currentString = selectionProperty.stringValue;
-			var currentIndex = Array.IndexOf(enumValues, currentString);
-	 
-			EditorGUI.LabelField(position, label);
-	 
+			var currentIndex = string.IsNullOrWhiteSpace(currentString) ? 0 : Array.FindIndex(enumValues, s => s.text == currentString);
+
 			if (currentIndex != -1)
 			{
-				selectionProperty.stringValue = enumValues[EditorGUI.Popup(selectionRect, currentIndex, enumValues)];
-	 
+				selectionProperty.stringValue = enumValues[EditorGUI.Popup(position, label, currentIndex, enumValues)].text;
+
 				_errorFound = false;
 			}
 			else
@@ -52,37 +48,46 @@ public override void OnGUI(Rect position, SerializedProperty property, GUIConten
 				if (!_errorFound)
 				{
 					var targetObject = selectionProperty.serializedObject.targetObject;
-					
+
 					Debug.LogError($"Invalid enum constant: {enumType.Name}.{currentString} in object {targetObject.name} of type: {targetObject.GetType().Name}");
-					
+
 					_errorFound = true;
 				}
-	 
+
 				var color = GUI.contentColor;
-				var finalArray = new[] { "Invalid: " + currentString }.Concat(enumValues).ToArray();
-	 
+				var finalArray = new[] { new GUIContent("Invalid: " + currentString) }.Concat(enumValues).ToArray();
+
 				GUI.contentColor = Color.red;
-				var newSelection = EditorGUI.Popup(selectionRect, 0, finalArray);
+				var newSelection = EditorGUI.Popup(position, label, 0, finalArray);
 				GUI.contentColor = color;
-				
+
 				if (newSelection > 0)
 				{
-					selectionProperty.stringValue = finalArray[newSelection];
+					selectionProperty.stringValue = finalArray[newSelection].text;
 				}
 			}
-	 
+
 			EditorGUI.EndProperty();
 		}
-	 
-		private string[] GetSortedEnumConstants(Type enumType)
+
+		private GUIContent[] GetSortedEnumConstants(Type enumType)
 		{
-			if (!_sortedEnums.TryGetValue(enumType, out var values))
+			if (!_sortedEnums.TryGetValue(enumType, out var content))
 			{
-				values = Enum.GetNames(enumType);
+				var values = Enum.GetNames(enumType);
+
+				content = new GUIContent[values.Length];
+
 				Array.Sort(values);
-				_sortedEnums.Add(enumType, values);
+
+				for (var i = 0; i < values.Length; i++)
+				{
+					content[i] = new GUIContent(values[i]);
+				}
+
+				_sortedEnums.Add(enumType, content);
 			}
-			return values;
+			return content;
 		}
 	}
 }

Editor/ReadOnlyPropertyDrawer.cs

@@ -1,6 +1,6 @@
-using FistLight;
 using UnityEditor;
 using UnityEngine;
+using GameLovers;
 
 // ReSharper disable once CheckNamespace
 

Runtime/EnumSelector.cs

@@ -27,27 +27,30 @@ public interface IEnumSelector
 		/// </summary>
 		string GetSelectionString();
 	}
-	
+
 	/// <summary>
 	/// The EnumSelector <typeparamref name="T"/> serves as a dropdown selection field that offers all enum values of <typeparamref name="T"/>. 
 	/// It stores the enum name instead of the enum value, to prevent pointing to the wrong enum when new values are added or removed
 	/// </summary>
 	[Serializable]
-	public abstract class EnumSelector<T> : IEnumSelector where T : Enum
+	public class EnumSelector<T> : IEnumSelector where T : Enum
 	{
 		[SerializeField, HideInInspector] private string _selection = "";
- 
+
 		public static readonly string[] EnumNames = Enum.GetNames(typeof(T));
 		public static readonly T[] EnumValues = (T[])Enum.GetValues(typeof(T));
 		public static readonly Dictionary<string, T> EnumDictionary = new Dictionary<string, T>();
-		
-		private EnumSelector() {}
+
+		private EnumSelector()
+		{
+			SetSelection(EnumValues[0]);
+		}
 
 		protected EnumSelector(T data)
 		{
 			SetSelection(data);
 		}
-		
+
 		/// <inheritdoc />
 		public int GetSelectedIndex()
 		{
@@ -58,24 +61,24 @@ public int GetSelectedIndex()
 					return i;
 				}
 			}
-			
+
 			Debug.LogError($"Could not load enum for string: {_selection}");
-			
+
 			return -1;
 		}
- 
+
 		/// <inheritdoc />
 		public bool HasValidSelection()
 		{
 			return GetSelectedIndex() != -1;
 		}
- 
+
 		/// <inheritdoc />
 		public string GetSelectionString()
 		{
 			return _selection;
 		}
- 
+
 		/// <summary>
 		/// Requests the enum selected value
 		/// </summary>
@@ -85,21 +88,21 @@ public T GetSelection()
 			{
 				return enumConstant;
 			}
- 
+
 			enumConstant = EnumValues[GetSelectedIndex()];
 			EnumDictionary.Add(_selection, enumConstant);
- 
+
 			return enumConstant;
 		}
- 
+
 		/// <summary>
 		/// Sets the enum value to <paramref name="data"/>
 		/// </summary>
 		public void SetSelection(T data)
 		{
-			_selection = EnumNames[(int) (object) data];
+			_selection = EnumNames[(int)(object)data];
 		}
- 
+
 		public static implicit operator T(EnumSelector<T> d)
 		{
 			return d.GetSelection();