Update components to use EnsureWarn (#2676)

Co-authored-by: Pieter-Jan Briers <pieterjan.briers+git@gmail.com>

Content.Server/GameObjects/Components/Access/IdCardConsoleComponent.cs

@@ -45,16 +45,10 @@ namespace Content.Server.GameObjects.Components.Access
             _privilegedIdContainer = ContainerManagerComponent.Ensure<ContainerSlot>($"{Name}-privilegedId", Owner);
             _targetIdContainer = ContainerManagerComponent.Ensure<ContainerSlot>($"{Name}-targetId", Owner);
 
-            if (!Owner.EnsureComponent(out AccessReader _))
+            Owner.EnsureComponentWarn<AccessReader>();
-            {
+            Owner.EnsureComponentWarn<ServerUserInterfaceComponent>();
-                Logger.Warning($"Entity {Owner} at {Owner.Transform.MapPosition} didn't have a {nameof(AccessReader)}");
-            }
 
-            if (UserInterface == null)
+            if (UserInterface != null)
-            {
-                Logger.Warning($"Entity {Owner} at {Owner.Transform.MapPosition} doesn't have a {nameof(ServerUserInterfaceComponent)}");
-            }
-            else
             {
                 UserInterface.OnReceiveMessage += OnUiReceiveMessage;
             }

Content.Server/GameObjects/Components/Atmos/AirtightComponent.cs

@@ -1,15 +1,10 @@
 #nullable enable
-using System;
 using Content.Server.GameObjects.EntitySystems;
 using Content.Shared.Atmos;
 using Robust.Server.Interfaces.GameObjects;
 using Robust.Shared.GameObjects;
 using Robust.Shared.GameObjects.Components.Transform;
 using Robust.Shared.GameObjects.Systems;
-using Robust.Shared.Interfaces.GameObjects;
-using Robust.Shared.Interfaces.Map;
-using Robust.Shared.IoC;
-using Robust.Shared.Log;
 using Robust.Shared.Map;
 using Robust.Shared.Maths;
 using Robust.Shared.Serialization;
@@ -85,10 +80,9 @@ namespace Content.Server.GameObjects.Components.Atmos
             // Using the SnapGrid is critical for performance, and thus if it is absent the component
             // will not be airtight. A warning is much easier to track down than the object magically
             // not being airtight, so log one if the SnapGrid component is missing.
-            if (!Owner.EnsureComponent(out SnapGridComponent _))
+            Owner.EnsureComponentWarn(out SnapGridComponent _);
-                Logger.Warning($"Entity {Owner} at {Owner.Transform.MapPosition} didn't have a {nameof(SnapGridComponent)}");
 
-            if(_fixAirBlockedDirectionInitialize)
+            if (_fixAirBlockedDirectionInitialize)
                 RotateEvent(new RotateEvent(Owner, Angle.Zero, Owner.Transform.LocalRotation));
 
             UpdatePosition();

Content.Server/GameObjects/Components/Body/Behavior/StomachBehavior.cs

@@ -6,7 +6,6 @@ using Content.Shared.Chemistry;
 using Content.Shared.GameObjects.Components.Body.Networks;
 using Content.Shared.GameObjects.Components.Chemistry;
 using Robust.Shared.GameObjects;
-using Robust.Shared.Log;
 using Robust.Shared.Serialization;
 using Robust.Shared.ViewVariables;
 
@@ -116,10 +115,7 @@ namespace Content.Server.GameObjects.Components.Body.Behavior
         {
             base.Startup();
 
-            if (!Owner.EnsureComponent(out SolutionContainerComponent solution))
+            Owner.EnsureComponentWarn(out SolutionContainerComponent solution);
-            {
-                Logger.Warning($"Entity {Owner} at {Owner.Transform.MapPosition} didn't have a {nameof(SolutionContainerComponent)}");
-            }
 
             solution.MaxVolume = InitialMaxVolume;
         }

Content.Server/GameObjects/Components/Body/BodyScannerComponent.cs

@@ -6,7 +6,6 @@ using Content.Shared.Interfaces.GameObjects.Components;
 using Robust.Server.GameObjects.Components.UserInterface;
 using Robust.Server.Interfaces.GameObjects;
 using Robust.Shared.GameObjects;
-using Robust.Shared.Log;
 using Robust.Shared.ViewVariables;
 
 namespace Content.Server.GameObjects.Components.Body
@@ -45,11 +44,9 @@ namespace Content.Server.GameObjects.Components.Body
         {
             base.Initialize();
 
-            if (UserInterface == null)
+            Owner.EnsureComponentWarn<ServerUserInterfaceComponent>();
-            {
+
-                Logger.Warning($"Entity {Owner} at {Owner.Transform.MapPosition} doesn't have a {nameof(ServerUserInterfaceComponent)}");
+            if (UserInterface != null)
-            }
-            else
             {
                 UserInterface.OnReceiveMessage += UserInterfaceOnOnReceiveMessage;
             }

Content.Server/GameObjects/Components/Botany/PlantHolderComponent.cs

@@ -26,7 +26,6 @@ using Robust.Shared.Interfaces.Random;
 using Robust.Shared.Interfaces.Timing;
 using Robust.Shared.IoC;
 using Robust.Shared.Localization;
-using Robust.Shared.Log;
 using Robust.Shared.Maths;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Random;
@@ -124,8 +123,7 @@ namespace Content.Server.GameObjects.Components.Botany
         {
             base.Initialize();
 
-            if(!Owner.EnsureComponent<SolutionContainerComponent>(out var solution))
+            Owner.EnsureComponentWarn<SolutionContainerComponent>();
-                Logger.Warning($"Entity {Owner} with a PlantHolderComponent did not have a SolutionContainerComponent.");
         }
 
         public override void ExposeData(ObjectSerializer serializer)

Content.Server/GameObjects/Components/Botany/ProduceComponent.cs

@@ -3,7 +3,6 @@ using Content.Server.GameObjects.Components.Chemistry;
 using Content.Shared.Chemistry;
 using Robust.Server.GameObjects;
 using Robust.Shared.GameObjects;
-using Robust.Shared.Interfaces.Random;
 using Robust.Shared.IoC;
 using Robust.Shared.Maths;
 using Robust.Shared.Prototypes;

Content.Server/GameObjects/Components/Cargo/CargoConsoleComponent.cs

@@ -66,15 +66,8 @@ namespace Content.Server.GameObjects.Components.Cargo
         {
             base.Initialize();
 
-            if (!Owner.EnsureComponent(out GalacticMarketComponent _))
+            Owner.EnsureComponentWarn(out GalacticMarketComponent _);
-            {
+            Owner.EnsureComponentWarn(out CargoOrderDatabaseComponent _);
-                Logger.Warning($"Entity {Owner} at {Owner.Transform.MapPosition} had no {nameof(GalacticMarketComponent)}");
-            }
-
-            if (!Owner.EnsureComponent(out CargoOrderDatabaseComponent _))
-            {
-                Logger.Warning($"Entity {Owner} at {Owner.Transform.MapPosition} had no {nameof(GalacticMarketComponent)}");
-            }
 
             if (UserInterface != null)
             {

Content.Server/GameObjects/Components/Chemistry/PillComponent.cs

@@ -4,7 +4,6 @@ using Content.Server.GameObjects.Components.Nutrition;
 using Content.Server.GameObjects.Components.Utensil;
 using Content.Shared.Chemistry;
 using Content.Shared.GameObjects.Components.Body;
-using Content.Shared.GameObjects.Components.Body.Mechanism;
 using Content.Shared.Interfaces;
 using Content.Shared.Interfaces.GameObjects.Components;
 using Content.Shared.Utility;
@@ -14,7 +13,6 @@ using Robust.Shared.GameObjects;
 using Robust.Shared.Interfaces.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Localization;
-using Robust.Shared.Log;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization;
 using Robust.Shared.ViewVariables;
@@ -52,10 +50,7 @@ namespace Content.Server.GameObjects.Components.Chemistry
         {
             base.Initialize();
 
-            if (!Owner.EnsureComponent(out _contents))
+            Owner.EnsureComponentWarn(out _contents);
-            {
-                Logger.Error($"Prototype {Owner.Prototype?.ID} had a {nameof(PillComponent)} without a {nameof(SolutionContainerComponent)}!");
-            }
         }
 
         bool IUse.UseEntity(UseEntityEventArgs eventArgs)

Content.Server/GameObjects/Components/Chemistry/TransformableContainerComponent.cs

@@ -4,7 +4,6 @@ using Content.Shared.Chemistry;
 using Robust.Server.GameObjects;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
-using Robust.Shared.Log;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Utility;
 
@@ -42,11 +41,7 @@ namespace Content.Server.GameObjects.Components.Chemistry
         {
             base.Startup();
 
-            if (!Owner.EnsureComponent(out SolutionContainerComponent solution))
+            Owner.EnsureComponentWarn(out SolutionContainerComponent solution);
-            {
-                Logger.Warning(
-                    $"Entity {Owner.Name} at {Owner.Transform.MapPosition} didn't have a {nameof(SolutionContainerComponent)}");
-            }
 
             solution.Capabilities |= SolutionContainerCaps.FitsInDispenser;
         }

Content.Server/GameObjects/Components/Chemistry/VaporComponent.cs

@@ -1,16 +1,13 @@
 using System.Linq;
-using Content.Server.GameObjects.Components.Fluids;
 using Content.Shared.Chemistry;
 using Content.Shared.GameObjects.Components;
 using Content.Shared.Interfaces.GameObjects.Components;
 using Content.Shared.Physics;
-using Microsoft.DiaSymReader;
 using Robust.Shared.GameObjects;
 using Robust.Shared.GameObjects.Components;
 using Robust.Shared.Interfaces.GameObjects;
 using Robust.Shared.Interfaces.Map;
 using Robust.Shared.IoC;
-using Robust.Shared.Log;
 using Robust.Shared.Map;
 using Robust.Shared.Maths;
 using Robust.Shared.Prototypes;
@@ -43,11 +40,7 @@ namespace Content.Server.GameObjects.Components.Chemistry
         {
             base.Initialize();
 
-            if (!Owner.EnsureComponent(out SolutionContainerComponent _))
+            Owner.EnsureComponentWarn(out SolutionContainerComponent _);
-            {
-                Logger.Warning(
-                    $"Entity {Owner.Name} at {Owner.Transform.MapPosition} didn't have a {nameof(SolutionContainerComponent)}");
-            }
         }
 
         public void Start(Vector2 dir, float velocity, EntityCoordinates target, float aliveTime)

Content.Server/GameObjects/Components/Fluids/BucketComponent.cs

@@ -49,7 +49,7 @@ namespace Content.Server.GameObjects.Components.Fluids
         public override void Initialize()
         {
             base.Initialize();
-            Owner.EnsureComponent<SolutionContainerComponent>();
+            Owner.EnsureComponentWarn<SolutionContainerComponent>();
         }
 
         private bool TryGiveToMop(MopComponent mopComponent)

Content.Server/GameObjects/Components/Fluids/MopComponent.cs

@@ -8,7 +8,6 @@ using Robust.Server.GameObjects.EntitySystems;
 using Robust.Shared.GameObjects;
 using Robust.Shared.GameObjects.Systems;
 using Robust.Shared.Localization;
-using Robust.Shared.Log;
 using Robust.Shared.Serialization;
 
 namespace Content.Server.GameObjects.Components.Fluids
@@ -59,10 +58,7 @@ namespace Content.Server.GameObjects.Components.Fluids
         {
             base.Initialize();
 
-            if (!Owner.EnsureComponent(out SolutionContainerComponent _))
+            Owner.EnsureComponentWarn(out SolutionContainerComponent _);
-            {
-                Logger.Warning($"Entity {Owner.Name} at {Owner.Transform.MapPosition} didn't have a {nameof(SolutionContainerComponent)}");
-            }
         }
 
         void IAfterInteract.AfterInteract(AfterInteractEventArgs eventArgs)

Content.Server/GameObjects/Components/Fluids/PuddleComponent.cs

@@ -17,7 +17,6 @@ using Robust.Shared.GameObjects.Components;
 using Robust.Shared.GameObjects.Components.Timers;
 using Robust.Shared.GameObjects.Components.Transform;
 using Robust.Shared.GameObjects.Systems;
-using Robust.Shared.Interfaces.GameObjects;
 using Robust.Shared.Interfaces.Map;
 using Robust.Shared.Interfaces.Random;
 using Robust.Shared.IoC;
@@ -26,7 +25,6 @@ using Robust.Shared.Maths;
 using Robust.Shared.Serialization;
 using Robust.Shared.Utility;
 using Robust.Shared.ViewVariables;
-using Timer = Robust.Shared.Timers.Timer;
 
 namespace Content.Server.GameObjects.Components.Fluids
 {

Content.Server/GameObjects/Components/Fluids/SprayComponent.cs

@@ -75,11 +75,7 @@ namespace Content.Server.GameObjects.Components.Fluids
         {
             base.Initialize();
 
-            if (!Owner.EnsureComponent(out SolutionContainerComponent _))
+            Owner.EnsureComponentWarn(out SolutionContainerComponent _);
-            {
-                Logger.Warning(
-                    $"Entity {Owner.Name} at {Owner.Transform.MapPosition} didn't have a {nameof(SolutionContainerComponent)}");
-            }
 
             if (_hasSafety)
             {

Content.Server/GameObjects/Components/GUI/StrippableComponent.cs

@@ -39,14 +39,15 @@ namespace Content.Server.GameObjects.Components.GUI
                 UserInterface.OnReceiveMessage += HandleUserInterfaceMessage;
             }
 
-            Owner.EnsureComponent<InventoryComponent>();
+            Owner.EnsureComponentWarn<InventoryComponent>();
-            Owner.EnsureComponent<HandsComponent>();
+            Owner.EnsureComponentWarn<HandsComponent>();
-            Owner.EnsureComponent<CuffableComponent>();
+            Owner.EnsureComponentWarn<CuffableComponent>();
 
             if (Owner.TryGetComponent(out CuffableComponent? cuffed))
             {
                 cuffed.OnCuffedStateChanged += UpdateSubscribed;
             }
+
             if (Owner.TryGetComponent(out InventoryComponent? inventory))
             {
                 inventory.OnItemChanged += UpdateSubscribed;

Content.Server/GameObjects/Components/Movement/ClimbableComponent.cs

@@ -46,10 +46,7 @@ namespace Content.Server.GameObjects.Components.Movement
         {
             base.Initialize();
 
-            if (!Owner.EnsureComponent(out PhysicsComponent _))
+            Owner.EnsureComponentWarn(out PhysicsComponent _);
-            {
-                Logger.Warning($"Entity {Owner.Name} at {Owner.Transform.MapPosition} didn't have a {nameof(PhysicsComponent)}");
-            }
 
             _doAfterSystem = EntitySystem.Get<DoAfterSystem>();
         }

Content.Server/GameObjects/Components/Nutrition/FoodComponent.cs

@@ -88,7 +88,7 @@ namespace Content.Server.GameObjects.Components.Nutrition
         public override void Initialize()
         {
             base.Initialize();
-            Owner.EnsureComponent<SolutionContainerComponent>();
+            Owner.EnsureComponentWarn<SolutionContainerComponent>();
         }
 
         bool IUse.UseEntity(UseEntityEventArgs eventArgs)

Content.Server/GameObjects/Components/Power/ApcNetComponents/ApcComponent.cs

@@ -56,6 +56,7 @@ namespace Content.Server.GameObjects.Components.Power.ApcNetComponents
 
             Owner.EnsureComponent<BatteryComponent>();
             Owner.EnsureComponent<PowerConsumerComponent>();
+            Owner.EnsureComponentWarn<ServerUserInterfaceComponent>();
 
             if (UserInterface != null)
             {

Content.Server/GameObjects/Components/Power/ApcNetComponents/PowerReceiverUsers/EmergencyLightComponent.cs

@@ -3,9 +3,7 @@ using System.Collections.Generic;
 using Content.Shared.GameObjects.EntitySystems;
 using Robust.Server.GameObjects;
 using Robust.Shared.GameObjects;
-using Robust.Shared.GameObjects.Systems;
 using Robust.Shared.Localization;
-using Robust.Shared.Log;
 using Robust.Shared.Serialization;
 using Robust.Shared.Utility;
 using Robust.Shared.ViewVariables;
@@ -142,10 +140,7 @@ namespace Content.Server.GameObjects.Components.Power.ApcNetComponents.PowerRece
         {
             base.Initialize();
 
-            if (!Owner.EnsureComponent(out PowerReceiverComponent receiver))
+            Owner.EnsureComponentWarn(out PowerReceiverComponent receiver);
-            {
-                Logger.Warning($"Entity {Owner.Name} at {Owner.Transform.MapPosition} didn't have a {nameof(PowerReceiverComponent)}");
-            }
 
             receiver.OnPowerStateChanged += UpdateState;
             State = EmergencyLightState.Charging;

Content.Server/GameObjects/Components/Power/PowerNetComponents/SmesComponent.cs

@@ -36,7 +36,7 @@ namespace Content.Server.GameObjects.Components.Power.PowerNetComponents
             base.Initialize();
 
             Owner.EnsureComponent<BatteryComponent>();
-            Owner.EnsureComponent<AppearanceComponent>();
+            Owner.EnsureComponentWarn<AppearanceComponent>();
         }
 
         public void OnUpdate()

Content.Server/GameObjects/Components/Power/PowerNetComponents/SolarPanelComponent.cs

@@ -4,7 +4,6 @@ using Content.Shared.GameObjects.EntitySystems;
 using Robust.Server.GameObjects;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Interfaces.Timing;
-using Robust.Shared.Log;
 using Robust.Shared.Serialization;
 using Robust.Shared.ViewVariables;
 
@@ -73,10 +72,7 @@ namespace Content.Server.GameObjects.Components.Power.PowerNetComponents
         {
             base.Initialize();
 
-            if (!Owner.EnsureComponent(out PowerSupplierComponent _))
+            Owner.EnsureComponentWarn(out PowerSupplierComponent _);
-            {
-                Logger.Warning($"Entity {Owner.Name} at {Owner.Transform.MapPosition} didn't have a {nameof(PowerSupplierComponent)}");
-            }
 
             UpdateSupply();
         }

Content.Server/GameObjects/Components/Projectiles/StunnableProjectileComponent.cs

@@ -32,11 +32,7 @@ namespace Content.Server.GameObjects.Components.Projectiles
         {
             base.Initialize();
 
-            if (!Owner.EnsureComponent(out ProjectileComponent _))
+            Owner.EnsureComponentWarn(out ProjectileComponent _);
-            {
-                Logger.Warning(
-                    $"Entity {Owner.Name} at {Owner.Transform.MapPosition} didn't have a {nameof(ProjectileComponent)}");
-            }
         }
 
         void ICollideBehavior.CollideWith(IEntity entity)

Content.Server/GameObjects/Components/Research/ResearchConsoleComponent.cs

@@ -37,6 +37,8 @@ namespace Content.Server.GameObjects.Components.Research
         {
             base.Initialize();
 
+            Owner.EnsureComponentWarn<ServerUserInterfaceComponent>();
+
             if (UserInterface != null)
             {
                 UserInterface.OnReceiveMessage += UserInterfaceOnOnReceiveMessage;

Content.Server/GameObjects/Components/Weapon/Ranged/Barrels/ServerRangedBarrelComponent.cs

@@ -157,11 +157,7 @@ namespace Content.Server.GameObjects.Components.Weapon.Ranged.Barrels
         {
             base.OnAdd();
 
-            if (!Owner.EnsureComponent(out ServerRangedWeaponComponent rangedWeaponComponent))
+            Owner.EnsureComponentWarn(out ServerRangedWeaponComponent rangedWeaponComponent);
-            {
-                Logger.Warning(
-                    $"Entity {Owner.Name} at {Owner.Transform.MapPosition} didn't have a {nameof(ServerRangedWeaponComponent)}");
-            }
 
             rangedWeaponComponent.Barrel ??= this;
             rangedWeaponComponent.FireHandler += Fire;