Fully sync exosuits and drilling (SubnauticaNitrox#2304)

Author: SpaceMonkeyy86

Nitrox.Model.Subnautica/DataStructures/GameLogic/Entities/Metadata/DrillableMetadata.cs

@@ -0,0 +1,33 @@
+using System;
+using System.Runtime.Serialization;
+using BinaryPack.Attributes;
+
+namespace Nitrox.Model.Subnautica.DataStructures.GameLogic.Entities.Metadata;
+
+[Serializable]
+[DataContract]
+public class DrillableMetadata : EntityMetadata
+{
+    [DataMember(Order = 1)]
+    public float[] ChunkHealth { get; }
+
+    [DataMember(Order = 2)]
+    public float TimeLastDrilled { get; }
+
+    [IgnoreConstructor]
+    protected DrillableMetadata()
+    {
+        //Constructor for serialization. Has to be "protected" for json serialization.
+    }
+
+    public DrillableMetadata(float[] chunkHealth, float timeLastDrilled)
+    {
+        ChunkHealth = chunkHealth;
+        TimeLastDrilled = timeLastDrilled;
+    }
+
+    public override string ToString()
+    {
+        return $"[DrillableMetadata ChunkHealth: {string.Join(",", ChunkHealth)} TimeLastDrilled: {TimeLastDrilled}]";
+    }
+}

Nitrox.Model.Subnautica/DataStructures/GameLogic/Entities/Metadata/EntityMetadata.cs

@@ -40,6 +40,7 @@ namespace Nitrox.Model.Subnautica.DataStructures.GameLogic.Entities.Metadata
     [ProtoInclude(81, typeof(EggMetadata))]
     [ProtoInclude(82, typeof(PlantableMetadata))]
     [ProtoInclude(83, typeof(FruitPlantMetadata))]
+    [ProtoInclude(84, typeof(DrillableMetadata))]
     public abstract class EntityMetadata
     {
     }

Nitrox.Model.Subnautica/Packets/ExosuitArmActionPacket.cs

@@ -1,6 +1,5 @@
-using System;
+using System;
 using Nitrox.Model.DataStructures;
-using Nitrox.Model.DataStructures.Unity;
 using Nitrox.Model.Packets;
 
 namespace Nitrox.Model.Subnautica.Packets
@@ -9,23 +8,21 @@ namespace Nitrox.Model.Subnautica.Packets
     public class ExosuitArmActionPacket : Packet
     {
         public TechType TechType { get; }
-        public NitroxId ArmId { get; }
+        public NitroxId ExosuitId { get; }
+        public Exosuit.Arm ArmSide { get; }
         public ExosuitArmAction ArmAction { get; }
-        public NitroxVector3? OpVector { get; }
-        public NitroxQuaternion? OpRotation { get; }
 
-        public ExosuitArmActionPacket(TechType techType, NitroxId armId, ExosuitArmAction armAction, NitroxVector3? opVector, NitroxQuaternion? opRotation)
+        public ExosuitArmActionPacket(TechType techType, NitroxId exosuitId, Exosuit.Arm armSide, ExosuitArmAction armAction)
         {
             TechType = techType;
-            ArmId = armId;
+            ExosuitId = exosuitId;
+            ArmSide = armSide;
             ArmAction = armAction;
-            OpVector = opVector;
-            OpRotation = opRotation;
         }
 
         public override string ToString()
         {
-            return $"[ExosuitArmAction - TechType: {TechType}, ArmId:{ArmId}, ArmAction: {ArmAction}, Vector: {OpVector}, Rotation: {OpRotation}]";
+            return $"[ExosuitArmAction - TechType: {TechType}, ExosuitId:{ExosuitId}, ArmSide: {ArmSide}, ArmAction: {ArmAction}]";
         }
     }
 

Nitrox.Model.Subnautica/Packets/GrapplingHookMovement.cs

@@ -0,0 +1,28 @@
+using System;
+using Nitrox.Model.DataStructures;
+using Nitrox.Model.DataStructures.Unity;
+using Nitrox.Model.Networking;
+using Nitrox.Model.Packets;
+
+namespace Nitrox.Model.Subnautica.Packets;
+
+[Serializable]
+public class GrapplingHookMovement : Packet
+{
+    public NitroxId ExosuitId { get; }
+    public Exosuit.Arm ArmSide { get; }
+    public NitroxVector3 Position { get; }
+    public NitroxVector3 Velocity { get; }
+    public NitroxQuaternion Rotation { get; }
+
+    public GrapplingHookMovement(NitroxId exosuitId, Exosuit.Arm armSide, NitroxVector3 position, NitroxVector3 velocity, NitroxQuaternion rotation)
+    {
+        ExosuitId = exosuitId;
+        ArmSide = armSide;
+        Position = position;
+        Velocity = velocity;
+        Rotation = rotation;
+        DeliveryMethod = NitroxDeliveryMethod.DeliveryMethod.UNRELIABLE_SEQUENCED;
+        UdpChannel = UdpChannelId.MOVEMENTS;
+    }
+}

Nitrox.Model.Subnautica/Packets/ModuleAdded.cs

@@ -26,7 +26,17 @@ public VehicleMovements(List<MovementData> data, double realTime)
 public abstract record class MovementData(NitroxId Id, NitroxVector3 Position, NitroxQuaternion Rotation) { }
 
 [Serializable]
-public record class SimpleMovementData(NitroxId Id, NitroxVector3 Position, NitroxQuaternion Rotation) : MovementData(Id, Position, Rotation) { }
+public record class SimpleMovementData(NitroxId Id, NitroxVector3 Position, NitroxQuaternion Rotation)
+    : MovementData(Id, Position, Rotation) { }
 
 [Serializable]
-public record class DrivenVehicleMovementData(NitroxId Id, NitroxVector3 Position, NitroxQuaternion Rotation, sbyte SteeringWheelYaw, sbyte SteeringWheelPitch, bool ThrottleApplied) : MovementData(Id, Position, Rotation) { }
+public record class DrivenVehicleMovementData(
+    NitroxId Id, NitroxVector3 Position, NitroxQuaternion Rotation,
+    sbyte SteeringWheelYaw, sbyte SteeringWheelPitch, bool ThrottleApplied)
+    : MovementData(Id, Position, Rotation) { }
+
+[Serializable]
+public record class ExosuitMovementData(NitroxId Id, NitroxVector3 Position, NitroxQuaternion Rotation, 
+    NitroxVector3 AimTargetLeft, NitroxVector3 AimTargetRight, sbyte SteeringWheelYaw,
+    sbyte SteeringWheelPitch, bool ThrottleApplied, bool IKEnabled)
+    : DrivenVehicleMovementData(Id, Position, Rotation, SteeringWheelYaw, SteeringWheelPitch, ThrottleApplied) { }

Nitrox.Model.Subnautica/Packets/ModuleRemoved.cs

@@ -28,7 +28,7 @@ public override void Process(EntityReparented packet, Player player)
             Log.Error($"Couldn't find parent entity for {packet.NewParentId}");
             return;
         }
-        
+
         entityRegistry.ReparentEntity(packet.Id, packet.NewParentId);
         playerManager.SendPacketToOtherPlayers(packet, player);
     }