From b87806f7eda1a8630151079a2f277541dbe20a48 Mon Sep 17 00:00:00 2001 From: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> Date: Mon, 21 Feb 2022 14:41:50 +1100 Subject: [PATCH] Fix some build warnings (#6832) Co-authored-by: metalgearsloth --- Content.IntegrationTests/Tests/EntityTest.cs | 15 +++++------- .../Tests/Fluids/PuddleTest.cs | 13 +++++----- .../Tests/SaveLoadSaveTest.cs | 5 ++-- Content.Server/AI/Commands/FactionCommand.cs | 2 -- .../AI/Steering/AiSteeringSystem.cs | 3 +-- .../Actions/Idle/CloseLastEntityStorage.cs | 2 +- .../Considerations/Hands/FreeHandCon.cs | 2 +- .../State/StoredStateEntityIsNullCon.cs | 2 +- .../Botany/Systems/BotanySystem.Plant.cs | 1 - Content.Server/Chat/Managers/ChatManager.cs | 2 +- .../EntitySystems/ChemistrySystem.cs | 1 - .../EntitySystems/ReagentDispenserSystem.cs | 1 - .../Cuffs/Components/CuffableComponent.cs | 2 +- .../DisassembleOnAltVerbSystem.cs | 2 -- .../GameTicking/Commands/MappingCommand.cs | 3 +-- .../GameTicking/GameTicker.RoundFlow.cs | 6 ++--- Content.Server/GameTicking/GameTicker.cs | 1 - .../Lathe/Components/LatheComponent.cs | 4 ++-- Content.Server/Medical/HealingSystem.cs | 1 - Content.Server/Nuke/NukeSystem.cs | 1 - .../Conditions/RandomTraitorAliveCondition.cs | 24 +++++++++---------- Content.Server/PDA/Ringer/RingerSystem.cs | 1 - .../Plants/Systems/PottedPlantHideSystem.cs | 1 - Content.Server/Salvage/SalvageSystem.cs | 3 +-- .../Components/RadiationCollectorComponent.cs | 2 +- .../StationEvents/Events/RadiationStorm.cs | 4 ++-- .../UserInterface/ActivatableUISystem.cs | 2 +- .../Melee/EnergySword/EnergySwordSystem.cs | 4 ++-- Content.Server/Weapon/Ranged/GunSystem.cs | 1 - .../WireHacking/WireHackingSystem.cs | 1 - .../ActionBlocker/ActionBlockerSystem.cs | 1 + Content.Shared/Camera/CameraRecoilSystem.cs | 2 +- .../Friction/SharedTileFrictionController.cs | 2 +- .../Friction/TileFrictionModifier.cs | 5 ++-- .../Rotatable/RotatableComponent.cs | 6 ++--- Content.Shared/Verbs/SharedVerbSystem.cs | 1 - 36 files changed, 53 insertions(+), 76 deletions(-) diff --git a/Content.IntegrationTests/Tests/EntityTest.cs b/Content.IntegrationTests/Tests/EntityTest.cs index 4a58af2957..08d12b69dd 100644 --- a/Content.IntegrationTests/Tests/EntityTest.cs +++ b/Content.IntegrationTests/Tests/EntityTest.cs @@ -32,7 +32,6 @@ namespace Content.IntegrationTests.Tests var mapManager = server.ResolveDependency(); var entityMan = server.ResolveDependency(); var prototypeMan = server.ResolveDependency(); - var pauseManager = server.ResolveDependency(); var tileDefinitionManager = server.ResolveDependency(); var prototypes = new List(); @@ -45,7 +44,7 @@ namespace Content.IntegrationTests.Tests // Create a one tile grid to stave off the grid 0 monsters var mapId = mapManager.CreateMap(); - pauseManager.AddUninitializedMap(mapId); + mapManager.AddUninitializedMap(mapId); var gridId = new GridId(1); @@ -60,7 +59,7 @@ namespace Content.IntegrationTests.Tests grid.SetTile(coordinates, tile); - pauseManager.DoMapInitialize(mapId); + mapManager.DoMapInitialize(mapId); }); server.Assert(() => @@ -126,7 +125,6 @@ namespace Content.IntegrationTests.Tests var mapManager = server.ResolveDependency(); var entityManager = server.ResolveDependency(); - var pauseManager = server.ResolveDependency(); var componentFactory = server.ResolveDependency(); var tileDefinitionManager = server.ResolveDependency(); @@ -137,7 +135,7 @@ namespace Content.IntegrationTests.Tests // Create a one tile grid to stave off the grid 0 monsters var mapId = mapManager.CreateMap(); - pauseManager.AddUninitializedMap(mapId); + mapManager.AddUninitializedMap(mapId); var gridId = new GridId(1); @@ -152,7 +150,7 @@ namespace Content.IntegrationTests.Tests grid.SetTile(coordinates, tile); - pauseManager.DoMapInitialize(mapId); + mapManager.DoMapInitialize(mapId); }); server.Assert(() => @@ -230,7 +228,6 @@ namespace Content.IntegrationTests.Tests var mapManager = server.ResolveDependency(); var entityManager = server.ResolveDependency(); - var pauseManager = server.ResolveDependency(); var componentFactory = server.ResolveDependency(); var tileDefinitionManager = server.ResolveDependency(); @@ -241,7 +238,7 @@ namespace Content.IntegrationTests.Tests // Create a one tile grid to stave off the grid 0 monsters var mapId = mapManager.CreateMap(); - pauseManager.AddUninitializedMap(mapId); + mapManager.AddUninitializedMap(mapId); var gridId = new GridId(1); @@ -256,7 +253,7 @@ namespace Content.IntegrationTests.Tests grid.SetTile(coordinates, tile); - pauseManager.DoMapInitialize(mapId); + mapManager.DoMapInitialize(mapId); }); var distinctComponents = new List<(List components, List references)> diff --git a/Content.IntegrationTests/Tests/Fluids/PuddleTest.cs b/Content.IntegrationTests/Tests/Fluids/PuddleTest.cs index fed0939d53..dbe394b2a5 100644 --- a/Content.IntegrationTests/Tests/Fluids/PuddleTest.cs +++ b/Content.IntegrationTests/Tests/Fluids/PuddleTest.cs @@ -87,7 +87,6 @@ namespace Content.IntegrationTests.Tests.Fluids await server.WaitIdleAsync(); var sMapManager = server.ResolveDependency(); - var sPauseManager = server.ResolveDependency(); var sTileDefinitionManager = server.ResolveDependency(); var sGameTiming = server.ResolveDependency(); var entityManager = server.ResolveDependency(); @@ -102,7 +101,7 @@ namespace Content.IntegrationTests.Tests.Fluids await server.WaitPost(() => { sMapId = sMapManager.CreateMap(); - sPauseManager.SetMapPaused(sMapId, true); + sMapManager.SetMapPaused(sMapId, true); sGrid = sMapManager.CreateGrid(sMapId); sGridId = sGrid.Index; sGridEntity = sGrid.GridEntityId; @@ -118,8 +117,8 @@ namespace Content.IntegrationTests.Tests.Fluids // Check that the map and grid are paused await server.WaitAssertion(() => { - Assert.True(sPauseManager.IsGridPaused(sGridId)); - Assert.True(sPauseManager.IsMapPaused(sMapId)); + Assert.True(sMapManager.IsGridPaused(sGridId)); + Assert.True(sMapManager.IsMapPaused(sMapId)); }); float evaporateTime = default; @@ -171,13 +170,13 @@ namespace Content.IntegrationTests.Tests.Fluids }); // Unpause the map - await server.WaitPost(() => { sPauseManager.SetMapPaused(sMapId, false); }); + await server.WaitPost(() => { sMapManager.SetMapPaused(sMapId, false); }); // Check that the map, grid and puddle are unpaused await server.WaitAssertion(() => { - Assert.False(sPauseManager.IsMapPaused(sMapId)); - Assert.False(sPauseManager.IsGridPaused(sGridId)); + Assert.False(sMapManager.IsMapPaused(sMapId)); + Assert.False(sMapManager.IsGridPaused(sGridId)); Assert.False(meta.EntityPaused); // Check that the puddle still exists diff --git a/Content.IntegrationTests/Tests/SaveLoadSaveTest.cs b/Content.IntegrationTests/Tests/SaveLoadSaveTest.cs index 48a3fad9b9..0054addfd5 100644 --- a/Content.IntegrationTests/Tests/SaveLoadSaveTest.cs +++ b/Content.IntegrationTests/Tests/SaveLoadSaveTest.cs @@ -82,7 +82,6 @@ namespace Content.IntegrationTests.Tests await server.WaitIdleAsync(); var mapLoader = server.ResolveDependency(); var mapManager = server.ResolveDependency(); - var pauseMgr = server.ResolveDependency(); IMapGrid grid = default; @@ -90,8 +89,8 @@ namespace Content.IntegrationTests.Tests server.Post(() => { var mapId = mapManager.CreateMap(); - pauseMgr.AddUninitializedMap(mapId); - pauseMgr.SetMapPaused(mapId, true); + mapManager.AddUninitializedMap(mapId); + mapManager.SetMapPaused(mapId, true); grid = mapLoader.LoadBlueprint(mapId, "Maps/saltern.yml"); mapLoader.SaveBlueprint(grid.Index, "load save ticks save 1.yml"); }); diff --git a/Content.Server/AI/Commands/FactionCommand.cs b/Content.Server/AI/Commands/FactionCommand.cs index 0db4c06ae6..c9e01f2c97 100644 --- a/Content.Server/AI/Commands/FactionCommand.cs +++ b/Content.Server/AI/Commands/FactionCommand.cs @@ -87,8 +87,6 @@ namespace Content.Server.AI.Commands shell.WriteLine(Loc.GetString("faction-command-unknown-faction-argument-error")); break; } - - return; } } } diff --git a/Content.Server/AI/Steering/AiSteeringSystem.cs b/Content.Server/AI/Steering/AiSteeringSystem.cs index 29c9e8420e..eb368006fb 100644 --- a/Content.Server/AI/Steering/AiSteeringSystem.cs +++ b/Content.Server/AI/Steering/AiSteeringSystem.cs @@ -26,7 +26,6 @@ namespace Content.Server.AI.Steering { // http://www.red3d.com/cwr/papers/1999/gdc99steer.html for a steering overview [Dependency] private readonly IMapManager _mapManager = default!; - [Dependency] private readonly IPauseManager _pauseManager = default!; [Dependency] private readonly PathfindingSystem _pathfindingSystem = default!; [Dependency] private readonly AccessReaderSystem _accessReader = default!; [Dependency] private readonly SharedInteractionSystem _interactionSystem = default!; @@ -264,7 +263,7 @@ namespace Content.Server.AI.Steering return SteeringStatus.NoPath; } - if (_pauseManager.IsGridPaused(EntityManager.GetComponent(entity).GridID)) + if (_mapManager.IsGridPaused(EntityManager.GetComponent(entity).GridID)) { controller.VelocityDir = Vector2.Zero; return SteeringStatus.Pending; diff --git a/Content.Server/AI/Utility/Actions/Idle/CloseLastEntityStorage.cs b/Content.Server/AI/Utility/Actions/Idle/CloseLastEntityStorage.cs index 0c92ca875a..7e467e3e3d 100644 --- a/Content.Server/AI/Utility/Actions/Idle/CloseLastEntityStorage.cs +++ b/Content.Server/AI/Utility/Actions/Idle/CloseLastEntityStorage.cs @@ -25,7 +25,7 @@ namespace Content.Server.AI.Utility.Actions.Idle { var lastStorage = context.GetState().GetValue(); - if (lastStorage == null) + if (!lastStorage.IsValid()) { ActionOperators = new Queue(new AiOperator[] { diff --git a/Content.Server/AI/Utility/Considerations/Hands/FreeHandCon.cs b/Content.Server/AI/Utility/Considerations/Hands/FreeHandCon.cs index bb40bd2f83..7eeccc21b3 100644 --- a/Content.Server/AI/Utility/Considerations/Hands/FreeHandCon.cs +++ b/Content.Server/AI/Utility/Considerations/Hands/FreeHandCon.cs @@ -12,7 +12,7 @@ namespace Content.Server.AI.Utility.Considerations.Hands { var owner = context.GetState().GetValue(); - if (owner == null || !IoCManager.Resolve().TryGetComponent(owner, out HandsComponent? handsComponent)) + if (!owner.IsValid() || !IoCManager.Resolve().TryGetComponent(owner, out HandsComponent? handsComponent)) { return 0.0f; } diff --git a/Content.Server/AI/Utility/Considerations/State/StoredStateEntityIsNullCon.cs b/Content.Server/AI/Utility/Considerations/State/StoredStateEntityIsNullCon.cs index 17c41986ae..dced8ba625 100644 --- a/Content.Server/AI/Utility/Considerations/State/StoredStateEntityIsNullCon.cs +++ b/Content.Server/AI/Utility/Considerations/State/StoredStateEntityIsNullCon.cs @@ -28,7 +28,7 @@ namespace Content.Server.AI.Utility.Considerations.State } context.GetStoredState(stateData, out StoredStateData state); - return state.GetValue() == null ? 1.0f : 0.0f; + return !state.GetValue().IsValid() ? 1.0f : 0.0f; } } } diff --git a/Content.Server/Botany/Systems/BotanySystem.Plant.cs b/Content.Server/Botany/Systems/BotanySystem.Plant.cs index 8513e8ae37..343c94e53d 100644 --- a/Content.Server/Botany/Systems/BotanySystem.Plant.cs +++ b/Content.Server/Botany/Systems/BotanySystem.Plant.cs @@ -19,7 +19,6 @@ namespace Content.Server.Botany.Systems [Dependency] private readonly PopupSystem _popupSystem = default!; [Dependency] private readonly IRobustRandom _robustRandom = default!; [Dependency] private readonly SolutionContainerSystem _solutionContainerSystem = default!; - [Dependency] private readonly TagSystem _tags = default!; private int _nextUid = 0; private float _timer = 0f; diff --git a/Content.Server/Chat/Managers/ChatManager.cs b/Content.Server/Chat/Managers/ChatManager.cs index b073fa2f6c..b2d87b7f6a 100644 --- a/Content.Server/Chat/Managers/ChatManager.cs +++ b/Content.Server/Chat/Managers/ChatManager.cs @@ -364,7 +364,7 @@ namespace Content.Server.Chat.Managers var msg = _netManager.CreateNetMessage(); msg.Channel = ChatChannel.LOOC; msg.Message = message; - msg.MessageWrap = Loc.GetString("chat-manager-entity-looc-wrap-message", ("entityName", Name: _entManager.GetComponent(entity).EntityName)); + msg.MessageWrap = Loc.GetString("chat-manager-entity-looc-wrap-message", ("entityName", _entManager.GetComponent(entity).EntityName)); _netManager.ServerSendToMany(msg, sessions.Select(o => o.ConnectedClient).ToList()); diff --git a/Content.Server/Chemistry/EntitySystems/ChemistrySystem.cs b/Content.Server/Chemistry/EntitySystems/ChemistrySystem.cs index cd194a1ad0..27dfa55972 100644 --- a/Content.Server/Chemistry/EntitySystems/ChemistrySystem.cs +++ b/Content.Server/Chemistry/EntitySystems/ChemistrySystem.cs @@ -10,7 +10,6 @@ namespace Content.Server.Chemistry.EntitySystems; public sealed partial class ChemistrySystem : EntitySystem { - [Dependency] private readonly ActionBlockerSystem _blocker = default!; [Dependency] private readonly AdminLogSystem _logs = default!; [Dependency] private readonly BloodstreamSystem _blood = default!; [Dependency] private readonly DoAfterSystem _doAfter = default!; diff --git a/Content.Server/Chemistry/EntitySystems/ReagentDispenserSystem.cs b/Content.Server/Chemistry/EntitySystems/ReagentDispenserSystem.cs index 8b1b2e0f3b..71b332e529 100644 --- a/Content.Server/Chemistry/EntitySystems/ReagentDispenserSystem.cs +++ b/Content.Server/Chemistry/EntitySystems/ReagentDispenserSystem.cs @@ -11,7 +11,6 @@ namespace Content.Server.Chemistry.EntitySystems [UsedImplicitly] public sealed class ReagentDispenserSystem : SharedReagentDispenserSystem { - [Dependency] private readonly IPrototypeManager _prototypeManager = default!; public override void Initialize() { base.Initialize(); diff --git a/Content.Server/Cuffs/Components/CuffableComponent.cs b/Content.Server/Cuffs/Components/CuffableComponent.cs index ec5de0ac55..0f51607b77 100644 --- a/Content.Server/Cuffs/Components/CuffableComponent.cs +++ b/Content.Server/Cuffs/Components/CuffableComponent.cs @@ -33,7 +33,7 @@ namespace Content.Server.Cuffs.Components [ViewVariables] public int CuffedHandCount => Container.ContainedEntities.Count * 2; - protected EntityUid LastAddedCuffs => Container.ContainedEntities[^1]; + private EntityUid LastAddedCuffs => Container.ContainedEntities[^1]; public IReadOnlyList StoredEntities => Container.ContainedEntities; diff --git a/Content.Server/Engineering/EntitySystems/DisassembleOnAltVerbSystem.cs b/Content.Server/Engineering/EntitySystems/DisassembleOnAltVerbSystem.cs index 2c2d8aa3cb..be31e0bee2 100644 --- a/Content.Server/Engineering/EntitySystems/DisassembleOnAltVerbSystem.cs +++ b/Content.Server/Engineering/EntitySystems/DisassembleOnAltVerbSystem.cs @@ -11,8 +11,6 @@ namespace Content.Server.Engineering.EntitySystems [UsedImplicitly] public sealed class DisassembleOnAltVerbSystem : EntitySystem { - [Dependency] private readonly SharedInteractionSystem _interactionSystem = default!; - public override void Initialize() { base.Initialize(); diff --git a/Content.Server/GameTicking/Commands/MappingCommand.cs b/Content.Server/GameTicking/Commands/MappingCommand.cs index d284b6dfa5..9de3b0e934 100644 --- a/Content.Server/GameTicking/Commands/MappingCommand.cs +++ b/Content.Server/GameTicking/Commands/MappingCommand.cs @@ -88,9 +88,8 @@ namespace Content.Server.GameTicking.Commands shell.RemoteExecuteCommand("showmarkers"); var newGrid = mapManager.GetAllGrids().OrderByDescending(g => (int) g.Index).First(); - var pauseManager = IoCManager.Resolve(); - pauseManager.SetMapPaused(newGrid.ParentMapId, true); + mapManager.SetMapPaused(newGrid.ParentMapId, true); shell.WriteLine($"Created unloaded map from file {mapName} with id {mapId}. Use \"savebp {newGrid.Index} foo.yml\" to save the new grid as a map."); } diff --git a/Content.Server/GameTicking/GameTicker.RoundFlow.cs b/Content.Server/GameTicking/GameTicker.RoundFlow.cs index ccd0f1c25c..8a626806b7 100644 --- a/Content.Server/GameTicking/GameTicker.RoundFlow.cs +++ b/Content.Server/GameTicking/GameTicker.RoundFlow.cs @@ -74,7 +74,7 @@ namespace Content.Server.GameTicking AddGamePresetRules(); DefaultMap = _mapManager.CreateMap(); - _pauseManager.AddUninitializedMap(DefaultMap); + _mapManager.AddUninitializedMap(DefaultMap); _startingRound = false; var startTime = _gameTiming.RealTime; var maps = new List() { _gameMapManager.GetSelectedMapChecked(true) }; @@ -89,7 +89,7 @@ namespace Content.Server.GameTicking { // Create other maps for the others since we need to. toLoad = _mapManager.CreateMap(); - _pauseManager.AddUninitializedMap(toLoad); + _mapManager.AddUninitializedMap(toLoad); } _mapLoader.LoadMap(toLoad, map.MapPath.ToString()); @@ -273,7 +273,7 @@ namespace Content.Server.GameTicking } // MapInitialize *before* spawning players, our codebase is too shit to do it afterwards... - _pauseManager.DoMapInitialize(DefaultMap); + _mapManager.DoMapInitialize(DefaultMap); // Allow game rules to spawn players by themselves if needed. (For example, nuke ops or wizard) RaiseLocalEvent(new RulePlayerSpawningEvent(readyPlayers, profiles, force)); diff --git a/Content.Server/GameTicking/GameTicker.cs b/Content.Server/GameTicking/GameTicker.cs index 08d9221bbf..13f573f1a9 100644 --- a/Content.Server/GameTicking/GameTicker.cs +++ b/Content.Server/GameTicking/GameTicker.cs @@ -90,7 +90,6 @@ namespace Content.Server.GameTicking [Dependency] private readonly IBaseServer _baseServer = default!; [Dependency] private readonly IWatchdogApi _watchdogApi = default!; [Dependency] private readonly IGameMapManager _gameMapManager = default!; - [Dependency] private readonly IPauseManager _pauseManager = default!; #if EXCEPTION_TOLERANCE [Dependency] private readonly IRuntimeLog _runtimeLog = default!; #endif diff --git a/Content.Server/Lathe/Components/LatheComponent.cs b/Content.Server/Lathe/Components/LatheComponent.cs index 06407ddbc8..b008cef2a5 100644 --- a/Content.Server/Lathe/Components/LatheComponent.cs +++ b/Content.Server/Lathe/Components/LatheComponent.cs @@ -35,7 +35,7 @@ namespace Content.Server.Lathe.Components private LatheState _state = LatheState.Base; - protected LatheState State + private LatheState State { get => _state; set => _state = value; @@ -228,7 +228,7 @@ namespace Content.Server.Lathe.Components return queue; } - protected enum LatheState + private enum LatheState : byte { Base, Inserting, diff --git a/Content.Server/Medical/HealingSystem.cs b/Content.Server/Medical/HealingSystem.cs index cc7c05b141..806a6e9abe 100644 --- a/Content.Server/Medical/HealingSystem.cs +++ b/Content.Server/Medical/HealingSystem.cs @@ -15,7 +15,6 @@ namespace Content.Server.Medical; public sealed class HealingSystem : EntitySystem { - [Dependency] private readonly ActionBlockerSystem _blocker = default!; [Dependency] private readonly AdminLogSystem _logs = default!; [Dependency] private readonly DamageableSystem _damageable = default!; [Dependency] private readonly BloodstreamSystem _bloodstreamSystem = default!; diff --git a/Content.Server/Nuke/NukeSystem.cs b/Content.Server/Nuke/NukeSystem.cs index b46d1e274a..be233e62f2 100644 --- a/Content.Server/Nuke/NukeSystem.cs +++ b/Content.Server/Nuke/NukeSystem.cs @@ -26,7 +26,6 @@ namespace Content.Server.Nuke public sealed class NukeSystem : EntitySystem { [Dependency] private readonly NukeCodeSystem _codes = default!; - [Dependency] private readonly ActionBlockerSystem _actionBlocker = default!; [Dependency] private readonly ItemSlotsSystem _itemSlots = default!; [Dependency] private readonly PopupSystem _popups = default!; [Dependency] private readonly IEntityLookup _lookup = default!; diff --git a/Content.Server/Objectives/Conditions/RandomTraitorAliveCondition.cs b/Content.Server/Objectives/Conditions/RandomTraitorAliveCondition.cs index c6c508040c..e313d4b8a2 100644 --- a/Content.Server/Objectives/Conditions/RandomTraitorAliveCondition.cs +++ b/Content.Server/Objectives/Conditions/RandomTraitorAliveCondition.cs @@ -16,22 +16,22 @@ namespace Content.Server.Objectives.Conditions [DataDefinition] public sealed class RandomTraitorAliveCondition : IObjectiveCondition { - protected Mind.Mind? Target; + private Mind.Mind? _target; public IObjectiveCondition GetAssigned(Mind.Mind mind) { var entityMgr = IoCManager.Resolve(); - List _allOtherTraitors = new List(); + var allOtherTraitors = new List(); foreach (var targetMind in entityMgr.EntityQuery()) { if (targetMind.Mind?.CharacterDeadIC == false && targetMind.Mind != mind && targetMind.Mind?.HasRole() == true) { - _allOtherTraitors.Add(targetMind.Mind); + allOtherTraitors.Add(targetMind.Mind); } } - return new RandomTraitorAliveCondition {Target = IoCManager.Resolve().Pick(_allOtherTraitors)}; + return new RandomTraitorAliveCondition {_target = IoCManager.Resolve().Pick(allOtherTraitors)}; } public string Title @@ -39,14 +39,14 @@ namespace Content.Server.Objectives.Conditions get { var targetName = string.Empty; - var jobName = Target?.CurrentJob?.Name ?? "Unknown"; + var jobName = _target?.CurrentJob?.Name ?? "Unknown"; - if (Target == null) + if (_target == null) return Loc.GetString("objective-condition-other-traitor-alive-title", ("targetName", targetName), ("job", jobName)); - if (Target.CharacterName != null) - targetName = Target.CharacterName; - else if (Target.OwnedEntity is {Valid: true} owned) + if (_target.CharacterName != null) + targetName = _target.CharacterName; + else if (_target.OwnedEntity is {Valid: true} owned) targetName = IoCManager.Resolve().GetComponent(owned).EntityName; return Loc.GetString("objective-condition-other-traitor-alive-title", ("targetName", targetName), ("job", jobName)); @@ -57,13 +57,13 @@ namespace Content.Server.Objectives.Conditions public SpriteSpecifier Icon => new SpriteSpecifier.Rsi(new ResourcePath("Objects/Misc/bureaucracy.rsi"), "folder-white"); - public float Progress => (!Target?.CharacterDeadIC ?? true) ? 1f : 0f; + public float Progress => (!_target?.CharacterDeadIC ?? true) ? 1f : 0f; public float Difficulty => 1.75f; public bool Equals(IObjectiveCondition? other) { - return other is RandomTraitorAliveCondition kpc && Equals(Target, kpc.Target); + return other is RandomTraitorAliveCondition kpc && Equals(_target, kpc._target); } public override bool Equals(object? obj) @@ -75,7 +75,7 @@ namespace Content.Server.Objectives.Conditions public override int GetHashCode() { - return Target?.GetHashCode() ?? 0; + return _target?.GetHashCode() ?? 0; } } } diff --git a/Content.Server/PDA/Ringer/RingerSystem.cs b/Content.Server/PDA/Ringer/RingerSystem.cs index 8d5e04941d..38767dceb1 100644 --- a/Content.Server/PDA/Ringer/RingerSystem.cs +++ b/Content.Server/PDA/Ringer/RingerSystem.cs @@ -18,7 +18,6 @@ namespace Content.Server.PDA.Ringer { public sealed class RingerSystem : SharedRingerSystem { - [Dependency] private readonly IPrototypeManager _proto = default!; [Dependency] private readonly IRobustRandom _random = default!; public override void Initialize() diff --git a/Content.Server/Plants/Systems/PottedPlantHideSystem.cs b/Content.Server/Plants/Systems/PottedPlantHideSystem.cs index e2ecfa51e6..d9ff9a5971 100644 --- a/Content.Server/Plants/Systems/PottedPlantHideSystem.cs +++ b/Content.Server/Plants/Systems/PottedPlantHideSystem.cs @@ -17,7 +17,6 @@ namespace Content.Server.Plants.Systems { [Dependency] private readonly SecretStashSystem _stashSystem = default!; [Dependency] private readonly PopupSystem _popupSystem = default!; - [Dependency] private readonly ActionBlockerSystem _blocker = default!; public override void Initialize() { diff --git a/Content.Server/Salvage/SalvageSystem.cs b/Content.Server/Salvage/SalvageSystem.cs index 37bd56f57e..999752e731 100644 --- a/Content.Server/Salvage/SalvageSystem.cs +++ b/Content.Server/Salvage/SalvageSystem.cs @@ -27,7 +27,6 @@ namespace Content.Server.Salvage public sealed class SalvageSystem : EntitySystem { [Dependency] private readonly IChatManager _chatManager = default!; - [Dependency] private readonly IPauseManager _pauseManager = default!; [Dependency] private readonly IMapLoader _mapLoader = default!; [Dependency] private readonly IMapManager _mapManager = default!; [Dependency] private readonly IPrototypeManager _prototypeManager = default!; @@ -346,7 +345,7 @@ namespace Content.Server.Salvage var gridId = gridIdAndState.Key; // Not handling the case where the salvage we spawned got paused // They both need to be paused, or it doesn't make sense - if (_pauseManager.IsGridPaused(gridId)) continue; + if (_mapManager.IsGridPaused(gridId)) continue; state.CurrentTime += secondsPassed; var deleteQueue = new RemQueue(); diff --git a/Content.Server/Singularity/Components/RadiationCollectorComponent.cs b/Content.Server/Singularity/Components/RadiationCollectorComponent.cs index c9e28a8c02..f5eb6122df 100644 --- a/Content.Server/Singularity/Components/RadiationCollectorComponent.cs +++ b/Content.Server/Singularity/Components/RadiationCollectorComponent.cs @@ -73,7 +73,7 @@ namespace Content.Server.Singularity.Components } } - protected void SetAppearance(RadiationCollectorVisualState state) + private void SetAppearance(RadiationCollectorVisualState state) { if (IoCManager.Resolve().TryGetComponent(Owner, out var appearance)) { diff --git a/Content.Server/StationEvents/Events/RadiationStorm.cs b/Content.Server/StationEvents/Events/RadiationStorm.cs index fc4dc173a4..4685a0229c 100644 --- a/Content.Server/StationEvents/Events/RadiationStorm.cs +++ b/Content.Server/StationEvents/Events/RadiationStorm.cs @@ -66,7 +66,7 @@ namespace Content.Server.StationEvents.Events if (_timeUntilPulse <= 0.0f) { - var pauseManager = IoCManager.Resolve(); + var mapManager = IoCManager.Resolve(); // Account for split stations by just randomly picking a piece of it. var possibleTargets = _entityManager.EntityQuery() .Where(x => x.Station == _target).ToArray(); @@ -76,7 +76,7 @@ namespace Content.Server.StationEvents.Events if (!_entityManager.TryGetComponent(stationEnt, out var grid)) return; - if (pauseManager.IsGridPaused(grid.GridIndex)) + if (mapManager.IsGridPaused(grid.GridIndex)) return; SpawnPulse(grid.Grid); diff --git a/Content.Server/UserInterface/ActivatableUISystem.cs b/Content.Server/UserInterface/ActivatableUISystem.cs index c8bfc5e31c..1e70873840 100644 --- a/Content.Server/UserInterface/ActivatableUISystem.cs +++ b/Content.Server/UserInterface/ActivatableUISystem.cs @@ -127,7 +127,7 @@ namespace Content.Server.UserInterface } } - public class UserOpenActivatableUIAttemptEvent : CancellableEntityEventArgs //have to one-up the already stroke-inducing name + public sealed class UserOpenActivatableUIAttemptEvent : CancellableEntityEventArgs //have to one-up the already stroke-inducing name { public EntityUid User { get; } public UserOpenActivatableUIAttemptEvent(EntityUid who) diff --git a/Content.Server/Weapon/Melee/EnergySword/EnergySwordSystem.cs b/Content.Server/Weapon/Melee/EnergySword/EnergySwordSystem.cs index 2f37aa8340..d6caf5b57a 100644 --- a/Content.Server/Weapon/Melee/EnergySword/EnergySwordSystem.cs +++ b/Content.Server/Weapon/Melee/EnergySword/EnergySwordSystem.cs @@ -11,10 +11,10 @@ using Robust.Shared.Random; namespace Content.Server.Weapon.Melee.EnergySword { - internal sealed class EnergySwordSystem : EntitySystem + public sealed class EnergySwordSystem : EntitySystem { - [Dependency] private readonly ActionBlockerSystem _blockerSystem = default!; [Dependency] private readonly IRobustRandom _random = default!; + public override void Initialize() { base.Initialize(); diff --git a/Content.Server/Weapon/Ranged/GunSystem.cs b/Content.Server/Weapon/Ranged/GunSystem.cs index 445459d88b..1391acdd8d 100644 --- a/Content.Server/Weapon/Ranged/GunSystem.cs +++ b/Content.Server/Weapon/Ranged/GunSystem.cs @@ -34,7 +34,6 @@ namespace Content.Server.Weapon.Ranged; public sealed partial class GunSystem : EntitySystem { [Dependency] private readonly IGameTiming _gameTiming = default!; - [Dependency] private readonly IPrototypeManager _protoMan = default!; [Dependency] private readonly IRobustRandom _random = default!; [Dependency] private readonly ActionBlockerSystem _blocker = default!; [Dependency] private readonly AdminLogSystem _logs = default!; diff --git a/Content.Server/WireHacking/WireHackingSystem.cs b/Content.Server/WireHacking/WireHackingSystem.cs index 60dd9f8ee6..402ed56e1b 100644 --- a/Content.Server/WireHacking/WireHackingSystem.cs +++ b/Content.Server/WireHacking/WireHackingSystem.cs @@ -19,7 +19,6 @@ namespace Content.Server.WireHacking public sealed class WireHackingSystem : EntitySystem { [Dependency] private readonly IRobustRandom _random = default!; - [Dependency] private readonly ActionBlockerSystem _blocker = default!; [Dependency] private readonly ToolSystem _tools = default!; [ViewVariables] private readonly Dictionary _layouts = diff --git a/Content.Shared/ActionBlocker/ActionBlockerSystem.cs b/Content.Shared/ActionBlocker/ActionBlockerSystem.cs index e9f2f19fda..186ca6cdfb 100644 --- a/Content.Shared/ActionBlocker/ActionBlockerSystem.cs +++ b/Content.Shared/ActionBlocker/ActionBlockerSystem.cs @@ -1,6 +1,7 @@ using Content.Shared.Body.Events; using Content.Shared.DragDrop; using Content.Shared.Emoting; +using Content.Shared.Interaction; using Content.Shared.Interaction.Events; using Content.Shared.Inventory.Events; using Content.Shared.Item; diff --git a/Content.Shared/Camera/CameraRecoilSystem.cs b/Content.Shared/Camera/CameraRecoilSystem.cs index 80b66a53fc..d3984274fb 100644 --- a/Content.Shared/Camera/CameraRecoilSystem.cs +++ b/Content.Shared/Camera/CameraRecoilSystem.cs @@ -33,7 +33,7 @@ public sealed class CameraRecoilSystem : EntitySystem private readonly ISawmill _log; - protected CameraRecoilSystem(IEntityManager entityManager) + private CameraRecoilSystem(IEntityManager entityManager) : base(entityManager) { _log = Logger.GetSawmill($"ecs.systems.{nameof(CameraRecoilSystem)}"); diff --git a/Content.Shared/Friction/SharedTileFrictionController.cs b/Content.Shared/Friction/SharedTileFrictionController.cs index a53b96ed90..dd353ef4c2 100644 --- a/Content.Shared/Friction/SharedTileFrictionController.cs +++ b/Content.Shared/Friction/SharedTileFrictionController.cs @@ -59,7 +59,7 @@ namespace Content.Shared.Friction Mover.UseMobMovement(body.Owner)) continue; var surfaceFriction = GetTileFriction(body); - var bodyModifier = IoCManager.Resolve().GetComponentOrNull(body.Owner)?.Modifier ?? 1.0f; + var bodyModifier = IoCManager.Resolve().GetComponentOrNull(body.Owner)?.Modifier ?? 1.0f; var friction = _frictionModifier * surfaceFriction * bodyModifier; ReduceLinearVelocity(prediction, body, friction, frameTime); diff --git a/Content.Shared/Friction/TileFrictionModifier.cs b/Content.Shared/Friction/TileFrictionModifier.cs index d49bc81034..c5858f0a36 100644 --- a/Content.Shared/Friction/TileFrictionModifier.cs +++ b/Content.Shared/Friction/TileFrictionModifier.cs @@ -9,8 +9,7 @@ using Robust.Shared.ViewVariables; namespace Content.Shared.Friction { [RegisterComponent] - [ComponentProtoName("TileFrictionModifier")] - public sealed class SharedTileFrictionModifier : Component + public sealed class TileFrictionModifierComponent : Component { /// /// Multiply the tilefriction cvar by this to get the body's actual tilefriction. @@ -43,7 +42,7 @@ namespace Content.Shared.Friction } [NetSerializable, Serializable] - protected sealed class TileFrictionComponentState : ComponentState + private sealed class TileFrictionComponentState : ComponentState { public float Modifier; diff --git a/Content.Shared/Rotatable/RotatableComponent.cs b/Content.Shared/Rotatable/RotatableComponent.cs index 225119d1f0..24aedea6d3 100644 --- a/Content.Shared/Rotatable/RotatableComponent.cs +++ b/Content.Shared/Rotatable/RotatableComponent.cs @@ -13,20 +13,20 @@ namespace Content.Shared.Rotatable /// [ViewVariables(VVAccess.ReadWrite)] [DataField("rotateWhileAnchored")] - public bool RotateWhileAnchored { get; protected set; } + public bool RotateWhileAnchored { get; private set; } /// /// If true, will rotate entity in players direction when pulled /// [ViewVariables(VVAccess.ReadWrite)] [DataField("rotateWhilePulling")] - public bool RotateWhilePulling { get; protected set; } = true; + public bool RotateWhilePulling { get; private set; } = true; /// /// The angular value to change when using the rotate verbs. /// [ViewVariables(VVAccess.ReadWrite)] [DataField("increment")] - public Angle Increment { get; protected set; } = Angle.FromDegrees(90); + public Angle Increment { get; private set; } = Angle.FromDegrees(90); } } diff --git a/Content.Shared/Verbs/SharedVerbSystem.cs b/Content.Shared/Verbs/SharedVerbSystem.cs index 2f7626a370..bfde29b3b6 100644 --- a/Content.Shared/Verbs/SharedVerbSystem.cs +++ b/Content.Shared/Verbs/SharedVerbSystem.cs @@ -16,7 +16,6 @@ namespace Content.Shared.Verbs [Dependency] private readonly SharedInteractionSystem _interactionSystem = default!; [Dependency] private readonly ActionBlockerSystem _actionBlockerSystem = default!; [Dependency] protected readonly SharedContainerSystem ContainerSystem = default!; - [Dependency] private readonly ExamineSystemShared _examineSystem = default!; public override void Initialize() {