Implement more entities

Nitrox.Test/Patcher/Patches/Dynamic/Flare_Update_PatchTest.cs

@@ -0,0 +1,20 @@
+using System.Collections.Generic;
+using System.Linq;
+using FluentAssertions;
+using HarmonyLib;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using NitroxTest.Patcher;
+
+namespace NitroxPatcher.Patches.Dynamic;
+
+[TestClass]
+public class Flare_Update_PatchTest
+{
+    [TestMethod]
+    public void Sanity()
+    {
+        IEnumerable<CodeInstruction> originalIl = PatchTestHelper.GetInstructionsFromMethod(Flare_Update_Patch.TARGET_METHOD);
+        IEnumerable<CodeInstruction> transformedIl = Flare_Update_Patch.Transpiler(originalIl);
+        transformedIl.Count().Should().Be(originalIl.Count());
+    }
+}

Nitrox.Test/Server/Serialization/WorldPersistenceTest.cs

@@ -305,6 +305,14 @@ private static void EntityTest(Entity entity, Entity entityAfter)
                 Assert.AreEqual(metadata.TimeNextBreed, metadataAfter.TimeNextBreed);
                 Assert.AreEqual(metadata.BornInside, metadataAfter.BornInside);
                 break;
+            case FlareMetadata metadata when entityAfter.Metadata is FlareMetadata metadataAfter:
+                Assert.AreEqual(metadata.EnergyLeft, metadataAfter.EnergyLeft);
+                Assert.AreEqual(metadata.HasBeenThrown, metadataAfter.HasBeenThrown);
+                Assert.AreEqual(metadata.FlareActivateTime, metadataAfter.FlareActivateTime);
+                break;
+            case BeaconMetadata metadata when entityAfter.Metadata is BeaconMetadata metadataAfter:
+                Assert.AreEqual(metadata.Label, metadataAfter.Label);
+                break;
             default:
                 Assert.Fail($"Runtime type of {nameof(Entity)}.{nameof(Entity.Metadata)} is not equal: {entity.Metadata?.GetType().Name} - {entityAfter.Metadata?.GetType().Name}");
                 break;
@@ -332,6 +340,13 @@ private static void EntityTest(Entity entity, Entity entityAfter)
                             break;
                         case CellRootEntity _ when worldEntityAfter is CellRootEntity _:
                             break;
+                        case PlacedWorldEntity _ when worldEntityAfter is PlacedWorldEntity _:
+                            break;
+                        case OxygenPipeEntity oxygenPipeEntity when worldEntityAfter is OxygenPipeEntity oxygenPipeEntityAfter:
+                            Assert.AreEqual(oxygenPipeEntity.ParentPipeId, oxygenPipeEntityAfter.ParentPipeId);
+                            Assert.AreEqual(oxygenPipeEntity.RootPipeId, oxygenPipeEntityAfter.RootPipeId);
+                            Assert.AreEqual(oxygenPipeEntity.ParentPosition, oxygenPipeEntityAfter.ParentPosition);
+                            break;
                         case GlobalRootEntity globalRootEntity when worldEntityAfter is GlobalRootEntity globalRootEntityAfter:
                             if (globalRootEntity.GetType() != typeof(GlobalRootEntity))
                             {

NitroxClient/ClientAutoFacRegistrar.cs

@@ -48,6 +48,7 @@ public void RegisterDependencies(ContainerBuilder containerBuilder)
             }
 
             RegisterCoreDependencies(containerBuilder);
+            RegisterMetadataDependencies(containerBuilder);
             RegisterPacketProcessors(containerBuilder);
             RegisterColorSwapManagers(containerBuilder);
             RegisterInitialSyncProcessors(containerBuilder);
@@ -99,18 +100,6 @@ private static void RegisterCoreDependencies(ContainerBuilder containerBuilder)
                             .As<IMap>()
                             .InstancePerLifetimeScope();
 
-            containerBuilder.RegisterAssemblyTypes(currentAssembly)
-                            .AssignableTo<EntityMetadataExtractor>()
-                            .As<EntityMetadataExtractor>()
-                            .AsSelf()
-                            .SingleInstance();
-
-            containerBuilder.RegisterAssemblyTypes(currentAssembly)
-                            .AssignableTo<EntityMetadataProcessor>()
-                            .As<EntityMetadataProcessor>()
-                            .AsSelf()
-                            .SingleInstance();
-
             containerBuilder.RegisterType<PlayerManager>().InstancePerLifetimeScope();
             containerBuilder.RegisterType<PlayerModelManager>().InstancePerLifetimeScope();
             containerBuilder.RegisterType<PlayerVitalsManager>().InstancePerLifetimeScope();
@@ -144,6 +133,18 @@ private static void RegisterCoreDependencies(ContainerBuilder containerBuilder)
             containerBuilder.RegisterType<TimeManager>().InstancePerLifetimeScope();
         }
 
+        private void RegisterMetadataDependencies(ContainerBuilder containerBuilder)
+        {
+            containerBuilder.RegisterAssemblyTypes(currentAssembly)
+                            .AssignableTo<EntityMetadataExtractor>()
+                            .As<EntityMetadataExtractor>()
+                            .InstancePerLifetimeScope();
+            containerBuilder.RegisterAssemblyTypes(currentAssembly)
+                            .AssignableTo<EntityMetadataProcessor>()
+                            .As<EntityMetadataProcessor>()
+                            .InstancePerLifetimeScope();
+        }
+
         private void RegisterPacketProcessors(ContainerBuilder containerBuilder)
         {
             containerBuilder

NitroxClient/Communication/Packets/Processors/InitialPlayerSyncProcessor.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections;
 using System.Collections.Generic;
 using NitroxClient.Communication.Abstract;
@@ -38,21 +38,17 @@ public override void Process(InitialPlayerSync packet)
 
         private IEnumerator ProcessInitialSyncPacket(object sender, EventArgs eventArgs)
         {
-            // Some packets should not fire during game session join but only afterwards so that initialized/spawned game objects don't trigger packet sending again.
-            using (PacketSuppressor<PingRenamed>.Suppress())
+            bool moreProcessorsToRun;
+            do
             {
-                bool moreProcessorsToRun;
-                do
+                yield return Multiplayer.Main.StartCoroutine(RunPendingProcessors());
+
+                moreProcessorsToRun = alreadyRan.Count < processors.Count;
+                if (moreProcessorsToRun && processorsRanLastCycle == 0)
                 {
-                    yield return Multiplayer.Main.StartCoroutine(RunPendingProcessors());
-
-                    moreProcessorsToRun = alreadyRan.Count < processors.Count;
-                    if (moreProcessorsToRun && processorsRanLastCycle == 0)
-                    {
-                        throw new Exception($"Detected circular dependencies in initial packet sync between: {GetRemainingProcessorsText()}");
-                    }
-                } while (moreProcessorsToRun);
-            }
+                    throw new Exception($"Detected circular dependencies in initial packet sync between: {GetRemainingProcessorsText()}");
+                }
+            } while (moreProcessorsToRun);
 
             WaitScreen.Remove(loadingMultiplayerWaitItem);
             Multiplayer.Main.InitialSyncCompleted = true;

NitroxClient/Communication/Packets/Processors/SimulationOwnershipChangeProcessor.cs

@@ -4,6 +4,7 @@
 using NitroxClient.MonoBehaviours;
 using NitroxModel.DataStructures;
 using NitroxModel.Packets;
+using UnityEngine;
 
 namespace NitroxClient.Communication.Packets.Processors;
 
@@ -47,6 +48,12 @@ public override void Process(SimulationOwnershipChange simulationOwnershipChange
                 simulationOwnershipManager.StopSimulatingEntity(simulatedEntity.Id);
                 EntityPositionBroadcaster.StopWatchingEntity(simulatedEntity.Id);
             }
+
+            // Avoid keeping artifacts of the entity's previous ChangesPosition state
+            if (!simulatedEntity.ChangesPosition && NitroxEntity.TryGetComponentFrom(simulatedEntity.Id, out RemotelyControlled remotelyControlled))
+            {
+                Object.Destroy(remotelyControlled);
+            }
         }
     }
 }

NitroxClient/GameLogic/Entities.cs

@@ -9,6 +9,7 @@
 using NitroxClient.GameLogic.Spawning.Bases;
 using NitroxClient.GameLogic.Spawning.Metadata;
 using NitroxClient.GameLogic.Spawning.Metadata.Extractor;
+using NitroxClient.GameLogic.Spawning.WorldEntities;
 using NitroxClient.MonoBehaviours;
 using NitroxClient.Unity.Helper;
 using NitroxModel.DataStructures;
@@ -54,11 +55,13 @@ public Entities(IPacketSender packetSender, ThrottledPacketSender throttledPacke
             entitySpawnersByType[typeof(EscapePodWorldEntity)] = entitySpawnersByType[typeof(WorldEntity)];
             entitySpawnersByType[typeof(PlayerWorldEntity)] = entitySpawnersByType[typeof(WorldEntity)];
             entitySpawnersByType[typeof(VehicleWorldEntity)] = entitySpawnersByType[typeof(WorldEntity)];
-            entitySpawnersByType[typeof(GlobalRootEntity)] = entitySpawnersByType[typeof(WorldEntity)];
+            entitySpawnersByType[typeof(GlobalRootEntity)] = new GlobalRootEntitySpawner();
             entitySpawnersByType[typeof(BuildEntity)] = new BuildEntitySpawner(this);
             entitySpawnersByType[typeof(ModuleEntity)] = new ModuleEntitySpawner(this);
             entitySpawnersByType[typeof(GhostEntity)] = new GhostEntitySpawner();
             entitySpawnersByType[typeof(InteriorPieceEntity)] = new InteriorPieceEntitySpawner(this);
+            entitySpawnersByType[typeof(OxygenPipeEntity)] = new OxygenPipeEntitySpawner(this, (WorldEntitySpawner)entitySpawnersByType[typeof(WorldEntity)]);
+            entitySpawnersByType[typeof(PlacedWorldEntity)] = new PlacedWorldEntitySpawner((WorldEntitySpawner)entitySpawnersByType[typeof(WorldEntity)]);
         }
 
         public void EntityMetadataChanged(object o, NitroxId id)
@@ -279,7 +282,7 @@ public Type RequireEntityType(NitroxId id)
 
         public bool IsParentReady(NitroxId id)
         {
-            return WasParentSpawned(id) || (NitroxEntity.TryGetObjectFrom(id, out GameObject o) && o);
+            return WasParentSpawned(id) || NitroxEntity.TryGetObjectFrom(id, out GameObject _);
         }
 
         public bool WasParentSpawned(NitroxId id)