[v0.3.10] Minor improvements for EntityReceipeEditor

Author: g0dzZz-coder

Editor/EntityRecipeEditor.cs

@@ -14,9 +14,6 @@ namespace Depra.Ecs.Hybrid.Editor
 	[CustomEditor(typeof(EntityRecipe))]
 	internal sealed class EntityRecipeEditor : UnityEditor.Editor
 	{
-		private static void DrawBundlesHeader(Rect rect) => EditorGUI.LabelField(rect, "Component Bundles");
-		private static void DrawSourcesHeader(Rect rect) => EditorGUI.LabelField(rect, "Component Sources");
-
 		private ReorderableList _componentBundles;
 		private SerializedProperty _componentBundlesProperty;
 		private ReorderableList _componentSources;
@@ -38,15 +35,14 @@ private void OnEnable()
 			_componentSources = new ReorderableList(serializedObject, _componentSourcesProperty, true, true, true, true)
 			{
 				drawHeaderCallback = DrawSourcesHeader,
-				drawElementCallback = DrawSourceElement
+				drawElementCallback = DrawSourceElement,
 			};
 		}
 
 		public override void OnInspectorGUI()
 		{
 			serializedObject.Update();
-			var recipe = (EntityRecipe)target;
-			DrawControlButtons(recipe);
+			DrawControlButtons((EntityRecipe)target);
 			EditorGUILayout.Space(5);
 			_componentBundles.DoLayoutList();
 			_componentSources.DoLayoutList();
@@ -142,13 +138,27 @@ private void DrawBundleElement(Rect rect, int index, bool isActive, bool isFocus
 			if (componentBundle)
 			{
 				var actionRect = new Rect(rect.x + rect.width - 45, rect.y, 45, rect.height);
+				var pendingOriginalPath = isNested ? GetPendingDeletionPath(componentBundle) : null;
+				var hasPendingOriginal = !string.IsNullOrEmpty(pendingOriginalPath);
+
 				if (!isNested)
 				{
 					if (GUI.Button(actionRect, "Nest"))
 					{
 						MakeNested(recipe, index);
 					}
 				}
+				else if (hasPendingOriginal)
+				{
+					var originalColor = GUI.backgroundColor;
+					GUI.backgroundColor = new Color(1f, 0.3f, 0.3f);
+					if (GUI.Button(actionRect, "Del"))
+					{
+						DeleteOriginal(componentBundle, pendingOriginalPath);
+					}
+
+					GUI.backgroundColor = originalColor;
+				}
 				else
 				{
 					if (GUI.Button(actionRect, "Out"))
@@ -172,15 +182,9 @@ private void OnBundleRemoved(ReorderableList list)
 			var componentBundle = element.objectReferenceValue as ComponentDatabase;
 			var recipe = (EntityRecipe)target;
 
-			Undo.RecordObject(recipe, "Remove Set");
-
-			if (componentBundle)
+			if (componentBundle && IsNestedInAsset(componentBundle, recipe))
 			{
-				recipe.Remove(componentBundle);
-				if (IsNestedInAsset(componentBundle, recipe))
-				{
-					Undo.DestroyObjectImmediate(componentBundle);
-				}
+				Undo.DestroyObjectImmediate(componentBundle);
 			}
 
 			ReorderableList.defaultBehaviours.DoRemoveButton(list);
@@ -229,6 +233,7 @@ private void MakeAllNested(EntityRecipe recipe, List<ComponentDatabase> bundles)
 
 				var newNested = CreateNestedCopy(recipe, componentBundle);
 				_componentBundlesProperty.GetArrayElementAtIndex(index).objectReferenceValue = newNested;
+				SavePendingDeletion(newNested, componentBundle);
 				convertedCount++;
 			}
 
@@ -249,12 +254,45 @@ private void MakeNested(EntityRecipe recipe, int index)
 			Undo.RecordObject(recipe, $"Make Nested: {original.name}");
 			var newNested = CreateNestedCopy(recipe, original);
 			_componentBundlesProperty.GetArrayElementAtIndex(index).objectReferenceValue = newNested;
-
+			SavePendingDeletion(newNested, original);
 			serializedObject.ApplyModifiedProperties();
 			EditorUtility.SetDirty(recipe);
 			AssetDatabase.SaveAssets();
 		}
 
+		private static void DeleteOriginal(ComponentDatabase nested, string originalPath)
+		{
+			if (nested == null || string.IsNullOrEmpty(originalPath))
+			{
+				return;
+			}
+
+			if (!File.Exists(originalPath))
+			{
+				ClearPendingDeletion(nested);
+				Debug.LogWarning($"Original file no longer exists: {originalPath}");
+				return;
+			}
+
+			if (EditorUtility.DisplayDialog(
+				    "Delete Original File",
+				    $"Delete original file?\n\n{originalPath}\n\nThis cannot be undone!",
+				    "Delete",
+				    "Cancel"))
+			{
+				if (AssetDatabase.DeleteAsset(originalPath))
+				{
+					ClearPendingDeletion(nested);
+					AssetDatabase.SaveAssets();
+					Debug.Log($"Deleted original file: {originalPath}");
+				}
+				else
+				{
+					Debug.LogError($"Failed to delete: {originalPath}");
+				}
+			}
+		}
+
 		private static ComponentDatabase CreateNestedCopy(EntityRecipe recipe, ComponentDatabase original)
 		{
 			var copy = Instantiate(original);
@@ -320,5 +358,47 @@ private static ComponentDatabase ExtractToNewAsset(ComponentDatabase nested, str
 
 			return copy;
 		}
+
+		private static void DrawBundlesHeader(Rect rect) => EditorGUI.LabelField(rect, "Component Bundles");
+		private static void DrawSourcesHeader(Rect rect) => EditorGUI.LabelField(rect, "Component Sources");
+
+		private static string GetSessionStateKey(string nestedGuid) => $"EntityRecipe_PendingDeletion_{nestedGuid}";
+
+		private static void SavePendingDeletion(ComponentDatabase nested, ComponentDatabase original)
+		{
+			if (!nested || !original)
+			{
+				return;
+			}
+
+			var nestedPath = AssetDatabase.GetAssetPath(nested);
+			var nestedGuid = AssetDatabase.AssetPathToGUID(nestedPath);
+			var originalPath = AssetDatabase.GetAssetPath(original);
+			SessionState.SetString(GetSessionStateKey(nestedGuid), originalPath);
+		}
+
+		private static string GetPendingDeletionPath(ComponentDatabase nested)
+		{
+			if (nested == null)
+			{
+				return null;
+			}
+
+			var nestedPath = AssetDatabase.GetAssetPath(nested);
+			var nestedGuid = AssetDatabase.AssetPathToGUID(nestedPath);
+			return SessionState.GetString(GetSessionStateKey(nestedGuid), null);
+		}
+
+		private static void ClearPendingDeletion(ComponentDatabase nested)
+		{
+			if (nested == null)
+			{
+				return;
+			}
+
+			var nestedPath = AssetDatabase.GetAssetPath(nested);
+			var nestedGuid = AssetDatabase.AssetPathToGUID(nestedPath);
+			SessionState.EraseString(GetSessionStateKey(nestedGuid));
+		}
 	}
 }

…time/Components/AuthoringEntityRecipe.cs Runtime/Entities/AuthoringEntityRecipe.csRuntime/Components/AuthoringEntityRecipe.cs renamed to Runtime/Entities/AuthoringEntityRecipe.cs Runtime/Components/AuthoringEntityRecipe.cs renamed to Runtime/Entities/AuthoringEntityRecipe.cs

@@ -1,7 +1,6 @@
 // SPDX-License-Identifier: Apache-2.0
 // © 2023-2026 Depra <n.melnikov@depra.org>
 
-using System.Collections.Generic;
 using System.Runtime.CompilerServices;
 using UnityEngine;
 using static Depra.Ecs.Hybrid.RuntimeSceneBakeModule;

…Components/AuthoringEntityRecipe.cs.meta …e/Entities/AuthoringEntityRecipe.cs.metaRuntime/Components/AuthoringEntityRecipe.cs.meta renamed to Runtime/Entities/AuthoringEntityRecipe.cs.meta Runtime/Components/AuthoringEntityRecipe.cs.meta renamed to Runtime/Entities/AuthoringEntityRecipe.cs.meta

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: Apache-2.0
-// © 2023-2025 Nikolay Melnikov <n.melnikov@depra.org>
+// © 2023-2026 Depra <n.melnikov@depra.org>
 
 using Depra.Ecs.QoL;
 #if ENABLE_IL2CPP
@@ -14,14 +14,15 @@ namespace Depra.Ecs.Hybrid
 #endif
 	public sealed class ContinuousEntityBakingSystem : IPreInitializationSystem, IExecutionSystem
 	{
-		private IEntityQuery _entities;
+		private EntityQuery _entities;
 		private ComponentPool<BakingEntityRef> _bakingEntities;
 
 		void IPreInitializationSystem.PreInitialize(IWorldGroup worlds)
 		{
 			var world = worlds.Default;
+			_entities = new EntityQuery(typeof(BakingEntityRef));
+			_entities.Initialize(world);
 			_bakingEntities = world.Pool<BakingEntityRef>();
-			_entities = new EntityQuery(typeof(BakingEntityRef)).Initialize(world);
 		}
 
 		void IExecutionSystem.Execute()

Runtime/Components/EntityRecipe.cs Runtime/Entities/EntityRecipe.csRuntime/Components/EntityRecipe.cs renamed to Runtime/Entities/EntityRecipe.cs

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: Apache-2.0
-// © 2023-2025 Nikolay Melnikov <n.melnikov@depra.org>
+// © 2023-2026 Depra <n.melnikov@depra.org>
 
 using Depra.Ecs.Hybrid.Internal;
 #if ENABLE_IL2CPP