Removed escapepod referenced content

Author: Coding-Hen

Nitrox.Test/Server/Serialization/WorldPersistenceTest.cs

@@ -376,10 +376,12 @@ private static void EntityTest(Entity entity, Entity entityAfter)
                     {
                         case PlaceholderGroupWorldEntity _ when worldEntityAfter is PlaceholderGroupWorldEntity _:
                             break;
+#if SUBNAUTICA
                         case EscapePodWorldEntity escapePodWorldEntity when worldEntityAfter is EscapePodWorldEntity escapePodWorldEntityAfter:
                             Assert.AreEqual(escapePodWorldEntity.Damaged, escapePodWorldEntityAfter.Damaged);
                             Assert.IsTrue(escapePodWorldEntity.Players.SequenceEqual(escapePodWorldEntityAfter.Players));
                             break;
+#endif
                         case PlayerWorldEntity _ when worldEntityAfter is PlayerWorldEntity _:
                             break;
                         case VehicleWorldEntity vehicleWorldEntity when worldEntityAfter is VehicleWorldEntity vehicleWorldEntityAfter:

NitroxClient/GameLogic/Entities.cs

@@ -42,7 +42,9 @@ public Entities(IPacketSender packetSender, ThrottledPacketSender throttledPacke
             entitySpawnersByType[typeof(InventoryItemEntity)] = new InventoryItemEntitySpawner();
             entitySpawnersByType[typeof(WorldEntity)] = new WorldEntitySpawner(playerManager, localPlayer);
             entitySpawnersByType[typeof(PlaceholderGroupWorldEntity)] = entitySpawnersByType[typeof(WorldEntity)];
+#if SUBNAUTICA
             entitySpawnersByType[typeof(EscapePodWorldEntity)] = entitySpawnersByType[typeof(WorldEntity)];
+#endif
             entitySpawnersByType[typeof(PlayerWorldEntity)] = entitySpawnersByType[typeof(WorldEntity)];
             entitySpawnersByType[typeof(VehicleWorldEntity)] = entitySpawnersByType[typeof(WorldEntity)];
         }

NitroxClient/GameLogic/Helper/EquipmentHelper.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using NitroxClient.Unity.Helper;
 using NitroxModel.DataStructures.Util;
@@ -14,7 +14,9 @@ public class EquipmentHelper
             o => o.GetComponent<BaseNuclearReactor>().AliveOrNull()?._equipment,
             o => o.GetComponent<CyclopsDecoyLoadingTube>().AliveOrNull()?.decoySlots,
             o => o.GetComponent<Exosuit>().AliveOrNull()?.modules,
+#if SUBNAUTICA
             o => o.GetComponent<SeaMoth>().AliveOrNull()?.modules,
+#endif
             o => o.GetComponent<UpgradeConsole>().AliveOrNull()?.modules,
             o => o.GetComponent<Vehicle>().AliveOrNull()?.modules,
             o => o.GetComponent<VehicleUpgradeConsoleInput>().AliveOrNull()?.equipment,

NitroxClient/GameLogic/LocalPlayer.cs

@@ -77,8 +77,9 @@ public void BroadcastLocation(Vector3 location, Vector3 velocity, Quaternion bod
         public void BroadcastDeath(Vector3 deathPosition) => packetSender.Send(new PlayerDeathEvent(multiplayerSession.Reservation.PlayerId, deathPosition.ToDto()));
 
         public void BroadcastSubrootChange(Optional<NitroxId> subrootId) => packetSender.Send(new SubRootChanged(multiplayerSession.Reservation.PlayerId, subrootId));
-
+#if SUBNAUTICA
         public void BroadcastEscapePodChange(Optional<NitroxId> escapePodId) => packetSender.Send(new EscapePodChanged(multiplayerSession.Reservation.PlayerId, escapePodId));
+#endif
 
         public void BroadcastWeld(NitroxId id, float healthAdded) => packetSender.Send(new WeldAction(id, healthAdded));
 

NitroxClient/GameLogic/RemotePlayer.cs

@@ -233,9 +233,11 @@ public void SetVehicle(Vehicle newVehicle)
                     // Therefore we need to make sure that the MultiplayerVehicleControl component exists before using it
                     switch (newVehicle)
                     {
+#if SUBNAUTICA
                         case SeaMoth:
                             newVehicle.gameObject.EnsureComponent<MultiplayerSeaMoth>().Enter();
                             break;
+#endif
                         case Exosuit:
                             newVehicle.gameObject.EnsureComponent<MultiplayerExosuit>().Enter();
                             break;
@@ -245,8 +247,9 @@ public void SetVehicle(Vehicle newVehicle)
                 RigidBody.isKinematic = newVehicle;
 
                 Vehicle = newVehicle;
-
+#if SUBNAUTICA
                 AnimationController["in_seamoth"] = newVehicle is SeaMoth;
+#endif
                 AnimationController["in_exosuit"] = AnimationController["using_mechsuit"] = newVehicle is Exosuit;
             }
         }

NitroxModel/DataStructures/GameLogic/Entities/EscapePodEntity.cs

@@ -1,3 +1,4 @@
+#if SUBNAUTICA
 using System;
 using NitroxModel.DataStructures.GameLogic.Entities.Metadata;
 using NitroxModel.DataStructures.Unity;
@@ -65,3 +66,4 @@ public override string ToString()
 
     }
 }
+#endif

NitroxModel/DataStructures/GameLogic/Entities/WorldEntity.cs

@@ -15,7 +15,9 @@ namespace NitroxModel.DataStructures.GameLogic.Entities
     [Serializable]
     [DataContract]
     [ProtoInclude(51, typeof(PlaceholderGroupWorldEntity))]
+#if SUBNAUTICA
     [ProtoInclude(52, typeof(EscapePodWorldEntity))]
+#endif
     [ProtoInclude(53, typeof(PlayerWorldEntity))]
     [ProtoInclude(54, typeof(VehicleWorldEntity))]
     [ProtoInclude(55, typeof(CellRootEntity))]

NitroxModel/Packets/EscapePodChanged.cs

@@ -1,4 +1,5 @@
-using System;
+#if SUBNAUTICA
+using System;
 using NitroxModel.DataStructures;
 using NitroxModel.DataStructures.Util;
 
@@ -18,3 +19,4 @@ public EscapePodChanged(ushort playerId, Optional<NitroxId> escapePodId)
     }
 }
 
+#endif

NitroxModel/Packets/InitialPlayerSync.cs

@@ -12,8 +12,10 @@ namespace NitroxModel.Packets
 {
     [Serializable]
     public class InitialPlayerSync : Packet
-    { 
+    {
+#if SUBNAUTICA
         public NitroxId AssignedEscapePodId { get; }
+#endif
         public List<EquippedItemData> EquippedItems { get; }
         public List<BasePiece> BasePieces { get; }
         public List<NitroxTechType> UsedItems { get; }
@@ -36,7 +38,9 @@ public class InitialPlayerSync : Packet
 
         public InitialPlayerSync(NitroxId playerGameObjectId,
             bool firstTimeConnecting,
+#if SUBNAUTICA
             NitroxId assignedEscapePodId,
+#endif
             IEnumerable<EquippedItemData> equipment,
             IEnumerable<BasePiece> basePieces,
             IEnumerable<NitroxTechType> usedItems,
@@ -55,7 +59,9 @@ public InitialPlayerSync(NitroxId playerGameObjectId,
             SubnauticaPlayerPreferences preferences,
             TimeData timeData)
         {
+#if SUBNAUTICA
             AssignedEscapePodId = assignedEscapePodId;
+#endif
             PlayerGameObjectId = playerGameObjectId;
             FirstTimeConnecting = firstTimeConnecting;
             EquippedItems = equipment.ToList();
@@ -79,7 +85,9 @@ public InitialPlayerSync(NitroxId playerGameObjectId,
 
         /// <remarks>Used for deserialization</remarks>
         public InitialPlayerSync(
+#if SUBNAUTICA
             NitroxId assignedEscapePodId,
+#endif
             List<EquippedItemData> equippedItems,
             List<BasePiece> basePieces,
             List<NitroxTechType> usedItems,
@@ -100,7 +108,9 @@ public InitialPlayerSync(
             SubnauticaPlayerPreferences preferences,
             TimeData timeData)
         {
+#if SUBNAUTICA
             AssignedEscapePodId = assignedEscapePodId;
+#endif
             PlayerGameObjectId = playerGameObjectId;
             FirstTimeConnecting = firstTimeConnecting;
             EquippedItems = equippedItems;

NitroxServer/Communication/Packets/Processors/EscapePodChangedPacketProcessor.cs

@@ -1,4 +1,5 @@
-using NitroxModel.Packets;
+#if SUBNAUTICA
+using NitroxModel.Packets;
 using NitroxServer.Communication.Packets.Processors.Abstract;
 using NitroxServer.GameLogic;
 
@@ -21,3 +22,4 @@ public override void Process(EscapePodChanged packet, Player player)
         }
     }
 }
+#endif

NitroxServer/Communication/Packets/Processors/PlayerJoiningMultiplayerSessionProcessor.cs

@@ -36,13 +36,15 @@ public PlayerJoiningMultiplayerSessionProcessor(ScheduleKeeper scheduleKeeper, S
         public override void Process(PlayerJoiningMultiplayerSession packet, NitroxConnection connection)
         {
             Player player = playerManager.PlayerConnected(connection, packet.ReservationKey, out bool wasBrandNewPlayer);
+#if SUBNAUTUICA
             NitroxId assignedEscapePodId = world.EscapePodManager.AssignPlayerToEscapePod(player.Id, out Optional<EscapePodWorldEntity> newlyCreatedEscapePod);
 
             if (newlyCreatedEscapePod.HasValue)
             {
                 SpawnEntities spawnNewEscapePod = new(newlyCreatedEscapePod.Value);
                 playerManager.SendPacketToOtherPlayers(spawnNewEscapePod, player);
             }
+#endif
 
             List<EquippedItemData> equippedItems = player.GetEquipment();
             List<NitroxTechType> techTypes = equippedItems.Select(equippedItem => equippedItem.TechType).ToList();
@@ -69,7 +71,9 @@ public override void Process(PlayerJoiningMultiplayerSession packet, NitroxConne
 
             InitialPlayerSync initialPlayerSync = new(player.GameObjectId,
                 wasBrandNewPlayer,
+#if SUBNAUTICA
                 assignedEscapePodId,
+#endif
                 equippedItems,
                 world.BaseManager.GetBasePiecesForNewlyConnectedPlayer(),
                 player.UsedItems,

NitroxServer/GameLogic/EscapePodManager.cs

@@ -1,3 +1,4 @@
+#if SUBNAUTICA
 using System;
 using System.Collections.Generic;
 using NitroxModel.DataStructures;
@@ -155,3 +156,4 @@ private static bool IsPodFull(EscapePodWorldEntity pod)
         }
     }
 }
+#endif

NitroxServer/Serialization/World/World.cs

@@ -12,7 +12,9 @@ public class World
         public ScheduleKeeper ScheduleKeeper { get; set; }
         public TimeKeeper TimeKeeper { get; set; }
         public SimulationOwnershipData SimulationOwnershipData { get; set; }
+#if SUBNAUTCIA
         public EscapePodManager EscapePodManager { get; set; }
+#endif
         public BatchEntitySpawner BatchEntitySpawner { get; set; }
         public EntitySimulation EntitySimulation { get; set; }
         public EntityRegistry EntityRegistry { get; set; }

NitroxServer/Serialization/World/WorldPersistence.cs

@@ -200,8 +200,9 @@ public World CreateWorld(PersistedWorldData pWorldData, ServerGameMode gameMode)
                 PlayerManager = new PlayerManager(pWorldData.PlayerData.GetPlayers(), config),
 
                 BaseManager = new BaseManager(pWorldData.BaseData.PartiallyConstructedPieces, pWorldData.BaseData.CompletedBasePieceHistory),
-
+#if SUBNAUTICA
                 EscapePodManager = new EscapePodManager(entityRegistry, randomStart, seed),
+#endif
 
                 EntityRegistry = entityRegistry,
 

NitroxServer/ServerAutoFacRegistrar.cs

@@ -33,7 +33,9 @@ private static void RegisterCoreDependencies(ContainerBuilder containerBuilder)
             containerBuilder.RegisterType<PlayerManager>().SingleInstance();
             containerBuilder.RegisterType<DefaultServerPacketProcessor>().InstancePerLifetimeScope();
             containerBuilder.RegisterType<PacketHandler>().InstancePerLifetimeScope();
+#if SUBNAUTICA
             containerBuilder.RegisterType<EscapePodManager>().InstancePerLifetimeScope();
+#endif
             containerBuilder.RegisterType<EntitySimulation>().SingleInstance();
             containerBuilder.RegisterType<ConsoleCommandProcessor>().SingleInstance();