Abstract class approach, removed wrapper

Author: Extrys

com.unity.netcode.gameobjects/Runtime/Spawning/INetworkPrefabInstanceHandlerWithData.cs

@@ -9,33 +9,26 @@ namespace Unity.Netcode
     /// Specialized version of <see cref="INetworkPrefabInstanceHandler"/> that receives
     /// custom instantiation data injected by the server before spawning.
     /// </summary>
-    public interface INetworkPrefabInstanceHandlerWithData<T> where T : struct, INetworkSerializable
+    public abstract class NetworkPrefabInstanceHandlerWithData<T> : INetworkPrefabInstanceHandlerWithData where T : struct, INetworkSerializable
     {
-        NetworkObject Instantiate(ulong ownerClientId, Vector3 position, Quaternion rotation, T instantiationData);
-        void Destroy(NetworkObject networkObject);
-    }
-
-    internal interface INetworkPrefabInstanceHandlerWithData : INetworkPrefabInstanceHandler
-    {
-        NetworkObject Instantiate(ulong ownerClientId, Vector3 position, Quaternion rotation, FastBufferReader reader);
-        bool HandlesDataType<T>();
-    }
-
-    internal class HandlerWrapper<T> : INetworkPrefabInstanceHandlerWithData where T : struct, INetworkSerializable
-    {
-        private readonly INetworkPrefabInstanceHandlerWithData<T> _impl;
+        public abstract NetworkObject Instantiate(ulong ownerClientId, Vector3 position, Quaternion rotation, T instantiationData);
 
-        public HandlerWrapper(INetworkPrefabInstanceHandlerWithData<T> impl) => _impl = impl;
-
-        public bool HandlesDataType<U>() => typeof(T) == typeof(U);
+        public abstract void Destroy(NetworkObject networkObject);
 
-        public NetworkObject Instantiate(ulong ownerClientId, Vector3 position, Quaternion rotation, FastBufferReader reader)
+        bool INetworkPrefabInstanceHandlerWithData.HandlesDataType<U>() => typeof(T) == typeof(U);
+       
+        NetworkObject INetworkPrefabInstanceHandlerWithData.Instantiate(ulong ownerClientId, Vector3 position, Quaternion rotation, FastBufferReader reader)
         {
             reader.ReadValueSafe(out T _payload);
-            return _impl.Instantiate(ownerClientId, position, rotation, _payload);
+            return Instantiate(ownerClientId, position, rotation, _payload);
         }
 
-        public NetworkObject Instantiate(ulong ownerClientId, Vector3 position, Quaternion rotation) => _impl.Instantiate(ownerClientId, position, rotation, default);
-        public void Destroy(NetworkObject networkObject) => _impl.Destroy(networkObject);
+        NetworkObject INetworkPrefabInstanceHandler.Instantiate(ulong ownerClientId, Vector3 position, Quaternion rotation) => Instantiate(ownerClientId, position, rotation, default);
+    }
+
+    internal interface INetworkPrefabInstanceHandlerWithData : INetworkPrefabInstanceHandler
+    {
+        bool HandlesDataType<T>();
+        NetworkObject Instantiate(ulong ownerClientId, Vector3 position, Quaternion rotation, FastBufferReader reader);
     }
 }

com.unity.netcode.gameobjects/Runtime/Spawning/NetworkPrefabHandler.cs

@@ -84,10 +84,6 @@ public bool AddHandler(GameObject networkPrefabAsset, INetworkPrefabInstanceHand
         {
             return AddHandler(networkPrefabAsset.GetComponent<NetworkObject>().GlobalObjectIdHash, instanceHandler);
         }
-        public bool AddHandler<T>(GameObject networkPrefabAsset, INetworkPrefabInstanceHandlerWithData<T> instanceHandler) where T : struct, INetworkSerializable
-        {
-            return AddHandler(networkPrefabAsset.GetComponent<NetworkObject>().GlobalObjectIdHash, instanceHandler);
-        }
 
         /// <summary>
         /// Use a  <see cref="NetworkObject"/> to register a class that implements the <see cref="INetworkPrefabInstanceHandler"/> interface with the <see cref="NetworkPrefabHandler"/>
@@ -99,10 +95,6 @@ public bool AddHandler(NetworkObject prefabAssetNetworkObject, INetworkPrefabIns
         {
             return AddHandler(prefabAssetNetworkObject.GlobalObjectIdHash, instanceHandler);
         }
-        public bool AddHandler<T>(NetworkObject prefabAssetNetworkObject, INetworkPrefabInstanceHandlerWithData<T> instanceHandler) where T : struct, INetworkSerializable
-        {
-            return AddHandler(prefabAssetNetworkObject.GlobalObjectIdHash, instanceHandler);
-        }
 
         /// <summary>
         /// Use a <see cref="NetworkObject.GlobalObjectIdHash"/> to register a class that implements the <see cref="INetworkPrefabInstanceHandler"/> interface with the <see cref="NetworkPrefabHandler"/>
@@ -124,12 +116,6 @@ public bool AddHandler(uint globalObjectIdHash, INetworkPrefabInstanceHandler in
 
             return false;
         }
-        public bool AddHandler<T>(uint globalObjectIdHash, INetworkPrefabInstanceHandlerWithData<T> instanceHandler) where T : struct, INetworkSerializable
-        {
-            if (!m_PrefabAssetToPrefabHandler.ContainsKey(globalObjectIdHash))
-                return AddHandler(globalObjectIdHash, new HandlerWrapper<T>(instanceHandler));
-            return false;
-        }
 
         public void SetInstantiationData<T>(GameObject gameObject, T instantiationData) where T : struct, INetworkSerializable
         {

com.unity.netcode.gameobjects/Tests/Runtime/Prefabs/NetworkPrefabHandlerWithDataTests.cs

@@ -128,7 +128,7 @@ private IEnumerator WaitForAllClientsToSync(NetworkSerializableTest expectedData
             Assert.False(timeoutHelper.TimedOut, "Data did not synchronize correctly to all clients.");
         }
 
-        private class PrefabInstanceHandlerWithData : INetworkPrefabInstanceHandlerWithData<NetworkSerializableTest>
+        private class PrefabInstanceHandlerWithData : NetworkPrefabInstanceHandlerWithData<NetworkSerializableTest>
         {
             public GameObject Prefab;
             public NetworkSerializableTest instantiationData;
@@ -138,13 +138,13 @@ public PrefabInstanceHandlerWithData(GameObject prefab)
                 Prefab = prefab;
             }
 
-            public NetworkObject Instantiate(ulong ownerClientId, Vector3 position, Quaternion rotation, NetworkSerializableTest data)
+            public override NetworkObject Instantiate(ulong ownerClientId, Vector3 position, Quaternion rotation, NetworkSerializableTest data)
             {
                 instantiationData = data;
                 return GameObject.Instantiate(Prefab, position, rotation).GetComponent<NetworkObject>();
             }
 
-            public void Destroy(NetworkObject networkObject)
+            public override void Destroy(NetworkObject networkObject)
             {
                 GameObject.DestroyImmediate(networkObject.gameObject);
             }