Merge pull request #34 from CoderGamester/develop

Release 2.1.1

Author: CoderGamester

CHANGELOG.md

@@ -4,6 +4,15 @@ All notable changes to this package will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## [2.1.1] - 2026-07-04
+
+**Changed**:
+- PlayMode tests updated to parameterless `FindObjectsByType<T>()` overload (Unity 6 API).
+- Removed redundant `[Serializable]` from `AddressableConfig` (already implicitly serializable as a reference type in Unity YAML).
+
+**Fixed**:
+- `ServicesScaffolders` adapts to Unity 6000.4+ `AssetCreationEndAction` / `EntityId` API (guarded by `UNITY_6000_4_OR_NEWER`; pre-6000.4 path unchanged).
+
 ## [2.1.0] - 2026-05-20
 
 **New**:

Editor/GameLovers.Services.Editor.asmdef

@@ -20,3 +20,4 @@
     "versionDefines": [],
     "noEngineReferences": false
 }
+

Editor/Scaffolders/ServicesScaffolders.cs

@@ -52,12 +52,21 @@ private static void CreateFromTemplate(string templateFileName, string defaultNa
 			var endAction = ScriptableObject.CreateInstance<ScriptNameEditAction>();
 			endAction.TemplatePath = templatePath;
 
+#if UNITY_6000_4_OR_NEWER
+			ProjectWindowUtil.StartNameEditingIfProjectWindowExists(
+				default,
+				endAction,
+				defaultName,
+				EditorGUIUtility.IconContent("cs Script Icon").image as Texture2D,
+				null);
+#else
 			ProjectWindowUtil.StartNameEditingIfProjectWindowExists(
 				0,
 				endAction,
 				defaultName,
 				EditorGUIUtility.IconContent("cs Script Icon").image as Texture2D,
 				null);
+#endif
 		}
 
 		private static string FindTemplatePath(string fileName)
@@ -92,15 +101,21 @@ private static string FindTemplatePath(string fileName)
 			return null;
 		}
 
-		/// <summary>
-		/// Called by <see cref="ProjectWindowUtil"/> after the user confirms the file name.
-		/// Reads the template, replaces placeholders, and writes the final .cs file.
-		/// </summary>
-		private class ScriptNameEditAction : EndNameEditAction
+#if UNITY_6000_4_OR_NEWER
+		private class ScriptNameEditAction : AssetCreationEndAction
 		{
 			public string TemplatePath;
 
-			public override void Action(int instanceId, string pathName, string resourceFile)
+			public override void Action(EntityId entityId, string pathName, string resourceFile)
+			{
+				WriteScript(pathName);
+			}
+
+			public override void Cancelled(EntityId entityId, string pathName, string resourceFile)
+			{
+			}
+
+			private void WriteScript(string pathName)
 			{
 				var scriptName = Path.GetFileNameWithoutExtension(pathName);
 				var ns = DeriveNamespace(pathName);
@@ -117,10 +132,79 @@ public override void Action(int instanceId, string pathName, string resourceFile
 				ProjectWindowUtil.ShowCreatedAsset(asset);
 			}
 
+			private static string DeriveNamespace(string assetPath)
+			{
+				var rootNamespace = EditorSettings.projectGenerationRootNamespace;
+
+				if (string.IsNullOrEmpty(rootNamespace))
+				{
+					rootNamespace = "Game";
+				}
+
+				var dir = Path.GetDirectoryName(assetPath);
+
+				if (string.IsNullOrEmpty(dir))
+				{
+					return rootNamespace;
+				}
+
+				dir = dir.Replace('\\', '/');
+
+				const string assetsPrefix = "Assets/";
+
+				if (dir.StartsWith(assetsPrefix, StringComparison.Ordinal))
+				{
+					dir = dir.Substring(assetsPrefix.Length);
+				}
+
+				var parts = dir.Split('/');
+				var nsBuilder = new StringBuilder(rootNamespace);
+
+				foreach (var part in parts)
+				{
+					if (string.IsNullOrEmpty(part))
+					{
+						continue;
+					}
+
+					nsBuilder.Append('.');
+					nsBuilder.Append(part);
+				}
+
+				return nsBuilder.ToString();
+			}
+		}
+#else
+		private class ScriptNameEditAction : EndNameEditAction
+		{
+			public string TemplatePath;
+
+			public override void Action(int instanceId, string pathName, string resourceFile)
+			{
+				WriteScript(pathName);
+			}
+
 			public override void Cancelled(int instanceId, string pathName, string resourceFile)
 			{
 			}
 
+			private void WriteScript(string pathName)
+			{
+				var scriptName = Path.GetFileNameWithoutExtension(pathName);
+				var ns = DeriveNamespace(pathName);
+				var template = File.ReadAllText(TemplatePath, Encoding.UTF8);
+
+				var content = template
+					.Replace("$NAME$", scriptName)
+					.Replace("$NAMESPACE$", ns);
+
+				File.WriteAllText(pathName, content, Encoding.UTF8);
+				AssetDatabase.ImportAsset(pathName);
+
+				var asset = AssetDatabase.LoadAssetAtPath<UnityEngine.Object>(pathName);
+				ProjectWindowUtil.ShowCreatedAsset(asset);
+			}
+
 			private static string DeriveNamespace(string assetPath)
 			{
 				var rootNamespace = EditorSettings.projectGenerationRootNamespace;
@@ -163,5 +247,6 @@ private static string DeriveNamespace(string assetPath)
 				return nsBuilder.ToString();
 			}
 		}
+#endif
 	}
 }

Runtime/AssetsImporter/AddressableConfig.cs

@@ -10,7 +10,6 @@ namespace GameLovers.Services.AssetsImporter
 	/// Represents a configuration of an Addressable with all it's important data
 	/// The Id is the int representation of the AddressableId generated by the AddressableIdsGenerator code generator
 	/// </summary>
-	[Serializable]
 	public class AddressableConfig
 	{
 		public int Id;

Tests/PlayMode/Unit/CoroutineServiceTest.cs

@@ -145,19 +145,19 @@ public IEnumerator StopAllCoroutines_Successfully()
 		[UnityTest]
 		public IEnumerator Dispose_DestroysHostGameObject()
 		{
-			var initialCount = Object.FindObjectsByType<CoroutineServiceMonoBehaviour>(FindObjectsSortMode.None).Length;
+			var initialCount = Object.FindObjectsByType<CoroutineServiceMonoBehaviour>().Length;
 			var service = new CoroutineService();
 
 			Assert.AreEqual(
 				initialCount + 1,
-				Object.FindObjectsByType<CoroutineServiceMonoBehaviour>(FindObjectsSortMode.None).Length);
+				Object.FindObjectsByType<CoroutineServiceMonoBehaviour>().Length);
 
 			service.Dispose();
 			yield return null;
 
 			Assert.AreEqual(
 				initialCount,
-				Object.FindObjectsByType<CoroutineServiceMonoBehaviour>(FindObjectsSortMode.None).Length);
+				Object.FindObjectsByType<CoroutineServiceMonoBehaviour>().Length);
 		}
 
 		[UnityTest]

Tests/PlayMode/Unit/TickServiceTest.cs

@@ -141,15 +141,15 @@ public IEnumerator UnsubscribeAll_BySubscriber_RemovesOnlyThatSubscriber()
 		[UnityTest]
 		public IEnumerator Dispose_DestroysGameObject()
 		{
-			var initialCount = Object.FindObjectsByType<TickServiceMonoBehaviour>(FindObjectsSortMode.None).Length;
+			var initialCount = Object.FindObjectsByType<TickServiceMonoBehaviour>().Length;
 			var tickService = new TickService();
 
-			Assert.AreEqual(initialCount + 1, Object.FindObjectsByType<TickServiceMonoBehaviour>(FindObjectsSortMode.None).Length);
+			Assert.AreEqual(initialCount + 1, Object.FindObjectsByType<TickServiceMonoBehaviour>().Length);
 
 			tickService.Dispose();
 			yield return null; // Allow Destroy to complete
 
-			Assert.AreEqual(initialCount, Object.FindObjectsByType<TickServiceMonoBehaviour>(FindObjectsSortMode.None).Length);
+			Assert.AreEqual(initialCount, Object.FindObjectsByType<TickServiceMonoBehaviour>().Length);
 		}
 
 		[UnityTest]
@@ -367,7 +367,7 @@ public TickService()
 			var service1 = new TickService();
 			var service2 = new TickService();
 
-			var objects = Object.FindObjectsByType<TickServiceMonoBehaviour>(FindObjectsSortMode.None);
+			var objects = Object.FindObjectsByType<TickServiceMonoBehaviour>();
 			Assert.GreaterOrEqual(objects.Length, 2);
 
 			service1.Dispose();

package.json

@@ -2,7 +2,7 @@
   "name": "com.gamelovers.services",
   "displayName": "GameLovers Services",
   "author": "Miguel Tomas",
-  "version": "2.1.0",
+  "version": "2.1.1",
   "unity": "6000.3",
   "license": "MIT",
   "description": "Foundation services for a Unity based project (DI-lite, messaging, ticking, coroutines, pooling, persistence, RNG, time, commands, versioning) plus Addressables-based asset loading and importing tooling.",