Upgrading to use the new callback registration

Author: Chris

workers/unity/Assets/Gamelogic/Pirates/Behaviours/PlayerEntityLifecycleManager.cs

@@ -27,8 +27,8 @@ void OnEnable()
             PlayerLifecycleWriter.Send(new PlayerLifecycle.Update().SetCurrentMissedHeartbeats(0));
 
             // Register command callbacks
-            PlayerLifecycleWriter.CommandReceiver.OnDeletePlayer += OnDeletePlayer;
-            PlayerLifecycleWriter.CommandReceiver.OnHeartbeat += OnHeartbeat;
+            PlayerLifecycleWriter.CommandReceiver.OnDeletePlayer.RegisterResponse(OnDeletePlayer);
+            PlayerLifecycleWriter.CommandReceiver.OnHeartbeat.RegisterResponse(OnHeartbeat);
 
             // Periodic counter increase
             InvokeRepeating("IncrementMissedHeartbeats", 0f, PlayerLifecycleWriter.Data.playerHeartbeatInterval);
@@ -37,17 +37,16 @@ void OnEnable()
         void OnDisable()
         {
             // Deregister command callbacks
-            PlayerLifecycleWriter.CommandReceiver.OnDeletePlayer -= OnDeletePlayer;
-            PlayerLifecycleWriter.CommandReceiver.OnHeartbeat -= OnHeartbeat;
+            PlayerLifecycleWriter.CommandReceiver.OnDeletePlayer.DeregisterResponse();
+            PlayerLifecycleWriter.CommandReceiver.OnHeartbeat.DeregisterResponse();
 
             CancelInvoke("IncrementMissedHeartbeats");
         }
 
-        // Command callback for requests for this entity to be deleted from the simulation
-        private void OnDeletePlayer(ResponseHandle<PlayerLifecycle.Commands.DeletePlayer, DeletePlayerRequest, DeletePlayerResponse> responseHandle)
+        private DeletePlayerResponse OnDeletePlayer(DeletePlayerRequest Request, ICommandCallerInfo CallerInfo)
         {
             DeletePlayer();
-            responseHandle.Respond(new DeletePlayerResponse());
+            return new DeletePlayerResponse();
         }
 
         private void DeletePlayer()
@@ -65,16 +64,16 @@ private void DeletePlayer()
         }
 
         // Command callback for handling heartbeats from clients indicating client is connect and missed heartbeat counter should be reset
-        private void OnHeartbeat(ResponseHandle<PlayerLifecycle.Commands.Heartbeat, HeartbeatRequest, HeartbeatResponse> responseHandle)
+        private HeartbeatResponse OnHeartbeat(HeartbeatRequest Request, ICommandCallerInfo CallerInfo)
         {
             // Heartbeats are issued by clients authoritative over the player entity and should only be sending heartbeats for themselves
-            if (responseHandle.Request.senderEntityId == thisEntityId)
+            if (Request.senderEntityId == thisEntityId)
             {
                 // Reset missed heartbeat counter to avoid entity being deleted
                 PlayerLifecycleWriter.Send(new PlayerLifecycle.Update().SetCurrentMissedHeartbeats(0));
             }
             // Acknowledge command receipt
-            responseHandle.Respond(new HeartbeatResponse());
+            return new HeartbeatResponse();
         }
 
         private void IncrementMissedHeartbeats()

workers/unity/Assets/Gamelogic/Pirates/Behaviours/PlayerHeartbeatSender.cs

@@ -31,13 +31,13 @@ private void OnEnable()
             InvokeRepeating("SendHeartbeat", 0f, PlayerLifecycleReader.Data.playerHeartbeatInterval);
 
             // Register callback for when components change
-            PlayerLifecycleReader.ComponentUpdated += OnComponentUpdated;
+            PlayerLifecycleReader.ComponentUpdated.Add(OnComponentUpdated);
         }
 
         private void OnDisable()
         {
             // Deregister callback for when components change
-            PlayerLifecycleReader.ComponentUpdated -= OnComponentUpdated;
+            PlayerLifecycleReader.ComponentUpdated.Remove(OnComponentUpdated);
         }
 
         // Callback for whenever one or more property of the PlayerLifecycle component is updated

workers/unity/Assets/Gamelogic/Pirates/Behaviours/PlayerSpawnManager.cs

@@ -19,22 +19,22 @@ public class PlayerSpawnManager : MonoBehaviour
         void OnEnable()
         {
             // Register command callback
-            SpawnerWriter.CommandReceiver.OnSpawnPlayer += OnSpawnPlayer;
+            SpawnerWriter.CommandReceiver.OnSpawnPlayer.RegisterAsyncResponse(OnSpawnPlayer);
         }
 
         void OnDisable()
         {
             // Deregister command callback
-            SpawnerWriter.CommandReceiver.OnSpawnPlayer -= OnSpawnPlayer;
+            SpawnerWriter.CommandReceiver.OnSpawnPlayer.DeregisterResponse();
         }
 
         // Command callback for requests by new clients for a new player ship to be spawned
         private void OnSpawnPlayer(
-            ResponseHandle<Spawner.Commands.SpawnPlayer, SpawnPlayerRequest, SpawnPlayerResponse> responseHandle)
+            ResponseHandle<Spawner.Commands.SpawnPlayer, SpawnPlayerRequest, SpawnPlayerResponse> Handle)
         {
-            var request = responseHandle.Request;
-            var playerEntityTemplate = PlayerShipEntityTemplate.GeneratePlayerShipEntityTemplate(responseHandle.CallerInfo.CallerWorkerId,
-                 request.initialPosition);
+            
+            var playerEntityTemplate = PlayerShipEntityTemplate.GeneratePlayerShipEntityTemplate(Handle.CallerInfo.CallerWorkerId,
+                 Handle.Request.initialPosition);
             SpatialOS.Commands.CreateEntity(SpawnerWriter, "PlayerShip", playerEntityTemplate, result =>
             {
                 if (result.StatusCode != StatusCode.Success)
@@ -46,7 +46,7 @@ private void OnSpawnPlayer(
                 Debug.Log("PlayerSpawnManager created player entity with entity ID: " + createdEntityId);
 
                 // Acknowledge command receipt and provide client with ID for newly created entity
-                responseHandle.Respond(new SpawnPlayerResponse(createdEntityId));
+                Handle.Respond(new SpawnPlayerResponse(createdEntityId));
             });
         }
     }

workers/unity/Assets/Gamelogic/Pirates/Behaviours/TransformReceiver.cs

@@ -18,13 +18,13 @@ void OnEnable()
             transform.rotation = Quaternion.Euler(0.0f, WorldTransformReader.Data.rotation, 0.0f);
 
             // Register callback for when component changes
-            WorldTransformReader.ComponentUpdated += OnComponentUpdated;
+            WorldTransformReader.ComponentUpdated.Add(OnComponentUpdated);
         }
 
         void OnDisable()
         {
             // Deregister callback for when component changes
-            WorldTransformReader.ComponentUpdated -= OnComponentUpdated;
+            WorldTransformReader.ComponentUpdated.Add(OnComponentUpdated);
         }
 
         // Callback for whenever one or more property of the WorldTransform component is updated