Crops persistence

Nitrox.Test/Patcher/Patches/PatchesTranspilerTest.cs

@@ -49,25 +49,29 @@ public class PatchesTranspilerTest
         [typeof(Flare_Update_Patch), 0],
         [typeof(FootstepSounds_OnStep_Patch), 6],
         [typeof(GameInput_Initialize_Patch), 5],
+        [typeof(GrowingPlant_SpawnGrownModelAsync_Patch), -1],
         [typeof(Player_TriggerInfectionRevealAsync_Patch), 1],
         [typeof(IngameMenu_OnSelect_Patch), -2],
         [typeof(IngameMenu_QuitGameAsync_Patch), 2],
         [typeof(IngameMenu_QuitSubscreen_Patch), -24],
         [typeof(ItemsContainer_DestroyItem_Patch), 2],
         [typeof(Knife_OnToolUseAnim_Patch), 0],
+        [typeof(LargeRoomWaterPark_OnDeconstructionStart_Patch), 3],
         [typeof(LargeWorldEntity_UpdateCell_Patch), 1],
         [typeof(LaunchRocket_OnHandClick_Patch), -9],
         [typeof(LeakingRadiation_Update_Patch), 0],
         [typeof(MainGameController_StartGame_Patch), 1],
         [typeof(MeleeAttack_CanDealDamageTo_Patch), 4],
         [typeof(PDAScanner_Scan_Patch), 3],
+        [typeof(PickPrefab_AddToContainerAsync_Patch), 4],
         [typeof(Player_OnKill_Patch), 0],
         [typeof(Respawn_Start_Patch), 3],
         [typeof(RocketConstructor_StartRocketConstruction_Patch), 3],
         [typeof(SpawnConsoleCommand_SpawnAsync_Patch), 2],
         [typeof(SpawnOnKill_OnKill_Patch), 3],
         [typeof(SubConsoleCommand_OnConsoleCommand_sub_Patch), 0],
         [typeof(SubRoot_OnPlayerEntered_Patch), 5],
+        [typeof(Trashcan_Update_Patch), 4],
         [typeof(uGUI_PDA_Initialize_Patch), 2],
         [typeof(uGUI_PDA_SetTabs_Patch), 3],
         [typeof(uGUI_Pings_IsVisibleNow_Patch), 0],

Nitrox.Test/Server/Serialization/WorldPersistenceTest.cs

@@ -208,7 +208,13 @@ private static void EntityTest(Entity entity, Entity entityAfter)
                 Assert.AreEqual(metadata.Duration, metadataAfter.Duration);
                 break;
             case PlantableMetadata metadata when entityAfter.Metadata is PlantableMetadata metadataAfter:
-                Assert.AreEqual(metadata.Progress, metadataAfter.Progress);
+                Assert.AreEqual(metadata.TimeStartGrowth, metadataAfter.TimeStartGrowth);
+                Assert.AreEqual(metadata.SlotID, metadataAfter.SlotID);
+                // FruitPlantMetadata field is not checked before it's only temporary
+                break;
+            case FruitPlantMetadata metadata when entityAfter.Metadata is FruitPlantMetadata metadataAfter:
+                Assert.AreEqual(metadata.PickedStates, metadataAfter.PickedStates);
+                Assert.AreEqual(metadata.TimeNextFruit, metadataAfter.TimeNextFruit);
                 break;
             case CyclopsMetadata metadata when entityAfter.Metadata is CyclopsMetadata metadataAfter:
                 Assert.AreEqual(metadata.SilentRunningOn, metadataAfter.SilentRunningOn);

NitroxClient/ClientAutoFacRegistrar.cs

@@ -1,6 +1,3 @@
-global using NitroxClient.Helpers;
-global using NitroxModel.Logger;
-global using static NitroxModel.Extensions;
 using System.Reflection;
 using Autofac;
 using Autofac.Core;

NitroxClient/Communication/Packets/Processors/BuildProcessor.cs

@@ -27,3 +27,5 @@ public class BaseDeconstructedProcessor : BuildProcessor<BaseDeconstructed> { }
 public class PieceDeconstructedProcessor : BuildProcessor<PieceDeconstructed> { }
 
 public class WaterParkDeconstructedProcessor : BuildProcessor<WaterParkDeconstructed> { }
+
+public class LargeWaterParkDeconstructedProcessor : BuildProcessor<LargeWaterParkDeconstructed> { }

NitroxClient/Communication/Packets/Processors/EntityDestroyedProcessor.cs

@@ -41,7 +41,7 @@ public override void Process(EntityDestroyed packet)
             }
             else
             {
-                DefaultDestroyAction(gameObject);
+                Entities.DestroyObject(gameObject);
             }
         }
     }
@@ -92,9 +92,4 @@ private void DestroyVehicle(Vehicle vehicle)
             Object.Destroy(vehicle.gameObject);
         }
     }
-
-    private void DefaultDestroyAction(GameObject gameObject)
-    {
-        Object.Destroy(gameObject);
-    }
 }

NitroxClient/Communication/Packets/Processors/EntityReparentedProcessor.cs

@@ -36,17 +36,24 @@ public override void Process(EntityReparented packet)
 
         if (entity.Value.TryGetComponent(out Pickupable pickupable))
         {
+            WaterParkItem waterParkItem = pickupable.GetComponent<WaterParkItem>();
             // If the entity is being parented to a WaterPark
             if (newParent.TryGetComponent(out WaterPark waterPark))
             {
+                // If the entity is already in a WaterPark
+                if (waterParkItem.currentWaterPark)
+                {
+                    waterParkItem.SetWaterPark(waterPark);
+                    return;
+                }
                 pickupable.SetVisible(false);
                 pickupable.Activate(false);
                 waterPark.AddItem(pickupable);
                 // The reparenting is automatic here so we don't need to continue
                 return;
             }
             // If the entity was parented to a WaterPark but is picked up by someone
-            else if (pickupable.TryGetComponent(out WaterParkItem waterParkItem))
+            else if (waterParkItem)
             {
                 pickupable.Deactivate();
                 waterParkItem.SetWaterPark(null);

NitroxClient/Communication/Packets/Processors/FastCheatChangedProcessor.cs

@@ -0,0 +1,21 @@
+using NitroxClient.Communication.Packets.Processors.Abstract;
+using NitroxModel.Packets;
+
+namespace NitroxClient.Communication.Packets.Processors;
+
+public class FastCheatChangedProcessor : ClientPacketProcessor<FastCheatChanged>
+{
+    public override void Process(FastCheatChanged packet)
+    {
+        switch (packet.Cheat)
+        {
+            case FastCheatChanged.FastCheat.HATCH:
+                NoCostConsoleCommand.main.fastHatchCheat = packet.Value;
+                break;
+
+            case FastCheatChanged.FastCheat.GROW:
+                NoCostConsoleCommand.main.fastGrowCheat = packet.Value;
+                break;
+        }
+    }
+}

NitroxClient/Debuggers/NetworkDebugger.cs

@@ -19,7 +19,7 @@ public class NetworkDebugger : BaseDebugger, INetworkDebugger
         {
             nameof(PlayerMovement), nameof(EntityTransformUpdates), nameof(PlayerStats), nameof(SpawnEntities), nameof(VehicleMovements), nameof(PlayerCinematicControllerCall),
             nameof(FMODAssetPacket), nameof(FMODEventInstancePacket), nameof(FMODCustomEmitterPacket), nameof(FMODStudioEmitterPacket), nameof(FMODCustomLoopingEmitterPacket), 
-            nameof(SimulationOwnershipChange), nameof(CellVisibilityChanged), nameof(PlayerInCyclopsMovement), nameof(CreatureActionChanged),
+            nameof(SimulationOwnershipChange), nameof(CellVisibilityChanged), nameof(PlayerInCyclopsMovement), nameof(CreatureActionChanged), nameof(FootstepPacket)
         };
         private readonly List<PacketDebugWrapper> packets = new List<PacketDebugWrapper>(PACKET_STORED_COUNT);
 

NitroxClient/Debuggers/SceneExtraDebugger.cs

@@ -5,6 +5,7 @@
 using System.Text.RegularExpressions;
 using NitroxClient.MonoBehaviours;
 using NitroxClient.Unity.Helper;
+using NitroxModel.DataStructures;
 using NitroxModel.Helper;
 using UnityEngine;
 using Mathf = UnityEngine.Mathf;
@@ -251,6 +252,28 @@ private void GettingSearchbarResults()
                         GUILayout.Label($"There is no component named \"{gameObjectSearch.Substring(2)}\"", "error");
                     }
                 }
+                else if (gameObjectSearch.StartsWith("id:"))
+                {
+                    string id = gameObjectSearch.Split(':')[1];
+                    try
+                    {
+                        NitroxId foundId = new(id);
+                        if (NitroxEntity.TryGetObjectFrom(foundId, out GameObject gameObject))
+                        {
+                            gameObjectResults = [gameObject];
+                        }
+                        else
+                        {
+                            GUILayout.Label($"No GameObject found with NitroxId \"{foundId}\"");
+                            gameObjectResults = [];
+                        }
+                    }
+                    catch
+                    {
+                        GUILayout.Label($"Id \"{id}\" is not a valid NitroxId");
+                        gameObjectResults = [];
+                    }
+                }
                 else
                 {
                     gameObjectResults = Resources.FindObjectsOfTypeAll<GameObject>().

NitroxClient/GameLogic/Bases/BuildingHandler.cs

@@ -258,6 +258,7 @@ public IEnumerator DeconstructPiece(PieceDeconstructed pieceDeconstructed)
             using (PacketSuppressor<BaseDeconstructed>.Suppress())
             using (PacketSuppressor<PieceDeconstructed>.Suppress())
             using (PacketSuppressor<WaterParkDeconstructed>.Suppress())
+            using (PacketSuppressor<LargeWaterParkDeconstructed>.Suppress())
             using (Temp.Fill(pieceDeconstructed))
             {
                 baseDeconstructable.Deconstruct();
@@ -291,6 +292,7 @@ public class TemporaryBuildData : IDisposable
         public List<NitroxId> MovedChildrenIds;
         public (NitroxId, NitroxId) ChildrenTransfer;
         public bool Transfer;
+        public Dictionary<NitroxId, List<NitroxId>> MovedChildrenIdsByNewHostId;
 
         public void Dispose()
         {
@@ -299,6 +301,7 @@ public void Dispose()
             MovedChildrenIds = null;
             ChildrenTransfer = (null, null);
             Transfer = false;
+            MovedChildrenIdsByNewHostId = null;
         }
 
         public TemporaryBuildData Fill(PieceDeconstructed pieceDeconstructed)
@@ -309,6 +312,11 @@ public TemporaryBuildData Fill(PieceDeconstructed pieceDeconstructed)
                 NewWaterPark = waterParkDeconstructed.NewWaterPark;
                 MovedChildrenIds = waterParkDeconstructed.MovedChildrenIds;
                 Transfer = waterParkDeconstructed.Transfer;
+                return this;
+            }
+            if (pieceDeconstructed is LargeWaterParkDeconstructed largeWaterParkDeconstructed)
+            {
+                MovedChildrenIdsByNewHostId = largeWaterParkDeconstructed.MovedChildrenIdsByNewHostId;
             }
             return this;
         }

NitroxClient/GameLogic/Entities.cs

@@ -55,7 +55,7 @@ public Entities(IPacketSender packetSender, ThrottledPacketSender throttledPacke
             entitySpawnersByType[typeof(InstalledModuleEntity)] = new InstalledModuleEntitySpawner();
             entitySpawnersByType[typeof(InstalledBatteryEntity)] = new InstalledBatteryEntitySpawner();
             entitySpawnersByType[typeof(InventoryEntity)] = new InventoryEntitySpawner();
-            entitySpawnersByType[typeof(InventoryItemEntity)] = new InventoryItemEntitySpawner();
+            entitySpawnersByType[typeof(InventoryItemEntity)] = new InventoryItemEntitySpawner(entityMetadataManager);
             entitySpawnersByType[typeof(WorldEntity)] = new WorldEntitySpawner(entityMetadataManager, playerManager, localPlayer, this, simulationOwnership);
             entitySpawnersByType[typeof(PlaceholderGroupWorldEntity)] = entitySpawnersByType[typeof(WorldEntity)];
             entitySpawnersByType[typeof(PrefabPlaceholderEntity)] = entitySpawnersByType[typeof(WorldEntity)];
@@ -256,11 +256,30 @@ public void CleanupExistingEntities(List<Entity> dirtyEntities)
 
                 if (gameObject.HasValue)
                 {
-                    UnityEngine.Object.Destroy(gameObject.Value);
+                    DestroyObject(gameObject.Value);
                 }
             }
         }
 
+        /// <summary>
+        /// Either perform a special operation (e.g. for plants) or a simple <see cref="UnityEngine.Object.Destroy"/>
+        /// </summary>
+        public static void DestroyObject(GameObject gameObject)
+        {
+            if (gameObject.TryGetComponent(out Plantable plantable))
+            {
+                plantable.FreeSpot();
+                return;
+            }
+            if (gameObject.TryGetComponent(out GrownPlant grownPlant))
+            {
+                grownPlant.seed.AliveOrNull()?.FreeSpot();
+                return;
+            }
+
+            UnityEngine.Object.Destroy(gameObject);
+        }
+
         private void UpdateEntity(Entity entity)
         {
             if (!NitroxEntity.TryGetObjectFrom(entity.Id, out GameObject gameObject))

NitroxClient/GameLogic/Helper/InventoryContainerHelper.cs

@@ -55,8 +55,15 @@ public static bool TryGetOwnerId(Transform ownerTransform, out NitroxId ownerId)
                 ownerId = null;
                 return false;
             }
+            // TODO: in the future maybe use a switch on the PrefabId (it's always the same structure in a prefab)
+            // and then statically look for the right object because we'll know exactly which one it is
 
-            if (parent.GetComponent<Constructable>() || parent.GetComponent<IBaseModule>().AliveOrNull())
+            // This check must happen before the GetComponent<IBaseModule> which will be triggered (wrong result)
+            if (parent.TryGetComponent(out WaterPark waterPark))
+            {
+                return waterPark.planter.TryGetIdOrWarn(out ownerId);
+            }
+            else if (parent.GetComponent<Constructable>() || parent.GetComponent<IBaseModule>().AliveOrNull())
             {
                 return parent.TryGetIdOrWarn(out ownerId);
             }
@@ -65,6 +72,7 @@ public static bool TryGetOwnerId(Transform ownerTransform, out NitroxId ownerId)
             {
                 return true;
             }
+            // For regular water parks, the main object contains the StorageRoot and the planter at the same level
             else if (LockerRegex.IsMatch(ownerTransform.gameObject.name))
             {
                 string lockerId = ownerTransform.gameObject.name.Substring(7, 1);

NitroxClient/GameLogic/InitialSync/PlayerInitialSyncProcessor.cs

@@ -1,4 +1,5 @@
 using System.Collections;
+using System.Text;
 using NitroxClient.GameLogic.InitialSync.Abstract;
 using NitroxClient.MonoBehaviours;
 using NitroxModel.DataStructures;
@@ -34,7 +35,7 @@ public PlayerInitialSyncProcessor(Items item, ItemContainers itemContainers, Loc
         AddStep(sync => AddStartingItemsToPlayer(sync.FirstTimeConnecting));
         AddStep(sync => SetPlayerStats(sync.PlayerStatsData));
         AddStep(sync => SetPlayerGameMode(sync.GameMode));
-        AddStep(sync => SetPlayerKeepInventoryOnDeath(sync.KeepInventoryOnDeath));
+        AddStep(sync => ApplySettings(sync.KeepInventoryOnDeath, sync.SessionSettings.FastHatch, sync.SessionSettings.FastGrow));
     }
 
     private void SetPlayerPermissions(Perms permissions)
@@ -96,7 +97,7 @@ private IEnumerator AddStartingItemsToPlayer(bool firstTimeConnecting)
                 Pickupable pickupable = gameObject.GetComponent<Pickupable>();
                 pickupable.Initialize();
 
-                item.Created(gameObject);
+                item.PickedUp(gameObject, techType);
                 itemContainers.AddItem(gameObject, localPlayerId);
             }
         }
@@ -137,8 +138,25 @@ private static void SetPlayerGameMode(NitroxGameMode gameMode)
         GameModeUtils.SetGameMode((GameModeOption)(int)gameMode, GameModeOption.None);
     }
 
-    private void SetPlayerKeepInventoryOnDeath(bool keepInventoryOnDeath)
+    private void ApplySettings(bool keepInventoryOnDeath, bool fastHatch, bool fastGrow)
     {
         localPlayer.KeepInventoryOnDeath = keepInventoryOnDeath;
+        NoCostConsoleCommand.main.fastHatchCheat = fastHatch;
+        NoCostConsoleCommand.main.fastGrowCheat = fastGrow;
+        if (!fastHatch && !fastGrow)
+        {
+            return;
+        }
+
+        StringBuilder cheatsEnabled = new("Cheats enabled:");
+        if (fastHatch)
+        {
+            cheatsEnabled.Append(" fastHatch");
+        }
+        if (fastGrow)
+        {
+            cheatsEnabled.Append(" fastGrow");
+        }
+        Log.InGame(cheatsEnabled.ToString());
     }
 }