Some misc improvements (#620)

jamiebrynes7 · web-flow · commit 8fdc87fdc929 · 2018-11-19T15:52:16.000Z
* add HasEntity to worker system

* make entityid available from reader/writer

* update generated code

* add changelog

* fix and add tests

* PR feedback
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,10 +5,11 @@
 ### Added
 
 - Added support for the Steam authentication flow.
-- Added a reference to Blank Starter Project in the README.
 - Added Frames Per Second (FPS) and Unity heap usage as metrics sent by `MetricSendSystem.cs`.
 - Added a warning message to the top of schema files copied into the `from_gdk_packages` directory.
 - Added an `ISnapshottable<T>` interface to all generated components. This allows you to convert a component to a snapshot.
+- Added an `EntityId` property on the Readers/Writers to access the `EntityId` of the underlying SpatialOS entity.
+- Added a `HasEntity` method to the `WorkerSystem`. This allows you to check if an entity is checked out on your worker.
 
 ### Changed
 
diff --git a/test-project/Assets/EditmodeTests/GameObjectRepresentation/MonoBehaviourActivationManager/ActivationManagerTestBase.cs b/test-project/Assets/EditmodeTests/GameObjectRepresentation/MonoBehaviourActivationManager/ActivationManagerTestBase.cs
@@ -33,6 +33,7 @@ public void SetUp()
             var spatialOSComponent = TestGameObject.AddComponent<SpatialOSComponent>();
             spatialOSComponent.Worker = workerSystem;
             spatialOSComponent.Entity = entityManager.CreateEntity();
+            entityManager.AddComponentData(spatialOSComponent.Entity, new SpatialEntityId());
 
             var injectableStore = new InjectableStore();
             var requiredFieldInjector = new RequiredFieldInjector(entityManager, loggingDispatcher);
diff --git a/test-project/Assets/EditmodeTests/GameObjectRepresentation/Readers/EventTests.cs b/test-project/Assets/EditmodeTests/GameObjectRepresentation/Readers/EventTests.cs
@@ -27,6 +27,7 @@ public void SetUp()
             world = new World("test-world");
             entityManager = world.GetOrCreateManager<EntityManager>();
             entity = entityManager.CreateEntity(ComponentType.Create<BlittableComponent.Component>());
+            entityManager.AddComponentData(entity, new SpatialEntityId());
             readerWriterInternal =
                 new ComponentWithEvents.Requirable.ReaderWriterImpl(entity, entityManager, new LoggingDispatcher());
             readerPublic = readerWriterInternal;
diff --git a/test-project/Assets/EditmodeTests/GameObjectRepresentation/Readers/NonBlittableReaderTests.cs b/test-project/Assets/EditmodeTests/GameObjectRepresentation/Readers/NonBlittableReaderTests.cs
@@ -16,6 +16,7 @@ public void Data_returns_non_blittable_component_instance()
             {
                 var entityManager = world.GetOrCreateManager<EntityManager>();
                 var entity = entityManager.CreateEntity(typeof(NonBlittableComponent.Component));
+                entityManager.AddComponentData(entity, new SpatialEntityId());
                 var reader =
                     new NonBlittableComponent.Requirable.ReaderWriterImpl(entity, entityManager,
                         new LoggingDispatcher());
@@ -51,6 +52,7 @@ public void Field_updates_get_called_for_non_blittable_fields()
             {
                 var entityManager = world.GetOrCreateManager<EntityManager>();
                 var entity = entityManager.CreateEntity(typeof(NonBlittableComponent.Component));
+                entityManager.AddComponentData(entity, new SpatialEntityId());
                 var reader =
                     new NonBlittableComponent.Requirable.ReaderWriterImpl(entity, entityManager,
                         new LoggingDispatcher());
diff --git a/test-project/Assets/EditmodeTests/GameObjectRepresentation/Readers/NonBlittableWriterTests.cs b/test-project/Assets/EditmodeTests/GameObjectRepresentation/Readers/NonBlittableWriterTests.cs
@@ -17,6 +17,7 @@ public void Sending_component_update_changes_field()
                 var entityManager = world.GetOrCreateManager<EntityManager>();
                 var entity = entityManager.CreateEntity(typeof(NonBlittableComponent.Component));
                 entityManager.SetComponentData(entity, new NonBlittableComponent.Component());
+                entityManager.AddComponentData(entity, new SpatialEntityId());
                 var writer =
                     new NonBlittableComponent.Requirable.ReaderWriterImpl(entity, entityManager,
                         new LoggingDispatcher());
@@ -38,6 +39,7 @@ public void Updating_field_leaves_other_field_unchanged()
             {
                 var entityManager = world.GetOrCreateManager<EntityManager>();
                 var entity = entityManager.CreateEntity(typeof(NonBlittableComponent.Component));
+                entityManager.AddComponentData(entity, new SpatialEntityId());
 
                 var schemaComponentData = NonBlittableComponent.Component.CreateSchemaComponentData(
                     boolField: false,
diff --git a/test-project/Assets/EditmodeTests/GameObjectRepresentation/Readers/ReaderDataTests.cs b/test-project/Assets/EditmodeTests/GameObjectRepresentation/Readers/ReaderDataTests.cs
@@ -16,5 +16,11 @@ public void Data_returns_component_instance()
             Assert.AreEqual(data, ReaderPublic.Data);
             Assert.AreEqual(data.FloatField, ReaderPublic.Data.FloatField);
         }
+
+        [Test]
+        public void EntityId_returns_spatial_entity_id()
+        {
+            Assert.AreEqual(EntityId, ReaderPublic.EntityId);
+        }
     }
 }
diff --git a/test-project/Assets/EditmodeTests/GameObjectRepresentation/Readers/ReaderWriterTestsBase.cs b/test-project/Assets/EditmodeTests/GameObjectRepresentation/Readers/ReaderWriterTestsBase.cs
@@ -7,6 +7,8 @@ namespace Improbable.Gdk.EditmodeTests.GameObjectRepresentation.Readers
 {
     internal abstract class ReaderWriterTestsBase
     {
+        protected EntityId EntityId = new EntityId(10);
+
         protected BlittableComponent.Requirable.Reader ReaderPublic;
         protected BlittableComponent.Requirable.Writer WriterPublic;
         protected BlittableComponent.Requirable.ReaderWriterImpl ReaderWriterInternal;
@@ -20,6 +22,10 @@ public void SetUp()
             world = new World("test-world");
             EntityManager = world.GetOrCreateManager<EntityManager>();
             Entity = EntityManager.CreateEntity(typeof(BlittableComponent.Component));
+            EntityManager.AddComponentData(Entity, new SpatialEntityId
+            {
+                EntityId = EntityId
+            });
             ReaderWriterInternal =
                 new BlittableComponent.Requirable.ReaderWriterImpl(Entity, EntityManager, new LoggingDispatcher());
             ReaderPublic = ReaderWriterInternal;
diff --git a/test-project/Assets/EditmodeTests/GameObjectRepresentation/RequiredFieldInjectorTests.cs b/test-project/Assets/EditmodeTests/GameObjectRepresentation/RequiredFieldInjectorTests.cs
@@ -59,6 +59,7 @@ public void Setup()
             var entityManager = world.GetOrCreateManager<EntityManager>();
             injector = new RequiredFieldInjector(entityManager, new LoggingDispatcher());
             testEntity = entityManager.CreateEntity();
+            entityManager.AddComponentData(testEntity, new SpatialEntityId());
             testGameObject = new GameObject();
         }
 
diff --git a/test-project/Assets/Generated/Source/improbable/gdk/tests/ExhaustiveBlittableSingularReaderWriter.cs b/test-project/Assets/Generated/Source/improbable/gdk/tests/ExhaustiveBlittableSingularReaderWriter.cs
@@ -29,6 +29,8 @@ public IInjectable CreateInjectable(Entity entity, EntityManager entityManager,
             [InjectionCondition(InjectionCondition.RequireComponentPresent)]
             public interface Reader : IReader<Improbable.Gdk.Tests.ExhaustiveBlittableSingular.Component, Improbable.Gdk.Tests.ExhaustiveBlittableSingular.Update>
             {
+                EntityId EntityId { get; }
+
                 event Action<BlittableBool> Field1Updated;
                 event Action<float> Field2Updated;
                 event Action<int> Field4Updated;
@@ -55,6 +57,8 @@ public interface Writer : Reader, IWriter<Improbable.Gdk.Tests.ExhaustiveBlittab
             internal class ReaderWriterImpl :
                 ReaderWriterBase<Improbable.Gdk.Tests.ExhaustiveBlittableSingular.Component, Improbable.Gdk.Tests.ExhaustiveBlittableSingular.Update>, Reader, Writer
             {
+                public new EntityId EntityId => base.EntityId;
+
                 public ReaderWriterImpl(Entity entity, EntityManager entityManager, ILogDispatcher logDispatcher)
                     : base(entity, entityManager, logDispatcher)
                 {
diff --git a/test-project/Assets/Generated/Source/improbable/gdk/tests/ExhaustiveMapKeyReaderWriter.cs b/test-project/Assets/Generated/Source/improbable/gdk/tests/ExhaustiveMapKeyReaderWriter.cs
@@ -29,6 +29,8 @@ public IInjectable CreateInjectable(Entity entity, EntityManager entityManager,
             [InjectionCondition(InjectionCondition.RequireComponentPresent)]
             public interface Reader : IReader<Improbable.Gdk.Tests.ExhaustiveMapKey.Component, Improbable.Gdk.Tests.ExhaustiveMapKey.Update>
             {
+                EntityId EntityId { get; }
+
                 event Action<global::System.Collections.Generic.Dictionary<BlittableBool,string>> Field1Updated;
                 event Action<global::System.Collections.Generic.Dictionary<float,string>> Field2Updated;
                 event Action<global::System.Collections.Generic.Dictionary<byte[],string>> Field3Updated;
@@ -57,6 +59,8 @@ public interface Writer : Reader, IWriter<Improbable.Gdk.Tests.ExhaustiveMapKey.
             internal class ReaderWriterImpl :
                 ReaderWriterBase<Improbable.Gdk.Tests.ExhaustiveMapKey.Component, Improbable.Gdk.Tests.ExhaustiveMapKey.Update>, Reader, Writer
             {
+                public new EntityId EntityId => base.EntityId;
+
                 public ReaderWriterImpl(Entity entity, EntityManager entityManager, ILogDispatcher logDispatcher)
                     : base(entity, entityManager, logDispatcher)
                 {
diff --git a/test-project/Assets/Generated/Source/improbable/gdk/tests/ExhaustiveMapValueReaderWriter.cs b/test-project/Assets/Generated/Source/improbable/gdk/tests/ExhaustiveMapValueReaderWriter.cs
@@ -29,6 +29,8 @@ public IInjectable CreateInjectable(Entity entity, EntityManager entityManager,
             [InjectionCondition(InjectionCondition.RequireComponentPresent)]
             public interface Reader : IReader<Improbable.Gdk.Tests.ExhaustiveMapValue.Component, Improbable.Gdk.Tests.ExhaustiveMapValue.Update>
             {
+                EntityId EntityId { get; }
+
                 event Action<global::System.Collections.Generic.Dictionary<string,BlittableBool>> Field1Updated;
                 event Action<global::System.Collections.Generic.Dictionary<string,float>> Field2Updated;
                 event Action<global::System.Collections.Generic.Dictionary<string,byte[]>> Field3Updated;
@@ -57,6 +59,8 @@ public interface Writer : Reader, IWriter<Improbable.Gdk.Tests.ExhaustiveMapValu
             internal class ReaderWriterImpl :
                 ReaderWriterBase<Improbable.Gdk.Tests.ExhaustiveMapValue.Component, Improbable.Gdk.Tests.ExhaustiveMapValue.Update>, Reader, Writer
             {
+                public new EntityId EntityId => base.EntityId;
+
                 public ReaderWriterImpl(Entity entity, EntityManager entityManager, ILogDispatcher logDispatcher)
                     : base(entity, entityManager, logDispatcher)
                 {
diff --git a/test-project/Assets/Generated/Source/improbable/gdk/tests/ExhaustiveOptionalReaderWriter.cs b/test-project/Assets/Generated/Source/improbable/gdk/tests/ExhaustiveOptionalReaderWriter.cs
@@ -29,6 +29,8 @@ public IInjectable CreateInjectable(Entity entity, EntityManager entityManager,
             [InjectionCondition(InjectionCondition.RequireComponentPresent)]
             public interface Reader : IReader<Improbable.Gdk.Tests.ExhaustiveOptional.Component, Improbable.Gdk.Tests.ExhaustiveOptional.Update>
             {
+                EntityId EntityId { get; }
+
                 event Action<BlittableBool?> Field1Updated;
                 event Action<float?> Field2Updated;
                 event Action<global::Improbable.Gdk.Core.Option<byte[]>> Field3Updated;
@@ -57,6 +59,8 @@ public interface Writer : Reader, IWriter<Improbable.Gdk.Tests.ExhaustiveOptiona
             internal class ReaderWriterImpl :
                 ReaderWriterBase<Improbable.Gdk.Tests.ExhaustiveOptional.Component, Improbable.Gdk.Tests.ExhaustiveOptional.Update>, Reader, Writer
             {
+                public new EntityId EntityId => base.EntityId;
+
                 public ReaderWriterImpl(Entity entity, EntityManager entityManager, ILogDispatcher logDispatcher)
                     : base(entity, entityManager, logDispatcher)
                 {
diff --git a/test-project/Assets/Generated/Source/improbable/gdk/tests/ExhaustiveRepeatedReaderWriter.cs b/test-project/Assets/Generated/Source/improbable/gdk/tests/ExhaustiveRepeatedReaderWriter.cs
@@ -29,6 +29,8 @@ public IInjectable CreateInjectable(Entity entity, EntityManager entityManager,
             [InjectionCondition(InjectionCondition.RequireComponentPresent)]
             public interface Reader : IReader<Improbable.Gdk.Tests.ExhaustiveRepeated.Component, Improbable.Gdk.Tests.ExhaustiveRepeated.Update>
             {
+                EntityId EntityId { get; }
+
                 event Action<global::System.Collections.Generic.List<BlittableBool>> Field1Updated;
                 event Action<global::System.Collections.Generic.List<float>> Field2Updated;
                 event Action<global::System.Collections.Generic.List<byte[]>> Field3Updated;
@@ -57,6 +59,8 @@ public interface Writer : Reader, IWriter<Improbable.Gdk.Tests.ExhaustiveRepeate
             internal class ReaderWriterImpl :
                 ReaderWriterBase<Improbable.Gdk.Tests.ExhaustiveRepeated.Component, Improbable.Gdk.Tests.ExhaustiveRepeated.Update>, Reader, Writer
             {
+                public new EntityId EntityId => base.EntityId;
+
                 public ReaderWriterImpl(Entity entity, EntityManager entityManager, ILogDispatcher logDispatcher)
                     : base(entity, entityManager, logDispatcher)
                 {
diff --git a/test-project/Assets/Generated/Source/improbable/gdk/tests/ExhaustiveSingularReaderWriter.cs b/test-project/Assets/Generated/Source/improbable/gdk/tests/ExhaustiveSingularReaderWriter.cs
@@ -29,6 +29,8 @@ public IInjectable CreateInjectable(Entity entity, EntityManager entityManager,
             [InjectionCondition(InjectionCondition.RequireComponentPresent)]
             public interface Reader : IReader<Improbable.Gdk.Tests.ExhaustiveSingular.Component, Improbable.Gdk.Tests.ExhaustiveSingular.Update>
             {
+                EntityId EntityId { get; }
+
                 event Action<BlittableBool> Field1Updated;
                 event Action<float> Field2Updated;
                 event Action<byte[]> Field3Updated;
@@ -57,6 +59,8 @@ public interface Writer : Reader, IWriter<Improbable.Gdk.Tests.ExhaustiveSingula
             internal class ReaderWriterImpl :
                 ReaderWriterBase<Improbable.Gdk.Tests.ExhaustiveSingular.Component, Improbable.Gdk.Tests.ExhaustiveSingular.Update>, Reader, Writer
             {
+                public new EntityId EntityId => base.EntityId;
+
                 public ReaderWriterImpl(Entity entity, EntityManager entityManager, ILogDispatcher logDispatcher)
                     : base(entity, entityManager, logDispatcher)
                 {
diff --git a/test-project/Assets/Generated/Source/improbable/gdk/tests/NestedComponentReaderWriter.cs b/test-project/Assets/Generated/Source/improbable/gdk/tests/NestedComponentReaderWriter.cs
@@ -29,6 +29,8 @@ public IInjectable CreateInjectable(Entity entity, EntityManager entityManager,
             [InjectionCondition(InjectionCondition.RequireComponentPresent)]
             public interface Reader : IReader<Improbable.Gdk.Tests.NestedComponent.Component, Improbable.Gdk.Tests.NestedComponent.Update>
             {
+                EntityId EntityId { get; }
+
                 event Action<global::Improbable.Gdk.Tests.TypeName> NestedTypeUpdated;
             }
 
@@ -41,6 +43,8 @@ public interface Writer : Reader, IWriter<Improbable.Gdk.Tests.NestedComponent.C
             internal class ReaderWriterImpl :
                 ReaderWriterBase<Improbable.Gdk.Tests.NestedComponent.Component, Improbable.Gdk.Tests.NestedComponent.Update>, Reader, Writer
             {
+                public new EntityId EntityId => base.EntityId;
+
                 public ReaderWriterImpl(Entity entity, EntityManager entityManager, ILogDispatcher logDispatcher)
                     : base(entity, entityManager, logDispatcher)
                 {
diff --git a/test-project/Assets/Generated/Source/improbable/gdk/tests/alternateschemasyntax/ConnectionReaderWriter.cs b/test-project/Assets/Generated/Source/improbable/gdk/tests/alternateschemasyntax/ConnectionReaderWriter.cs
@@ -29,6 +29,8 @@ public IInjectable CreateInjectable(Entity entity, EntityManager entityManager,
             [InjectionCondition(InjectionCondition.RequireComponentPresent)]
             public interface Reader : IReader<Improbable.Gdk.Tests.AlternateSchemaSyntax.Connection.Component, Improbable.Gdk.Tests.AlternateSchemaSyntax.Connection.Update>
             {
+                EntityId EntityId { get; }
+
                 event Action<int> ValueUpdated;
                 event Action<global::Improbable.Gdk.Tests.AlternateSchemaSyntax.RandomDataType> OnMyEvent;
             }
@@ -43,6 +45,8 @@ public interface Writer : Reader, IWriter<Improbable.Gdk.Tests.AlternateSchemaSy
             internal class ReaderWriterImpl :
                 ReaderWriterBase<Improbable.Gdk.Tests.AlternateSchemaSyntax.Connection.Component, Improbable.Gdk.Tests.AlternateSchemaSyntax.Connection.Update>, Reader, Writer
             {
+                public new EntityId EntityId => base.EntityId;
+
                 public ReaderWriterImpl(Entity entity, EntityManager entityManager, ILogDispatcher logDispatcher)
                     : base(entity, entityManager, logDispatcher)
                 {
@@ -111,7 +115,7 @@ protected override void ApplyUpdate(Improbable.Gdk.Tests.AlternateSchemaSyntax.C
 
                 public void OnMyEventEvent(global::Improbable.Gdk.Tests.AlternateSchemaSyntax.RandomDataType payload)
                 {
-                    GameObjectDelegates.DispatchWithErrorHandling(payload, MyEventDelegates, logDispatcher);
+                    GameObjectDelegates.DispatchWithErrorHandling(payload, MyEventDelegates, LogDispatcher);
                 }
 
                 public void SendMyEvent(global::Improbable.Gdk.Tests.AlternateSchemaSyntax.RandomDataType payload)
diff --git a/test-project/Assets/Generated/Source/improbable/gdk/tests/blittabletypes/BlittableComponentReaderWriter.cs b/test-project/Assets/Generated/Source/improbable/gdk/tests/blittabletypes/BlittableComponentReaderWriter.cs
@@ -29,6 +29,8 @@ public IInjectable CreateInjectable(Entity entity, EntityManager entityManager,
             [InjectionCondition(InjectionCondition.RequireComponentPresent)]
             public interface Reader : IReader<Improbable.Gdk.Tests.BlittableTypes.BlittableComponent.Component, Improbable.Gdk.Tests.BlittableTypes.BlittableComponent.Update>
             {
+                EntityId EntityId { get; }
+
                 event Action<BlittableBool> BoolFieldUpdated;
                 event Action<int> IntFieldUpdated;
                 event Action<long> LongFieldUpdated;
@@ -49,6 +51,8 @@ public interface Writer : Reader, IWriter<Improbable.Gdk.Tests.BlittableTypes.Bl
             internal class ReaderWriterImpl :
                 ReaderWriterBase<Improbable.Gdk.Tests.BlittableTypes.BlittableComponent.Component, Improbable.Gdk.Tests.BlittableTypes.BlittableComponent.Update>, Reader, Writer
             {
+                public new EntityId EntityId => base.EntityId;
+
                 public ReaderWriterImpl(Entity entity, EntityManager entityManager, ILogDispatcher logDispatcher)
                     : base(entity, entityManager, logDispatcher)
                 {
@@ -233,7 +237,7 @@ protected override void ApplyUpdate(Improbable.Gdk.Tests.BlittableTypes.Blittabl
 
                 public void OnFirstEventEvent(global::Improbable.Gdk.Tests.BlittableTypes.FirstEventPayload payload)
                 {
-                    GameObjectDelegates.DispatchWithErrorHandling(payload, FirstEventDelegates, logDispatcher);
+                    GameObjectDelegates.DispatchWithErrorHandling(payload, FirstEventDelegates, LogDispatcher);
                 }
 
                 public void SendFirstEvent(global::Improbable.Gdk.Tests.BlittableTypes.FirstEventPayload payload)
@@ -273,7 +277,7 @@ public void SendFirstEvent(global::Improbable.Gdk.Tests.BlittableTypes.FirstEven
 
                 public void OnSecondEventEvent(global::Improbable.Gdk.Tests.BlittableTypes.SecondEventPayload payload)
                 {
-                    GameObjectDelegates.DispatchWithErrorHandling(payload, SecondEventDelegates, logDispatcher);
+                    GameObjectDelegates.DispatchWithErrorHandling(payload, SecondEventDelegates, LogDispatcher);
                 }
 
                 public void SendSecondEvent(global::Improbable.Gdk.Tests.BlittableTypes.SecondEventPayload payload)
diff --git a/test-project/Assets/Generated/Source/improbable/gdk/tests/componentswithnofields/ComponentWithNoFieldsReaderWriter.cs b/test-project/Assets/Generated/Source/improbable/gdk/tests/componentswithnofields/ComponentWithNoFieldsReaderWriter.cs
@@ -29,6 +29,8 @@ public IInjectable CreateInjectable(Entity entity, EntityManager entityManager,
             [InjectionCondition(InjectionCondition.RequireComponentPresent)]
             public interface Reader : IReader<Improbable.Gdk.Tests.ComponentsWithNoFields.ComponentWithNoFields.Component, Improbable.Gdk.Tests.ComponentsWithNoFields.ComponentWithNoFields.Update>
             {
+                EntityId EntityId { get; }
+
             }
 
             [InjectableId(InjectableType.ReaderWriter, 1003)]
@@ -40,6 +42,8 @@ public interface Writer : Reader, IWriter<Improbable.Gdk.Tests.ComponentsWithNoF
             internal class ReaderWriterImpl :
                 ReaderWriterBase<Improbable.Gdk.Tests.ComponentsWithNoFields.ComponentWithNoFields.Component, Improbable.Gdk.Tests.ComponentsWithNoFields.ComponentWithNoFields.Update>, Reader, Writer
             {
+                public new EntityId EntityId => base.EntityId;
+
                 public ReaderWriterImpl(Entity entity, EntityManager entityManager, ILogDispatcher logDispatcher)
                     : base(entity, entityManager, logDispatcher)
                 {
diff --git a/test-project/Assets/Generated/Source/improbable/gdk/tests/componentswithnofields/ComponentWithNoFieldsWithCommandsReaderWriter.cs b/test-project/Assets/Generated/Source/improbable/gdk/tests/componentswithnofields/ComponentWithNoFieldsWithCommandsReaderWriter.cs
diff --git a/test-project/Assets/Generated/Source/improbable/gdk/tests/componentswithnofields/ComponentWithNoFieldsWithEventsReaderWriter.cs b/test-project/Assets/Generated/Source/improbable/gdk/tests/componentswithnofields/ComponentWithNoFieldsWithEventsReaderWriter.cs
diff --git a/test-project/Assets/Generated/Source/improbable/gdk/tests/nonblittabletypes/NonBlittableComponentReaderWriter.cs b/test-project/Assets/Generated/Source/improbable/gdk/tests/nonblittabletypes/NonBlittableComponentReaderWriter.cs
diff --git a/workers/unity/Packages/com.improbable.gdk.core/GameObjectRepresentation/ReadersWriters/ReaderWriterBase.cs b/workers/unity/Packages/com.improbable.gdk.core/GameObjectRepresentation/ReadersWriters/ReaderWriterBase.cs
diff --git a/workers/unity/Packages/com.improbable.gdk.core/Systems/WorkerSystem.cs b/workers/unity/Packages/com.improbable.gdk.core/Systems/WorkerSystem.cs
diff --git a/workers/unity/Packages/com.improbable.gdk.tools/.CodeGenerator/GdkCodeGenerator/Templates/UnityReaderWriterGenerator.tt b/workers/unity/Packages/com.improbable.gdk.tools/.CodeGenerator/GdkCodeGenerator/Templates/UnityReaderWriterGenerator.tt

Original file line number	Diff line number	Diff line change
`@@ -16,5 +16,11 @@ public void Data_returns_component_instance()`
`16`	`16`	`Assert.AreEqual(data, ReaderPublic.Data);`
`17`	`17`	`Assert.AreEqual(data.FloatField, ReaderPublic.Data.FloatField);`
`18`	`18`	`}`
	`19`	`+`
	`20`	`+ [Test]`
	`21`	`+ public void EntityId_returns_spatial_entity_id()`
	`22`	`+ {`
	`23`	`+ Assert.AreEqual(EntityId, ReaderPublic.EntityId);`
	`24`	`+ }`
`19`	`25`	`}`
`20`	`26`	`}`
Original file line number	Diff line number	Diff line change
`@@ -59,6 +59,7 @@ public void Setup()`
`59`	`59`	`var entityManager = world.GetOrCreateManager<EntityManager>();`
`60`	`60`	`injector = new RequiredFieldInjector(entityManager, new LoggingDispatcher());`
`61`	`61`	`testEntity = entityManager.CreateEntity();`
	`62`	`+ entityManager.AddComponentData(testEntity, new SpatialEntityId());`
`62`	`63`	`testGameObject = new GameObject();`
`63`	`64`	`}`
`64`	`65`
Original file line number	Diff line number	Diff line change
`@@ -29,6 +29,8 @@ public IInjectable CreateInjectable(Entity entity, EntityManager entityManager,`
`29`	`29`	`[InjectionCondition(InjectionCondition.RequireComponentPresent)]`
`30`	`30`	`public interface Reader : IReader<Improbable.Gdk.Tests.ExhaustiveBlittableSingular.Component, Improbable.Gdk.Tests.ExhaustiveBlittableSingular.Update>`
`31`	`31`	`{`
	`32`	`+ EntityId EntityId { get; }`
	`33`	`+`
`32`	`34`	`event Action<BlittableBool> Field1Updated;`
`33`	`35`	`event Action<float> Field2Updated;`
`34`	`36`	`event Action<int> Field4Updated;`
`@@ -55,6 +57,8 @@ public interface Writer : Reader, IWriter<Improbable.Gdk.Tests.ExhaustiveBlittab`
`55`	`57`	`internal class ReaderWriterImpl :`
`56`	`58`	`ReaderWriterBase<Improbable.Gdk.Tests.ExhaustiveBlittableSingular.Component, Improbable.Gdk.Tests.ExhaustiveBlittableSingular.Update>, Reader, Writer`
`57`	`59`	`{`
	`60`	`+ public new EntityId EntityId => base.EntityId;`
	`61`	`+`
`58`	`62`	`public ReaderWriterImpl(Entity entity, EntityManager entityManager, ILogDispatcher logDispatcher)`
`59`	`63`	`: base(entity, entityManager, logDispatcher)`
`60`	`64`	`{`