Movements overhaul

Nitrox.Assets.Subnautica/Resources/SoundWhitelist_Subnautica.csv

@@ -678,7 +678,7 @@ event:/sub/seamoth/crush_depth_warning;false;false;0
 event:/sub/seamoth/depth_update;false;false;0
 event:/sub/seamoth/dock;false;false;0
 event:/sub/seamoth/dock_seamoth_cyclops;false;false;0
-event:/sub/seamoth/enter_seamoth;false;false;0
+event:/sub/seamoth/enter_seamoth;false;false;50
 event:/sub/seamoth/impact_solid_hard;false;false;0
 event:/sub/seamoth/impact_solid_medium;false;false;0
 event:/sub/seamoth/impact_solid_soft;false;false;0

Nitrox.sln.DotSettings

@@ -127,6 +127,7 @@
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpPlaceEmbeddedOnSameLineMigration/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpRenamePlacementToArrangementMigration/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpUseContinuousIndentInsideBracesMigration/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002EMemberReordering_002EMigrations_002ECSharpFileLayoutPatternRemoveIsAttributeUpgrade/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EAddAccessorOwnerDeclarationBracesMigration/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EAlwaysTreatStructAsNotReorderableMigration/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002ECSharpPlaceAttributeOnSameLineMigration/@EntryIndexedValue">True</s:Boolean>

NitroxClient/Communication/NetworkingLayer/LiteNetLib/LiteNetLibClient.cs

@@ -31,9 +31,11 @@ public LiteNetLibClient(PacketReceiver packetReceiver, INetworkDebugger networkD
         listener.PeerDisconnectedEvent += Disconnected;
         listener.NetworkReceiveEvent += ReceivedNetworkData;
 
+
         client = new NetManager(listener)
         {
             UpdateTime = 15,
+            ChannelsCount = (byte)typeof(Packet.UdpChannelId).GetEnumValues().Length,
 #if DEBUG
             DisconnectTimeout = 300000 //Disables Timeout (for 5 min) for debug purpose (like if you jump though the server code)
 #endif
@@ -64,7 +66,7 @@ public void Send(Packet packet)
         dataWriter.Put(packetData);
 
         networkDebugger?.PacketSent(packet, dataWriter.Length);
-        client.SendToAll(dataWriter, NitroxDeliveryMethod.ToLiteNetLib(packet.DeliveryMethod));
+        client.SendToAll(dataWriter, (byte)packet.UdpChannel, NitroxDeliveryMethod.ToLiteNetLib(packet.DeliveryMethod));
     }
 
     public void Stop()

NitroxClient/Communication/Packets/Processors/SpawnEntitiesProcessor.cs

@@ -1,16 +1,19 @@
 using NitroxClient.Communication.Packets.Processors.Abstract;
 using NitroxClient.GameLogic;
+using NitroxModel.DataStructures;
 using NitroxModel.Packets;
 
 namespace NitroxClient.Communication.Packets.Processors;
 
 public class SpawnEntitiesProcessor : ClientPacketProcessor<SpawnEntities>
 {
     private readonly Entities entities;
+    private readonly SimulationOwnership simulationOwnership;
 
-    public SpawnEntitiesProcessor(Entities entities)
+    public SpawnEntitiesProcessor(Entities entities, SimulationOwnership simulationOwnership)
     {
         this.entities = entities;
+        this.simulationOwnership = simulationOwnership;
     }
 
     public override void Process(SpawnEntities packet)
@@ -22,6 +25,14 @@ public override void Process(SpawnEntities packet)
 
         if (packet.Entities.Count > 0)
         {
+            if (packet.Simulations != null)
+            {
+                foreach (SimulatedEntity simulatedEntity in packet.Simulations)
+                {
+                    simulationOwnership.RegisterNewerSimulation(simulatedEntity.Id, simulatedEntity);
+                }
+            }
+
             // Packet processing is done in the main thread so there's no issue calling this
             entities.EnqueueEntitiesToSpawn(packet.Entities);
         }

NitroxClient/Communication/Packets/Processors/VehicleDockingProcessor.cs

@@ -1,56 +1,84 @@
-using System.Collections;
-using NitroxClient.Communication.Abstract;
+using System.Collections;
 using NitroxClient.Communication.Packets.Processors.Abstract;
 using NitroxClient.GameLogic;
 using NitroxClient.MonoBehaviours;
+using NitroxClient.MonoBehaviours.Vehicles;
 using NitroxClient.Unity.Helper;
 using NitroxModel.DataStructures;
 using NitroxModel.Packets;
 using UnityEngine;
 
-namespace NitroxClient.Communication.Packets.Processors
+namespace NitroxClient.Communication.Packets.Processors;
+
+public class VehicleDockingProcessor : ClientPacketProcessor<VehicleDocking>
 {
-    public class VehicleDockingProcessor : ClientPacketProcessor<VehicleDocking>
+    private readonly Vehicles vehicles;
+
+    public VehicleDockingProcessor(Vehicles vehicles)
+    {
+        this.vehicles = vehicles;
+    }
+
+    public override void Process(VehicleDocking packet)
     {
-        private readonly IPacketSender packetSender;
-        private readonly Vehicles vehicles;
+        if (!NitroxEntity.TryGetComponentFrom(packet.VehicleId, out Vehicle vehicle))
+        {
+            Log.Error($"[{nameof(VehicleDockingProcessor)}] could not find Vehicle component on {packet.VehicleId}");
+            return;
+        }
 
-        public VehicleDockingProcessor(IPacketSender packetSender, Vehicles vehicles)
+        if (!NitroxEntity.TryGetComponentFrom(packet.DockId, out VehicleDockingBay dockingBay))
         {
-            this.packetSender = packetSender;
-            this.vehicles = vehicles;
+            Log.Error($"[{nameof(VehicleDockingProcessor)}] could not find VehicleDockingBay component on {packet.DockId}");
+            return;
         }
 
-        public override void Process(VehicleDocking packet)
+        if (vehicle.TryGetComponent(out VehicleMovementReplicator vehicleMovementReplicator))
         {
-            GameObject vehicleGo = NitroxEntity.RequireObjectFrom(packet.VehicleId);
-            GameObject vehicleDockingBayGo = NitroxEntity.RequireObjectFrom(packet.DockId);
-
-            Vehicle vehicle = vehicleGo.RequireComponent<Vehicle>();
-            VehicleDockingBay vehicleDockingBay = vehicleDockingBayGo.RequireComponent<VehicleDockingBay>();
-
-            using (PacketSuppressor<VehicleDocking>.Suppress())
-            {
-                Log.Debug($"Set vehicle docked for {vehicleDockingBay.gameObject.name}");
-                vehicle.GetComponent<MultiplayerVehicleControl>().SetPositionVelocityRotation(vehicle.transform.position, Vector3.zero, vehicle.transform.rotation, Vector3.zero);
-                vehicle.GetComponent<MultiplayerVehicleControl>().Exit();
-            }
-            vehicle.StartCoroutine(DelayAnimationAndDisablePiloting(vehicle, vehicleDockingBay, packet.VehicleId, packet.PlayerId));
+            vehicleMovementReplicator.enabled = false;
+            Log.Debug($"[{nameof(VehicleDockingProcessor)}] Disabled VehicleMovementReplicator on {packet.VehicleId}");
         }
 
-        IEnumerator DelayAnimationAndDisablePiloting(Vehicle vehicle, VehicleDockingBay vehicleDockingBay, NitroxId vehicleId, ushort playerId)
+        vehicle.StartCoroutine(DelayAnimationAndDisablePiloting(vehicle, vehicleMovementReplicator, dockingBay, packet.VehicleId, packet.PlayerId));
+    }
+
+    private IEnumerator DelayAnimationAndDisablePiloting(Vehicle vehicle, VehicleMovementReplicator vehicleMovementReplicator, VehicleDockingBay vehicleDockingBay, NitroxId vehicleId, ushort playerId)
+    {
+        // Consider the vehicle movement latency (we don't teleport the vehicle to the docking position)
+        if (vehicleMovementReplicator)
+        {
+            // NB: We don't have a lifetime ahead of us
+            float waitTime = Mathf.Clamp(vehicleMovementReplicator.maxAllowedLatency, 0f, 2f);
+            yield return new WaitForSeconds(waitTime);
+        }
+        else
         {
             yield return Yielders.WaitFor1Second;
-            // DockVehicle sets the rigid body kinematic of the vehicle to true, we don't want that behaviour
-            // Therefore disable kinematic (again) to remove the bouncing behavior
-            vehicleDockingBay.DockVehicle(vehicle);
-            vehicle.useRigidbody.isKinematic = false;
-            yield return Yielders.WaitFor2Seconds;
-            vehicles.SetOnPilotMode(vehicleId, playerId, false);
-            if (!vehicle.docked)
-            {
-                Log.Error($"Vehicle {vehicleId} not docked after docking process");
-            }
         }
+
+        // DockVehicle sets the rigid body kinematic of the vehicle to true, we don't want that behaviour
+        // Therefore disable kinematic (again) to remove the bouncing behavior
+        DockRemoteVehicle(vehicleDockingBay, vehicle);
+        vehicle.useRigidbody.isKinematic = false;
+
+        yield return Yielders.WaitFor2Seconds;
+        vehicles.SetOnPilotMode(vehicleId, playerId, false);
+    }
+
+    /// Copy of <see cref="VehicleDockingBay.DockVehicle"/> without the player centric bits
+    private void DockRemoteVehicle(VehicleDockingBay bay, Vehicle vehicle)
+    {
+        bay.dockedVehicle = vehicle;
+        LargeWorldStreamer.main.cellManager.UnregisterEntity(bay.dockedVehicle.gameObject);
+        bay.dockedVehicle.transform.parent = bay.GetSubRoot().transform;
+        vehicle.docked = true;
+        bay.vehicle_docked_param = true;
+        SkyEnvironmentChanged.Broadcast(vehicle.gameObject, bay.subRoot);
+        bay.GetSubRoot().BroadcastMessage("UnlockDoors", SendMessageOptions.DontRequireReceiver);
+
+        // We are only actually adding the health if we have a lock on the vehicle so we're fine to keep this routine going on.
+        // If vehicle ownership changes then it'll still be fine because the verification will still be on the vehicle ownership.
+        bay.CancelInvoke(nameof(VehicleDockingBay.RepairVehicle));
+        bay.InvokeRepeating(nameof(VehicleDockingBay.RepairVehicle), 0.0f, 5f);
     }
 }

NitroxClient/Communication/Packets/Processors/VehicleMovementsProcessor.cs

@@ -0,0 +1,24 @@
+using NitroxClient.Communication.Packets.Processors.Abstract;
+using NitroxClient.MonoBehaviours;
+using NitroxModel.Packets;
+
+namespace NitroxClient.Communication.Packets.Processors;
+
+public class VehicleMovementsProcessor : ClientPacketProcessor<VehicleMovements>
+{
+    public override void Process(VehicleMovements packet)
+    {
+        if (!MovementBroadcaster.Instance)
+        {
+            return;
+        }
+
+        foreach (MovementData movementData in packet.Data)
+        {
+            if (MovementBroadcaster.Instance.Replicators.TryGetValue(movementData.Id, out MovementReplicator movementReplicator))
+            {
+                movementReplicator.AddSnapshot(movementData, (float)packet.RealTime);
+            }
+        }
+    }
+}

NitroxClient/Communication/Packets/Processors/VehicleOnPilotModeChangedProcessor.cs

@@ -1,37 +1,36 @@
-using NitroxClient.Communication.Abstract;
 using NitroxClient.Communication.Packets.Processors.Abstract;
 using NitroxClient.GameLogic;
 using NitroxClient.MonoBehaviours;
-using NitroxClient.Unity.Helper;
 using NitroxModel.Packets;
 using UnityEngine;
 
-namespace NitroxClient.Communication.Packets.Processors
+namespace NitroxClient.Communication.Packets.Processors;
+
+public class VehicleOnPilotModeChangedProcessor : ClientPacketProcessor<VehicleOnPilotModeChanged>
 {
-    public class VehicleOnPilotModeChangedProcessor : ClientPacketProcessor<VehicleOnPilotModeChanged>
-    {
-        private readonly IPacketSender packetSender;
-        private readonly Vehicles vehicles;
+    private readonly Vehicles vehicles;
+    private readonly PlayerManager playerManager;
 
-        public VehicleOnPilotModeChangedProcessor(IPacketSender packetSender, Vehicles vehicles)
-        {
-            this.packetSender = packetSender;
-            this.vehicles = vehicles;
-        }
+    public VehicleOnPilotModeChangedProcessor(Vehicles vehicles, PlayerManager playerManager)
+    {
+        this.vehicles = vehicles;
+        this.playerManager = playerManager;
+    }
 
-        public override void Process(VehicleOnPilotModeChanged packet)
+    public override void Process(VehicleOnPilotModeChanged packet)
+    {
+        if (NitroxEntity.TryGetObjectFrom(packet.VehicleId, out GameObject gameObject))
         {
-            GameObject vehicleGo = NitroxEntity.RequireObjectFrom(packet.VehicleId);
-            Vehicle vehicle = vehicleGo.RequireComponent<Vehicle>();
-
             // If the vehicle is docked, then we will manually set the piloting mode
             // once the animations complete.  This prevents weird behaviour such as the
             // player existing the vehicle while it is about to dock (the event fires 
             // before the animation completes on the remote player.)
-            if (!vehicle.docked)
+            if (gameObject.TryGetComponent(out Vehicle vehicle) && vehicle.docked)
             {
-                vehicles.SetOnPilotMode(packet.VehicleId, packet.PlayerId, packet.IsPiloting);
+                return;
             }
+
+            vehicles.SetOnPilotMode(gameObject, packet.PlayerId, packet.IsPiloting);
         }
     }
 }