Replace reflection with version-gated conditional compilation.

tomicz · tomicz · commit deea7d2a56b1 · 2026-04-11T22:55:45.000+02:00
Addresses review feedback on the Unity 6.5 GetInstanceID migration:

- UnityObjectIdCompatExtensions: drop the reflective method lookup in
  favor of a simple #if UNITY_6000_5_OR_NEWER / #else split calling
  GetEntityId() or GetInstanceID() directly. Also wrap the class in
  the MCPForUnity.Runtime.Helpers namespace.
- UnityTypeConverters: remove the reflective EntityIdToObject probe and
  call EditorUtility.EntityIdToObject(EntityId) directly under the same
  version gate. Serialize entityID as EntityId.ToULong() rather than
  ToString(), since Unity's docs explicitly warn that the textual form
  is not a stable serialization contract.
- Drop #pragma warning disable 0619 from 22 files that no longer make
  any direct calls to obsolete APIs. The remaining 7 files still need
  it (FindObjectsOfType, InstanceIDToObject fallback) and are left as-is
  — those deprecations are out of scope for this PR.
- Add the MCPForUnity.Runtime.Helpers using to every file that calls
  GetInstanceIDCompat() now that the extension method lives in a
  namespace.
diff --git a/MCPForUnity/Editor/Helpers/ComponentOps.cs b/MCPForUnity/Editor/Helpers/ComponentOps.cs
@@ -1,11 +1,11 @@
-#pragma warning disable 0619
 using System;
 using System.Collections.Generic;
 using System.Reflection;
 using Newtonsoft.Json.Linq;
 using UnityEditor;
 using UnityEngine;
 using UnityEngine.Events;
+using MCPForUnity.Runtime.Helpers;
 
 namespace MCPForUnity.Editor.Helpers
 {
diff --git a/MCPForUnity/Editor/Helpers/GameObjectLookup.cs b/MCPForUnity/Editor/Helpers/GameObjectLookup.cs
@@ -7,6 +7,7 @@
 using UnityEditor.SceneManagement;
 using UnityEngine;
 using UnityEngine.SceneManagement;
+using MCPForUnity.Runtime.Helpers;
 
 namespace MCPForUnity.Editor.Helpers
 {
diff --git a/MCPForUnity/Editor/Helpers/GameObjectSerializer.cs b/MCPForUnity/Editor/Helpers/GameObjectSerializer.cs
@@ -1,4 +1,3 @@
-#pragma warning disable 0619
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -8,6 +7,7 @@
 using Newtonsoft.Json.Linq;
 using UnityEditor;
 using UnityEngine;
+using MCPForUnity.Runtime.Helpers;
 
 namespace MCPForUnity.Editor.Helpers
 {
diff --git a/MCPForUnity/Editor/Resources/Editor/Selection.cs b/MCPForUnity/Editor/Resources/Editor/Selection.cs
@@ -1,9 +1,9 @@
-#pragma warning disable 0619
 using System;
 using System.Linq;
 using MCPForUnity.Editor.Helpers;
 using Newtonsoft.Json.Linq;
 using UnityEditor;
+using MCPForUnity.Runtime.Helpers;
 
 namespace MCPForUnity.Editor.Resources.Editor
 {
diff --git a/MCPForUnity/Editor/Resources/Editor/Windows.cs b/MCPForUnity/Editor/Resources/Editor/Windows.cs
@@ -5,6 +5,7 @@
 using Newtonsoft.Json.Linq;
 using UnityEditor;
 using UnityEngine;
+using MCPForUnity.Runtime.Helpers;
 
 namespace MCPForUnity.Editor.Resources.Editor
 {
diff --git a/MCPForUnity/Editor/Resources/Scene/GameObjectResource.cs b/MCPForUnity/Editor/Resources/Scene/GameObjectResource.cs
@@ -1,11 +1,11 @@
-#pragma warning disable 0619
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using MCPForUnity.Editor.Helpers;
 using Newtonsoft.Json.Linq;
 using UnityEditor;
 using UnityEngine;
+using MCPForUnity.Runtime.Helpers;
 
 namespace MCPForUnity.Editor.Resources.Scene
 {
diff --git a/MCPForUnity/Editor/Tools/Cameras/CameraConfigure.cs b/MCPForUnity/Editor/Tools/Cameras/CameraConfigure.cs
@@ -1,10 +1,10 @@
-#pragma warning disable 0619
 using System;
 using System.Reflection;
 using MCPForUnity.Editor.Helpers;
 using Newtonsoft.Json.Linq;
 using UnityEditor;
 using UnityEngine;
+using MCPForUnity.Runtime.Helpers;
 
 namespace MCPForUnity.Editor.Tools.Cameras
 {
diff --git a/MCPForUnity/Editor/Tools/Cameras/CameraControl.cs b/MCPForUnity/Editor/Tools/Cameras/CameraControl.cs
@@ -7,6 +7,7 @@
 using Newtonsoft.Json.Linq;
 using UnityEditor;
 using UnityEngine;
+using MCPForUnity.Runtime.Helpers;
 
 namespace MCPForUnity.Editor.Tools.Cameras
 {
diff --git a/MCPForUnity/Editor/Tools/Cameras/CameraCreate.cs b/MCPForUnity/Editor/Tools/Cameras/CameraCreate.cs
@@ -1,11 +1,11 @@
-#pragma warning disable 0619
 using System;
 using System.Collections.Generic;
 using System.Reflection;
 using MCPForUnity.Editor.Helpers;
 using Newtonsoft.Json.Linq;
 using UnityEditor;
 using UnityEngine;
+using MCPForUnity.Runtime.Helpers;
 
 namespace MCPForUnity.Editor.Tools.Cameras
 {
diff --git a/MCPForUnity/Editor/Tools/GameObjects/GameObjectDelete.cs b/MCPForUnity/Editor/Tools/GameObjects/GameObjectDelete.cs
@@ -1,10 +1,10 @@
-#pragma warning disable 0619
 #nullable disable
 using System.Collections.Generic;
 using MCPForUnity.Editor.Helpers;
 using Newtonsoft.Json.Linq;
 using UnityEditor;
 using UnityEngine;
+using MCPForUnity.Runtime.Helpers;
 
 namespace MCPForUnity.Editor.Tools.GameObjects
 {
diff --git a/MCPForUnity/Editor/Tools/GameObjects/GameObjectDuplicate.cs b/MCPForUnity/Editor/Tools/GameObjects/GameObjectDuplicate.cs
@@ -1,10 +1,10 @@
-#pragma warning disable 0619
 #nullable disable
 using MCPForUnity.Editor.Helpers;
 using Newtonsoft.Json.Linq;
 using UnityEditor;
 using UnityEditor.SceneManagement;
 using UnityEngine;
+using MCPForUnity.Runtime.Helpers;
 
 namespace MCPForUnity.Editor.Tools.GameObjects
 {
diff --git a/MCPForUnity/Editor/Tools/GameObjects/GameObjectLookAt.cs b/MCPForUnity/Editor/Tools/GameObjects/GameObjectLookAt.cs
@@ -1,9 +1,9 @@
-#pragma warning disable 0619
 #nullable disable
 using MCPForUnity.Editor.Helpers;
 using Newtonsoft.Json.Linq;
 using UnityEditor;
 using UnityEngine;
+using MCPForUnity.Runtime.Helpers;
 
 namespace MCPForUnity.Editor.Tools.GameObjects
 {
diff --git a/MCPForUnity/Editor/Tools/GameObjects/ManageGameObjectCommon.cs b/MCPForUnity/Editor/Tools/GameObjects/ManageGameObjectCommon.cs
@@ -9,6 +9,7 @@
 using UnityEditor.SceneManagement;
 using UnityEngine;
 using UnityEngine.SceneManagement;
+using MCPForUnity.Runtime.Helpers;
 
 namespace MCPForUnity.Editor.Tools.GameObjects
 {
diff --git a/MCPForUnity/Editor/Tools/Graphics/LightBakingOps.cs b/MCPForUnity/Editor/Tools/Graphics/LightBakingOps.cs
@@ -1,4 +1,3 @@
-#pragma warning disable 0619
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -8,6 +7,7 @@
 using UnityEditor;
 using UnityEngine;
 using UnityEngine.Rendering;
+using MCPForUnity.Runtime.Helpers;
 
 namespace MCPForUnity.Editor.Tools.Graphics
 {
diff --git a/MCPForUnity/Editor/Tools/Graphics/RendererFeatureOps.cs b/MCPForUnity/Editor/Tools/Graphics/RendererFeatureOps.cs
@@ -1,4 +1,3 @@
-#pragma warning disable 0619
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -8,6 +7,7 @@
 using UnityEditor;
 using UnityEngine;
 using UnityEngine.Rendering;
+using MCPForUnity.Runtime.Helpers;
 
 namespace MCPForUnity.Editor.Tools.Graphics
 {
diff --git a/MCPForUnity/Editor/Tools/Graphics/SkyboxOps.cs b/MCPForUnity/Editor/Tools/Graphics/SkyboxOps.cs
@@ -1,11 +1,11 @@
-#pragma warning disable 0619
 using System;
 using System.Collections.Generic;
 using Newtonsoft.Json.Linq;
 using MCPForUnity.Editor.Helpers;
 using UnityEditor;
 using UnityEngine;
 using UnityEngine.Rendering;
+using MCPForUnity.Runtime.Helpers;
 
 namespace MCPForUnity.Editor.Tools.Graphics
 {
diff --git a/MCPForUnity/Editor/Tools/Graphics/VolumeOps.cs b/MCPForUnity/Editor/Tools/Graphics/VolumeOps.cs
@@ -7,6 +7,7 @@
 using Newtonsoft.Json.Linq;
 using UnityEditor;
 using UnityEngine;
+using MCPForUnity.Runtime.Helpers;
 
 namespace MCPForUnity.Editor.Tools.Graphics
 {
diff --git a/MCPForUnity/Editor/Tools/ManageAsset.cs b/MCPForUnity/Editor/Tools/ManageAsset.cs
@@ -1,4 +1,3 @@
-#pragma warning disable 0619
 using System;
 using System.Collections.Generic;
 using System.Globalization;
@@ -16,6 +15,7 @@
 #else
 using PhysicsMaterialType = UnityEngine.PhysicMaterial;
 using PhysicsMaterialCombine = UnityEngine.PhysicMaterialCombine;
+using MCPForUnity.Runtime.Helpers;
 #endif
 
 namespace MCPForUnity.Editor.Tools
diff --git a/MCPForUnity/Editor/Tools/ManageComponents.cs b/MCPForUnity/Editor/Tools/ManageComponents.cs
@@ -1,4 +1,3 @@
-#pragma warning disable 0619
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -8,6 +7,7 @@
 using UnityEditor;
 using UnityEditor.SceneManagement;
 using UnityEngine;
+using MCPForUnity.Runtime.Helpers;
 
 namespace MCPForUnity.Editor.Tools
 {
diff --git a/MCPForUnity/Editor/Tools/ManageMaterial.cs b/MCPForUnity/Editor/Tools/ManageMaterial.cs
@@ -1,11 +1,11 @@
-#pragma warning disable 0619
 using System;
 using System.Collections.Generic;
 using MCPForUnity.Editor.Helpers;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 using UnityEditor;
 using UnityEngine;
+using MCPForUnity.Runtime.Helpers;
 
 namespace MCPForUnity.Editor.Tools
 {
diff --git a/MCPForUnity/Editor/Tools/ManageUI.cs b/MCPForUnity/Editor/Tools/ManageUI.cs
@@ -1,4 +1,3 @@
-#pragma warning disable 0619
 using System;
 using System.Collections.Generic;
 using System.IO;
diff --git a/MCPForUnity/Editor/Tools/Physics/JointOps.cs b/MCPForUnity/Editor/Tools/Physics/JointOps.cs
@@ -1,11 +1,11 @@
-#pragma warning disable 0619
 using System;
 using System.Collections.Generic;
 using System.Reflection;
 using Newtonsoft.Json.Linq;
 using UnityEditor;
 using UnityEngine;
 using MCPForUnity.Editor.Helpers;
+using MCPForUnity.Runtime.Helpers;
 
 namespace MCPForUnity.Editor.Tools.Physics
 {
diff --git a/MCPForUnity/Editor/Tools/Physics/PhysicsQueryOps.cs b/MCPForUnity/Editor/Tools/Physics/PhysicsQueryOps.cs
@@ -1,9 +1,9 @@
-#pragma warning disable 0619
 using System;
 using System.Collections.Generic;
 using Newtonsoft.Json.Linq;
 using UnityEngine;
 using MCPForUnity.Editor.Helpers;
+using MCPForUnity.Runtime.Helpers;
 
 namespace MCPForUnity.Editor.Tools.Physics
 {
diff --git a/MCPForUnity/Editor/Tools/Physics/PhysicsRigidbodyOps.cs b/MCPForUnity/Editor/Tools/Physics/PhysicsRigidbodyOps.cs
@@ -1,10 +1,10 @@
-#pragma warning disable 0619
 using System;
 using System.Collections.Generic;
 using Newtonsoft.Json.Linq;
 using UnityEditor;
 using UnityEngine;
 using MCPForUnity.Editor.Helpers;
+using MCPForUnity.Runtime.Helpers;
 
 namespace MCPForUnity.Editor.Tools.Physics
 {
diff --git a/MCPForUnity/Editor/Tools/Physics/PhysicsSimulationOps.cs b/MCPForUnity/Editor/Tools/Physics/PhysicsSimulationOps.cs
@@ -3,6 +3,7 @@
 using MCPForUnity.Editor.Helpers;
 using Newtonsoft.Json.Linq;
 using UnityEngine;
+using MCPForUnity.Runtime.Helpers;
 
 namespace MCPForUnity.Editor.Tools.Physics
 {
diff --git a/MCPForUnity/Editor/Tools/Prefabs/ManagePrefabs.cs b/MCPForUnity/Editor/Tools/Prefabs/ManagePrefabs.cs
@@ -1,4 +1,3 @@
-#pragma warning disable 0619
 using System;
 using System.Collections.Generic;
 using System.IO;
@@ -9,6 +8,7 @@
 using UnityEditor.SceneManagement;
 using UnityEngine;
 using UnityEngine.SceneManagement;
+using MCPForUnity.Runtime.Helpers;
 
 namespace MCPForUnity.Editor.Tools.Prefabs
 {
diff --git a/MCPForUnity/Editor/Tools/ProBuilder/ManageProBuilder.cs b/MCPForUnity/Editor/Tools/ProBuilder/ManageProBuilder.cs
@@ -1,4 +1,3 @@
-#pragma warning disable 0619
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -7,6 +6,7 @@
 using MCPForUnity.Editor.Helpers;
 using UnityEditor;
 using UnityEngine;
+using MCPForUnity.Runtime.Helpers;
 
 namespace MCPForUnity.Editor.Tools.ProBuilder
 {
diff --git a/MCPForUnity/Editor/Tools/Vfx/ParticleControl.cs b/MCPForUnity/Editor/Tools/Vfx/ParticleControl.cs
@@ -1,9 +1,9 @@
-#pragma warning disable 0619
 using System;
 using Newtonsoft.Json.Linq;
 using UnityEditor;
 using UnityEngine;
 using MCPForUnity.Editor.Helpers;
+using MCPForUnity.Runtime.Helpers;
 
 namespace MCPForUnity.Editor.Tools.Vfx
 {
diff --git a/MCPForUnity/Runtime/Helpers/UnityObjectIdCompatExtensions.cs b/MCPForUnity/Runtime/Helpers/UnityObjectIdCompatExtensions.cs
@@ -1,40 +1,30 @@
-using System.Reflection;
 using UnityEngine;
 
-public static class UnityObjectIdCompatExtensions
+namespace MCPForUnity.Runtime.Helpers
 {
-    private static readonly MethodInfo GetInstanceIdMethod = typeof(Object).GetMethod("GetInstanceID", BindingFlags.Public | BindingFlags.Instance);
-    private static readonly MethodInfo GetEntityIdMethod = typeof(Object).GetMethod("GetEntityId", BindingFlags.Public | BindingFlags.Instance);
-
-    public static int GetInstanceIDCompat(this Object obj)
+    /// <summary>
+    /// Version-gated wrapper for <see cref="Object.GetInstanceID"/>, which was removed in Unity 6.5
+    /// in favor of <see cref="Object.GetEntityId"/>. Returns a session-scoped int handle that
+    /// callers can use for in-process comparisons and wire-format compatibility with older readers.
+    /// For deserialization round-trips on Unity 6.5+, prefer the full <c>entityID</c> field.
+    /// </summary>
+    public static class UnityObjectIdCompatExtensions
     {
-        if (obj == null)
+        public static int GetInstanceIDCompat(this Object obj)
         {
-            return 0;
-        }
-
-        if (GetInstanceIdMethod != null)
-        {
-            object result = GetInstanceIdMethod.Invoke(obj, null);
-            if (result is int id)
+            if (obj == null)
             {
-                return id;
+                return 0;
             }
-        }
 
-        if (GetEntityIdMethod != null)
-        {
-            object entity = GetEntityIdMethod.Invoke(obj, null);
-            if (entity != null)
-            {
-                if (int.TryParse(entity.ToString(), out int parsed))
-                {
-                    return parsed;
-                }
-            }
+#if UNITY_6000_5_OR_NEWER
+            // GetInstanceID() is obsolete-as-error on Unity 6.5+. Truncate the EntityId's
+            // underlying ulong to int; this is lossy but stable within a session and
+            // preserves the int-shaped wire format that older consumers expect.
+            return (int)EntityId.ToULong(obj.GetEntityId());
+#else
+            return obj.GetInstanceID();
+#endif
         }
-
-        Debug.LogWarning($"[UnityObjectIdCompatExtensions] Failed to resolve Unity object ID for '{obj.name}'. Returning 0.");
-        return 0;
     }
 }
diff --git a/MCPForUnity/Runtime/Serialization/UnityTypeConverters.cs b/MCPForUnity/Runtime/Serialization/UnityTypeConverters.cs

Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,7 @@`
`7`	`7`	`using UnityEditor.SceneManagement;`
`8`	`8`	`using UnityEngine;`
`9`	`9`	`using UnityEngine.SceneManagement;`
	`10`	`+using MCPForUnity.Runtime.Helpers;`
`10`	`11`
`11`	`12`	`namespace MCPForUnity.Editor.Helpers`
`12`	`13`	`{`
Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,7 @@`
`5`	`5`	`using Newtonsoft.Json.Linq;`
`6`	`6`	`using UnityEditor;`
`7`	`7`	`using UnityEngine;`
	`8`	`+using MCPForUnity.Runtime.Helpers;`
`8`	`9`
`9`	`10`	`namespace MCPForUnity.Editor.Resources.Editor`
`10`	`11`	`{`