diff --git a/Content.Client/Animations/ReusableAnimations.cs b/Content.Client/Animations/ReusableAnimations.cs index fc718d1cfd..f25ba07a75 100644 --- a/Content.Client/Animations/ReusableAnimations.cs +++ b/Content.Client/Animations/ReusableAnimations.cs @@ -3,6 +3,7 @@ using Robust.Client.Animations; using Robust.Client.GameObjects; using Robust.Shared.Animations; using Robust.Shared.GameObjects; +using Robust.Shared.IoC; using Robust.Shared.Log; using Robust.Shared.Map; using Robust.Shared.Maths; @@ -13,7 +14,7 @@ namespace Content.Client.Animations { public static void AnimateEntityPickup(IEntity entity, EntityCoordinates initialPosition, Vector2 finalPosition) { - var animatableClone = entity.EntityManager.SpawnEntity("clientsideclone", initialPosition); + var animatableClone = IoCManager.Resolve().SpawnEntity("clientsideclone", initialPosition); animatableClone.Name = entity.Name; if (!entity.TryGetComponent(out SpriteComponent? sprite0)) diff --git a/Content.Client/Body/UI/BodyScannerBoundUserInterface.cs b/Content.Client/Body/UI/BodyScannerBoundUserInterface.cs index 448f070ce3..70b3a548d1 100644 --- a/Content.Client/Body/UI/BodyScannerBoundUserInterface.cs +++ b/Content.Client/Body/UI/BodyScannerBoundUserInterface.cs @@ -3,6 +3,7 @@ using Content.Shared.Body.Components; using JetBrains.Annotations; using Robust.Client.GameObjects; using Robust.Shared.GameObjects; +using Robust.Shared.IoC; using Robust.Shared.ViewVariables; namespace Content.Client.Body.UI @@ -35,7 +36,7 @@ namespace Content.Client.Body.UI return; } - if (!Owner.Owner.EntityManager.TryGetEntity(scannerState.Uid, out _entity)) + if (!IoCManager.Resolve().TryGetEntity(scannerState.Uid, out _entity)) { throw new ArgumentException($"Received an invalid entity with id {scannerState.Uid} for body scanner with id {Owner.Owner.Uid} at {Owner.Owner.Transform.MapPosition}"); } diff --git a/Content.Client/Chat/UI/SpeechBubble.cs b/Content.Client/Chat/UI/SpeechBubble.cs index 88816d6817..e20335a30b 100644 --- a/Content.Client/Chat/UI/SpeechBubble.cs +++ b/Content.Client/Chat/UI/SpeechBubble.cs @@ -5,6 +5,7 @@ using Robust.Client.Graphics; using Robust.Client.UserInterface; using Robust.Client.UserInterface.Controls; using Robust.Shared.GameObjects; +using Robust.Shared.IoC; using Robust.Shared.Maths; using Robust.Shared.Timing; @@ -98,7 +99,7 @@ namespace Content.Client.Chat.UI _verticalOffsetAchieved = MathHelper.Lerp(_verticalOffsetAchieved, VerticalOffset, 10 * args.DeltaSeconds); } - if (!_senderEntity.Transform.Coordinates.IsValid(_senderEntity.EntityManager)) + if (!_senderEntity.Transform.Coordinates.IsValid(IoCManager.Resolve())) { Modulate = Color.White.WithAlpha(0); return; diff --git a/Content.Client/Doors/ClientDoorComponent.cs b/Content.Client/Doors/ClientDoorComponent.cs index 37201e4a66..f3dec6ffef 100644 --- a/Content.Client/Doors/ClientDoorComponent.cs +++ b/Content.Client/Doors/ClientDoorComponent.cs @@ -2,6 +2,7 @@ using System; using Content.Shared.Doors; using JetBrains.Annotations; using Robust.Shared.GameObjects; +using Robust.Shared.IoC; using Robust.Shared.Serialization.Manager.Attributes; using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom; using DrawDepthTag = Robust.Shared.GameObjects.DrawDepth; @@ -38,7 +39,7 @@ namespace Content.Client.Doors base.State = value; - Owner.EntityManager.EventBus.RaiseLocalEvent(Owner.Uid, new DoorStateChangedEvent(State), false); + IoCManager.Resolve().EventBus.RaiseLocalEvent(Owner.Uid, new DoorStateChangedEvent(State), false); } } diff --git a/Content.Client/IconSmoothing/IconSmoothComponent.cs b/Content.Client/IconSmoothing/IconSmoothComponent.cs index deb8113c45..7cc5bbc6a2 100644 --- a/Content.Client/IconSmoothing/IconSmoothComponent.cs +++ b/Content.Client/IconSmoothing/IconSmoothComponent.cs @@ -76,7 +76,7 @@ namespace Content.Client.IconSmoothing // ensures lastposition initial value is populated on spawn. Just calling // the hook here would cause a dirty event to fire needlessly UpdateLastPosition(); - Owner.EntityManager.EventBus.RaiseEvent(EventSource.Local, new IconSmoothDirtyEvent(Owner, null, Mode)); + IoCManager.Resolve().EventBus.RaiseEvent(EventSource.Local, new IconSmoothDirtyEvent(Owner, null, Mode)); } if (Sprite != null && Mode == IconSmoothingMode.Corners) @@ -260,7 +260,7 @@ namespace Content.Client.IconSmoothing if (Owner.Transform.Anchored) { - Owner.EntityManager.EventBus.RaiseEvent(EventSource.Local, new IconSmoothDirtyEvent(Owner, _lastPosition, Mode)); + IoCManager.Resolve().EventBus.RaiseEvent(EventSource.Local, new IconSmoothDirtyEvent(Owner, _lastPosition, Mode)); } } @@ -268,7 +268,7 @@ namespace Content.Client.IconSmoothing { if (Owner.Transform.Anchored) { - Owner.EntityManager.EventBus.RaiseEvent(EventSource.Local, new IconSmoothDirtyEvent(Owner, _lastPosition, Mode)); + IoCManager.Resolve().EventBus.RaiseEvent(EventSource.Local, new IconSmoothDirtyEvent(Owner, _lastPosition, Mode)); UpdateLastPosition(); } } @@ -278,7 +278,7 @@ namespace Content.Client.IconSmoothing { foreach (var entity in candidates) { - if (!Owner.EntityManager.TryGetComponent(entity, out IconSmoothComponent? other)) + if (!IoCManager.Resolve().TryGetComponent(entity, out IconSmoothComponent? other)) { continue; } diff --git a/Content.Client/Interactable/Components/InteractionOutlineComponent.cs b/Content.Client/Interactable/Components/InteractionOutlineComponent.cs index da3da6a773..f97b128ab3 100644 --- a/Content.Client/Interactable/Components/InteractionOutlineComponent.cs +++ b/Content.Client/Interactable/Components/InteractionOutlineComponent.cs @@ -28,7 +28,7 @@ namespace Content.Client.Interactable.Components if (Owner.TryGetComponent(out ISpriteComponent? sprite)) { sprite.PostShader = MakeNewShader(inInteractionRange, renderScale); - sprite.RenderOrder = Owner.EntityManager.CurrentTick.Value; + sprite.RenderOrder = IoCManager.Resolve().CurrentTick.Value; } } diff --git a/Content.Client/Inventory/ClientInventoryComponent.cs b/Content.Client/Inventory/ClientInventoryComponent.cs index 56062b5255..45e6471fd9 100644 --- a/Content.Client/Inventory/ClientInventoryComponent.cs +++ b/Content.Client/Inventory/ClientInventoryComponent.cs @@ -94,7 +94,7 @@ namespace Content.Client.Inventory foreach (var (slot, entityUid) in state.Entities) { - if (!Owner.EntityManager.TryGetEntity(entityUid, out var entity)) + if (!IoCManager.Resolve().TryGetEntity(entityUid, out var entity)) { continue; } @@ -109,7 +109,7 @@ namespace Content.Client.Inventory if (state.HoverEntity != null) { var (slot, (entityUid, fits)) = state.HoverEntity.Value; - var entity = Owner.EntityManager.GetEntity(entityUid); + var entity = IoCManager.Resolve().GetEntity(entityUid); InterfaceController?.HoverInSlot(slot, entity, fits); } diff --git a/Content.Client/Items/UI/ItemStatusPanel.cs b/Content.Client/Items/UI/ItemStatusPanel.cs index e4d7aa1d41..7e9911f2a6 100644 --- a/Content.Client/Items/UI/ItemStatusPanel.cs +++ b/Content.Client/Items/UI/ItemStatusPanel.cs @@ -194,7 +194,7 @@ namespace Content.Client.Items.UI } var collectMsg = new ItemStatusCollectMessage(); - _entity.EntityManager.EventBus.RaiseLocalEvent(_entity.Uid, collectMsg); + IoCManager.Resolve().EventBus.RaiseLocalEvent(_entity.Uid, collectMsg); foreach (var control in collectMsg.Controls) { diff --git a/Content.Client/Spawners/ClientEntitySpawnerComponent.cs b/Content.Client/Spawners/ClientEntitySpawnerComponent.cs index bb17ab1700..ae76f94958 100644 --- a/Content.Client/Spawners/ClientEntitySpawnerComponent.cs +++ b/Content.Client/Spawners/ClientEntitySpawnerComponent.cs @@ -1,5 +1,6 @@ using System.Collections.Generic; using Robust.Shared.GameObjects; +using Robust.Shared.IoC; using Robust.Shared.Serialization.Manager.Attributes; namespace Content.Client.Spawners @@ -32,7 +33,7 @@ namespace Content.Client.Spawners { foreach (var proto in _prototypes) { - var entity = Owner.EntityManager.SpawnEntity(proto, Owner.Transform.Coordinates); + var entity = IoCManager.Resolve().SpawnEntity(proto, Owner.Transform.Coordinates); _entity.Add(entity); } } @@ -41,7 +42,7 @@ namespace Content.Client.Spawners { foreach (var entity in _entity) { - Owner.EntityManager.DeleteEntity(entity); + IoCManager.Resolve().DeleteEntity(entity); } } } diff --git a/Content.Client/Storage/ClientStorageComponent.cs b/Content.Client/Storage/ClientStorageComponent.cs index a74836279d..9f72156410 100644 --- a/Content.Client/Storage/ClientStorageComponent.cs +++ b/Content.Client/Storage/ClientStorageComponent.cs @@ -67,7 +67,7 @@ namespace Content.Client.Storage } _storedEntities = state.StoredEntities - .Select(id => Owner.EntityManager.GetEntity(id)) + .Select(id => IoCManager.Resolve().GetEntity(id)) .ToList(); } @@ -101,7 +101,7 @@ namespace Content.Client.Storage /// private void HandleStorageMessage(StorageHeldItemsMessage storageState) { - _storedEntities = storageState.StoredEntities.Select(id => Owner.EntityManager.GetEntity(id)).ToList(); + _storedEntities = storageState.StoredEntities.Select(id => IoCManager.Resolve().GetEntity(id)).ToList(); StorageSizeUsed = storageState.StorageSizeUsed; StorageCapacityMax = storageState.StorageSizeMax; _window?.BuildEntityList(storageState.StoredEntities.ToList()); @@ -118,7 +118,7 @@ namespace Content.Client.Storage var entityId = msg.StoredEntities[i]; var initialPosition = msg.EntityPositions[i]; - if (Owner.EntityManager.TryGetEntity(entityId, out var entity)) + if (IoCManager.Resolve().TryGetEntity(entityId, out var entity)) { ReusableAnimations.AnimateEntityPickup(entity, initialPosition, Owner.Transform.LocalPosition); } @@ -156,7 +156,7 @@ namespace Content.Client.Storage #pragma warning restore 618 buttonEventArgs.Event.Handle(); } - else if (Owner.EntityManager.TryGetEntity(entityUid, out var entity)) + else if (IoCManager.Resolve().TryGetEntity(entityUid, out var entity)) { _itemSlotManager.OnButtonPressed(buttonEventArgs.Event, entity); } @@ -178,7 +178,7 @@ namespace Content.Client.Storage /// private void GenerateButton(EntityUid entityUid, EntityContainerButton button) { - if (!Owner.EntityManager.TryGetEntity(entityUid, out var entity)) + if (!IoCManager.Resolve().TryGetEntity(entityUid, out var entity)) return; entity.TryGetComponent(out ISpriteComponent? sprite); diff --git a/Content.Client/Suspicion/SuspicionRoleComponent.cs b/Content.Client/Suspicion/SuspicionRoleComponent.cs index 28b62ad913..5bf4116fce 100644 --- a/Content.Client/Suspicion/SuspicionRoleComponent.cs +++ b/Content.Client/Suspicion/SuspicionRoleComponent.cs @@ -72,7 +72,7 @@ namespace Content.Client.Suspicion } _overlayActive = true; - var overlay = new TraitorOverlay(Owner.EntityManager, _resourceCache, _eyeManager); + var overlay = new TraitorOverlay(IoCManager.Resolve(), _resourceCache, _eyeManager); _overlayManager.AddOverlay(overlay); } diff --git a/Content.Client/Wall/Components/LowWallComponent.cs b/Content.Client/Wall/Components/LowWallComponent.cs index 93a009cf12..2eda861800 100644 --- a/Content.Client/Wall/Components/LowWallComponent.cs +++ b/Content.Client/Wall/Components/LowWallComponent.cs @@ -42,7 +42,7 @@ namespace Content.Client.Wall.Components { base.Startup(); - _overlayEntity = Owner.EntityManager.SpawnEntity("LowWallOverlay", Owner.Transform.Coordinates); + _overlayEntity = IoCManager.Resolve().SpawnEntity("LowWallOverlay", Owner.Transform.Coordinates); _overlayEntity.Transform.AttachParent(Owner); _overlayEntity.Transform.LocalPosition = Vector2.Zero; @@ -204,7 +204,7 @@ namespace Content.Client.Wall.Components foreach (var entity in grid.GetLocal(coords)) { - if (Owner.EntityManager.TryGetComponent(entity, out WindowComponent? window)) + if (IoCManager.Resolve().TryGetComponent(entity, out WindowComponent? window)) { //window.UpdateSprite(); } @@ -216,7 +216,7 @@ namespace Content.Client.Wall.Components { foreach (var entity in candidates) { - if (!Owner.EntityManager.TryGetComponent(entity, out IconSmoothComponent? other)) + if (!IoCManager.Resolve().TryGetComponent(entity, out IconSmoothComponent? other)) { continue; } diff --git a/Content.Server/AI/Utility/AiLogic/UtilityAI.cs b/Content.Server/AI/Utility/AiLogic/UtilityAI.cs index b314ffe24e..15a7e708c1 100644 --- a/Content.Server/AI/Utility/AiLogic/UtilityAI.cs +++ b/Content.Server/AI/Utility/AiLogic/UtilityAI.cs @@ -85,7 +85,7 @@ namespace Content.Server.AI.Utility.AiLogic { var behaviorManager = IoCManager.Resolve(); behaviorManager.RebuildActions(this); - Owner.EntityManager.EventBus.RaiseEvent(EventSource.Local, new SleepAiMessage(this, false)); + IoCManager.Resolve().EventBus.RaiseEvent(EventSource.Local, new SleepAiMessage(this, false)); } base.Initialize(); diff --git a/Content.Server/AME/AMENodeGroup.cs b/Content.Server/AME/AMENodeGroup.cs index b430b66a59..9763724579 100644 --- a/Content.Server/AME/AMENodeGroup.cs +++ b/Content.Server/AME/AMENodeGroup.cs @@ -49,7 +49,7 @@ namespace Content.Server.AME if (nodeOwner.TryGetComponent(out AMEShieldComponent? shield)) { var nodeNeighbors = grid.GetCellsInSquareArea(nodeOwner.Transform.Coordinates, 1) - .Select(sgc => nodeOwner.EntityManager.GetEntity(sgc)) + .Select(sgc => IoCManager.Resolve().GetEntity(sgc)) .Where(entity => entity != nodeOwner && entity.HasComponent()); if (nodeNeighbors.Count() >= 8) diff --git a/Content.Server/Actions/Actions/GhostBoo.cs b/Content.Server/Actions/Actions/GhostBoo.cs index ee6b8260cb..150cd487e7 100644 --- a/Content.Server/Actions/Actions/GhostBoo.cs +++ b/Content.Server/Actions/Actions/GhostBoo.cs @@ -32,7 +32,7 @@ namespace Content.Server.Actions.Actions foreach (var ent in ents) { var ghostBoo = new GhostBooEvent(); - ent.EntityManager.EventBus.RaiseLocalEvent(ent.Uid, ghostBoo); + IoCManager.Resolve().EventBus.RaiseLocalEvent(ent.Uid, ghostBoo); if (ghostBoo.Handled) booCounter++; diff --git a/Content.Server/Actions/Spells/GiveItemSpell.cs b/Content.Server/Actions/Spells/GiveItemSpell.cs index e87656cbbe..6168d20d6d 100644 --- a/Content.Server/Actions/Spells/GiveItemSpell.cs +++ b/Content.Server/Actions/Spells/GiveItemSpell.cs @@ -52,7 +52,7 @@ namespace Content.Server.Actions.Spells } // TODO: Look this is shitty and ideally a test would do it - var spawnedProto = caster.EntityManager.SpawnEntity(ItemProto, caster.Transform.MapPosition); + var spawnedProto = IoCManager.Resolve().SpawnEntity(ItemProto, caster.Transform.MapPosition); if (!spawnedProto.TryGetComponent(out ItemComponent? itemComponent)) { diff --git a/Content.Server/Atmos/Components/GasAnalyzerComponent.cs b/Content.Server/Atmos/Components/GasAnalyzerComponent.cs index d0ff509c2e..2c452d1068 100644 --- a/Content.Server/Atmos/Components/GasAnalyzerComponent.cs +++ b/Content.Server/Atmos/Components/GasAnalyzerComponent.cs @@ -10,6 +10,7 @@ using Content.Shared.Popups; using Robust.Server.GameObjects; using Robust.Server.Player; using Robust.Shared.GameObjects; +using Robust.Shared.IoC; using Robust.Shared.Localization; using Robust.Shared.Map; using Robust.Shared.Players; @@ -174,7 +175,7 @@ namespace Content.Server.Atmos.Components if (!_checkPlayer && _position.HasValue) { // Check if position is out of range => don't update - if (!_position.Value.InRange(Owner.EntityManager, pos, SharedInteractionSystem.InteractionRange)) + if (!_position.Value.InRange(IoCManager.Resolve(), pos, SharedInteractionSystem.InteractionRange)) return; pos = _position.Value; diff --git a/Content.Server/Body/Components/BodyComponent.cs b/Content.Server/Body/Components/BodyComponent.cs index b325eea9f1..6a9bf73417 100644 --- a/Content.Server/Body/Components/BodyComponent.cs +++ b/Content.Server/Body/Components/BodyComponent.cs @@ -8,6 +8,7 @@ using Content.Shared.Sound; using Robust.Shared.Audio; using Robust.Shared.Containers; using Robust.Shared.GameObjects; +using Robust.Shared.IoC; using Robust.Shared.Log; using Robust.Shared.Player; using Robust.Shared.Serialization.Manager.Attributes; @@ -57,7 +58,7 @@ namespace Content.Server.Body.Components { // Using MapPosition instead of Coordinates here prevents // a crash within the character preview menu in the lobby - var entity = Owner.EntityManager.SpawnEntity(preset.PartIDs[slot.Id], Owner.Transform.MapPosition); + var entity = IoCManager.Resolve().SpawnEntity(preset.PartIDs[slot.Id], Owner.Transform.MapPosition); if (!entity.TryGetComponent(out SharedBodyPartComponent? part)) { diff --git a/Content.Server/Body/Components/BodyPartComponent.cs b/Content.Server/Body/Components/BodyPartComponent.cs index e9cceeb7c6..428c4d6478 100644 --- a/Content.Server/Body/Components/BodyPartComponent.cs +++ b/Content.Server/Body/Components/BodyPartComponent.cs @@ -64,7 +64,7 @@ namespace Content.Server.Body.Components // identical on it foreach (var mechanismId in MechanismIds) { - var entity = Owner.EntityManager.SpawnEntity(mechanismId, Owner.Transform.MapPosition); + var entity = IoCManager.Resolve().SpawnEntity(mechanismId, Owner.Transform.MapPosition); if (!entity.TryGetComponent(out SharedMechanismComponent? mechanism)) { diff --git a/Content.Server/Body/Surgery/Components/SurgeryToolComponent.cs b/Content.Server/Body/Surgery/Components/SurgeryToolComponent.cs index 3af071f842..6005e9c851 100644 --- a/Content.Server/Body/Surgery/Components/SurgeryToolComponent.cs +++ b/Content.Server/Body/Surgery/Components/SurgeryToolComponent.cs @@ -12,6 +12,7 @@ using Content.Shared.Popups; using Robust.Server.GameObjects; using Robust.Server.Player; using Robust.Shared.GameObjects; +using Robust.Shared.IoC; using Robust.Shared.Localization; using Robust.Shared.Log; using Robust.Shared.Serialization.Manager.Attributes; @@ -159,7 +160,7 @@ namespace Content.Server.Body.Surgery.Components #pragma warning disable 618 SendMessage(message); #pragma warning restore 618 - Owner.EntityManager.EventBus.RaiseEvent(EventSource.Local, message); + IoCManager.Resolve().EventBus.RaiseEvent(EventSource.Local, message); } private void UpdateSurgeryUIBodyPartRequest(IPlayerSession session, Dictionary options) diff --git a/Content.Server/Botany/Components/LogComponent.cs b/Content.Server/Botany/Components/LogComponent.cs index b12205d205..1ecd881ecd 100644 --- a/Content.Server/Botany/Components/LogComponent.cs +++ b/Content.Server/Botany/Components/LogComponent.cs @@ -5,6 +5,7 @@ using Content.Shared.Interaction.Events; using Content.Shared.Random.Helpers; using Content.Shared.Tag; using Robust.Shared.GameObjects; +using Robust.Shared.IoC; namespace Content.Server.Botany.Components { @@ -22,7 +23,7 @@ namespace Content.Server.Botany.Components { for (var i = 0; i < 2; i++) { - var plank = Owner.EntityManager.SpawnEntity("MaterialWoodPlank1", Owner.Transform.Coordinates); + var plank = IoCManager.Resolve().SpawnEntity("MaterialWoodPlank1", Owner.Transform.Coordinates); plank.RandomOffset(0.25f); } diff --git a/Content.Server/Botany/Components/SeedExtractorComponent.cs b/Content.Server/Botany/Components/SeedExtractorComponent.cs index 5b638ac7ff..84b9ccdb66 100644 --- a/Content.Server/Botany/Components/SeedExtractorComponent.cs +++ b/Content.Server/Botany/Components/SeedExtractorComponent.cs @@ -37,7 +37,7 @@ namespace Content.Server.Botany.Components for (var i = 0; i < random; i++) { - produce.Seed.SpawnSeedPacket(Owner.Transform.Coordinates, Owner.EntityManager); + produce.Seed.SpawnSeedPacket(Owner.Transform.Coordinates, IoCManager.Resolve()); } return true; diff --git a/Content.Server/Buckle/Components/BuckleComponent.cs b/Content.Server/Buckle/Components/BuckleComponent.cs index afb1356ed1..0113482c05 100644 --- a/Content.Server/Buckle/Components/BuckleComponent.cs +++ b/Content.Server/Buckle/Components/BuckleComponent.cs @@ -335,7 +335,7 @@ namespace Content.Server.Buckle.Components EntitySystem.Get().Stand(Owner.Uid); } - _mobState?.CurrentState?.EnterState(Owner.Uid, Owner.EntityManager); + _mobState?.CurrentState?.EnterState(Owner.Uid, IoCManager.Resolve()); UpdateBuckleStatus(); diff --git a/Content.Server/Cargo/Components/CargoConsoleComponent.cs b/Content.Server/Cargo/Components/CargoConsoleComponent.cs index 9d01c73980..cf9636635f 100644 --- a/Content.Server/Cargo/Components/CargoConsoleComponent.cs +++ b/Content.Server/Cargo/Components/CargoConsoleComponent.cs @@ -162,7 +162,7 @@ namespace Content.Server.Cargo.Components // TODO replace with shuttle code // TEMPORARY loop for spawning stuff on telepad (looks for a telepad adjacent to the console) IEntity? cargoTelepad = null; - var indices = Owner.Transform.Coordinates.ToVector2i(Owner.EntityManager, _mapManager); + var indices = Owner.Transform.Coordinates.ToVector2i(IoCManager.Resolve(), _mapManager); var offsets = new Vector2i[] { new Vector2i(0, 1), new Vector2i(1, 1), new Vector2i(1, 0), new Vector2i(1, -1), new Vector2i(0, -1), new Vector2i(-1, -1), new Vector2i(-1, 0), new Vector2i(-1, 1), }; var adjacentEntities = new List>(); //Probably better than IEnumerable.concat diff --git a/Content.Server/Cargo/Components/CargoTelepadComponent.cs b/Content.Server/Cargo/Components/CargoTelepadComponent.cs index d674713a4c..285e269168 100644 --- a/Content.Server/Cargo/Components/CargoTelepadComponent.cs +++ b/Content.Server/Cargo/Components/CargoTelepadComponent.cs @@ -119,13 +119,13 @@ namespace Content.Server.Cargo.Components if (!_prototypeManager.TryIndex(data.ProductId, out CargoProductPrototype? prototype)) return; - var product = Owner.EntityManager.SpawnEntity(prototype.Product, Owner.Transform.Coordinates); + var product = IoCManager.Resolve().SpawnEntity(prototype.Product, Owner.Transform.Coordinates); product.Transform.Anchored = false; // spawn a piece of paper. - var printed = Owner.EntityManager.SpawnEntity(PrinterOutput, Owner.Transform.Coordinates); - if (!Owner.EntityManager.TryGetComponent(printed.Uid, out PaperComponent paper)) + var printed = IoCManager.Resolve().SpawnEntity(PrinterOutput, Owner.Transform.Coordinates); + if (!IoCManager.Resolve().TryGetComponent(printed.Uid, out PaperComponent paper)) return; // fill in the order data @@ -138,7 +138,7 @@ namespace Content.Server.Cargo.Components ("approver", data.Approver))); // attempt to attach the label - if (Owner.EntityManager.TryGetComponent(product.Uid, out PaperLabelComponent label)) + if (IoCManager.Resolve().TryGetComponent(product.Uid, out PaperLabelComponent label)) { EntitySystem.Get().TryInsert(OwnerUid, label.LabelSlot, printed); } diff --git a/Content.Server/Chemistry/Components/ChemMasterComponent.cs b/Content.Server/Chemistry/Components/ChemMasterComponent.cs index c0e21b0d99..b499501a40 100644 --- a/Content.Server/Chemistry/Components/ChemMasterComponent.cs +++ b/Content.Server/Chemistry/Components/ChemMasterComponent.cs @@ -26,6 +26,7 @@ using Robust.Shared.Serialization.Manager.Attributes; using Robust.Shared.ViewVariables; using Robust.Shared.Log; using Content.Server.Labels.Components; +using Robust.Shared.IoC; namespace Content.Server.Chemistry.Components { @@ -71,7 +72,7 @@ namespace Content.Server.Chemistry.Components protected override void Initialize() { base.Initialize(); - + if (UserInterface != null) { UserInterface.OnReceiveMessage += OnUiReceiveMessage; @@ -257,7 +258,7 @@ namespace Content.Server.Chemistry.Components { actualAmount = FixedPoint2.Min(reagent.Quantity, amount); } - + EntitySystem.Get().TryRemoveReagent(beaker.Uid, beakerSolution, id, actualAmount); BufferSolution.AddReagent(id, actualAmount); break; @@ -301,7 +302,7 @@ namespace Content.Server.Chemistry.Components var actualVolume = FixedPoint2.Min(individualVolume, FixedPoint2.New(30)); for (int i = 0; i < bottleAmount; i++) { - var bottle = Owner.EntityManager.SpawnEntity("ChemistryEmptyBottle01", Owner.Transform.Coordinates); + var bottle = IoCManager.Resolve().SpawnEntity("ChemistryEmptyBottle01", Owner.Transform.Coordinates); //Adding label LabelComponent labelComponent = bottle.EnsureComponent(); @@ -343,7 +344,7 @@ namespace Content.Server.Chemistry.Components var actualVolume = FixedPoint2.Min(individualVolume, FixedPoint2.New(50)); for (int i = 0; i < pillAmount; i++) { - var pill = Owner.EntityManager.SpawnEntity("pill", Owner.Transform.Coordinates); + var pill = IoCManager.Resolve().SpawnEntity("pill", Owner.Transform.Coordinates); //Adding label LabelComponent labelComponent = pill.EnsureComponent(); diff --git a/Content.Server/Chemistry/Components/FoamSolutionAreaEffectComponent.cs b/Content.Server/Chemistry/Components/FoamSolutionAreaEffectComponent.cs index dfbf930a8d..6713c2dfb5 100644 --- a/Content.Server/Chemistry/Components/FoamSolutionAreaEffectComponent.cs +++ b/Content.Server/Chemistry/Components/FoamSolutionAreaEffectComponent.cs @@ -7,6 +7,7 @@ using Content.Shared.FixedPoint; using Content.Shared.Foam; using Content.Shared.Inventory; using Robust.Shared.GameObjects; +using Robust.Shared.IoC; using Robust.Shared.Serialization.Manager.Attributes; namespace Content.Server.Chemistry.Components @@ -78,7 +79,7 @@ namespace Content.Server.Chemistry.Components { if (!string.IsNullOrEmpty(_foamedMetalPrototype)) { - Owner.EntityManager.SpawnEntity(_foamedMetalPrototype, Owner.Transform.Coordinates); + IoCManager.Resolve().SpawnEntity(_foamedMetalPrototype, Owner.Transform.Coordinates); } Owner.QueueDelete(); diff --git a/Content.Server/Chemistry/Components/HyposprayComponent.cs b/Content.Server/Chemistry/Components/HyposprayComponent.cs index 0d3f23559e..f20f1e16c2 100644 --- a/Content.Server/Chemistry/Components/HyposprayComponent.cs +++ b/Content.Server/Chemistry/Components/HyposprayComponent.cs @@ -10,6 +10,7 @@ using Content.Shared.Popups; using Content.Shared.Sound; using Robust.Shared.Audio; using Robust.Shared.GameObjects; +using Robust.Shared.IoC; using Robust.Shared.Localization; using Robust.Shared.Maths; using Robust.Shared.Player; @@ -124,7 +125,7 @@ namespace Content.Server.Chemistry.Components public override ComponentState GetComponentState() { - var solutionSys = Owner.EntityManager.EntitySysManager.GetEntitySystem(); + var solutionSys = IoCManager.Resolve().EntitySysManager.GetEntitySystem(); return solutionSys.TryGetSolution(Owner.Uid, SolutionName, out var solution) ? new HyposprayComponentState(solution.CurrentVolume, solution.MaxVolume) : new HyposprayComponentState(FixedPoint2.Zero, FixedPoint2.Zero); diff --git a/Content.Server/Chemistry/Components/InjectorComponent.cs b/Content.Server/Chemistry/Components/InjectorComponent.cs index b922aabd5c..7a71e5b1f6 100644 --- a/Content.Server/Chemistry/Components/InjectorComponent.cs +++ b/Content.Server/Chemistry/Components/InjectorComponent.cs @@ -12,6 +12,7 @@ using Content.Shared.Interaction; using Content.Shared.Interaction.Helpers; using Content.Shared.Popups; using Robust.Shared.GameObjects; +using Robust.Shared.IoC; using Robust.Shared.Localization; using Robust.Shared.Players; using Robust.Shared.Serialization.Manager.Attributes; @@ -303,7 +304,7 @@ namespace Content.Server.Chemistry.Components public override ComponentState GetComponentState() { - Owner.EntityManager.EntitySysManager.GetEntitySystem() + IoCManager.Resolve().EntitySysManager.GetEntitySystem() .TryGetSolution(Owner.Uid, SolutionName, out var solution); var currentVolume = solution?.CurrentVolume ?? FixedPoint2.Zero; diff --git a/Content.Server/Chemistry/Components/SolutionAreaEffectComponent.cs b/Content.Server/Chemistry/Components/SolutionAreaEffectComponent.cs index eb8d12b716..f35beb935a 100644 --- a/Content.Server/Chemistry/Components/SolutionAreaEffectComponent.cs +++ b/Content.Server/Chemistry/Components/SolutionAreaEffectComponent.cs @@ -74,16 +74,16 @@ namespace Content.Server.Chemistry.Components var coords = Owner.Transform.Coordinates; foreach (var neighbor in grid.GetInDir(coords, dir)) { - if (Owner.EntityManager.TryGetComponent(neighbor, + if (IoCManager.Resolve().TryGetComponent(neighbor, out SolutionAreaEffectComponent? comp) && comp.Inception == Inception) return; - if (Owner.EntityManager.TryGetComponent(neighbor, + if (IoCManager.Resolve().TryGetComponent(neighbor, out AirtightComponent? airtight) && airtight.AirBlocked) return; } - var newEffect = Owner.EntityManager.SpawnEntity(Owner.Prototype.ID, grid.DirectionToGrid(coords, dir)); + var newEffect = IoCManager.Resolve().SpawnEntity(Owner.Prototype.ID, grid.DirectionToGrid(coords, dir)); if (!newEffect.TryGetComponent(out SolutionAreaEffectComponent? effectComponent)) { @@ -133,7 +133,7 @@ namespace Content.Server.Chemistry.Components var chemistry = EntitySystem.Get(); var mapGrid = MapManager.GetGrid(Owner.Transform.GridID); - var tile = mapGrid.GetTileRef(Owner.Transform.Coordinates.ToVector2i(Owner.EntityManager, MapManager)); + var tile = mapGrid.GetTileRef(Owner.Transform.Coordinates.ToVector2i(IoCManager.Resolve(), MapManager)); var solutionFraction = 1 / Math.Floor(averageExposures); diff --git a/Content.Server/Chemistry/EntitySystems/RehydratableSystem.cs b/Content.Server/Chemistry/EntitySystems/RehydratableSystem.cs index 37ab0be606..eb0c4705ac 100644 --- a/Content.Server/Chemistry/EntitySystems/RehydratableSystem.cs +++ b/Content.Server/Chemistry/EntitySystems/RehydratableSystem.cs @@ -40,7 +40,7 @@ namespace Content.Server.Chemistry.EntitySystems owner.PopupMessageEveryone(Loc.GetString("rehydratable-component-expands-message", ("owner", owner))); if (!string.IsNullOrEmpty(component.TargetPrototype)) { - var ent = component.Owner.EntityManager.SpawnEntity(component.TargetPrototype, + var ent = IoCManager.Resolve().SpawnEntity(component.TargetPrototype, owner.Transform.Coordinates); ent.Transform.AttachToGridOrMap(); } diff --git a/Content.Server/Cloning/Components/CloningPodComponent.cs b/Content.Server/Cloning/Components/CloningPodComponent.cs index d9faa3d082..c1ed74966f 100644 --- a/Content.Server/Cloning/Components/CloningPodComponent.cs +++ b/Content.Server/Cloning/Components/CloningPodComponent.cs @@ -107,7 +107,7 @@ namespace Content.Server.Cloning.Components if (cloningSystem.ClonesWaitingForMind.TryGetValue(mind, out var cloneUid)) { - if (Owner.EntityManager.TryGetEntity(cloneUid, out var clone) && + if (IoCManager.Resolve().TryGetEntity(cloneUid, out var clone) && clone.TryGetComponent(out var cloneState) && !cloneState.IsDead() && clone.TryGetComponent(out MindComponent? cloneMindComp) && @@ -135,7 +135,7 @@ namespace Content.Server.Cloning.Components return; // If we can't track down the client, we can't offer transfer. That'd be quite bad. } - var mob = Owner.EntityManager.SpawnEntity("MobHuman", Owner.Transform.MapPosition); + var mob = IoCManager.Resolve().SpawnEntity("MobHuman", Owner.Transform.MapPosition); EntitySystem.Get().UpdateFromProfile(mob.Uid, dna.Profile); diff --git a/Content.Server/Computer/ComputerComponent.cs b/Content.Server/Computer/ComputerComponent.cs index 8985fcd82e..9e14020e71 100644 --- a/Content.Server/Computer/ComputerComponent.cs +++ b/Content.Server/Computer/ComputerComponent.cs @@ -5,6 +5,7 @@ using Content.Server.Power.Components; using Content.Shared.Computer; using Robust.Shared.Containers; using Robust.Shared.GameObjects; +using Robust.Shared.IoC; using Robust.Shared.Log; using Robust.Shared.Serialization.Manager.Attributes; using Robust.Shared.ViewVariables; @@ -78,7 +79,7 @@ namespace Content.Server.Computer return; } - var board = Owner.EntityManager.SpawnEntity(_boardPrototype, Owner.Transform.Coordinates); + var board = IoCManager.Resolve().SpawnEntity(_boardPrototype, Owner.Transform.Coordinates); if(!container.Insert(board)) Logger.Warning($"Couldn't insert board {board} to computer {Owner}!"); diff --git a/Content.Server/Construction/Components/MachineComponent.cs b/Content.Server/Construction/Components/MachineComponent.cs index 2c970c3843..af6e494767 100644 --- a/Content.Server/Construction/Components/MachineComponent.cs +++ b/Content.Server/Construction/Components/MachineComponent.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using Content.Server.Stack; using Robust.Shared.Containers; using Robust.Shared.GameObjects; +using Robust.Shared.IoC; using Robust.Shared.Serialization.Manager.Attributes; namespace Content.Server.Construction.Components @@ -52,7 +53,7 @@ namespace Content.Server.Construction.Components if (string.IsNullOrEmpty(BoardPrototype)) return; - var entityManager = Owner.EntityManager; + var entityManager = IoCManager.Resolve(); if (existedBoard || existedParts) { @@ -88,7 +89,7 @@ namespace Content.Server.Construction.Components { var stack = EntitySystem.Get().Spawn(amount, stackType, Owner.Transform.Coordinates); - if (!partContainer.Insert(Owner.EntityManager.GetEntity(stack))) + if (!partContainer.Insert(IoCManager.Resolve().GetEntity(stack))) throw new Exception($"Couldn't insert machine material of type {stackType} to machine with prototype {Owner.Prototype?.ID ?? "N/A"}"); } diff --git a/Content.Server/Construction/Components/MachineFrameComponent.cs b/Content.Server/Construction/Components/MachineFrameComponent.cs index 7dfe524b50..0eea48f91d 100644 --- a/Content.Server/Construction/Components/MachineFrameComponent.cs +++ b/Content.Server/Construction/Components/MachineFrameComponent.cs @@ -318,7 +318,7 @@ namespace Content.Server.Construction.Components if (splitStack == null) return false; - if(!_partContainer.Insert(Owner.EntityManager.GetEntity(splitStack.Value))) + if(!_partContainer.Insert(IoCManager.Resolve().GetEntity(splitStack.Value))) return false; _materialProgress[type] += needed; diff --git a/Content.Server/Construction/Components/WelderRefinableComponent.cs b/Content.Server/Construction/Components/WelderRefinableComponent.cs index c6eb09027d..68381d6dff 100644 --- a/Content.Server/Construction/Components/WelderRefinableComponent.cs +++ b/Content.Server/Construction/Components/WelderRefinableComponent.cs @@ -8,6 +8,7 @@ using Content.Shared.Stacks; using Content.Shared.Tools; using Content.Shared.Tools.Components; using Robust.Shared.GameObjects; +using Robust.Shared.IoC; using Robust.Shared.Serialization.Manager.Attributes; using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype; using Robust.Shared.ViewVariables; @@ -65,7 +66,7 @@ namespace Content.Server.Construction.Components // spawn each result after refine foreach (var result in _refineResult!) { - var droppedEnt = Owner.EntityManager.SpawnEntity(result, resultPosition); + var droppedEnt = IoCManager.Resolve().SpawnEntity(result, resultPosition); // TODO: If something has a stack... Just use a prototype with a single thing in the stack. // This is not a good way to do it. diff --git a/Content.Server/Crayon/CrayonComponent.cs b/Content.Server/Crayon/CrayonComponent.cs index 5290a391eb..19208d6760 100644 --- a/Content.Server/Crayon/CrayonComponent.cs +++ b/Content.Server/Crayon/CrayonComponent.cs @@ -125,13 +125,13 @@ namespace Content.Server.Crayon return true; } - if (!eventArgs.ClickLocation.IsValid(Owner.EntityManager)) + if (!eventArgs.ClickLocation.IsValid(IoCManager.Resolve())) { eventArgs.User.PopupMessage(Loc.GetString("crayon-interact-invalid-location")); return true; } - var entity = Owner.EntityManager.SpawnEntity("CrayonDecal", eventArgs.ClickLocation); + var entity = IoCManager.Resolve().SpawnEntity("CrayonDecal", eventArgs.ClickLocation); if (entity.TryGetComponent(out AppearanceComponent? appearance)) { appearance.SetData(CrayonVisuals.State, SelectedState); diff --git a/Content.Server/Cuffs/Components/CuffableComponent.cs b/Content.Server/Cuffs/Components/CuffableComponent.cs index 367c426388..e84f169955 100644 --- a/Content.Server/Cuffs/Components/CuffableComponent.cs +++ b/Content.Server/Cuffs/Components/CuffableComponent.cs @@ -14,6 +14,7 @@ using Robust.Server.GameObjects; using Robust.Shared.Audio; using Robust.Shared.Containers; using Robust.Shared.GameObjects; +using Robust.Shared.IoC; using Robust.Shared.Localization; using Robust.Shared.Log; using Robust.Shared.Maths; @@ -207,7 +208,7 @@ namespace Content.Server.Cuffs.Components } var attempt = new UncuffAttemptEvent(user.Uid, Owner.Uid); - Owner.EntityManager.EventBus.RaiseLocalEvent(user.Uid, attempt); + IoCManager.Resolve().EventBus.RaiseLocalEvent(user.Uid, attempt); if (attempt.Cancelled) { diff --git a/Content.Server/Disposal/Tube/Components/DisposalEntryComponent.cs b/Content.Server/Disposal/Tube/Components/DisposalEntryComponent.cs index 3b30f4275b..26d7515aac 100644 --- a/Content.Server/Disposal/Tube/Components/DisposalEntryComponent.cs +++ b/Content.Server/Disposal/Tube/Components/DisposalEntryComponent.cs @@ -21,7 +21,7 @@ namespace Content.Server.Disposal.Tube.Components public bool TryInsert(DisposalUnitComponent from) { - var holder = Owner.EntityManager.SpawnEntity(HolderPrototypeId, Owner.Transform.MapPosition); + var holder = IoCManager.Resolve().SpawnEntity(HolderPrototypeId, Owner.Transform.MapPosition); var holderComponent = holder.GetComponent(); foreach (var entity in from.ContainedEntities.ToArray()) diff --git a/Content.Server/Doors/Components/AirlockComponent.cs b/Content.Server/Doors/Components/AirlockComponent.cs index 06fafb4818..6d565aa209 100644 --- a/Content.Server/Doors/Components/AirlockComponent.cs +++ b/Content.Server/Doors/Components/AirlockComponent.cs @@ -7,6 +7,7 @@ using Content.Shared.Doors; using Content.Shared.Sound; using Robust.Shared.Audio; using Robust.Shared.GameObjects; +using Robust.Shared.IoC; using Robust.Shared.Maths; using Robust.Shared.Player; using Robust.Shared.Serialization.Manager.Attributes; @@ -175,7 +176,7 @@ namespace Content.Server.Doors.Components _boltLightsWirePulsed ? StatusLightState.On : StatusLightState.Off, "BLTL"); var ev = new DoorGetCloseTimeModifierEvent(); - Owner.EntityManager.EventBus.RaiseLocalEvent(Owner.Uid, ev, false); + IoCManager.Resolve().EventBus.RaiseLocalEvent(Owner.Uid, ev, false); var timingStatus = new StatusLightData(Color.Orange, !AutoClose ? StatusLightState.Off : diff --git a/Content.Server/Doors/Components/ServerDoorComponent.cs b/Content.Server/Doors/Components/ServerDoorComponent.cs index a4916c3e5b..c771738ae9 100644 --- a/Content.Server/Doors/Components/ServerDoorComponent.cs +++ b/Content.Server/Doors/Components/ServerDoorComponent.cs @@ -21,6 +21,7 @@ using Content.Shared.Tools; using Robust.Shared.Audio; using Robust.Shared.Containers; using Robust.Shared.GameObjects; +using Robust.Shared.IoC; using Robust.Shared.Log; using Robust.Shared.Maths; using Robust.Shared.Player; @@ -77,7 +78,7 @@ namespace Content.Server.Doors.Components _ => throw new ArgumentOutOfRangeException(), }; - Owner.EntityManager.EventBus.RaiseLocalEvent(Owner.Uid, new DoorStateChangedEvent(State), false); + IoCManager.Resolve().EventBus.RaiseLocalEvent(Owner.Uid, new DoorStateChangedEvent(State), false); _autoCloseCancelTokenSource?.Cancel(); Dirty(); @@ -257,7 +258,7 @@ namespace Content.Server.Doors.Components return; DoorClickShouldActivateEvent ev = new DoorClickShouldActivateEvent(eventArgs); - Owner.EntityManager.EventBus.RaiseLocalEvent(Owner.Uid, ev, false); + IoCManager.Resolve().EventBus.RaiseLocalEvent(Owner.Uid, ev, false); if (ev.Handled) return; @@ -276,7 +277,7 @@ namespace Content.Server.Doors.Components public void TryOpen(IEntity? user=null) { var msg = new DoorOpenAttemptEvent(); - Owner.EntityManager.EventBus.RaiseLocalEvent(Owner.Uid, msg); + IoCManager.Resolve().EventBus.RaiseLocalEvent(Owner.Uid, msg); if (msg.Cancelled) return; @@ -354,7 +355,7 @@ namespace Content.Server.Doors.Components } var ev = new BeforeDoorOpenedEvent(); - Owner.EntityManager.EventBus.RaiseLocalEvent(Owner.Uid, ev, false); + IoCManager.Resolve().EventBus.RaiseLocalEvent(Owner.Uid, ev, false); return !ev.Cancelled; } @@ -402,7 +403,7 @@ namespace Content.Server.Doors.Components EntitySystem.Get().SetAirblocked(airtight, false); } - Owner.EntityManager.EventBus.RaiseEvent(EventSource.Local, new AccessReaderChangeMessage(Owner, false)); + IoCManager.Resolve().EventBus.RaiseEvent(EventSource.Local, new AccessReaderChangeMessage(Owner, false)); } private void QuickOpen(bool refresh) @@ -424,7 +425,7 @@ namespace Content.Server.Doors.Components public void TryClose(IEntity? user=null) { var msg = new DoorCloseAttemptEvent(); - Owner.EntityManager.EventBus.RaiseLocalEvent(Owner.Uid, msg); + IoCManager.Resolve().EventBus.RaiseLocalEvent(Owner.Uid, msg); if (msg.Cancelled) return; @@ -460,7 +461,7 @@ namespace Content.Server.Doors.Components public bool CanCloseGeneric() { var ev = new BeforeDoorClosedEvent(); - Owner.EntityManager.EventBus.RaiseLocalEvent(Owner.Uid, ev, false); + IoCManager.Resolve().EventBus.RaiseLocalEvent(Owner.Uid, ev, false); if (ev.Cancelled) return false; @@ -470,7 +471,7 @@ namespace Content.Server.Doors.Components private bool SafetyCheck() { var ev = new DoorSafetyEnabledEvent(); - Owner.EntityManager.EventBus.RaiseLocalEvent(Owner.Uid, ev, false); + IoCManager.Resolve().EventBus.RaiseLocalEvent(Owner.Uid, ev, false); return ev.Safety || _inhibitCrush; } @@ -547,7 +548,7 @@ namespace Content.Server.Doors.Components EntitySystem.Get().SetAirblocked(airtight, true); } - Owner.EntityManager.EventBus.RaiseEvent(EventSource.Local, new AccessReaderChangeMessage(Owner, true)); + IoCManager.Resolve().EventBus.RaiseEvent(EventSource.Local, new AccessReaderChangeMessage(Owner, true)); } /// @@ -603,7 +604,7 @@ namespace Content.Server.Doors.Components public void Deny() { var ev = new BeforeDoorDeniedEvent(); - Owner.EntityManager.EventBus.RaiseLocalEvent(Owner.Uid, ev, false); + IoCManager.Resolve().EventBus.RaiseLocalEvent(Owner.Uid, ev, false); if (ev.Cancelled) return; @@ -650,14 +651,14 @@ namespace Content.Server.Doors.Components return; var autoev = new BeforeDoorAutoCloseEvent(); - Owner.EntityManager.EventBus.RaiseLocalEvent(Owner.Uid, autoev, false); + IoCManager.Resolve().EventBus.RaiseLocalEvent(Owner.Uid, autoev, false); if (autoev.Cancelled) return; _autoCloseCancelTokenSource = new(); var ev = new DoorGetCloseTimeModifierEvent(); - Owner.EntityManager.EventBus.RaiseLocalEvent(Owner.Uid, ev, false); + IoCManager.Resolve().EventBus.RaiseLocalEvent(Owner.Uid, ev, false); var realCloseTime = AutoCloseDelay * ev.CloseTimeModifier; Owner.SpawnRepeatingTimer(realCloseTime, async () => @@ -683,10 +684,10 @@ namespace Content.Server.Doors.Components if (tool.Qualities.Contains(_pryingQuality) && !IsWeldedShut) { var ev = new DoorGetPryTimeModifierEvent(); - Owner.EntityManager.EventBus.RaiseLocalEvent(Owner.Uid, ev, false); + IoCManager.Resolve().EventBus.RaiseLocalEvent(Owner.Uid, ev, false); var canEv = new BeforeDoorPryEvent(eventArgs); - Owner.EntityManager.EventBus.RaiseLocalEvent(Owner.Uid, canEv, false); + IoCManager.Resolve().EventBus.RaiseLocalEvent(Owner.Uid, canEv, false); if (canEv.Cancelled) return false; @@ -695,7 +696,7 @@ namespace Content.Server.Doors.Components if (successfulPry && !IsWeldedShut) { - Owner.EntityManager.EventBus.RaiseLocalEvent(Owner.Uid, new OnDoorPryEvent(eventArgs), false); + IoCManager.Resolve().EventBus.RaiseLocalEvent(Owner.Uid, new OnDoorPryEvent(eventArgs), false); if (State == DoorState.Closed) { Open(); diff --git a/Content.Server/Explosion/Components/ClusterFlashComponent.cs b/Content.Server/Explosion/Components/ClusterFlashComponent.cs index e458726def..6cd69da443 100644 --- a/Content.Server/Explosion/Components/ClusterFlashComponent.cs +++ b/Content.Server/Explosion/Components/ClusterFlashComponent.cs @@ -135,7 +135,7 @@ namespace Content.Server.Explosion.Components if (_unspawnedCount > 0) { _unspawnedCount--; - grenade = Owner.EntityManager.SpawnEntity(_fillPrototype, Owner.Transform.MapPosition); + grenade = IoCManager.Resolve().SpawnEntity(_fillPrototype, Owner.Transform.MapPosition); return true; } diff --git a/Content.Server/Explosion/Components/ExplosionLaunchedComponent.cs b/Content.Server/Explosion/Components/ExplosionLaunchedComponent.cs index d71ccba148..bf04c5ef14 100644 --- a/Content.Server/Explosion/Components/ExplosionLaunchedComponent.cs +++ b/Content.Server/Explosion/Components/ExplosionLaunchedComponent.cs @@ -1,6 +1,7 @@ using Content.Server.Throwing; using Content.Shared.Acts; using Robust.Shared.GameObjects; +using Robust.Shared.IoC; using Robust.Shared.Maths; namespace Content.Server.Explosion.Components @@ -16,11 +17,11 @@ namespace Content.Server.Explosion.Components return; var sourceLocation = eventArgs.Source; - var targetLocation = Owner.EntityManager.GetComponent(eventArgs.Target).Coordinates; + var targetLocation = IoCManager.Resolve().GetComponent(eventArgs.Target).Coordinates; if (sourceLocation.Equals(targetLocation)) return; - var offset = (targetLocation.ToMapPos(Owner.EntityManager) - sourceLocation.ToMapPos(Owner.EntityManager)); + var offset = (targetLocation.ToMapPos(IoCManager.Resolve()) - sourceLocation.ToMapPos(IoCManager.Resolve())); //Don't throw if the direction is center (0,0) if (offset == Vector2.Zero) return; diff --git a/Content.Server/Fluids/Components/SprayComponent.cs b/Content.Server/Fluids/Components/SprayComponent.cs index f2d5f96d53..2dd6166bcb 100644 --- a/Content.Server/Fluids/Components/SprayComponent.cs +++ b/Content.Server/Fluids/Components/SprayComponent.cs @@ -100,7 +100,7 @@ namespace Content.Server.Fluids.Components return true; var playerPos = eventArgs.User.Transform.Coordinates; - var entManager = Owner.EntityManager; + var entManager = IoCManager.Resolve(); if (eventArgs.ClickLocation.GetGridId(entManager) != playerPos.GetGridId(entManager)) return true; @@ -126,7 +126,7 @@ namespace Content.Server.Fluids.Components var target = eventArgs.User.Transform.Coordinates.Offset((diffNorm + rotation.ToVec()).Normalized * diffLength + quarter); - if (target.TryDistance(Owner.EntityManager, playerPos, out var distance) && distance > SprayDistance) + if (target.TryDistance(IoCManager.Resolve(), playerPos, out var distance) && distance > SprayDistance) target = eventArgs.User.Transform.Coordinates.Offset(diffNorm * SprayDistance); var solution = EntitySystem.Get().SplitSolution(Owner.Uid, contents, _transferAmount); diff --git a/Content.Server/Fluids/EntitySystems/PuddleSystem.cs b/Content.Server/Fluids/EntitySystems/PuddleSystem.cs index e432b10adb..d79ff5d458 100644 --- a/Content.Server/Fluids/EntitySystems/PuddleSystem.cs +++ b/Content.Server/Fluids/EntitySystems/PuddleSystem.cs @@ -328,7 +328,7 @@ namespace Content.Server.Fluids.EntitySystems } puddle ??= () => - puddleComponent.Owner.EntityManager.SpawnEntity(puddleComponent.Owner.Prototype?.ID, + IoCManager.Resolve().SpawnEntity(puddleComponent.Owner.Prototype?.ID, mapGrid.DirectionToGrid(coords, direction)) .GetComponent(); diff --git a/Content.Server/Ghost/Roles/Components/GhostRoleMobSpawnerComponent.cs b/Content.Server/Ghost/Roles/Components/GhostRoleMobSpawnerComponent.cs index 27dc5b82a4..8042108297 100644 --- a/Content.Server/Ghost/Roles/Components/GhostRoleMobSpawnerComponent.cs +++ b/Content.Server/Ghost/Roles/Components/GhostRoleMobSpawnerComponent.cs @@ -5,6 +5,7 @@ using Content.Server.Players; using JetBrains.Annotations; using Robust.Server.Player; using Robust.Shared.GameObjects; +using Robust.Shared.IoC; using Robust.Shared.Serialization.Manager.Attributes; using Robust.Shared.Utility; using Robust.Shared.ViewVariables; @@ -41,10 +42,10 @@ namespace Content.Server.Ghost.Roles.Components if (string.IsNullOrEmpty(Prototype)) throw new NullReferenceException("Prototype string cannot be null or empty!"); - var mob = Owner.EntityManager.SpawnEntity(Prototype, Owner.Transform.Coordinates); + var mob = IoCManager.Resolve().SpawnEntity(Prototype, Owner.Transform.Coordinates); if (MakeSentient) - MakeSentientCommand.MakeSentient(mob.Uid, Owner.EntityManager); + MakeSentientCommand.MakeSentient(mob.Uid, IoCManager.Resolve()); mob.EnsureComponent(); diff --git a/Content.Server/Ghost/Roles/Components/GhostTakeoverAvailableComponent.cs b/Content.Server/Ghost/Roles/Components/GhostTakeoverAvailableComponent.cs index 786ec1fdf7..187628a211 100644 --- a/Content.Server/Ghost/Roles/Components/GhostTakeoverAvailableComponent.cs +++ b/Content.Server/Ghost/Roles/Components/GhostTakeoverAvailableComponent.cs @@ -4,6 +4,7 @@ using Content.Server.Mind.Components; using Content.Server.Players; using Robust.Server.Player; using Robust.Shared.GameObjects; +using Robust.Shared.IoC; using Robust.Shared.Utility; namespace Content.Server.Ghost.Roles.Components @@ -29,7 +30,7 @@ namespace Content.Server.Ghost.Roles.Components return false; if (MakeSentient) - MakeSentientCommand.MakeSentient(OwnerUid, Owner.EntityManager); + MakeSentientCommand.MakeSentient(OwnerUid, IoCManager.Resolve()); var ghostRoleSystem = EntitySystem.Get(); ghostRoleSystem.GhostRoleInternalCreateMindAndTransfer(session, OwnerUid, OwnerUid, this); diff --git a/Content.Server/Hands/Components/HandsComponent.cs b/Content.Server/Hands/Components/HandsComponent.cs index 84d7cea30d..0d1fae024d 100644 --- a/Content.Server/Hands/Components/HandsComponent.cs +++ b/Content.Server/Hands/Components/HandsComponent.cs @@ -45,7 +45,7 @@ namespace Content.Server.Hands.Components } if (heldEntity.TryGetComponent(out SpriteComponent? sprite)) { - sprite.RenderOrder = heldEntity.EntityManager.CurrentTick.Value; + sprite.RenderOrder = IoCManager.Resolve().CurrentTick.Value; } } @@ -58,7 +58,7 @@ namespace Content.Server.Hands.Components if (finalPosition.EqualsApprox(initialPosition.Position)) return; - Owner.EntityManager.EntityNetManager!.SendSystemNetworkMessage( + IoCManager.Resolve().EntityNetManager!.SendSystemNetworkMessage( new PickupAnimationMessage(entity.Uid, finalPosition, initialPosition)); } diff --git a/Content.Server/Inventory/InventoryHelpers.cs b/Content.Server/Inventory/InventoryHelpers.cs index 30a07de4bc..cd645d5faf 100644 --- a/Content.Server/Inventory/InventoryHelpers.cs +++ b/Content.Server/Inventory/InventoryHelpers.cs @@ -1,5 +1,6 @@ using Content.Server.Inventory.Components; using Content.Server.Items; +using Robust.Shared.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Prototypes; using static Content.Shared.Inventory.EquipmentSlotDefines; @@ -10,7 +11,7 @@ namespace Content.Server.Inventory { public static bool SpawnItemInSlot(this InventoryComponent inventory, Slots slot, string prototype, bool mobCheck = false) { - var entityManager = inventory.Owner.EntityManager; + var entityManager = IoCManager.Resolve(); var protoManager = IoCManager.Resolve(); var user = inventory.Owner; diff --git a/Content.Server/Jobs/GiveItemOnHolidaySpecial.cs b/Content.Server/Jobs/GiveItemOnHolidaySpecial.cs index cea9a1df19..fdbd425323 100644 --- a/Content.Server/Jobs/GiveItemOnHolidaySpecial.cs +++ b/Content.Server/Jobs/GiveItemOnHolidaySpecial.cs @@ -30,7 +30,7 @@ namespace Content.Server.Jobs if (!EntitySystem.Get().IsCurrentlyHoliday(Holiday)) return; - var entity = mob.EntityManager.SpawnEntity(Prototype, mob.Transform.Coordinates); + var entity = IoCManager.Resolve().SpawnEntity(Prototype, mob.Transform.Coordinates); if (!entity.TryGetComponent(out ItemComponent? item) || !mob.TryGetComponent(out HandsComponent? hands)) return; diff --git a/Content.Server/Kitchen/Components/KitchenSpikeComponent.cs b/Content.Server/Kitchen/Components/KitchenSpikeComponent.cs index 0b140ff68d..c0bd432b64 100644 --- a/Content.Server/Kitchen/Components/KitchenSpikeComponent.cs +++ b/Content.Server/Kitchen/Components/KitchenSpikeComponent.cs @@ -12,6 +12,7 @@ using Content.Shared.Nutrition.Components; using Content.Shared.Popups; using Robust.Shared.Audio; using Robust.Shared.GameObjects; +using Robust.Shared.IoC; using Robust.Shared.Localization; using Robust.Shared.Player; @@ -39,7 +40,7 @@ namespace Content.Server.Kitchen.Components if (!string.IsNullOrEmpty(_meatPrototype)) { - var meat = Owner.EntityManager.SpawnEntity(_meatPrototype, Owner.Transform.Coordinates); + var meat = IoCManager.Resolve().SpawnEntity(_meatPrototype, Owner.Transform.Coordinates); meat.Name = _meatName; } diff --git a/Content.Server/Kitchen/Components/MicrowaveComponent.cs b/Content.Server/Kitchen/Components/MicrowaveComponent.cs index f86613b5f5..2a33716c47 100644 --- a/Content.Server/Kitchen/Components/MicrowaveComponent.cs +++ b/Content.Server/Kitchen/Components/MicrowaveComponent.cs @@ -365,13 +365,13 @@ namespace Content.Server.Kitchen.Components if (recipeToCook != null) { SubtractContents(recipeToCook); - Owner.EntityManager.SpawnEntity(recipeToCook.Result, Owner.Transform.Coordinates); + IoCManager.Resolve().SpawnEntity(recipeToCook.Result, Owner.Transform.Coordinates); } else { VaporizeReagents(); VaporizeSolids(); - Owner.EntityManager.SpawnEntity(_badRecipeName, Owner.Transform.Coordinates); + IoCManager.Resolve().SpawnEntity(_badRecipeName, Owner.Transform.Coordinates); } } @@ -424,9 +424,9 @@ namespace Content.Server.Kitchen.Components private void EjectSolid(EntityUid entityId) { - if (Owner.EntityManager.EntityExists(entityId)) + if (IoCManager.Resolve().EntityExists(entityId)) { - _storage.Remove(Owner.EntityManager.GetEntity(entityId)); + _storage.Remove(IoCManager.Resolve().GetEntity(entityId)); } } diff --git a/Content.Server/Lathe/Components/LatheComponent.cs b/Content.Server/Lathe/Components/LatheComponent.cs index df45d4f17f..e0f84228f0 100644 --- a/Content.Server/Lathe/Components/LatheComponent.cs +++ b/Content.Server/Lathe/Components/LatheComponent.cs @@ -14,6 +14,7 @@ using Content.Shared.Research.Prototypes; using Robust.Server.GameObjects; using Robust.Server.Player; using Robust.Shared.GameObjects; +using Robust.Shared.IoC; using Robust.Shared.ViewVariables; namespace Content.Server.Lathe.Components @@ -122,7 +123,7 @@ namespace Content.Server.Lathe.Components { Producing = false; _producingRecipe = null; - Owner.EntityManager.SpawnEntity(recipe.Result, Owner.Transform.Coordinates); + IoCManager.Resolve().SpawnEntity(recipe.Result, Owner.Transform.Coordinates); UserInterface?.SendMessage(new LatheStoppedProducingRecipeMessage()); State = LatheState.Base; SetAppearance(LatheVisualState.Idle); diff --git a/Content.Server/Light/Components/EmergencyLightComponent.cs b/Content.Server/Light/Components/EmergencyLightComponent.cs index 9ab0361cdd..76a38dba86 100644 --- a/Content.Server/Light/Components/EmergencyLightComponent.cs +++ b/Content.Server/Light/Components/EmergencyLightComponent.cs @@ -5,6 +5,7 @@ using Content.Shared.Examine; using Content.Shared.Light.Component; using Robust.Server.GameObjects; using Robust.Shared.GameObjects; +using Robust.Shared.IoC; using Robust.Shared.Localization; using Robust.Shared.Serialization.Manager.Attributes; using Robust.Shared.Utility; @@ -30,7 +31,7 @@ namespace Content.Server.Light.Components return; _state = value; - Owner.EntityManager.EventBus.RaiseEvent(EventSource.Local, new EmergencyLightMessage(this, _state)); + IoCManager.Resolve().EventBus.RaiseEvent(EventSource.Local, new EmergencyLightMessage(this, _state)); } } diff --git a/Content.Server/Light/Components/HandheldLightComponent.cs b/Content.Server/Light/Components/HandheldLightComponent.cs index b517a67961..4e47df5f6c 100644 --- a/Content.Server/Light/Components/HandheldLightComponent.cs +++ b/Content.Server/Light/Components/HandheldLightComponent.cs @@ -17,6 +17,7 @@ using JetBrains.Annotations; using Robust.Server.GameObjects; using Robust.Shared.Audio; using Robust.Shared.GameObjects; +using Robust.Shared.IoC; using Robust.Shared.Localization; using Robust.Shared.Maths; using Robust.Shared.Player; @@ -71,7 +72,7 @@ namespace Content.Server.Light.Components protected override void OnRemove() { base.OnRemove(); - Owner.EntityManager.EventBus.QueueEvent(EventSource.Local, new DeactivateHandheldLightMessage(this)); + IoCManager.Resolve().EventBus.QueueEvent(EventSource.Local, new DeactivateHandheldLightMessage(this)); } async Task IInteractUsing.InteractUsing(InteractUsingEventArgs eventArgs) @@ -119,7 +120,7 @@ namespace Content.Server.Light.Components SetState(false); Activated = false; UpdateLightAction(); - Owner.EntityManager.EventBus.QueueEvent(EventSource.Local, new DeactivateHandheldLightMessage(this)); + IoCManager.Resolve().EventBus.QueueEvent(EventSource.Local, new DeactivateHandheldLightMessage(this)); if (makeNoise) { @@ -158,7 +159,7 @@ namespace Content.Server.Light.Components Activated = true; UpdateLightAction(); SetState(true); - Owner.EntityManager.EventBus.QueueEvent(EventSource.Local, new ActivateHandheldLightMessage(this)); + IoCManager.Resolve().EventBus.QueueEvent(EventSource.Local, new ActivateHandheldLightMessage(this)); SoundSystem.Play(Filter.Pvs(Owner), TurnOnSound.GetSound(), Owner); return true; diff --git a/Content.Server/Mind/Components/MindComponent.cs b/Content.Server/Mind/Components/MindComponent.cs index 3334643a01..7e4a2dae78 100644 --- a/Content.Server/Mind/Components/MindComponent.cs +++ b/Content.Server/Mind/Components/MindComponent.cs @@ -59,7 +59,7 @@ namespace Content.Server.Mind.Components public void InternalEjectMind() { if (!Deleted) - Owner.EntityManager.EventBus.RaiseLocalEvent(Owner.Uid, new MindRemovedMessage()); + IoCManager.Resolve().EventBus.RaiseLocalEvent(Owner.Uid, new MindRemovedMessage()); Mind = null; } @@ -71,7 +71,7 @@ namespace Content.Server.Mind.Components public void InternalAssignMind(Mind value) { Mind = value; - Owner.EntityManager.EventBus.RaiseLocalEvent(Owner.Uid, new MindAddedMessage()); + IoCManager.Resolve().EventBus.RaiseLocalEvent(Owner.Uid, new MindAddedMessage()); } protected override void Shutdown() @@ -103,13 +103,13 @@ namespace Content.Server.Mind.Components // Async this so that we don't throw if the grid we're on is being deleted. var mapMan = IoCManager.Resolve(); - var gridId = spawnPosition.GetGridId(Owner.EntityManager); + var gridId = spawnPosition.GetGridId(IoCManager.Resolve()); if (gridId == GridId.Invalid || !mapMan.GridExists(gridId)) { spawnPosition = EntitySystem.Get().GetObserverSpawnPoint(); } - var ghost = Owner.EntityManager.SpawnEntity("MobObserver", spawnPosition); + var ghost = IoCManager.Resolve().SpawnEntity("MobObserver", spawnPosition); var ghostComponent = ghost.GetComponent(); EntitySystem.Get().SetCanReturnToBody(ghostComponent, false); diff --git a/Content.Server/Mind/Mind.cs b/Content.Server/Mind/Mind.cs index 3aadd4b2ec..bd16455cdd 100644 --- a/Content.Server/Mind/Mind.cs +++ b/Content.Server/Mind/Mind.cs @@ -184,7 +184,8 @@ namespace Content.Server.Mind role.Greet(); var message = new RoleAddedEvent(role); - OwnedEntity?.EntityManager.EventBus.RaiseLocalEvent(OwnedEntity.Uid, message); + IEntity? tempQualifier = OwnedEntity; + (tempQualifier != null ? IoCManager.Resolve() : null).EventBus.RaiseLocalEvent(OwnedEntity.Uid, message); return role; } @@ -206,7 +207,8 @@ namespace Content.Server.Mind _roles.Remove(role); var message = new RoleRemovedEvent(role); - OwnedEntity?.EntityManager.EventBus.RaiseLocalEvent(OwnedEntity.Uid, message); + IEntity? tempQualifier = OwnedEntity; + (tempQualifier != null ? IoCManager.Resolve() : null).EventBus.RaiseLocalEvent(OwnedEntity.Uid, message); } public bool HasRole() where T : Role @@ -380,7 +382,7 @@ namespace Content.Server.Mind oldVisitingEnt.RemoveComponent(); } - oldVisitingEnt.EntityManager.EventBus.RaiseLocalEvent(oldVisitingEnt.Uid, new MindUnvisitedMessage()); + IoCManager.Resolve().EventBus.RaiseLocalEvent(oldVisitingEnt.Uid, new MindUnvisitedMessage()); } public bool TryGetSession([NotNullWhen(true)] out IPlayerSession? session) diff --git a/Content.Server/Morgue/Components/CrematoriumEntityStorageComponent.cs b/Content.Server/Morgue/Components/CrematoriumEntityStorageComponent.cs index 384ec59538..d4f8576d3c 100644 --- a/Content.Server/Morgue/Components/CrematoriumEntityStorageComponent.cs +++ b/Content.Server/Morgue/Components/CrematoriumEntityStorageComponent.cs @@ -15,6 +15,7 @@ using Robust.Server.GameObjects; using Robust.Server.Player; using Robust.Shared.Audio; using Robust.Shared.GameObjects; +using Robust.Shared.IoC; using Robust.Shared.Localization; using Robust.Shared.Player; using Robust.Shared.Serialization.Manager.Attributes; @@ -119,7 +120,7 @@ namespace Content.Server.Morgue.Components item.Delete(); } - var ash = Owner.EntityManager.SpawnEntity("Ash", Owner.Transform.Coordinates); + var ash = IoCManager.Resolve().SpawnEntity("Ash", Owner.Transform.Coordinates); Contents.Insert(ash); } diff --git a/Content.Server/Morgue/Components/MorgueEntityStorageComponent.cs b/Content.Server/Morgue/Components/MorgueEntityStorageComponent.cs index 881f866c58..61182dff78 100644 --- a/Content.Server/Morgue/Components/MorgueEntityStorageComponent.cs +++ b/Content.Server/Morgue/Components/MorgueEntityStorageComponent.cs @@ -100,7 +100,7 @@ namespace Content.Server.Morgue.Components if (_tray == null) { - _tray = Owner.EntityManager.SpawnEntity(_trayPrototypeId, Owner.Transform.Coordinates); + _tray = IoCManager.Resolve().SpawnEntity(_trayPrototypeId, Owner.Transform.Coordinates); var trayComp = _tray.EnsureComponent(); trayComp.Morgue = Owner; } diff --git a/Content.Server/NodeContainer/Nodes/PipeNode.cs b/Content.Server/NodeContainer/Nodes/PipeNode.cs index af13370149..44e34cc035 100644 --- a/Content.Server/NodeContainer/Nodes/PipeNode.cs +++ b/Content.Server/NodeContainer/Nodes/PipeNode.cs @@ -173,7 +173,7 @@ namespace Content.Server.NodeContainer.Nodes var position = Owner.Transform.Coordinates; foreach (var entity in grid.GetInDir(position, pipeDir.ToDirection())) { - if (!Owner.EntityManager.TryGetComponent(entity, out var container)) + if (!IoCManager.Resolve().TryGetComponent(entity, out var container)) continue; foreach (var node in container.Nodes.Values) @@ -196,7 +196,7 @@ namespace Content.Server.NodeContainer.Nodes var position = Owner.Transform.Coordinates; foreach (var entity in grid.GetLocal(position)) { - if (!Owner.EntityManager.TryGetComponent(entity, out var container)) + if (!IoCManager.Resolve().TryGetComponent(entity, out var container)) continue; foreach (var node in container.Nodes.Values) diff --git a/Content.Server/Nutrition/EntitySystems/FoodSystem.cs b/Content.Server/Nutrition/EntitySystems/FoodSystem.cs index e85f1df558..392fbb9a76 100644 --- a/Content.Server/Nutrition/EntitySystems/FoodSystem.cs +++ b/Content.Server/Nutrition/EntitySystems/FoodSystem.cs @@ -197,7 +197,7 @@ namespace Content.Server.Nutrition.EntitySystems { //We're empty. Become trash. var position = component.Owner.Transform.Coordinates; - var finisher = component.Owner.EntityManager.SpawnEntity(component.TrashPrototype, position); + var finisher = IoCManager.Resolve().SpawnEntity(component.TrashPrototype, position); // If the user is holding the item if (userUid != null && diff --git a/Content.Server/ParticleAccelerator/Components/ParticleAcceleratorControlBoxComponent.cs b/Content.Server/ParticleAccelerator/Components/ParticleAcceleratorControlBoxComponent.cs index d890de6857..d2e2c6bc61 100644 --- a/Content.Server/ParticleAccelerator/Components/ParticleAcceleratorControlBoxComponent.cs +++ b/Content.Server/ParticleAccelerator/Components/ParticleAcceleratorControlBoxComponent.cs @@ -390,7 +390,7 @@ namespace Content.Server.ParticleAccelerator.Components var coords = Owner.Transform.Coordinates; foreach (var maybeFuel in grid.GetCardinalNeighborCells(coords)) { - if (Owner.EntityManager.TryGetComponent(maybeFuel, out _partFuelChamber)) + if (IoCManager.Resolve().TryGetComponent(maybeFuel, out _partFuelChamber)) { break; } @@ -464,7 +464,7 @@ namespace Content.Server.ParticleAccelerator.Components var coords = Owner.Transform.Coordinates; foreach (var ent in grid.GetOffset(coords, offset)) { - if (Owner.EntityManager.TryGetComponent(ent, out part) && !part.Deleted) + if (IoCManager.Resolve().TryGetComponent(ent, out part) && !part.Deleted) { return true; } diff --git a/Content.Server/ParticleAccelerator/Components/ParticleAcceleratorEmitterComponent.cs b/Content.Server/ParticleAccelerator/Components/ParticleAcceleratorEmitterComponent.cs index da09283cd0..fef04614bc 100644 --- a/Content.Server/ParticleAccelerator/Components/ParticleAcceleratorEmitterComponent.cs +++ b/Content.Server/ParticleAccelerator/Components/ParticleAcceleratorEmitterComponent.cs @@ -1,5 +1,6 @@ using Content.Shared.Singularity.Components; using Robust.Shared.GameObjects; +using Robust.Shared.IoC; using Robust.Shared.Log; using Robust.Shared.Serialization.Manager.Attributes; @@ -15,7 +16,7 @@ namespace Content.Server.ParticleAccelerator.Components public void Fire(ParticleAcceleratorPowerState strength) { - var projectile = Owner.EntityManager.SpawnEntity("ParticlesProjectile", Owner.Transform.Coordinates); + var projectile = IoCManager.Resolve().SpawnEntity("ParticlesProjectile", Owner.Transform.Coordinates); if (!projectile.TryGetComponent(out var particleProjectileComponent)) { diff --git a/Content.Server/Physics/Controllers/PullController.cs b/Content.Server/Physics/Controllers/PullController.cs index 1978036cfa..ecc83477f0 100644 --- a/Content.Server/Physics/Controllers/PullController.cs +++ b/Content.Server/Physics/Controllers/PullController.cs @@ -2,6 +2,7 @@ using System.Collections.Generic; using Content.Shared.Pulling; using Robust.Shared.GameObjects; +using Robust.Shared.IoC; using Robust.Shared.Physics; using Robust.Shared.Physics.Controllers; using Robust.Shared.Maths; @@ -74,7 +75,7 @@ namespace Content.Server.Physics.Controllers // Now that's over with... var pullerPosition = puller.Transform.MapPosition; - var movingTo = pullable.MovingTo.Value.ToMap(pullable.Owner.EntityManager); + var movingTo = pullable.MovingTo.Value.ToMap(IoCManager.Resolve()); if (movingTo.MapId != pullerPosition.MapId) { _pullableSystem.StopMoveTo(pullable); diff --git a/Content.Server/Power/Components/ApcPowerReceiverComponent.cs b/Content.Server/Power/Components/ApcPowerReceiverComponent.cs index 6e36108e5f..d515b069d9 100644 --- a/Content.Server/Power/Components/ApcPowerReceiverComponent.cs +++ b/Content.Server/Power/Components/ApcPowerReceiverComponent.cs @@ -85,7 +85,7 @@ namespace Content.Server.Power.Components #pragma warning disable 618 SendMessage(new PowerChangedMessage(Powered)); #pragma warning restore 618 - Owner.EntityManager.EventBus.RaiseLocalEvent(Owner.Uid, new PowerChangedEvent(Powered, NetworkLoad.ReceivingPower)); + IoCManager.Resolve().EventBus.RaiseLocalEvent(Owner.Uid, new PowerChangedEvent(Powered, NetworkLoad.ReceivingPower)); if (Owner.TryGetComponent(out var appearance)) { diff --git a/Content.Server/Power/Components/CableComponent.cs b/Content.Server/Power/Components/CableComponent.cs index e74fbcc8b2..45c5f679d8 100644 --- a/Content.Server/Power/Components/CableComponent.cs +++ b/Content.Server/Power/Components/CableComponent.cs @@ -7,6 +7,7 @@ using Content.Shared.Interaction; using Content.Shared.Tools; using Content.Shared.Tools.Components; using Robust.Shared.GameObjects; +using Robust.Shared.IoC; using Robust.Shared.Serialization.Manager.Attributes; using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype; using Robust.Shared.ViewVariables; @@ -47,7 +48,7 @@ namespace Content.Server.Power.Components if (EntitySystem.Get().TryDoElectrifiedAct(Owner.Uid, eventArgs.User.Uid)) return false; Owner.Delete(); - var droppedEnt = Owner.EntityManager.SpawnEntity(_cableDroppedOnCutPrototype, eventArgs.ClickLocation); + var droppedEnt = IoCManager.Resolve().SpawnEntity(_cableDroppedOnCutPrototype, eventArgs.ClickLocation); // TODO: Literally just use a prototype that has a single thing in the stack, it's not that complicated... if (droppedEnt.TryGetComponent(out var stack)) diff --git a/Content.Server/Power/Components/CablePlacerComponent.cs b/Content.Server/Power/Components/CablePlacerComponent.cs index 62bc4ec85a..fc3b2d0e6d 100644 --- a/Content.Server/Power/Components/CablePlacerComponent.cs +++ b/Content.Server/Power/Components/CablePlacerComponent.cs @@ -40,7 +40,7 @@ namespace Content.Server.Power.Components if (!eventArgs.InRangeUnobstructed(ignoreInsideBlocker: true, popup: true)) return false; - if(!_mapManager.TryGetGrid(eventArgs.ClickLocation.GetGridId(Owner.EntityManager), out var grid)) + if(!_mapManager.TryGetGrid(eventArgs.ClickLocation.GetGridId(IoCManager.Resolve()), out var grid)) return false; var snapPos = grid.TileIndicesFor(eventArgs.ClickLocation); @@ -51,7 +51,7 @@ namespace Content.Server.Power.Components foreach (var anchored in grid.GetAnchoredEntities(snapPos)) { - if (Owner.EntityManager.TryGetComponent(anchored, out var wire) && wire.CableType == _blockingCableType) + if (IoCManager.Resolve().TryGetComponent(anchored, out var wire) && wire.CableType == _blockingCableType) { return false; } @@ -61,7 +61,7 @@ namespace Content.Server.Power.Components && !EntitySystem.Get().Use(Owner.Uid, 1, stack)) return false; - Owner.EntityManager.SpawnEntity(_cablePrototypeID, grid.GridTileToLocal(snapPos)); + IoCManager.Resolve().SpawnEntity(_cablePrototypeID, grid.GridTileToLocal(snapPos)); return true; } } diff --git a/Content.Server/Power/EntitySystems/ExtensionCableSystem.cs b/Content.Server/Power/EntitySystems/ExtensionCableSystem.cs index c1ec5db65e..d3815efbd4 100644 --- a/Content.Server/Power/EntitySystems/ExtensionCableSystem.cs +++ b/Content.Server/Power/EntitySystems/ExtensionCableSystem.cs @@ -87,7 +87,7 @@ namespace Content.Server.Power.EntitySystems if (EntityManager.TryGetComponent(entity.Uid, out var receiver) && receiver.Connectable && receiver.Provider == null && - entity.Transform.Coordinates.TryDistance(owner.EntityManager, owner.Transform.Coordinates, out var distance) && + entity.Transform.Coordinates.TryDistance(IoCManager.Resolve(), owner.Transform.Coordinates, out var distance) && distance < Math.Min(range, receiver.ReceptionRange)) { yield return receiver; @@ -185,7 +185,7 @@ namespace Content.Server.Power.EntitySystems if (!provider.Connectable) continue; - if (!entity.Transform.Coordinates.TryDistance(owner.EntityManager, owner.Transform.Coordinates, out var distance)) continue; + if (!entity.Transform.Coordinates.TryDistance(IoCManager.Resolve(), owner.Transform.Coordinates, out var distance)) continue; if (!(distance < Math.Min(range, provider.TransferRange))) continue; diff --git a/Content.Server/PowerCell/Components/PowerCellSlotComponent.cs b/Content.Server/PowerCell/Components/PowerCellSlotComponent.cs index 37263243ba..619182d9f2 100644 --- a/Content.Server/PowerCell/Components/PowerCellSlotComponent.cs +++ b/Content.Server/PowerCell/Components/PowerCellSlotComponent.cs @@ -7,6 +7,7 @@ using Content.Shared.Sound; using Robust.Shared.Audio; using Robust.Shared.Containers; using Robust.Shared.GameObjects; +using Robust.Shared.IoC; using Robust.Shared.Localization; using Robust.Shared.Player; using Robust.Shared.Serialization.Manager.Attributes; @@ -148,7 +149,7 @@ namespace Content.Server.PowerCell.Components SoundSystem.Play(Filter.Pvs(Owner), CellRemoveSound.GetSound(), Owner, AudioHelpers.WithVariation(0.125f)); } - Owner.EntityManager.EventBus.RaiseLocalEvent(Owner.Uid, new PowerCellChangedEvent(true), false); + IoCManager.Resolve().EventBus.RaiseLocalEvent(Owner.Uid, new PowerCellChangedEvent(true), false); return cell; } @@ -171,7 +172,7 @@ namespace Content.Server.PowerCell.Components SoundSystem.Play(Filter.Pvs(Owner), CellInsertSound.GetSound(), Owner, AudioHelpers.WithVariation(0.125f)); } - Owner.EntityManager.EventBus.RaiseLocalEvent(Owner.Uid, new PowerCellChangedEvent(false), false); + IoCManager.Resolve().EventBus.RaiseLocalEvent(Owner.Uid, new PowerCellChangedEvent(false), false); return true; } @@ -198,7 +199,7 @@ namespace Content.Server.PowerCell.Components }; } - var cell = Owner.EntityManager.SpawnEntity(type, Owner.Transform.Coordinates); + var cell = IoCManager.Resolve().SpawnEntity(type, Owner.Transform.Coordinates); _cellContainer.Insert(cell); } } diff --git a/Content.Server/Projectiles/Components/HitscanComponent.cs b/Content.Server/Projectiles/Components/HitscanComponent.cs index b2fd403f6e..6f6c20571c 100644 --- a/Content.Server/Projectiles/Components/HitscanComponent.cs +++ b/Content.Server/Projectiles/Components/HitscanComponent.cs @@ -59,7 +59,7 @@ namespace Content.Server.Projectiles.Components var gridOrMap = user.Transform.GridID == GridId.Invalid ? mapManager.GetMapEntityId(user.Transform.MapID) : mapManager.GetGrid(user.Transform.GridID).GridEntityId; - var parentXform = Owner.EntityManager.GetComponent(gridOrMap); + var parentXform = IoCManager.Resolve().GetComponent(gridOrMap); var localCoordinates = new EntityCoordinates(gridOrMap, parentXform.InvWorldMatrix.Transform(user.Transform.WorldPosition)); var localAngle = angle - parentXform.WorldRotation; diff --git a/Content.Server/Recycling/Components/RecyclableComponent.cs b/Content.Server/Recycling/Components/RecyclableComponent.cs index 5e5f3c661b..69713aae5d 100644 --- a/Content.Server/Recycling/Components/RecyclableComponent.cs +++ b/Content.Server/Recycling/Components/RecyclableComponent.cs @@ -1,5 +1,6 @@ using System; using Robust.Shared.GameObjects; +using Robust.Shared.IoC; using Robust.Shared.Serialization.Manager.Attributes; namespace Content.Server.Recycling.Components @@ -32,7 +33,7 @@ namespace Content.Server.Recycling.Components { for (var i = 0; i < Math.Max(_amount * efficiency, 1); i++) { - Owner.EntityManager.SpawnEntity(_prototype, Owner.Transform.Coordinates); + IoCManager.Resolve().SpawnEntity(_prototype, Owner.Transform.Coordinates); } } diff --git a/Content.Server/Rotatable/RotatableSystem.cs b/Content.Server/Rotatable/RotatableSystem.cs index 1d7e3db164..c4f6b5a7d3 100644 --- a/Content.Server/Rotatable/RotatableSystem.cs +++ b/Content.Server/Rotatable/RotatableSystem.cs @@ -2,6 +2,7 @@ using Content.Shared.Popups; using Content.Shared.Rotatable; using Content.Shared.Verbs; using Robust.Shared.GameObjects; +using Robust.Shared.IoC; using Robust.Shared.Localization; using Robust.Shared.Maths; using Robust.Shared.Physics; @@ -83,7 +84,7 @@ namespace Content.Server.Rotatable } var oldTransform = component.Owner.Transform; - var entity = component.Owner.EntityManager.SpawnEntity(component.MirrorEntity, oldTransform.Coordinates); + var entity = IoCManager.Resolve().SpawnEntity(component.MirrorEntity, oldTransform.Coordinates); var newTransform = entity.Transform; newTransform.LocalRotation = oldTransform.LocalRotation; newTransform.Anchored = false; diff --git a/Content.Server/Singularity/EntitySystems/EmitterSystem.cs b/Content.Server/Singularity/EntitySystems/EmitterSystem.cs index 77dd0b3d05..678c43b953 100644 --- a/Content.Server/Singularity/EntitySystems/EmitterSystem.cs +++ b/Content.Server/Singularity/EntitySystems/EmitterSystem.cs @@ -166,7 +166,7 @@ namespace Content.Server.Singularity.EntitySystems private void Fire(EmitterComponent component) { - var projectile = component.Owner.EntityManager.SpawnEntity(component.BoltType, component.Owner.Transform.Coordinates); + var projectile = IoCManager.Resolve().SpawnEntity(component.BoltType, component.Owner.Transform.Coordinates); if (!projectile.TryGetComponent(out var physicsComponent)) { diff --git a/Content.Server/Spawners/Components/ConditionalSpawnerComponent.cs b/Content.Server/Spawners/Components/ConditionalSpawnerComponent.cs index 4c9936494c..3e377b0af5 100644 --- a/Content.Server/Spawners/Components/ConditionalSpawnerComponent.cs +++ b/Content.Server/Spawners/Components/ConditionalSpawnerComponent.cs @@ -62,7 +62,7 @@ namespace Content.Server.Spawners.Components } if(!Owner.Deleted) - Owner.EntityManager.SpawnEntity(_robustRandom.Pick(Prototypes), Owner.Transform.Coordinates); + IoCManager.Resolve().SpawnEntity(_robustRandom.Pick(Prototypes), Owner.Transform.Coordinates); } public virtual void MapInit() diff --git a/Content.Server/Spawners/Components/RandomSpawnerComponent.cs b/Content.Server/Spawners/Components/RandomSpawnerComponent.cs index 8aba08a4f2..f763473b33 100644 --- a/Content.Server/Spawners/Components/RandomSpawnerComponent.cs +++ b/Content.Server/Spawners/Components/RandomSpawnerComponent.cs @@ -32,7 +32,7 @@ namespace Content.Server.Spawners.Components { if (RarePrototypes.Count > 0 && (RareChance == 1.0f || _robustRandom.Prob(RareChance))) { - Owner.EntityManager.SpawnEntity(_robustRandom.Pick(RarePrototypes), Owner.Transform.Coordinates); + IoCManager.Resolve().SpawnEntity(_robustRandom.Pick(RarePrototypes), Owner.Transform.Coordinates); return; } @@ -54,7 +54,7 @@ namespace Content.Server.Spawners.Components var x_negative = random.Prob(0.5f) ? -1 : 1; var y_negative = random.Prob(0.5f) ? -1 : 1; - var entity = Owner.EntityManager.SpawnEntity(_robustRandom.Pick(Prototypes), Owner.Transform.Coordinates); + var entity = IoCManager.Resolve().SpawnEntity(_robustRandom.Pick(Prototypes), Owner.Transform.Coordinates); entity.Transform.LocalPosition += new Vector2(random.NextFloat() * Offset * x_negative, random.NextFloat() * Offset * y_negative); } diff --git a/Content.Server/Spawners/Components/TimedSpawnerComponent.cs b/Content.Server/Spawners/Components/TimedSpawnerComponent.cs index ff804342d5..99d7b90c6c 100644 --- a/Content.Server/Spawners/Components/TimedSpawnerComponent.cs +++ b/Content.Server/Spawners/Components/TimedSpawnerComponent.cs @@ -76,7 +76,7 @@ namespace Content.Server.Spawners.Components for (int i = 0; i < number; i++) { var entity = _robustRandom.Pick(Prototypes); - Owner.EntityManager.SpawnEntity(entity, Owner.Transform.Coordinates); + IoCManager.Resolve().SpawnEntity(entity, Owner.Transform.Coordinates); } } } diff --git a/Content.Server/Storage/Components/CursedEntityStorageComponent.cs b/Content.Server/Storage/Components/CursedEntityStorageComponent.cs index cd51d95045..39c71a6725 100644 --- a/Content.Server/Storage/Components/CursedEntityStorageComponent.cs +++ b/Content.Server/Storage/Components/CursedEntityStorageComponent.cs @@ -31,7 +31,7 @@ namespace Content.Server.Storage.Components // No contents, we do nothing if (Contents.ContainedEntities.Count == 0) return; - var lockers = Owner.EntityManager.EntityQuery().Select(c => c.Owner).ToList(); + var lockers = IoCManager.Resolve().EntityQuery().Select(c => c.Owner).ToList(); if (lockers.Contains(Owner)) lockers.Remove(Owner); diff --git a/Content.Server/Storage/Components/EntityStorageComponent.cs b/Content.Server/Storage/Components/EntityStorageComponent.cs index cd45675f95..f822bcb769 100644 --- a/Content.Server/Storage/Components/EntityStorageComponent.cs +++ b/Content.Server/Storage/Components/EntityStorageComponent.cs @@ -218,14 +218,14 @@ namespace Content.Server.Storage.Components // 5. if this is NOT AN ITEM, then mobs can always be eaten unless unless a previous law prevents it // Let's not insert admin ghosts, yeah? This is really a a hack and should be replaced by attempt events - if (Owner.EntityManager.HasComponent(entity.Uid)) + if (IoCManager.Resolve().HasComponent(entity.Uid)) continue; // checks - var targetIsItem = Owner.EntityManager.HasComponent(entity.Uid); - var targetIsMob = Owner.EntityManager.HasComponent(entity.Uid); - var storageIsItem = Owner.EntityManager.HasComponent(OwnerUid); + var targetIsItem = IoCManager.Resolve().HasComponent(entity.Uid); + var targetIsMob = IoCManager.Resolve().HasComponent(entity.Uid); + var storageIsItem = IoCManager.Resolve().HasComponent(OwnerUid); var allowedToEat = false; diff --git a/Content.Server/Storage/Components/ServerStorageComponent.cs b/Content.Server/Storage/Components/ServerStorageComponent.cs index 11fe60b80a..2780e55c30 100644 --- a/Content.Server/Storage/Components/ServerStorageComponent.cs +++ b/Content.Server/Storage/Components/ServerStorageComponent.cs @@ -49,7 +49,7 @@ namespace Content.Server.Storage.Components private const string LoggerName = "Storage"; public Container? Storage; - + private readonly Dictionary _sizeCache = new(); [DataField("occludesLight")] @@ -462,13 +462,13 @@ namespace Content.Server.Storage.Components var ownerTransform = Owner.Transform; var playerTransform = player.Transform; - if (!playerTransform.Coordinates.InRange(Owner.EntityManager, ownerTransform.Coordinates, 2) || + if (!playerTransform.Coordinates.InRange(IoCManager.Resolve(), ownerTransform.Coordinates, 2) || Owner.IsInContainer() && !playerTransform.ContainsEntity(ownerTransform)) { break; } - if (!Owner.EntityManager.TryGetEntity(remove.EntityUid, out var entity) || Storage?.Contains(entity) == false) + if (!IoCManager.Resolve().TryGetEntity(remove.EntityUid, out var entity) || Storage?.Contains(entity) == false) { break; } diff --git a/Content.Server/Storage/Components/StorageFillComponent.cs b/Content.Server/Storage/Components/StorageFillComponent.cs index ed56832fb8..0e16db0451 100644 --- a/Content.Server/Storage/Components/StorageFillComponent.cs +++ b/Content.Server/Storage/Components/StorageFillComponent.cs @@ -51,7 +51,7 @@ namespace Content.Server.Storage.Components for (var i = 0; i < storageItem.Amount; i++) { storage.Insert( - Owner.EntityManager.SpawnEntity(storageItem.PrototypeId, Owner.Transform.Coordinates)); + IoCManager.Resolve().SpawnEntity(storageItem.PrototypeId, Owner.Transform.Coordinates)); } if (!string.IsNullOrEmpty(storageItem.GroupId)) alreadySpawnedGroups.Add(storageItem.GroupId); diff --git a/Content.Server/Throwing/ThrowHelper.cs b/Content.Server/Throwing/ThrowHelper.cs index 2c5af74fd6..9f42d8fe36 100644 --- a/Content.Server/Throwing/ThrowHelper.cs +++ b/Content.Server/Throwing/ThrowHelper.cs @@ -5,6 +5,7 @@ using Content.Shared.MobState.Components; using Content.Shared.Tag; using Content.Shared.Throwing; using Robust.Shared.GameObjects; +using Robust.Shared.IoC; using Robust.Shared.Log; using Robust.Shared.Maths; using Robust.Shared.Physics; @@ -96,7 +97,7 @@ namespace Content.Server.Throwing if (user != null && pushbackRatio > 0.0f && user.TryGetComponent(out IPhysBody? body)) { var msg = new ThrowPushbackAttemptEvent(); - body.Owner.EntityManager.EventBus.RaiseLocalEvent(body.Owner.Uid, msg); + IoCManager.Resolve().EventBus.RaiseLocalEvent(body.Owner.Uid, msg); if (!msg.Cancelled) { diff --git a/Content.Server/Tiles/FloorTileItemComponent.cs b/Content.Server/Tiles/FloorTileItemComponent.cs index ce04224e2e..b2f2b0e29c 100644 --- a/Content.Server/Tiles/FloorTileItemComponent.cs +++ b/Content.Server/Tiles/FloorTileItemComponent.cs @@ -64,10 +64,10 @@ namespace Content.Server.Tiles var mapManager = IoCManager.Resolve(); var location = eventArgs.ClickLocation.AlignWithClosestGridTile(); - var locationMap = location.ToMap(Owner.EntityManager); + var locationMap = location.ToMap(IoCManager.Resolve()); if (locationMap.MapId == MapId.Nullspace) return true; - mapManager.TryGetGrid(location.GetGridId(Owner.EntityManager), out var mapGrid); + mapManager.TryGetGrid(location.GetGridId(IoCManager.Resolve()), out var mapGrid); if (_outputTiles == null) return true; diff --git a/Content.Server/Tools/Components/TilePryingComponent.cs b/Content.Server/Tools/Components/TilePryingComponent.cs index 98275bd4fb..02cbc49254 100644 --- a/Content.Server/Tools/Components/TilePryingComponent.cs +++ b/Content.Server/Tools/Components/TilePryingComponent.cs @@ -37,7 +37,7 @@ namespace Content.Server.Tools.Components if (!Owner.TryGetComponent(out var tool) && _toolComponentNeeded) return; - if (!_mapManager.TryGetGrid(clickLocation.GetGridId(Owner.EntityManager), out var mapGrid)) + if (!_mapManager.TryGetGrid(clickLocation.GetGridId(IoCManager.Resolve()), out var mapGrid)) return; var tile = mapGrid.GetTileRef(clickLocation); @@ -55,7 +55,7 @@ namespace Content.Server.Tools.Components if (_toolComponentNeeded && !await EntitySystem.Get().UseTool(Owner.Uid, user.Uid, null, 0f, 0f, _qualityNeeded, toolComponent:tool)) return; - coordinates.PryTile(Owner.EntityManager, _mapManager); + coordinates.PryTile(IoCManager.Resolve(), _mapManager); } } } diff --git a/Content.Server/TraitorDeathMatch/Components/TraitorDeathMatchRedemptionComponent.cs b/Content.Server/TraitorDeathMatch/Components/TraitorDeathMatchRedemptionComponent.cs index 42ec6f3b24..fca255a89d 100644 --- a/Content.Server/TraitorDeathMatch/Components/TraitorDeathMatchRedemptionComponent.cs +++ b/Content.Server/TraitorDeathMatch/Components/TraitorDeathMatchRedemptionComponent.cs @@ -106,7 +106,7 @@ namespace Content.Server.TraitorDeathMatch.Components } // 4 is the per-PDA bonus amount. - var accounts = Owner.EntityManager.EntitySysManager.GetEntitySystem(); + var accounts = IoCManager.Resolve().EntitySysManager.GetEntitySystem(); var transferAmount = victimAccount.Balance + 4; accounts.SetBalance(victimAccount, 0); accounts.AddToBalance(userAccount, transferAmount); diff --git a/Content.Server/VendingMachines/VendingMachineComponent.cs b/Content.Server/VendingMachines/VendingMachineComponent.cs index c584997030..93acf530ea 100644 --- a/Content.Server/VendingMachines/VendingMachineComponent.cs +++ b/Content.Server/VendingMachines/VendingMachineComponent.cs @@ -185,7 +185,7 @@ namespace Content.Server.VendingMachines { _ejecting = false; TrySetVisualState(VendingMachineVisualState.Normal); - Owner.EntityManager.SpawnEntity(id, Owner.Transform.Coordinates); + IoCManager.Resolve().SpawnEntity(id, Owner.Transform.Coordinates); }); SoundSystem.Play(Filter.Pvs(Owner), _soundVend.GetSound(), Owner, AudioParams.Default.WithVolume(-2f)); diff --git a/Content.Server/Weapon/Melee/MeleeWeaponSystem.cs b/Content.Server/Weapon/Melee/MeleeWeaponSystem.cs index 274b05dd0b..a36cf82fbf 100644 --- a/Content.Server/Weapon/Melee/MeleeWeaponSystem.cs +++ b/Content.Server/Weapon/Melee/MeleeWeaponSystem.cs @@ -82,7 +82,7 @@ namespace Content.Server.Weapon.Melee var target = args.TargetEntity; var location = args.User.Transform.Coordinates; - var diff = args.ClickLocation.ToMapPos(owner.EntityManager) - location.ToMapPos(owner.EntityManager); + var diff = args.ClickLocation.ToMapPos(IoCManager.Resolve()) - location.ToMapPos(IoCManager.Resolve()); var angle = Angle.FromWorldVec(diff); if (target != null) @@ -139,7 +139,7 @@ namespace Content.Server.Weapon.Melee var owner = EntityManager.GetEntity(uid); var location = args.User.Transform.Coordinates; - var diff = args.ClickLocation.ToMapPos(owner.EntityManager) - location.ToMapPos(owner.EntityManager); + var diff = args.ClickLocation.ToMapPos(IoCManager.Resolve()) - location.ToMapPos(IoCManager.Resolve()); var angle = Angle.FromWorldVec(diff); // This should really be improved. GetEntitiesInArc uses pos instead of bounding boxes. @@ -220,7 +220,7 @@ namespace Content.Server.Weapon.Melee return; var location = args.User.Transform.Coordinates; - var diff = args.ClickLocation.ToMapPos(owner.EntityManager) - location.ToMapPos(owner.EntityManager); + var diff = args.ClickLocation.ToMapPos(IoCManager.Resolve()) - location.ToMapPos(IoCManager.Resolve()); var angle = Angle.FromWorldVec(diff); var hitEvent = new MeleeInteractEvent(args.Target, args.User); diff --git a/Content.Server/Weapon/Ranged/Ammunition/Components/AmmoBoxComponent.cs b/Content.Server/Weapon/Ranged/Ammunition/Components/AmmoBoxComponent.cs index 94191507b5..43e3553516 100644 --- a/Content.Server/Weapon/Ranged/Ammunition/Components/AmmoBoxComponent.cs +++ b/Content.Server/Weapon/Ranged/Ammunition/Components/AmmoBoxComponent.cs @@ -10,6 +10,7 @@ using Content.Shared.Popups; using Content.Shared.Weapons.Ranged.Barrels.Components; using Robust.Shared.Containers; using Robust.Shared.GameObjects; +using Robust.Shared.IoC; using Robust.Shared.Localization; using Robust.Shared.Serialization.Manager.Attributes; using Robust.Shared.Utility; @@ -90,7 +91,7 @@ namespace Content.Server.Weapon.Ranged.Ammunition.Components if (_unspawnedCount > 0) { - ammo = Owner.EntityManager.SpawnEntity(_fillPrototype, Owner.Transform.Coordinates); + ammo = IoCManager.Resolve().SpawnEntity(_fillPrototype, Owner.Transform.Coordinates); // when dumping from held ammo box, this detaches the spawned ammo from the player. ammo.Transform.AttachParentToContainerOrGrid(); diff --git a/Content.Server/Weapon/Ranged/Ammunition/Components/AmmoComponent.cs b/Content.Server/Weapon/Ranged/Ammunition/Components/AmmoComponent.cs index 79377077db..194c0f3a56 100644 --- a/Content.Server/Weapon/Ranged/Ammunition/Components/AmmoComponent.cs +++ b/Content.Server/Weapon/Ranged/Ammunition/Components/AmmoComponent.cs @@ -122,7 +122,7 @@ namespace Content.Server.Weapon.Ranged.Ammunition.Components appearanceComponent.SetData(AmmoVisuals.Spent, true); } - var entity = Owner.EntityManager.SpawnEntity(_projectileId, spawnAt); + var entity = IoCManager.Resolve().SpawnEntity(_projectileId, spawnAt); return entity; } diff --git a/Content.Server/Weapon/Ranged/Ammunition/Components/RangedMagazineComponent.cs b/Content.Server/Weapon/Ranged/Ammunition/Components/RangedMagazineComponent.cs index 6a2039c973..df9d062002 100644 --- a/Content.Server/Weapon/Ranged/Ammunition/Components/RangedMagazineComponent.cs +++ b/Content.Server/Weapon/Ranged/Ammunition/Components/RangedMagazineComponent.cs @@ -10,6 +10,7 @@ using Content.Shared.Popups; using Content.Shared.Weapons.Ranged.Barrels.Components; using Robust.Shared.Containers; using Robust.Shared.GameObjects; +using Robust.Shared.IoC; using Robust.Shared.Localization; using Robust.Shared.Serialization.Manager.Attributes; using Robust.Shared.Utility; @@ -127,7 +128,7 @@ namespace Content.Server.Weapon.Ranged.Ammunition.Components else if (_unspawnedCount > 0) { _unspawnedCount--; - ammo = Owner.EntityManager.SpawnEntity(_fillPrototype, Owner.Transform.Coordinates); + ammo = IoCManager.Resolve().SpawnEntity(_fillPrototype, Owner.Transform.Coordinates); } UpdateAppearance(); diff --git a/Content.Server/Weapon/Ranged/Ammunition/Components/SpeedLoaderComponent.cs b/Content.Server/Weapon/Ranged/Ammunition/Components/SpeedLoaderComponent.cs index b4ffb19ad2..579cad0880 100644 --- a/Content.Server/Weapon/Ranged/Ammunition/Components/SpeedLoaderComponent.cs +++ b/Content.Server/Weapon/Ranged/Ammunition/Components/SpeedLoaderComponent.cs @@ -8,6 +8,7 @@ using Content.Shared.Popups; using Content.Shared.Weapons.Ranged.Barrels.Components; using Robust.Shared.Containers; using Robust.Shared.GameObjects; +using Robust.Shared.IoC; using Robust.Shared.Localization; using Robust.Shared.Serialization.Manager.Attributes; @@ -129,7 +130,7 @@ namespace Content.Server.Weapon.Ranged.Ammunition.Components if (_unspawnedCount > 0) { - entity = Owner.EntityManager.SpawnEntity(_fillPrototype, Owner.Transform.Coordinates); + entity = IoCManager.Resolve().SpawnEntity(_fillPrototype, Owner.Transform.Coordinates); _unspawnedCount--; } diff --git a/Content.Server/Weapon/Ranged/Barrels/Components/BoltActionBarrelComponent.cs b/Content.Server/Weapon/Ranged/Barrels/Components/BoltActionBarrelComponent.cs index a59ea86059..01f7a82cbe 100644 --- a/Content.Server/Weapon/Ranged/Barrels/Components/BoltActionBarrelComponent.cs +++ b/Content.Server/Weapon/Ranged/Barrels/Components/BoltActionBarrelComponent.cs @@ -10,6 +10,7 @@ using Robust.Shared.Audio; using Robust.Shared.Containers; using Robust.Shared.GameObjects; using Robust.Shared.GameStates; +using Robust.Shared.IoC; using Robust.Shared.Localization; using Robust.Shared.Map; using Robust.Shared.Player; @@ -110,7 +111,7 @@ namespace Content.Server.Weapon.Ranged.Barrels.Components if (_unspawnedCount > 0) { _unspawnedCount--; - var chamberEntity = Owner.EntityManager.SpawnEntity(_fillPrototype, Owner.Transform.Coordinates); + var chamberEntity = IoCManager.Resolve().SpawnEntity(_fillPrototype, Owner.Transform.Coordinates); _chamberContainer.Insert(chamberEntity); } } @@ -319,7 +320,7 @@ namespace Content.Server.Weapon.Ranged.Barrels.Components else if (_unspawnedCount > 0) { _unspawnedCount--; - var ammoEntity = Owner.EntityManager.SpawnEntity(_fillPrototype, Owner.Transform.Coordinates); + var ammoEntity = IoCManager.Resolve().SpawnEntity(_fillPrototype, Owner.Transform.Coordinates); _chamberContainer.Insert(ammoEntity); return true; } diff --git a/Content.Server/Weapon/Ranged/Barrels/Components/PumpBarrelComponent.cs b/Content.Server/Weapon/Ranged/Barrels/Components/PumpBarrelComponent.cs index 5fba188d50..64aeeb24d2 100644 --- a/Content.Server/Weapon/Ranged/Barrels/Components/PumpBarrelComponent.cs +++ b/Content.Server/Weapon/Ranged/Barrels/Components/PumpBarrelComponent.cs @@ -9,6 +9,7 @@ using Robust.Shared.Audio; using Robust.Shared.Containers; using Robust.Shared.GameObjects; using Robust.Shared.GameStates; +using Robust.Shared.IoC; using Robust.Shared.Localization; using Robust.Shared.Map; using Robust.Shared.Player; @@ -182,7 +183,7 @@ namespace Content.Server.Weapon.Ranged.Barrels.Components if (_unspawnedCount > 0) { _unspawnedCount--; - var ammoEntity = Owner.EntityManager.SpawnEntity(_fillPrototype, Owner.Transform.Coordinates); + var ammoEntity = IoCManager.Resolve().SpawnEntity(_fillPrototype, Owner.Transform.Coordinates); _chamberContainer.Insert(ammoEntity); } diff --git a/Content.Server/Weapon/Ranged/Barrels/Components/RevolverBarrelComponent.cs b/Content.Server/Weapon/Ranged/Barrels/Components/RevolverBarrelComponent.cs index bb74085113..e566addc74 100644 --- a/Content.Server/Weapon/Ranged/Barrels/Components/RevolverBarrelComponent.cs +++ b/Content.Server/Weapon/Ranged/Barrels/Components/RevolverBarrelComponent.cs @@ -114,7 +114,7 @@ namespace Content.Server.Weapon.Ranged.Barrels.Components for (var i = 0; i < _unspawnedCount; i++) { - var entity = Owner.EntityManager.SpawnEntity(_fillPrototype, Owner.Transform.Coordinates); + var entity = IoCManager.Resolve().SpawnEntity(_fillPrototype, Owner.Transform.Coordinates); _ammoSlots[idx] = entity; _ammoContainer.Insert(entity); idx++; diff --git a/Content.Server/Weapon/Ranged/Barrels/Components/ServerBatteryBarrelComponent.cs b/Content.Server/Weapon/Ranged/Barrels/Components/ServerBatteryBarrelComponent.cs index 71a7ccab61..35b23fc43d 100644 --- a/Content.Server/Weapon/Ranged/Barrels/Components/ServerBatteryBarrelComponent.cs +++ b/Content.Server/Weapon/Ranged/Barrels/Components/ServerBatteryBarrelComponent.cs @@ -11,6 +11,7 @@ using Robust.Shared.Audio; using Robust.Shared.Containers; using Robust.Shared.GameObjects; using Robust.Shared.GameStates; +using Robust.Shared.IoC; using Robust.Shared.Map; using Robust.Shared.Player; using Robust.Shared.Players; @@ -96,7 +97,7 @@ namespace Content.Server.Weapon.Ranged.Barrels.Components _powerCellContainer = ContainerHelpers.EnsureContainer(Owner, $"{Name}-powercell-container", out var existing); if (!existing && _powerCellPrototype != null) { - var powerCellEntity = Owner.EntityManager.SpawnEntity(_powerCellPrototype, Owner.Transform.Coordinates); + var powerCellEntity = IoCManager.Resolve().SpawnEntity(_powerCellPrototype, Owner.Transform.Coordinates); _powerCellContainer.Insert(powerCellEntity); } @@ -133,7 +134,7 @@ namespace Content.Server.Weapon.Ranged.Barrels.Components var ammo = _ammoContainer.ContainedEntity; if (ammo == null) { - ammo = Owner.EntityManager.SpawnEntity(_ammoPrototype, Owner.Transform.Coordinates); + ammo = IoCManager.Resolve().SpawnEntity(_ammoPrototype, Owner.Transform.Coordinates); _ammoContainer.Insert(ammo); } @@ -174,7 +175,7 @@ namespace Content.Server.Weapon.Ranged.Barrels.Components } else { - entity = Owner.EntityManager.SpawnEntity(_ammoPrototype, spawnAt); + entity = IoCManager.Resolve().SpawnEntity(_ammoPrototype, spawnAt); } if (entity.TryGetComponent(out ProjectileComponent? projectileComponent)) diff --git a/Content.Server/Weapon/Ranged/Barrels/Components/ServerMagazineBarrelComponent.cs b/Content.Server/Weapon/Ranged/Barrels/Components/ServerMagazineBarrelComponent.cs index 67fd481c56..112d1839ba 100644 --- a/Content.Server/Weapon/Ranged/Barrels/Components/ServerMagazineBarrelComponent.cs +++ b/Content.Server/Weapon/Ranged/Barrels/Components/ServerMagazineBarrelComponent.cs @@ -14,6 +14,7 @@ using Robust.Shared.Audio; using Robust.Shared.Containers; using Robust.Shared.GameObjects; using Robust.Shared.GameStates; +using Robust.Shared.IoC; using Robust.Shared.Localization; using Robust.Shared.Map; using Robust.Shared.Player; @@ -179,7 +180,7 @@ namespace Content.Server.Weapon.Ranged.Barrels.Components if (!existing && _magFillPrototype != null) { - var magEntity = Owner.EntityManager.SpawnEntity(_magFillPrototype, Owner.Transform.Coordinates); + var magEntity = IoCManager.Resolve().SpawnEntity(_magFillPrototype, Owner.Transform.Coordinates); MagazineContainer.Insert(magEntity); } Dirty(); diff --git a/Content.Server/Weapon/Ranged/Barrels/Components/ServerRangedBarrelComponent.cs b/Content.Server/Weapon/Ranged/Barrels/Components/ServerRangedBarrelComponent.cs index 2ed5f793da..ce8c761d4a 100644 --- a/Content.Server/Weapon/Ranged/Barrels/Components/ServerRangedBarrelComponent.cs +++ b/Content.Server/Weapon/Ranged/Barrels/Components/ServerRangedBarrelComponent.cs @@ -330,7 +330,7 @@ namespace Content.Server.Weapon.Ranged.Barrels.Components else { projectile = - Owner.EntityManager.SpawnEntity(baseProjectile.Prototype?.ID, baseProjectile.Transform.Coordinates); + IoCManager.Resolve().SpawnEntity(baseProjectile.Prototype?.ID, baseProjectile.Transform.Coordinates); } firedProjectiles[i] = projectile.Uid; @@ -366,8 +366,8 @@ namespace Content.Server.Weapon.Ranged.Barrels.Components projectile.Transform.WorldRotation = projectileAngle + MathHelper.PiOver2; } - Owner.EntityManager.EventBus.RaiseLocalEvent(OwnerUid, new GunShotEvent(firedProjectiles)); - Owner.EntityManager.EventBus.RaiseLocalEvent(ammo.Uid, new AmmoShotEvent(firedProjectiles)); + IoCManager.Resolve().EventBus.RaiseLocalEvent(OwnerUid, new GunShotEvent(firedProjectiles)); + IoCManager.Resolve().EventBus.RaiseLocalEvent(ammo.Uid, new AmmoShotEvent(firedProjectiles)); } /// @@ -391,7 +391,7 @@ namespace Content.Server.Weapon.Ranged.Barrels.Components /// private void FireHitscan(IEntity shooter, HitscanComponent hitscan, Angle angle) { - var ray = new CollisionRay(Owner.Transform.Coordinates.ToMapPos(Owner.EntityManager), angle.ToVec(), (int) hitscan.CollisionMask); + var ray = new CollisionRay(Owner.Transform.Coordinates.ToMapPos(IoCManager.Resolve()), angle.ToVec(), (int) hitscan.CollisionMask); var physicsManager = EntitySystem.Get(); var rayCastResults = physicsManager.IntersectRay(Owner.Transform.MapID, ray, hitscan.MaxLength, shooter, false).ToList(); diff --git a/Content.Shared/Body/Components/SharedBodyPartComponent.cs b/Content.Shared/Body/Components/SharedBodyPartComponent.cs index 8655308f4e..5c55116941 100644 --- a/Content.Shared/Body/Components/SharedBodyPartComponent.cs +++ b/Content.Shared/Body/Components/SharedBodyPartComponent.cs @@ -304,7 +304,7 @@ namespace Content.Shared.Body.Components foreach (var mechanism in _mechanisms) { - Owner.EntityManager.EventBus.RaiseLocalEvent(mechanism.OwnerUid, new AddedToBodyEvent(body)); + IoCManager.Resolve().EventBus.RaiseLocalEvent(mechanism.OwnerUid, new AddedToBodyEvent(body)); } } @@ -319,7 +319,7 @@ namespace Content.Shared.Body.Components foreach (var mechanism in _mechanisms) { - Owner.EntityManager.EventBus.RaiseLocalEvent(mechanism.OwnerUid, new RemovedFromBodyEvent(old)); + IoCManager.Resolve().EventBus.RaiseLocalEvent(mechanism.OwnerUid, new RemovedFromBodyEvent(old)); } } diff --git a/Content.Shared/Body/Components/SharedMechanismComponent.cs b/Content.Shared/Body/Components/SharedMechanismComponent.cs index 106381995d..18b41ca1b9 100644 --- a/Content.Shared/Body/Components/SharedMechanismComponent.cs +++ b/Content.Shared/Body/Components/SharedMechanismComponent.cs @@ -2,6 +2,7 @@ using Content.Shared.Body.Events; using Content.Shared.Body.Part; using Robust.Shared.GameObjects; +using Robust.Shared.IoC; using Robust.Shared.Serialization; using Robust.Shared.Serialization.Manager.Attributes; @@ -36,11 +37,11 @@ namespace Content.Shared.Body.Components { if (old.Body == null) { - Owner.EntityManager.EventBus.RaiseLocalEvent(OwnerUid, new RemovedFromPartEvent(old)); + IoCManager.Resolve().EventBus.RaiseLocalEvent(OwnerUid, new RemovedFromPartEvent(old)); } else { - Owner.EntityManager.EventBus.RaiseLocalEvent(OwnerUid, new RemovedFromPartInBodyEvent(old.Body, old)); + IoCManager.Resolve().EventBus.RaiseLocalEvent(OwnerUid, new RemovedFromPartInBodyEvent(old.Body, old)); } } @@ -48,11 +49,11 @@ namespace Content.Shared.Body.Components { if (value.Body == null) { - Owner.EntityManager.EventBus.RaiseLocalEvent(OwnerUid, new AddedToPartEvent(value)); + IoCManager.Resolve().EventBus.RaiseLocalEvent(OwnerUid, new AddedToPartEvent(value)); } else { - Owner.EntityManager.EventBus.RaiseLocalEvent(OwnerUid, new AddedToPartInBodyEvent(value.Body, value)); + IoCManager.Resolve().EventBus.RaiseLocalEvent(OwnerUid, new AddedToPartInBodyEvent(value.Body, value)); } } } diff --git a/Content.Shared/Examine/ExamineSystemShared.cs b/Content.Shared/Examine/ExamineSystemShared.cs index cc390317d7..436457623c 100644 --- a/Content.Shared/Examine/ExamineSystemShared.cs +++ b/Content.Shared/Examine/ExamineSystemShared.cs @@ -7,6 +7,7 @@ using Content.Shared.MobState.Components; using JetBrains.Annotations; using Robust.Shared.Containers; using Robust.Shared.GameObjects; +using Robust.Shared.IoC; using Robust.Shared.Map; using Robust.Shared.Maths; using Robust.Shared.Physics; @@ -163,7 +164,7 @@ namespace Content.Shared.Examine public static bool InRangeUnOccluded(IEntity origin, EntityCoordinates other, float range, Ignored? predicate, bool ignoreInsideBlocker = true) { var originPos = origin.Transform.MapPosition; - var otherPos = other.ToMap(origin.EntityManager); + var otherPos = other.ToMap(IoCManager.Resolve()); return InRangeUnOccluded(originPos, otherPos, range, predicate, ignoreInsideBlocker); } @@ -186,7 +187,7 @@ namespace Content.Shared.Examine public static bool InRangeUnOccluded(DragDropEvent args, float range, Ignored? predicate, bool ignoreInsideBlocker = true) { var originPos = args.User.Transform.MapPosition; - var otherPos = args.DropLocation.ToMap(args.User.EntityManager); + var otherPos = args.DropLocation.ToMap(IoCManager.Resolve()); return InRangeUnOccluded(originPos, otherPos, range, predicate, ignoreInsideBlocker); } @@ -194,7 +195,7 @@ namespace Content.Shared.Examine public static bool InRangeUnOccluded(AfterInteractEventArgs args, float range, Ignored? predicate, bool ignoreInsideBlocker = true) { var originPos = args.User.Transform.MapPosition; - var otherPos = args.Target?.Transform.MapPosition ?? args.ClickLocation.ToMap(args.User.EntityManager); + var otherPos = args.Target?.Transform.MapPosition ?? args.ClickLocation.ToMap(IoCManager.Resolve()); return InRangeUnOccluded(originPos, otherPos, range, predicate, ignoreInsideBlocker); } diff --git a/Content.Shared/Hands/Components/SharedHandsComponent.cs b/Content.Shared/Hands/Components/SharedHandsComponent.cs index 1aad115d26..8ee09519cc 100644 --- a/Content.Shared/Hands/Components/SharedHandsComponent.cs +++ b/Content.Shared/Hands/Components/SharedHandsComponent.cs @@ -97,7 +97,7 @@ namespace Content.Shared.Hands.Components UpdateHandVisualizer(); Dirty(); - Owner.EntityManager.EventBus.RaiseEvent(EventSource.Local, new HandsModifiedMessage { Hands = this }); + IoCManager.Resolve().EventBus.RaiseEvent(EventSource.Local, new HandsModifiedMessage { Hands = this }); } public void UpdateHandVisualizer() @@ -491,7 +491,7 @@ namespace Content.Shared.Hands.Components private Vector2 GetFinalDropCoordinates(EntityCoordinates targetCoords) { var origin = Owner.Transform.MapPosition; - var target = targetCoords.ToMap(Owner.EntityManager); + var target = targetCoords.ToMap(IoCManager.Resolve()); var dropVector = target.Position - origin.Position; var requestedDropDistance = dropVector.Length; @@ -771,7 +771,7 @@ namespace Content.Shared.Hands.Components private void HandCountChanged() { - Owner.EntityManager.EventBus.RaiseEvent(EventSource.Local, new HandCountChangedEvent(Owner)); + IoCManager.Resolve().EventBus.RaiseEvent(EventSource.Local, new HandCountChangedEvent(Owner)); } /// diff --git a/Content.Shared/Interaction/Helpers/SharedUnobstructedExtensions.cs b/Content.Shared/Interaction/Helpers/SharedUnobstructedExtensions.cs index b54670ab18..bd1e1fc3c4 100644 --- a/Content.Shared/Interaction/Helpers/SharedUnobstructedExtensions.cs +++ b/Content.Shared/Interaction/Helpers/SharedUnobstructedExtensions.cs @@ -262,7 +262,7 @@ namespace Content.Shared.Interaction.Helpers Ignored? predicate = null, bool ignoreInsideBlocker = false) { - var originPosition = origin.ToMap(other.EntityManager); + var originPosition = origin.ToMap(IoCManager.Resolve()); var otherPosition = other.Transform.MapPosition; return SharedInteractionSystem.InRangeUnobstructed(originPosition, otherPosition, range, collisionMask, @@ -277,7 +277,7 @@ namespace Content.Shared.Interaction.Helpers Ignored? predicate = null, bool ignoreInsideBlocker = false) { - var originPosition = origin.ToMap(other.Owner.EntityManager); + var originPosition = origin.ToMap(IoCManager.Resolve()); var otherPosition = other.Owner.Transform.MapPosition; return SharedInteractionSystem.InRangeUnobstructed(originPosition, otherPosition, range, collisionMask, @@ -292,7 +292,7 @@ namespace Content.Shared.Interaction.Helpers Ignored? predicate = null, bool ignoreInsideBlocker = false) { - var originPosition = origin.ToMap(other.Owner.EntityManager); + var originPosition = origin.ToMap(IoCManager.Resolve()); var otherPosition = other.Owner.Transform.MapPosition; return SharedInteractionSystem.InRangeUnobstructed(originPosition, otherPosition, range, collisionMask, diff --git a/Content.Shared/Interaction/Helpers/SharedUnoccludedExtensions.cs b/Content.Shared/Interaction/Helpers/SharedUnoccludedExtensions.cs index 18b5537460..bd86041b34 100644 --- a/Content.Shared/Interaction/Helpers/SharedUnoccludedExtensions.cs +++ b/Content.Shared/Interaction/Helpers/SharedUnoccludedExtensions.cs @@ -203,7 +203,7 @@ namespace Content.Shared.Interaction.Helpers Ignored? predicate = null, bool ignoreInsideBlocker = true) { - var originPosition = origin.ToMap(other.EntityManager); + var originPosition = origin.ToMap(IoCManager.Resolve()); var otherPosition = other.Transform.MapPosition; return ExamineSystemShared.InRangeUnOccluded(originPosition, otherPosition, range, @@ -217,7 +217,7 @@ namespace Content.Shared.Interaction.Helpers Ignored? predicate = null, bool ignoreInsideBlocker = true) { - var originPosition = origin.ToMap(other.Owner.EntityManager); + var originPosition = origin.ToMap(IoCManager.Resolve()); var otherPosition = other.Owner.Transform.MapPosition; return ExamineSystemShared.InRangeUnOccluded(originPosition, otherPosition, range, @@ -231,7 +231,7 @@ namespace Content.Shared.Interaction.Helpers Ignored? predicate = null, bool ignoreInsideBlocker = true) { - var originPosition = origin.ToMap(other.Owner.EntityManager); + var originPosition = origin.ToMap(IoCManager.Resolve()); var otherPosition = other.Owner.Transform.MapPosition; return ExamineSystemShared.InRangeUnOccluded(originPosition, otherPosition, range, diff --git a/Content.Shared/MobState/Components/MobStateComponent.cs b/Content.Shared/MobState/Components/MobStateComponent.cs index be089c6e26..032a8477c6 100644 --- a/Content.Shared/MobState/Components/MobStateComponent.cs +++ b/Content.Shared/MobState/Components/MobStateComponent.cs @@ -8,6 +8,7 @@ using Content.Shared.FixedPoint; using Content.Shared.MobState.State; using Robust.Shared.GameObjects; using Robust.Shared.GameStates; +using Robust.Shared.IoC; using Robust.Shared.Players; using Robust.Shared.Serialization; using Robust.Shared.Serialization.Manager.Attributes; @@ -290,7 +291,7 @@ namespace Content.Shared.MobState.Components { if (!current.HasValue) { - old?.ExitState(OwnerUid, Owner.EntityManager); + old?.ExitState(OwnerUid, IoCManager.Resolve()); return; } @@ -300,22 +301,22 @@ namespace Content.Shared.MobState.Components if (state == old) { - state.UpdateState(OwnerUid, threshold, Owner.EntityManager); + state.UpdateState(OwnerUid, threshold, IoCManager.Resolve()); return; } - old?.ExitState(OwnerUid, Owner.EntityManager); + old?.ExitState(OwnerUid, IoCManager.Resolve()); CurrentState = state; - state.EnterState(OwnerUid, Owner.EntityManager); - state.UpdateState(OwnerUid, threshold, Owner.EntityManager); + state.EnterState(OwnerUid, IoCManager.Resolve()); + state.UpdateState(OwnerUid, threshold, IoCManager.Resolve()); var message = new MobStateChangedMessage(this, old, state); #pragma warning disable 618 SendMessage(message); #pragma warning restore 618 - Owner.EntityManager.EventBus.RaiseEvent(EventSource.Local, message); + IoCManager.Resolve().EventBus.RaiseEvent(EventSource.Local, message); Dirty(); } diff --git a/Content.Shared/Movement/Components/MovementIgnoreGravityComponent.cs b/Content.Shared/Movement/Components/MovementIgnoreGravityComponent.cs index 4fb57b6736..c12ff37b28 100644 --- a/Content.Shared/Movement/Components/MovementIgnoreGravityComponent.cs +++ b/Content.Shared/Movement/Components/MovementIgnoreGravityComponent.cs @@ -45,7 +45,7 @@ namespace Content.Shared.Movement.Components coords ??= transform.Coordinates; - if (!coords.Value.IsValid(entity.EntityManager)) + if (!coords.Value.IsValid(IoCManager.Resolve())) { return true; } diff --git a/Content.Shared/Movement/EntitySystems/SharedMoverSystem.cs b/Content.Shared/Movement/EntitySystems/SharedMoverSystem.cs index 6851f41d9b..176301087e 100644 --- a/Content.Shared/Movement/EntitySystems/SharedMoverSystem.cs +++ b/Content.Shared/Movement/EntitySystems/SharedMoverSystem.cs @@ -5,6 +5,7 @@ using Robust.Shared.Containers; using Robust.Shared.GameObjects; using Robust.Shared.Input; using Robust.Shared.Input.Binding; +using Robust.Shared.IoC; using Robust.Shared.Maths; using Robust.Shared.Players; @@ -57,7 +58,7 @@ namespace Content.Shared.Movement.EntitySystems mobState.IsAlive())) { var relayMoveEvent = new RelayMovementEntityEvent(owner); - owner.EntityManager.EventBus.RaiseLocalEvent(owner.Transform.ParentUid, relayMoveEvent); + IoCManager.Resolve().EventBus.RaiseLocalEvent(owner.Transform.ParentUid, relayMoveEvent); } } diff --git a/Content.Shared/Placeable/PlaceableSurfaceSystem.cs b/Content.Shared/Placeable/PlaceableSurfaceSystem.cs index 322b897735..1f8a4cd9b0 100644 --- a/Content.Shared/Placeable/PlaceableSurfaceSystem.cs +++ b/Content.Shared/Placeable/PlaceableSurfaceSystem.cs @@ -2,6 +2,7 @@ using Content.Shared.Hands.Components; using Content.Shared.Interaction; using Robust.Shared.GameObjects; using Robust.Shared.GameStates; +using Robust.Shared.IoC; using Robust.Shared.Maths; namespace Content.Shared.Placeable @@ -54,7 +55,7 @@ namespace Content.Shared.Placeable if(!args.User.TryGetComponent(out var handComponent)) return; - if (!args.ClickLocation.IsValid(args.User.EntityManager)) + if (!args.ClickLocation.IsValid(IoCManager.Resolve())) return; if(!handComponent.TryDropEntity(args.Used, surface.Owner.Transform.Coordinates)) diff --git a/Content.Shared/Pulling/Components/PullableComponent.cs b/Content.Shared/Pulling/Components/PullableComponent.cs index 2dd4c17d20..6874b13bb1 100644 --- a/Content.Shared/Pulling/Components/PullableComponent.cs +++ b/Content.Shared/Pulling/Components/PullableComponent.cs @@ -4,6 +4,7 @@ using Robust.Shared.Analyzers; using Robust.Shared.Containers; using Robust.Shared.GameObjects; using Robust.Shared.GameStates; +using Robust.Shared.IoC; using Robust.Shared.Log; using Robust.Shared.Map; using Robust.Shared.Physics; @@ -58,7 +59,7 @@ namespace Content.Shared.Pulling.Components return; } - if (!Owner.EntityManager.TryGetEntity(state.Puller.Value, out var entity)) + if (!IoCManager.Resolve().TryGetEntity(state.Puller.Value, out var entity)) { Logger.Error($"Invalid entity {state.Puller.Value} for pulling"); return; diff --git a/Content.Shared/Shuttles/Components/PilotComponent.cs b/Content.Shared/Shuttles/Components/PilotComponent.cs index 8e3789e537..30b2d71d20 100644 --- a/Content.Shared/Shuttles/Components/PilotComponent.cs +++ b/Content.Shared/Shuttles/Components/PilotComponent.cs @@ -1,6 +1,7 @@ using System; using Robust.Shared.GameObjects; using Robust.Shared.GameStates; +using Robust.Shared.IoC; using Robust.Shared.Log; using Robust.Shared.Map; using Robust.Shared.Players; @@ -37,7 +38,7 @@ namespace Content.Shared.Shuttles.Components return; } - if (!Owner.EntityManager.TryGetEntity(state.Console.Value, out var consoleEnt) || + if (!IoCManager.Resolve().TryGetEntity(state.Console.Value, out var consoleEnt) || !consoleEnt.TryGetComponent(out SharedShuttleConsoleComponent? shuttleConsoleComponent)) { Logger.Warning($"Unable to set Helmsman console to {state.Console.Value}");