ECS StorageFill (#6351)

Content.Server/Storage/Components/StorageFillComponent.cs

@@ -1,71 +1,14 @@
-using System;
 using System.Collections.Generic;
-using Content.Shared.Storage;
+using Content.Server.Storage.EntitySystems;
+using Robust.Shared.Analyzers;
 using Robust.Shared.GameObjects;
-using Robust.Shared.IoC;
-using Robust.Shared.Log;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Random;
-using Robust.Shared.Serialization.Manager;
 using Robust.Shared.Serialization.Manager.Attributes;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
 
 namespace Content.Server.Storage.Components
 {
-    [RegisterComponent]
+    [RegisterComponent, ComponentProtoName("StorageFill"), Friend(typeof(StorageSystem))]
-    public sealed class StorageFillComponent : Component, IMapInit
+    public sealed class StorageFillComponent : Component
     {
-        [Dependency] private readonly IEntityManager _entMan = default!;
+        [DataField("contents")] public List<EntitySpawnEntry> Contents = new();
-
-        public override string Name => "StorageFill";
-
-        [DataField("contents")] private List<EntitySpawnEntry> _contents = new();
-
-        public IReadOnlyList<EntitySpawnEntry> Contents => _contents;
-
-        void IMapInit.MapInit()
-        {
-            if (_contents.Count == 0)
-            {
-                return;
-            }
-
-            if (!_entMan.TryGetComponent(Owner, out IStorageComponent? storage))
-            {
-                Logger.Error($"StorageFillComponent couldn't find any StorageComponent ({Owner})");
-                return;
-            }
-
-            var random = IoCManager.Resolve<IRobustRandom>();
-
-            var alreadySpawnedGroups = new List<string>();
-            foreach (var storageItem in _contents)
-            {
-                if (!string.IsNullOrEmpty(storageItem.GroupId) &&
-                    alreadySpawnedGroups.Contains(storageItem.GroupId)) continue;
-
-                if (storageItem.SpawnProbability != 1f &&
-                    !random.Prob(storageItem.SpawnProbability))
-                {
-                    continue;
-                }
-
-				var entMan = _entMan;
-				var transform = entMan.GetComponent<TransformComponent>(Owner);
-
-                for (var i = 0; i < storageItem.Amount; i++)
-                {
-
-                    var ent = entMan.SpawnEntity(storageItem.PrototypeId, transform.Coordinates);
-
-                    if (storage.Insert(ent)) continue;
-
-                    Logger.ErrorS("storage", $"Tried to StorageFill {storageItem.PrototypeId} inside {Owner} but can't.");
-                    entMan.DeleteEntity(ent);
-                }
-
-                if (!string.IsNullOrEmpty(storageItem.GroupId)) alreadySpawnedGroups.Add(storageItem.GroupId);
-            }
-        }
     }
 }

Content.Server/Storage/EntitySystems/StorageSystem.Fill.cs

@@ -0,0 +1,46 @@
+using System.Collections.Generic;
+using Content.Server.Storage.Components;
+using Robust.Shared.GameObjects;
+using Robust.Shared.Log;
+using Robust.Shared.Random;
+
+namespace Content.Server.Storage.EntitySystems;
+
+public sealed partial class StorageSystem
+{
+    private void OnStorageFillMapInit(EntityUid uid, StorageFillComponent component, MapInitEvent args)
+    {
+        if (component.Contents.Count == 0) return;
+
+        if (!TryComp<IStorageComponent>(uid, out var storage))
+        {
+            Logger.Error($"StorageFillComponent couldn't find any StorageComponent ({uid})");
+            return;
+        }
+
+        var coordinates = Transform(uid).Coordinates;
+        var alreadySpawnedGroups = new HashSet<string>();
+
+        foreach (var entry in component.Contents)
+        {
+            // Handle "Or" groups
+            if (!string.IsNullOrEmpty(entry.GroupId) && alreadySpawnedGroups.Contains(entry.GroupId)) continue;
+
+            // Check random spawn
+            // ReSharper disable once CompareOfFloatsByEqualityOperator
+            if (entry.SpawnProbability != 1f && !_random.Prob(entry.SpawnProbability)) continue;
+
+            for (var i = 0; i < entry.Amount; i++)
+            {
+                var ent = EntityManager.SpawnEntity(entry.PrototypeId, coordinates);
+
+                if (storage.Insert(ent)) continue;
+
+                Logger.ErrorS("storage", $"Tried to StorageFill {entry.PrototypeId} inside {uid} but can't.");
+                EntityManager.DeleteEntity(ent);
+            }
+
+            if (!string.IsNullOrEmpty(entry.GroupId)) alreadySpawnedGroups.Add(entry.GroupId);
+        }
+    }
+}

Content.Server/Storage/EntitySystems/StorageSystem.cs

@@ -11,14 +11,16 @@ using Robust.Shared.Containers;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Localization;
+using Robust.Shared.Random;
 using Robust.Shared.Timing;
 
 namespace Content.Server.Storage.EntitySystems
 {
     [UsedImplicitly]
-    internal sealed class StorageSystem : EntitySystem
+    public sealed partial class StorageSystem : EntitySystem
     {
         [Dependency] private readonly IGameTiming _gameTiming = default!;
+        [Dependency] private readonly IRobustRandom _random = default!;
 
         private readonly List<IPlayerSession> _sessionCache = new();
 
@@ -33,6 +35,8 @@ namespace Content.Server.Storage.EntitySystems
             SubscribeLocalEvent<EntityStorageComponent, GetInteractionVerbsEvent>(AddToggleOpenVerb);
             SubscribeLocalEvent<ServerStorageComponent, GetActivationVerbsEvent>(AddOpenUiVerb);
             SubscribeLocalEvent<EntityStorageComponent, RelayMovementEntityEvent>(OnRelayMovement);
+
+            SubscribeLocalEvent<StorageFillComponent, MapInitEvent>(OnStorageFillMapInit);
         }
 
         private void OnRelayMovement(EntityUid uid, EntityStorageComponent component, RelayMovementEntityEvent args)