com.amanotes.prefabpool 1.3.0 → 2.0.0

package/CHANGELOG.md

@@ -1,5 +1,15 @@
 # Changelog
 
+## [2.0.0] - 2026-07-22
+
+### Added
+- `UnityObjectId` / `UnityObjectIdentity` — cross-version object identity using `EntityId` on Unity 6.0.4+ and `GetInstanceID()` on earlier versions (`UnityObjectIdentity.cs`)
+
+### Changed
+- **Breaking:** `MaterialPool.Take(Material, int borrowId)` → `MaterialPool.Take(Material, UnityObject borrower)` (`MaterialPool.cs`)
+- **Breaking:** `MaterialPool.Return(int borrowId)` → `MaterialPool.Return(UnityObject borrower)` (`MaterialPool.cs`)
+- Internal pool dictionaries use `UnityObjectId` keys instead of `int` instance IDs (`MaterialPool.cs`, `PrefabPool.cs`)
+
 ## [1.3.0] - 2026-06-12
 
 ### Added

package/Docs/PrefabPool-API.md

@@ -175,22 +175,24 @@ Static utility for pooling material instances.
 ```csharp
 public static class MaterialPool
 {
-    public static Material Take(Material sourceOrClone, int borrowId);
-    public static void Return(int borrowId);
+    public static Material Take(Material sourceOrClone, UnityObject borrower);
+    public static void Return(UnityObject borrower);
 }
 ```
 
 **Example:**
 ```csharp
+using UnityEngine;
+
 // Borrow material
-Material mat = MaterialPool.Take(originalMaterial, GetInstanceID());
-renderer.material = mat;
+Material mat = MaterialPool.Take(originalMaterial, renderer);
+renderer.sharedMaterial = mat;
 mat.SetAlpha(0.5f);
 
 // Return on destroy
 void OnDestroy()
 {
-    MaterialPool.Return(GetInstanceID());
+    MaterialPool.Return(renderer);
 }
 ```
 
@@ -313,17 +315,19 @@ void UpdateTileCount(int count)
 ### Pattern 4: Material Pooling
 
 ```csharp
+using UnityEngine;
+
 // When to use: Dynamic color/alpha changes without creating material instances
 public class ColoredTile : MonoBehaviour
 {
     private Material instanceMaterial;
-    private int borrowId;
+    private Renderer _renderer;
     
     void Start()
     {
-        borrowId = GetInstanceID();
-        instanceMaterial = MaterialPool.Take(GetComponent<Renderer>().sharedMaterial, borrowId);
-        GetComponent<Renderer>().material = instanceMaterial;
+        _renderer = GetComponent<Renderer>();
+        instanceMaterial = MaterialPool.Take(_renderer.sharedMaterial, _renderer);
+        _renderer.sharedMaterial = instanceMaterial;
     }
     
     public void SetColor(Color color)
@@ -333,7 +337,7 @@ public class ColoredTile : MonoBehaviour
     
     void OnDestroy()
     {
-        MaterialPool.Return(borrowId);
+        MaterialPool.Return(_renderer);
     }
 }
 ```

package/README.md

@@ -1,7 +1,7 @@
 # PrefabPool
 
 **Package:** `com.amanotes.prefabpool`  
-**Version:** 1.3.0
+**Version:** 2.0.0
 
 Generic object pooling system for Unity with lifecycle callbacks and material pooling support.
 
@@ -30,7 +30,7 @@ Add the package to your Unity project via `Packages/manifest.json`:
 ```json
 {
   "dependencies": {
-    "com.amanotes.prefabpool": "1.3.0"
+    "com.amanotes.prefabpool": "2.0.0"
   },
   "scopedRegistries": [
     {

package/Runtime/MaterialPool.cs

@@ -23,28 +23,29 @@ namespace Amanotes.Core
     
     public partial class MaterialPool
     {
-        [NonSerialized] private static readonly Dictionary<int, MaterialPool> _map = new Dictionary<int, MaterialPool>();
-        [NonSerialized] private static readonly Dictionary<int, MaterialPool> _cloned = new Dictionary<int, MaterialPool>();
+        [NonSerialized] private static readonly Dictionary<UnityObjectId, MaterialPool> _map = new Dictionary<UnityObjectId, MaterialPool>();
+        [NonSerialized] private static readonly Dictionary<UnityObjectId, MaterialPool> _cloned = new Dictionary<UnityObjectId, MaterialPool>();
         
         private static MaterialPool GetPool(Material sourceOrClone)
         {
             if (sourceOrClone == null) return null;
-            var instId = sourceOrClone.GetInstanceID();
+            var instId = UnityObjectIdentity.GetId(sourceOrClone);
             var isCloned = sourceOrClone.hideFlags == HideFlags.DontSave;
             return isCloned
                 ? _cloned.GetValueOrDefault(instId)
                 : _map.GetValueOrDefault(instId);
         }
         
-        public static Material Take(Material sourceOrClone, int borrowId)
+        public static Material Take(Material sourceOrClone, UnityObject borrower)
         {
             if (sourceOrClone == null) return null;
             var pool = GetPool(sourceOrClone) ?? new MaterialPool(sourceOrClone);
-            return pool.InternalTake(borrowId);
+            return pool.InternalTake(UnityObjectIdentity.GetId(borrower));
         }
         
-        public static void Return(int borrowId)
+        public static void Return(UnityObject borrower)
         {
+            var borrowId = UnityObjectIdentity.GetId(borrower);
             foreach (var kvp in _map)
             {
                 kvp.Value.InternalReturn(borrowId);
@@ -56,12 +57,12 @@ namespace Amanotes.Core
     {
         private readonly Material original;
         private readonly List<Material> pool = new List<Material>();
-        private readonly Dictionary<int, Material> borrowed = new Dictionary<int, Material>();
+        private readonly Dictionary<UnityObjectId, Material> borrowed = new Dictionary<UnityObjectId, Material>();
 
         private MaterialPool(Material source)
         {
             original = source;
-            _map[original.GetInstanceID()] = this;
+            _map[UnityObjectIdentity.GetId(original)] = this;
 
             if (source.hideFlags == HideFlags.DontSave)
             {
@@ -78,7 +79,7 @@ namespace Amanotes.Core
             if (pool.Count <= 0)
             {
                 result = new Material(original) { hideFlags = HideFlags.DontSave };
-                _cloned[result.GetInstanceID()] = this;
+                _cloned[UnityObjectIdentity.GetId(result)] = this;
                 return result;
             }
             
@@ -87,7 +88,7 @@ namespace Amanotes.Core
             return result;
         }
 
-        private Material InternalTake(int borrowId)
+        private Material InternalTake(UnityObjectId borrowId)
         {
             if (borrowed.TryGetValue(borrowId, out var mat)) return mat;
             
@@ -97,7 +98,7 @@ namespace Amanotes.Core
             return material;
         }
         
-        private void InternalReturn(int borrowId)
+        private void InternalReturn(UnityObjectId borrowId)
         {
             if (borrowed.Remove(borrowId, out var mat)) pool.Add(mat);
         }

package/Runtime/PrefabPool.cs

@@ -23,14 +23,14 @@ namespace Amanotes.Core
         [NonSerialized] private PoolGroup _parentGroup;
         
         // Per-instance IPoolPrefab cache — components don't change on pooled prefabs
-        [NonSerialized] private readonly Dictionary<int, IPoolPrefab[]> _poolPrefabCache = new Dictionary<int, IPoolPrefab[]>(32);
+        [NonSerialized] private readonly Dictionary<UnityObjectId, IPoolPrefab[]> _poolPrefabCache = new Dictionary<UnityObjectId, IPoolPrefab[]>(32);
         [NonSerialized] private static readonly List<IPoolPrefab> _tempPoolPrefabs = new List<IPoolPrefab>(8);
         
         public void SetParentGroup(PoolGroup parentGroup) => _parentGroup = parentGroup;
         
         private IPoolPrefab[] GetCachedPoolPrefabs(GameObject go)
         {
-            var instanceId = go.GetInstanceID();
+            var instanceId = UnityObjectIdentity.GetId(go);
             if (_poolPrefabCache.TryGetValue(instanceId, out var cached)) return cached;
             
             go.GetComponents(_tempPoolPrefabs);
@@ -311,7 +311,7 @@ namespace Amanotes.Core
         [NonSerialized] private bool _isReady = false;
         [NonSerialized] private bool _isInitializing = false;
         [NonSerialized] private readonly Dictionary<string, PoolGroup> _groups = new Dictionary<string, PoolGroup>();
-        [NonSerialized] private readonly Dictionary<int, PoolEntry> _instanceTypeMap = new Dictionary<int, PoolEntry>();
+        [NonSerialized] private readonly Dictionary<UnityObjectId, PoolEntry> _instanceTypeMap = new Dictionary<UnityObjectId, PoolEntry>();
         [NonSerialized] private readonly Dictionary<GameObject, PoolEntry> _customPool = new Dictionary<GameObject, PoolEntry>();
         
         public void Resize<T>(GameObject prefab, List<T> list, int count, Transform parent) where T: Component
@@ -385,7 +385,7 @@ namespace Amanotes.Core
             var result = entry.Get(transform, p, localPosition);
             if (result != null)
             {
-                _instanceTypeMap[result.GetInstanceID()] = entry;
+                _instanceTypeMap[UnityObjectIdentity.GetId(result)] = entry;
             }
             
             return result;
@@ -395,7 +395,7 @@ namespace Amanotes.Core
         {
             if (_isDestroyed || group == null || go == null) return;
             
-            var instanceId = go.GetInstanceID();
+            var instanceId = UnityObjectIdentity.GetId(go);
             if (_instanceTypeMap.TryGetValue(instanceId, out var entry))
             {
                 entry.Return(go, transform);
@@ -407,10 +407,10 @@ namespace Amanotes.Core
         {
 #if UNITY_EDITOR
             if (_instanceTypeMap.Count == 0) return;
-            var stale = new List<int>();
+            var stale = new List<UnityObjectId>();
             foreach (var kvp in _instanceTypeMap)
             {
-                if (EditorUtility.InstanceIDToObject(kvp.Key) == null) stale.Add(kvp.Key);
+                if (UnityObjectIdentity.IdToObject(kvp.Key) == null) stale.Add(kvp.Key);
             }
             foreach (var id in stale) _instanceTypeMap.Remove(id);
 #endif
@@ -482,7 +482,7 @@ namespace Amanotes.Core
 #if UNITY_EDITOR
             foreach (var kvp in _instanceTypeMap)
             {
-                var obj = EditorUtility.InstanceIDToObject(kvp.Key);
+                var obj = UnityObjectIdentity.IdToObject(kvp.Key);
                 if (obj != null) UnityObject.DestroyImmediate(obj);
             }
 #endif

package/Runtime/UnityObjectIdentity.cs

@@ -0,0 +1,60 @@
+using System;
+using UnityEngine;
+using UnityObject = UnityEngine.Object;
+
+namespace Amanotes.Core
+{
+    internal readonly struct UnityObjectId : IEquatable<UnityObjectId>
+    {
+#if UNITY_6000_4_OR_NEWER
+        private readonly EntityId _id;
+
+        public UnityObjectId(UnityObject obj) => _id = obj != null ? obj.GetEntityId() : default;
+
+        public bool IsValid => _id.IsValid();
+
+        public bool Equals(UnityObjectId other) => _id.Equals(other._id);
+
+        public override int GetHashCode() => _id.GetHashCode();
+
+        public override string ToString() => _id.ToString();
+
+#if UNITY_EDITOR
+        public UnityObject ToObject() => UnityEditor.EditorUtility.EntityIdToObject(_id);
+#endif
+#else
+        private readonly int _id;
+
+        public UnityObjectId(UnityObject obj) => _id = obj != null ? obj.GetInstanceID() : 0;
+
+        public bool IsValid => _id != 0;
+
+        public bool Equals(UnityObjectId other) => _id == other._id;
+
+        public override int GetHashCode() => _id;
+
+        public override string ToString() => _id.ToString();
+
+#if UNITY_EDITOR
+        public UnityObject ToObject() => UnityEditor.EditorUtility.InstanceIDToObject(_id);
+#endif
+#endif
+
+        public static bool operator ==(UnityObjectId left, UnityObjectId right) => left.Equals(right);
+
+        public static bool operator !=(UnityObjectId left, UnityObjectId right) => !left.Equals(right);
+
+        public override bool Equals(object obj) => obj is UnityObjectId other && Equals(other);
+    }
+
+    internal static class UnityObjectIdentity
+    {
+        public static UnityObjectId GetId(UnityObject obj) => new UnityObjectId(obj);
+
+        public static bool IsValid(UnityObjectId id) => id.IsValid;
+
+#if UNITY_EDITOR
+        public static UnityObject IdToObject(UnityObjectId id) => id.ToObject();
+#endif
+    }
+}

package/Runtime/UnityObjectIdentity.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 082b2708eccfb47e1b78c452d24ec500
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

package/Tests/Runtime/PrefabPoolGroupTests.cs

@@ -119,11 +119,8 @@ namespace Amanotes.Core
                 var objFromB = _groupB.Get("PrefabB");
                 Assert.IsNotNull(objFromB, $"Iteration {i}: GroupB should return valid GameObject");
                 
-                var instanceIdA = objFromA.GetInstanceID();
-                var instanceIdB = objFromB.GetInstanceID();
-                
-                Assert.AreNotEqual(instanceIdA, instanceIdB, 
-                    $"Iteration {i}: Objects from different groups should have different instance IDs");
+                Assert.AreNotSame(objFromA, objFromB,
+                    $"Iteration {i}: Objects from different groups should be different instances");
                 
                 Assert.IsTrue(objFromA.name.Contains("PrefabA"), 
                     $"Iteration {i}: Object from GroupA should be PrefabA instance");
@@ -136,9 +133,9 @@ namespace Amanotes.Core
                 var reusedFromA = _groupA.Get("PrefabA");
                 var reusedFromB = _groupB.Get("PrefabB");
                 
-                Assert.AreEqual(instanceIdA, reusedFromA.GetInstanceID(), 
+                Assert.AreSame(objFromA, reusedFromA,
                     $"Iteration {i}: GroupA should reuse its own objects");
-                Assert.AreEqual(instanceIdB, reusedFromB.GetInstanceID(), 
+                Assert.AreSame(objFromB, reusedFromB,
                     $"Iteration {i}: GroupB should reuse its own objects");
                 
                 Assert.IsTrue(reusedFromA.name.Contains("PrefabA"), 
@@ -168,11 +165,6 @@ namespace Amanotes.Core
                 Assert.IsNotNull(objB1, $"Iteration {i}: GroupB Get 1 should return valid GameObject");
                 Assert.IsNotNull(objB2, $"Iteration {i}: GroupB Get 2 should return valid GameObject");
                 
-                var instanceIdA1 = objA1.GetInstanceID();
-                var instanceIdA2 = objA2.GetInstanceID();
-                var instanceIdB1 = objB1.GetInstanceID();
-                var instanceIdB2 = objB2.GetInstanceID();
-                
                 _groupA.Return(objA1);
                 _groupA.Return(objA2);
                 _groupB.Return(objB1);
@@ -183,35 +175,27 @@ namespace Amanotes.Core
                 var reusedB1 = _groupB.Get("PrefabB");
                 var reusedB2 = _groupB.Get("PrefabB");
                 
-                var reusedInstanceIdsA = new HashSet<int> 
-                { 
-                    reusedA1.GetInstanceID(), 
-                    reusedA2.GetInstanceID() 
-                };
-                var reusedInstanceIdsB = new HashSet<int> 
-                { 
-                    reusedB1.GetInstanceID(), 
-                    reusedB2.GetInstanceID() 
-                };
-                
-                Assert.IsTrue(reusedInstanceIdsA.Contains(instanceIdA1), 
+                var reusedObjectsA = new HashSet<GameObject> { reusedA1, reusedA2 };
+                var reusedObjectsB = new HashSet<GameObject> { reusedB1, reusedB2 };
+                
+                Assert.IsTrue(reusedObjectsA.Contains(objA1),
                     $"Iteration {i}: Object returned to GroupA should be retrieved from GroupA");
-                Assert.IsTrue(reusedInstanceIdsA.Contains(instanceIdA2), 
+                Assert.IsTrue(reusedObjectsA.Contains(objA2),
                     $"Iteration {i}: Object returned to GroupA should be retrieved from GroupA");
                 
-                Assert.IsTrue(reusedInstanceIdsB.Contains(instanceIdB1), 
+                Assert.IsTrue(reusedObjectsB.Contains(objB1),
                     $"Iteration {i}: Object returned to GroupB should be retrieved from GroupB");
-                Assert.IsTrue(reusedInstanceIdsB.Contains(instanceIdB2), 
+                Assert.IsTrue(reusedObjectsB.Contains(objB2),
                     $"Iteration {i}: Object returned to GroupB should be retrieved from GroupB");
                 
-                Assert.IsFalse(reusedInstanceIdsA.Contains(instanceIdB1), 
+                Assert.IsFalse(reusedObjectsA.Contains(objB1),
                     $"Iteration {i}: GroupA should not return objects from GroupB");
-                Assert.IsFalse(reusedInstanceIdsA.Contains(instanceIdB2), 
+                Assert.IsFalse(reusedObjectsA.Contains(objB2),
                     $"Iteration {i}: GroupA should not return objects from GroupB");
                 
-                Assert.IsFalse(reusedInstanceIdsB.Contains(instanceIdA1), 
+                Assert.IsFalse(reusedObjectsB.Contains(objA1),
                     $"Iteration {i}: GroupB should not return objects from GroupA");
-                Assert.IsFalse(reusedInstanceIdsB.Contains(instanceIdA2), 
+                Assert.IsFalse(reusedObjectsB.Contains(objA2),
                     $"Iteration {i}: GroupB should not return objects from GroupA");
                 
                 _groupA.Return(reusedA1);

package/Tests/Runtime/PrefabPoolLifecycleTests.cs

@@ -81,16 +81,12 @@ namespace Amanotes.Core
                 var firstGet = _testGroup.Get("TestPrefab");
                 Assert.IsNotNull(firstGet, $"Iteration {i}: First Get should return valid GameObject");
                 
-                var firstInstanceId = firstGet.GetInstanceID();
-                
                 _testGroup.Return(firstGet);
                 
                 var secondGet = _testGroup.Get("TestPrefab");
                 Assert.IsNotNull(secondGet, $"Iteration {i}: Second Get should return valid GameObject");
                 
-                var secondInstanceId = secondGet.GetInstanceID();
-                
-                Assert.AreEqual(firstInstanceId, secondInstanceId, 
+                Assert.AreSame(firstGet, secondGet,
                     $"Iteration {i}: Get-Return-Get should reuse same instance (validates pooling eliminates instantiation)");
                 
                 _testGroup.Return(secondGet);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "com.amanotes.prefabpool",
-  "version": "1.3.0",
+  "version": "2.0.0",
   "displayName": "[Ama] Prefab Pool",
   "description": "Generic object pooling system for Unity",
   "unity": "2022.3",