tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Replace pragma warning 649 disable/restore with default!

Browse Source
This commit is contained in:
DrSmugleaf
2020-08-24 14:10:28 +02:00
parent 9e6459ac79
commit 8a27a5322a
147 changed files with 435 additions and 724 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Content.Client/Chat/ChatManager.cs
View File

@@ -70,14 +70,12 @@ namespace Content.Client.Chat
// Flag Enums for holding filtered channels // Flag Enums for holding filtered channels
private ChatChannel _filteredChannels; private ChatChannel _filteredChannels;
#pragma warning disable 649 [Dependency] private readonly IClientNetManager _netManager = default!;
[Dependency] private readonly IClientNetManager _netManager; [Dependency] private readonly IClientConsole _console = default!;
[Dependency] private readonly IClientConsole _console; [Dependency] private readonly IEntityManager _entityManager = default!;
[Dependency] private readonly IEntityManager _entityManager; [Dependency] private readonly IEyeManager _eyeManager = default!;
[Dependency] private readonly IEyeManager _eyeManager; [Dependency] private readonly IUserInterfaceManager _userInterfaceManager = default!;
[Dependency] private readonly IUserInterfaceManager _userInterfaceManager;
[Dependency] private readonly IClientConGroupController _groupController = default!; [Dependency] private readonly IClientConGroupController _groupController = default!;
#pragma warning restore 649
private ChatBox _currentChatBox; private ChatBox _currentChatBox;
private Control _speechBubbleRoot; private Control _speechBubbleRoot;
@@ -231,7 +229,7 @@ namespace Content.Client.Chat
{ {
string locWarning = Loc.GetString("Your message exceeds {0} character limit", _maxMessageLength); string locWarning = Loc.GetString("Your message exceeds {0} character limit", _maxMessageLength);
_currentChatBox?.AddLine(locWarning, ChatChannel.Server, Color.Orange); _currentChatBox?.AddLine(locWarning, ChatChannel.Server, Color.Orange);
_currentChatBox.ClearOnEnter = false; // The text shouldn't be cleared if it hasn't been sent _currentChatBox.ClearOnEnter = false; // The text shouldn't be cleared if it hasn't been sent
return; return;
} }

14
Content.Client/ClientNotifyManager.cs
View File

@@ -21,14 +21,12 @@ namespace Content.Client
{ {
public class ClientNotifyManager : SharedNotifyManager, IClientNotifyManager public class ClientNotifyManager : SharedNotifyManager, IClientNotifyManager
{ {
#pragma warning disable 649 [Dependency] private readonly IPlayerManager _playerManager = default!;
[Dependency] private IPlayerManager _playerManager; [Dependency] private readonly IUserInterfaceManager _userInterfaceManager = default!;
[Dependency] private IUserInterfaceManager _userInterfaceManager; [Dependency] private readonly IInputManager _inputManager = default!;
[Dependency] private IInputManager _inputManager; [Dependency] private readonly IEyeManager _eyeManager = default!;
[Dependency] private IEyeManager _eyeManager; [Dependency] private readonly IClientNetManager _netManager = default!;
[Dependency] private IClientNetManager _netManager; [Dependency] private readonly IEntityManager _entityManager = default!;
[Dependency] private IEntityManager _entityManager;
#pragma warning restore 649
private readonly List<PopupLabel> _aliveLabels = new List<PopupLabel>(); private readonly List<PopupLabel> _aliveLabels = new List<PopupLabel>();
private bool _initialized; private bool _initialized;

4
Content.Client/ClientPreferencesManager.cs
View File

@@ -14,9 +14,7 @@ namespace Content.Client
/// </summary> /// </summary>
public class ClientPreferencesManager : SharedPreferencesManager, IClientPreferencesManager public class ClientPreferencesManager : SharedPreferencesManager, IClientPreferencesManager
{ {
#pragma warning disable 649 [Dependency] private readonly IClientNetManager _netManager = default!;
[Dependency] private readonly IClientNetManager _netManager;
#pragma warning restore 649
public event Action OnServerDataLoaded; public event Action OnServerDataLoaded;
public GameSettings Settings { get; private set; } public GameSettings Settings { get; private set; }

4
Content.Client/Command/CommunicationsConsoleMenu.cs
View File

@@ -12,9 +12,7 @@ namespace Content.Client.Command
{ {
public class CommunicationsConsoleMenu : SS14Window public class CommunicationsConsoleMenu : SS14Window
{ {
#pragma warning disable 649 [Dependency] private readonly ILocalizationManager _localizationManager = default!;
[Dependency] private readonly ILocalizationManager _localizationManager;
#pragma warning restore 649
protected override Vector2? CustomSize => new Vector2(600, 400); protected override Vector2? CustomSize => new Vector2(600, 400);

8
Content.Client/Construction/ConstructionMenu.cs
View File

@@ -22,11 +22,9 @@ namespace Content.Client.Construction
{ {
public class ConstructionMenu : SS14Window public class ConstructionMenu : SS14Window
{ {
#pragma warning disable CS0649 [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
[Dependency] private readonly IPrototypeManager _prototypeManager; [Dependency] private readonly IResourceCache _resourceCache = default!;
[Dependency] private readonly IResourceCache _resourceCache; [Dependency] private readonly IEntitySystemManager _systemManager = default!;
[Dependency] private readonly IEntitySystemManager _systemManager;
#pragma warning restore
private readonly Button BuildButton; private readonly Button BuildButton;
private readonly Button EraseButton; private readonly Button EraseButton;

14
Content.Client/EntryPoint.cs
View File

@@ -39,14 +39,12 @@ namespace Content.Client
{ {
public class EntryPoint : GameClient public class EntryPoint : GameClient
{ {
#pragma warning disable 649 [Dependency] private readonly IPlayerManager _playerManager = default!;
[Dependency] private readonly IPlayerManager _playerManager; [Dependency] private readonly IBaseClient _baseClient = default!;
[Dependency] private readonly IBaseClient _baseClient; [Dependency] private readonly IEscapeMenuOwner _escapeMenuOwner = default!;
[Dependency] private readonly IEscapeMenuOwner _escapeMenuOwner; [Dependency] private readonly IGameController _gameController = default!;
[Dependency] private readonly IGameController _gameController; [Dependency] private readonly IStateManager _stateManager = default!;
[Dependency] private readonly IStateManager _stateManager; [Dependency] private readonly IConfigurationManager _configurationManager = default!;
[Dependency] private readonly IConfigurationManager _configurationManager;
#pragma warning restore 649
public override void Init() public override void Init()
{ {

22
Content.Client/EscapeMenuOwner.cs
View File

@@ -17,18 +17,16 @@ namespace Content.Client
{ {
internal sealed class EscapeMenuOwner : IEscapeMenuOwner internal sealed class EscapeMenuOwner : IEscapeMenuOwner
{ {
#pragma warning disable 649 [Dependency] private readonly IClientConsole _clientConsole = default!;
[Dependency] private readonly IClientConsole _clientConsole; [Dependency] private readonly IConfigurationManager _configurationManager = default!;
[Dependency] private readonly IConfigurationManager _configurationManager; [Dependency] private readonly IInputManager _inputManager = default!;
[Dependency] private readonly IInputManager _inputManager; [Dependency] private readonly IPlacementManager _placementManager = default!;
[Dependency] private readonly IPlacementManager _placementManager; [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
[Dependency] private readonly IPrototypeManager _prototypeManager; [Dependency] private readonly IResourceCache _resourceCache = default!;
[Dependency] private readonly IResourceCache _resourceCache; [Dependency] private readonly IStateManager _stateManager = default!;
[Dependency] private readonly IStateManager _stateManager; [Dependency] private readonly ITileDefinitionManager _tileDefinitionManager = default!;
[Dependency] private readonly ITileDefinitionManager _tileDefinitionManager; [Dependency] private readonly IGameHud _gameHud = default!;
[Dependency] private readonly IGameHud _gameHud; [Dependency] private readonly ILocalizationManager _localizationManager = default!;
[Dependency] private readonly ILocalizationManager _localizationManager;
#pragma warning restore 649
private EscapeMenu _escapeMenu; private EscapeMenu _escapeMenu;

7
Content.Client/GameObjects/Components/Access/IdCardConsoleBoundUserInterface.cs
View File

@@ -10,10 +10,9 @@ namespace Content.Client.GameObjects.Components.Access
{ {
public class IdCardConsoleBoundUserInterface : BoundUserInterface public class IdCardConsoleBoundUserInterface : BoundUserInterface
{ {
#pragma warning disable 649 [Dependency] private readonly ILocalizationManager _localizationManager = default!;
[Dependency] private readonly ILocalizationManager _localizationManager; [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
[Dependency] private readonly IPrototypeManager _prototypeManager;
#pragma warning restore 649
public IdCardConsoleBoundUserInterface(ClientUserInterfaceComponent owner, object uiKey) : base(owner, uiKey) public IdCardConsoleBoundUserInterface(ClientUserInterfaceComponent owner, object uiKey) : base(owner, uiKey)
{ {
} }

8
Content.Client/GameObjects/Components/Actor/CharacterInfoComponent.cs
View File

@@ -14,12 +14,10 @@ namespace Content.Client.GameObjects.Components.Actor
[RegisterComponent] [RegisterComponent]
public sealed class CharacterInfoComponent : Component, ICharacterUI public sealed class CharacterInfoComponent : Component, ICharacterUI
{ {
private CharacterInfoControl _control; [Dependency] private readonly ILocalizationManager _loc = default!;
[Dependency] private readonly IResourceCache _resourceCache = default!;
#pragma warning disable 649 private CharacterInfoControl _control;
[Dependency] private readonly ILocalizationManager _loc;
[Dependency] private readonly IResourceCache _resourceCache;
#pragma warning restore 649
public override string Name => "CharacterInfo"; public override string Name => "CharacterInfo";

7
Content.Client/GameObjects/Components/Actor/CharacterInterface.cs
View File

@@ -20,12 +20,9 @@ namespace Content.Client.GameObjects.Components.Actor
[RegisterComponent] [RegisterComponent]
public class CharacterInterface : Component public class CharacterInterface : Component
{ {
public override string Name => "Character Interface Component"; [Dependency] private readonly IGameHud _gameHud = default!;
[Dependency] public override string Name => "Character Interface Component";
#pragma warning disable 649
private readonly IGameHud _gameHud;
#pragma warning restore 649
/// <summary> /// <summary>
/// Window to hold each of the character interfaces /// Window to hold each of the character interfaces

4
Content.Client/GameObjects/Components/Cargo/GalacticMarketComponent.cs
View File

@@ -10,9 +10,7 @@ namespace Content.Client.GameObjects.Components.Cargo
[RegisterComponent] [RegisterComponent]
public class GalacticMarketComponent : SharedGalacticMarketComponent public class GalacticMarketComponent : SharedGalacticMarketComponent
{ {
#pragma warning disable CS0649 [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
[Dependency] private IPrototypeManager _prototypeManager;
#pragma warning restore
/// <summary> /// <summary>
/// Event called when the database is updated. /// Event called when the database is updated.

4
Content.Client/GameObjects/Components/Chemistry/ChemMaster/ChemMasterWindow.cs
View File

@@ -21,9 +21,7 @@ namespace Content.Client.GameObjects.Components.Chemistry.ChemMaster
/// </summary> /// </summary>
public class ChemMasterWindow : SS14Window public class ChemMasterWindow : SS14Window
{ {
#pragma warning disable 649 [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
[Dependency] private readonly IPrototypeManager _prototypeManager;
#pragma warning restore 649
/// <summary>Contains info about the reagent container such as it's contents, if one is loaded into the dispenser.</summary> /// <summary>Contains info about the reagent container such as it's contents, if one is loaded into the dispenser.</summary>
private readonly VBoxContainer ContainerInfo; private readonly VBoxContainer ContainerInfo;

4
Content.Client/GameObjects/Components/Chemistry/ReagentDispenser/ReagentDispenserWindow.cs
View File

@@ -20,9 +20,7 @@ namespace Content.Client.GameObjects.Components.Chemistry.ReagentDispenser
/// </summary> /// </summary>
public class ReagentDispenserWindow : SS14Window public class ReagentDispenserWindow : SS14Window
{ {
#pragma warning disable 649 [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
[Dependency] private readonly IPrototypeManager _prototypeManager;
#pragma warning restore 649
/// <summary>Contains info about the reagent container such as it's contents, if one is loaded into the dispenser.</summary> /// <summary>Contains info about the reagent container such as it's contents, if one is loaded into the dispenser.</summary>
private readonly VBoxContainer ContainerInfo; private readonly VBoxContainer ContainerInfo;

7
Content.Client/GameObjects/Components/Command/CommunicationsConsoleBoundUserInterface.cs
View File

@@ -11,12 +11,9 @@ namespace Content.Client.GameObjects.Components.Command
{ {
public class CommunicationsConsoleBoundUserInterface : BoundUserInterface public class CommunicationsConsoleBoundUserInterface : BoundUserInterface
{ {
[ViewVariables] [Dependency] private readonly IGameTiming _gameTiming = default!;
private CommunicationsConsoleMenu _menu;
#pragma warning disable 649 [ViewVariables] private CommunicationsConsoleMenu _menu;
[Dependency] private IGameTiming _gameTiming;
#pragma warning restore 649
public bool CountdownStarted { get; private set; } public bool CountdownStarted { get; private set; }

14
Content.Client/GameObjects/Components/HUD/Inventory/HumanInventoryInterfaceController.cs
View File

@@ -18,11 +18,9 @@ namespace Content.Client.GameObjects.Components.HUD.Inventory
[UsedImplicitly] [UsedImplicitly]
public class HumanInventoryInterfaceController : InventoryInterfaceController public class HumanInventoryInterfaceController : InventoryInterfaceController
{ {
#pragma warning disable 649 [Dependency] private readonly ILocalizationManager _loc = default!;
[Dependency] private readonly ILocalizationManager _loc; [Dependency] private readonly IResourceCache _resourceCache = default!;
[Dependency] private readonly IResourceCache _resourceCache; [Dependency] private readonly IItemSlotManager _itemSlotManager = default!;
[Dependency] private readonly IItemSlotManager _itemSlotManager;
#pragma warning restore 649
private readonly Dictionary<Slots, List<ItemSlotButton>> _inventoryButtons private readonly Dictionary<Slots, List<ItemSlotButton>> _inventoryButtons
= new Dictionary<Slots, List<ItemSlotButton>>(); = new Dictionary<Slots, List<ItemSlotButton>>();
@@ -43,7 +41,7 @@ namespace Content.Client.GameObjects.Components.HUD.Inventory
base.Initialize(); base.Initialize();
_window = new HumanInventoryWindow(_loc, _resourceCache); _window = new HumanInventoryWindow(_loc, _resourceCache);
_window.OnClose += () => _gameHud.InventoryButtonDown = false; _window.OnClose += () => GameHud.InventoryButtonDown = false;
foreach (var (slot, button) in _window.Buttons) foreach (var (slot, button) in _window.Buttons)
{ {
button.OnPressed = (e) => AddToInventory(e, slot); button.OnPressed = (e) => AddToInventory(e, slot);
@@ -153,7 +151,7 @@ namespace Content.Client.GameObjects.Components.HUD.Inventory
{ {
base.PlayerAttached(); base.PlayerAttached();
_gameHud.InventoryQuickButtonContainer.AddChild(_quickButtonsContainer); GameHud.InventoryQuickButtonContainer.AddChild(_quickButtonsContainer);
// Update all the buttons to make sure they check out. // Update all the buttons to make sure they check out.
@@ -175,7 +173,7 @@ namespace Content.Client.GameObjects.Components.HUD.Inventory
{ {
base.PlayerDetached(); base.PlayerDetached();
_gameHud.InventoryQuickButtonContainer.RemoveChild(_quickButtonsContainer); GameHud.InventoryQuickButtonContainer.RemoveChild(_quickButtonsContainer);
foreach (var (slot, list) in _inventoryButtons) foreach (var (slot, list) in _inventoryButtons)
{ {

10
Content.Client/GameObjects/Components/HUD/Inventory/InventoryInterfaceController.cs
View File

@@ -12,9 +12,7 @@ namespace Content.Client.GameObjects.Components.HUD.Inventory
{ {
public abstract class InventoryInterfaceController : IDisposable public abstract class InventoryInterfaceController : IDisposable
{ {
#pragma warning disable 649 [Dependency] protected readonly IGameHud GameHud = default!;
[Dependency] protected readonly IGameHud _gameHud;
#pragma warning restore 649
protected InventoryInterfaceController(ClientInventoryComponent owner) protected InventoryInterfaceController(ClientInventoryComponent owner)
{ {
@@ -31,8 +29,8 @@ namespace Content.Client.GameObjects.Components.HUD.Inventory
public virtual void PlayerAttached() public virtual void PlayerAttached()
{ {
_gameHud.InventoryButtonVisible = true; GameHud.InventoryButtonVisible = true;
_gameHud.InventoryButtonToggled = b => GameHud.InventoryButtonToggled = b =>
{ {
if (b) if (b)
{ {
@@ -47,7 +45,7 @@ namespace Content.Client.GameObjects.Components.HUD.Inventory
public virtual void PlayerDetached() public virtual void PlayerDetached()
{ {
_gameHud.InventoryButtonVisible = false; GameHud.InventoryButtonVisible = false;
Window.Close(); Window.Close();
} }

6
Content.Client/GameObjects/Components/InteractionOutlineComponent.cs
View File

@@ -9,15 +9,13 @@ namespace Content.Client.GameObjects.Components
[RegisterComponent] [RegisterComponent]
public class InteractionOutlineComponent : Component public class InteractionOutlineComponent : Component
{ {
[Dependency] private readonly IPrototypeManager _prototypeManager = default!;
private const string ShaderInRange = "SelectionOutlineInrange"; private const string ShaderInRange = "SelectionOutlineInrange";
private const string ShaderOutOfRange = "SelectionOutline"; private const string ShaderOutOfRange = "SelectionOutline";
public override string Name => "InteractionOutline"; public override string Name => "InteractionOutline";
#pragma warning disable 649
[Dependency] private readonly IPrototypeManager _prototypeManager;
#pragma warning restore 649
private ShaderInstance _selectionShaderInstance; private ShaderInstance _selectionShaderInstance;
private ShaderInstance _selectionShaderInRangeInstance; private ShaderInstance _selectionShaderInRangeInstance;

7
Content.Client/GameObjects/Components/Kitchen/MicrowaveBoundUserInterface.cs
View File

@@ -20,10 +20,9 @@ namespace Content.Client.GameObjects.Components.Kitchen
{ {
public class MicrowaveBoundUserInterface : BoundUserInterface public class MicrowaveBoundUserInterface : BoundUserInterface
{ {
#pragma warning disable 649 [Dependency] private readonly IEntityManager _entityManager = default!;
[Dependency] private readonly IEntityManager _entityManager; [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
[Dependency] private readonly IPrototypeManager _prototypeManager;
#pragma warning restore 649
private MicrowaveMenu _menu; private MicrowaveMenu _menu;
private Dictionary<int, EntityUid> _solids = new Dictionary<int, EntityUid>(); private Dictionary<int, EntityUid> _solids = new Dictionary<int, EntityUid>();

11
Content.Client/GameObjects/Components/Mobs/ClientOverlayEffectsComponent.cs
View File

@@ -24,6 +24,10 @@ namespace Content.Client.GameObjects.Components.Mobs
[ComponentReference(typeof(SharedOverlayEffectsComponent))] [ComponentReference(typeof(SharedOverlayEffectsComponent))]
public sealed class ClientOverlayEffectsComponent : SharedOverlayEffectsComponent//, ICharacterUI public sealed class ClientOverlayEffectsComponent : SharedOverlayEffectsComponent//, ICharacterUI
{ {
[Dependency] private readonly IOverlayManager _overlayManager = default!;
[Dependency] private readonly IReflectionManager _reflectionManager = default!;
[Dependency] private readonly IClientNetManager _netManager = default!;
/// <summary> /// <summary>
/// A list of overlay containers representing the current overlays applied /// A list of overlay containers representing the current overlays applied
/// </summary> /// </summary>
@@ -36,13 +40,6 @@ namespace Content.Client.GameObjects.Components.Mobs
set => SetEffects(value); set => SetEffects(value);
} }
#pragma warning disable 649
// Required dependencies
[Dependency] private readonly IOverlayManager _overlayManager;
[Dependency] private readonly IReflectionManager _reflectionManager;
[Dependency] private readonly IClientNetManager _netManager;
#pragma warning restore 649
public override void Initialize() public override void Initialize()
{ {
base.Initialize(); base.Initialize();

10
Content.Client/GameObjects/Components/Mobs/ClientStatusEffectsComponent.cs
View File

@@ -23,12 +23,10 @@ namespace Content.Client.GameObjects.Components.Mobs
[ComponentReference(typeof(SharedStatusEffectsComponent))] [ComponentReference(typeof(SharedStatusEffectsComponent))]
public sealed class ClientStatusEffectsComponent : SharedStatusEffectsComponent public sealed class ClientStatusEffectsComponent : SharedStatusEffectsComponent
{ {
#pragma warning disable 649 [Dependency] private readonly IPlayerManager _playerManager = default!;
[Dependency] private readonly IPlayerManager _playerManager; [Dependency] private readonly IResourceCache _resourceCache = default!;
[Dependency] private readonly IResourceCache _resourceCache; [Dependency] private readonly IUserInterfaceManager _userInterfaceManager = default!;
[Dependency] private readonly IUserInterfaceManager _userInterfaceManager; [Dependency] private readonly IGameTiming _gameTiming = default!;
[Dependency] private readonly IGameTiming _gameTiming;
#pragma warning restore 649
private StatusEffectsUI _ui; private StatusEffectsUI _ui;
private Dictionary<StatusEffect, StatusEffectStatus> _status = new Dictionary<StatusEffect, StatusEffectStatus>(); private Dictionary<StatusEffect, StatusEffectStatus> _status = new Dictionary<StatusEffect, StatusEffectStatus>();

6
Content.Client/GameObjects/Components/Mobs/CombatModeComponent.cs
View File

@@ -12,10 +12,8 @@ namespace Content.Client.GameObjects.Components.Mobs
[ComponentReference(typeof(SharedCombatModeComponent))] [ComponentReference(typeof(SharedCombatModeComponent))]
public sealed class CombatModeComponent : SharedCombatModeComponent public sealed class CombatModeComponent : SharedCombatModeComponent
{ {
#pragma warning disable 649 [Dependency] private readonly IPlayerManager _playerManager = default!;
[Dependency] private readonly IPlayerManager _playerManager; [Dependency] private readonly IGameHud _gameHud = default!;
[Dependency] private readonly IGameHud _gameHud;
#pragma warning restore 649
public override bool IsInCombatMode public override bool IsInCombatMode
{ {

10
Content.Client/GameObjects/Components/Observer/GhostComponent.cs
View File

@@ -12,6 +12,10 @@ namespace Content.Client.GameObjects.Components.Observer
[RegisterComponent] [RegisterComponent]
public class GhostComponent : SharedGhostComponent public class GhostComponent : SharedGhostComponent
{ {
[Dependency] private readonly IGameHud _gameHud = default!;
[Dependency] private readonly IPlayerManager _playerManager = default!;
[Dependency] private readonly IComponentManager _componentManager = default!;
private GhostGui _gui; private GhostGui _gui;
[ViewVariables(VVAccess.ReadOnly)] [ViewVariables(VVAccess.ReadOnly)]
@@ -19,12 +23,6 @@ namespace Content.Client.GameObjects.Components.Observer
private bool _isAttached; private bool _isAttached;
#pragma warning disable 649
[Dependency] private readonly IGameHud _gameHud;
[Dependency] private readonly IPlayerManager _playerManager;
[Dependency] private IComponentManager _componentManager;
#pragma warning restore 649
public override void OnRemove() public override void OnRemove()
{ {
base.OnRemove(); base.OnRemove();

7
Content.Client/GameObjects/Components/PDA/PDABoundUserInterface.cs
View File

@@ -19,10 +19,9 @@ namespace Content.Client.GameObjects.Components.PDA
{ {
public class PDABoundUserInterface : BoundUserInterface public class PDABoundUserInterface : BoundUserInterface
{ {
#pragma warning disable 649 [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
[Dependency] private readonly IPrototypeManager _prototypeManager; [Dependency] private readonly IUserInterfaceManager _userInterfaceManager = default!;
[Dependency] private readonly IUserInterfaceManager _userInterfaceManager;
#pragma warning restore 649
private PDAMenu _menu; private PDAMenu _menu;
private PDAMenuPopup failPopup; private PDAMenuPopup failPopup;

6
Content.Client/GameObjects/Components/Research/LatheBoundUserInterface.cs
View File

@@ -12,10 +12,8 @@ namespace Content.Client.GameObjects.Components.Research
{ {
public class LatheBoundUserInterface : BoundUserInterface public class LatheBoundUserInterface : BoundUserInterface
{ {
#pragma warning disable CS0649 [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
[Dependency]
private IPrototypeManager _prototypeManager;
#pragma warning restore
[ViewVariables] [ViewVariables]
private LatheMenu _menu; private LatheMenu _menu;
[ViewVariables] [ViewVariables]

5
Content.Client/GameObjects/Components/Research/LatheDatabaseComponent.cs
View File

@@ -10,10 +10,7 @@ namespace Content.Client.GameObjects.Components.Research
[ComponentReference(typeof(SharedLatheDatabaseComponent))] [ComponentReference(typeof(SharedLatheDatabaseComponent))]
public class LatheDatabaseComponent : SharedLatheDatabaseComponent public class LatheDatabaseComponent : SharedLatheDatabaseComponent
{ {
#pragma warning disable CS0649 [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
[Dependency]
private IPrototypeManager _prototypeManager;
#pragma warning restore
public override void HandleComponentState(ComponentState curState, ComponentState nextState) public override void HandleComponentState(ComponentState curState, ComponentState nextState)
{ {

5
Content.Client/GameObjects/Components/Research/ProtolatheDatabaseComponent.cs
View File

@@ -11,10 +11,7 @@ namespace Content.Client.GameObjects.Components.Research
[ComponentReference(typeof(SharedLatheDatabaseComponent))] [ComponentReference(typeof(SharedLatheDatabaseComponent))]
public class ProtolatheDatabaseComponent : SharedProtolatheDatabaseComponent public class ProtolatheDatabaseComponent : SharedProtolatheDatabaseComponent
{ {
#pragma warning disable CS0649 [Dependency] private IPrototypeManager _prototypeManager = default!;
[Dependency]
private IPrototypeManager _prototypeManager;
#pragma warning restore
/// <summary> /// <summary>
/// Invoked when the database gets updated. /// Invoked when the database gets updated.

5
Content.Client/GameObjects/Components/Sound/LoopingSoundComponent.cs
View File

@@ -16,11 +16,10 @@ namespace Content.Client.GameObjects.Components.Sound
[RegisterComponent] [RegisterComponent]
public class LoopingSoundComponent : SharedLoopingSoundComponent public class LoopingSoundComponent : SharedLoopingSoundComponent
{ {
[Dependency] private readonly IRobustRandom _random = default!;
private readonly Dictionary<ScheduledSound, IPlayingAudioStream> _audioStreams = new Dictionary<ScheduledSound, IPlayingAudioStream>(); private readonly Dictionary<ScheduledSound, IPlayingAudioStream> _audioStreams = new Dictionary<ScheduledSound, IPlayingAudioStream>();
private AudioSystem _audioSystem; private AudioSystem _audioSystem;
#pragma warning disable 649
[Dependency] private readonly IRobustRandom _random;
#pragma warning restore 649
public override void StopAllSounds() public override void StopAllSounds()
{ {

4
Content.Client/GameObjects/EntitySystems/AI/ClientAiDebugSystem.cs
View File

@@ -15,9 +15,7 @@ namespace Content.Client.GameObjects.EntitySystems.AI
#if DEBUG #if DEBUG
public class ClientAiDebugSystem : EntitySystem public class ClientAiDebugSystem : EntitySystem
{ {
#pragma warning disable 649 [Dependency] private readonly IEyeManager _eyeManager = default!;
[Dependency] private IEyeManager _eyeManager;
#pragma warning restore 649
private AiDebugMode _tooltips = AiDebugMode.None; private AiDebugMode _tooltips = AiDebugMode.None;
private readonly Dictionary<IEntity, PanelContainer> _aiBoxes = new Dictionary<IEntity,PanelContainer>(); private readonly Dictionary<IEntity, PanelContainer> _aiBoxes = new Dictionary<IEntity,PanelContainer>();

6
Content.Client/GameObjects/EntitySystems/CharacterInterfaceSystem.cs
View File

@@ -11,10 +11,8 @@ namespace Content.Client.GameObjects.EntitySystems
{ {
public sealed class CharacterInterfaceSystem : EntitySystem public sealed class CharacterInterfaceSystem : EntitySystem
{ {
#pragma warning disable 649 [Dependency] private readonly IGameHud _gameHud = default!;
[Dependency] private readonly IGameHud _gameHud; [Dependency] private readonly IPlayerManager _playerManager = default!;
[Dependency] private readonly IPlayerManager _playerManager;
#pragma warning restore 649
public override void Initialize() public override void Initialize()
{ {

6
Content.Client/GameObjects/EntitySystems/ClientInventorySystem.cs
View File

@@ -11,10 +11,8 @@ namespace Content.Client.GameObjects.EntitySystems
{ {
public sealed class ClientInventorySystem : EntitySystem public sealed class ClientInventorySystem : EntitySystem
{ {
#pragma warning disable 649 [Dependency] private readonly IGameHud _gameHud = default!;
[Dependency] private readonly IGameHud _gameHud; [Dependency] private readonly IPlayerManager _playerManager = default!;
[Dependency] private readonly IPlayerManager _playerManager;
#pragma warning restore 649
public override void Initialize() public override void Initialize()
{ {

8
Content.Client/GameObjects/EntitySystems/CombatModeSystem.cs
View File

@@ -17,11 +17,9 @@ namespace Content.Client.GameObjects.EntitySystems
[UsedImplicitly] [UsedImplicitly]
public sealed class CombatModeSystem : SharedCombatModeSystem public sealed class CombatModeSystem : SharedCombatModeSystem
{ {
#pragma warning disable 649 [Dependency] private readonly IGameHud _gameHud = default!;
[Dependency] private readonly IGameHud _gameHud; [Dependency] private readonly IPlayerManager _playerManager = default!;
[Dependency] private readonly IPlayerManager _playerManager; [Dependency] private readonly IGameTiming _gameTiming = default!;
[Dependency] private readonly IGameTiming _gameTiming;
#pragma warning restore 649
public override void Initialize() public override void Initialize()
{ {

8
Content.Client/GameObjects/EntitySystems/ConstructionSystem.cs
View File

@@ -24,11 +24,9 @@ namespace Content.Client.GameObjects.EntitySystems
[UsedImplicitly] [UsedImplicitly]
public class ConstructionSystem : SharedConstructionSystem public class ConstructionSystem : SharedConstructionSystem
{ {
#pragma warning disable 649 [Dependency] private readonly IGameHud _gameHud = default!;
[Dependency] private readonly IGameHud _gameHud; [Dependency] private readonly IPlayerManager _playerManager = default!;
[Dependency] private readonly IPlayerManager _playerManager; [Dependency] private readonly IEntityManager _entityManager = default!;
[Dependency] private readonly IEntityManager _entityManager;
#pragma warning restore 649
private int _nextId; private int _nextId;
private readonly Dictionary<int, ConstructionGhostComponent> _ghosts = new Dictionary<int, ConstructionGhostComponent>(); private readonly Dictionary<int, ConstructionGhostComponent> _ghosts = new Dictionary<int, ConstructionGhostComponent>();

16
Content.Client/GameObjects/EntitySystems/DragDropSystem.cs
View File

@@ -30,6 +30,13 @@ namespace Content.Client.GameObjects.EntitySystems
[UsedImplicitly] [UsedImplicitly]
public class DragDropSystem : EntitySystem public class DragDropSystem : EntitySystem
{ {
[Dependency] private readonly IStateManager _stateManager = default!;
[Dependency] private readonly IEntityManager _entityManager = default!;
[Dependency] private readonly IInputManager _inputManager = default!;
[Dependency] private readonly IEyeManager _eyeManager = default!;
[Dependency] private readonly IPrototypeManager _prototypeManager = default!;
[Dependency] private readonly IMapManager _mapManager = default!;
// drag will be triggered when mouse leaves this deadzone around the click position. // drag will be triggered when mouse leaves this deadzone around the click position.
private const float DragDeadzone = 2f; private const float DragDeadzone = 2f;
// how often to recheck possible targets (prevents calling expensive // how often to recheck possible targets (prevents calling expensive
@@ -44,15 +51,6 @@ namespace Content.Client.GameObjects.EntitySystems
private const string ShaderDropTargetInRange = "SelectionOutlineInrange"; private const string ShaderDropTargetInRange = "SelectionOutlineInrange";
private const string ShaderDropTargetOutOfRange = "SelectionOutline"; private const string ShaderDropTargetOutOfRange = "SelectionOutline";
#pragma warning disable 649
[Dependency] private readonly IStateManager _stateManager;
[Dependency] private readonly IEntityManager _entityManager;
[Dependency] private readonly IInputManager _inputManager;
[Dependency] private readonly IEyeManager _eyeManager;
[Dependency] private readonly IPrototypeManager _prototypeManager;
[Dependency] private readonly IMapManager _mapManager;
#pragma warning restore 649
// entity performing the drag action // entity performing the drag action
private IEntity _dragger; private IEntity _dragger;
private IEntity _draggedEntity; private IEntity _draggedEntity;

12
Content.Client/GameObjects/EntitySystems/ExamineSystem.cs
View File

@@ -25,14 +25,12 @@ namespace Content.Client.GameObjects.EntitySystems
[UsedImplicitly] [UsedImplicitly]
internal sealed class ExamineSystem : ExamineSystemShared internal sealed class ExamineSystem : ExamineSystemShared
{ {
public const string StyleClassEntityTooltip = "entity-tooltip"; [Dependency] private readonly IInputManager _inputManager = default!;
[Dependency] private readonly IUserInterfaceManager _userInterfaceManager = default!;
[Dependency] private readonly IEntityManager _entityManager = default!;
[Dependency] private readonly IPlayerManager _playerManager = default!;
#pragma warning disable 649 public const string StyleClassEntityTooltip = "entity-tooltip";
[Dependency] private IInputManager _inputManager;
[Dependency] private IUserInterfaceManager _userInterfaceManager;
[Dependency] private IEntityManager _entityManager;
[Dependency] private IPlayerManager _playerManager;
#pragma warning restore 649
private Popup _examineTooltipOpen; private Popup _examineTooltipOpen;
private CancellationTokenSource _requestCancelTokenSource; private CancellationTokenSource _requestCancelTokenSource;

4
Content.Client/GameObjects/EntitySystems/IconSmoothSystem.cs
View File

@@ -19,9 +19,7 @@ namespace Content.Client.GameObjects.EntitySystems
[UsedImplicitly] [UsedImplicitly]
internal sealed class IconSmoothSystem : EntitySystem internal sealed class IconSmoothSystem : EntitySystem
{ {
#pragma warning disable 649 [Dependency] private readonly IMapManager _mapManager = default!;
[Dependency] private readonly IMapManager _mapManager;
#pragma warning restore 649
private readonly Queue<IEntity> _dirtyEntities = new Queue<IEntity>(); private readonly Queue<IEntity> _dirtyEntities = new Queue<IEntity>();

4
Content.Client/GameObjects/EntitySystems/MeleeWeaponSystem.cs
View File

@@ -17,9 +17,7 @@ namespace Content.Client.GameObjects.EntitySystems
[UsedImplicitly] [UsedImplicitly]
public sealed class MeleeWeaponSystem : EntitySystem public sealed class MeleeWeaponSystem : EntitySystem
{ {
#pragma warning disable 649 [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
[Dependency] private readonly IPrototypeManager _prototypeManager;
#pragma warning restore 649
public override void Initialize() public override void Initialize()
{ {

13
Content.Client/GameObjects/EntitySystems/RangedWeaponSystem.cs
View File

@@ -17,14 +17,11 @@ namespace Content.Client.GameObjects.EntitySystems
{ {
public class RangedWeaponSystem : EntitySystem public class RangedWeaponSystem : EntitySystem
{ {
[Dependency] private readonly IPlayerManager _playerManager = default!;
#pragma warning disable 649 [Dependency] private readonly IEyeManager _eyeManager = default!;
[Dependency] private readonly IPlayerManager _playerManager; [Dependency] private readonly IMapManager _mapManager = default!;
[Dependency] private readonly IEyeManager _eyeManager; [Dependency] private readonly IInputManager _inputManager = default!;
[Dependency] private readonly IMapManager _mapManager; [Dependency] private readonly IGameTiming _gameTiming = default!;
[Dependency] private readonly IInputManager _inputManager;
[Dependency] private readonly IGameTiming _gameTiming;
#pragma warning restore 649
private InputSystem _inputSystem; private InputSystem _inputSystem;
private CombatModeSystem _combatModeSystem; private CombatModeSystem _combatModeSystem;

4
Content.Client/GameObjects/EntitySystems/StatusEffectsSystem.cs
View File

@@ -7,9 +7,7 @@ namespace Content.Client.GameObjects.EntitySystems
{ {
public class StatusEffectsSystem : EntitySystem public class StatusEffectsSystem : EntitySystem
{ {
#pragma warning disable 649 [Dependency] private readonly IGameTiming _gameTiming = default!;
[Dependency] private IGameTiming _gameTiming;
#pragma warning restore 649
public override void FrameUpdate(float frameTime) public override void FrameUpdate(float frameTime)
{ {

8
Content.Client/GameObjects/EntitySystems/SubFloorHideSystem.cs
View File

@@ -15,12 +15,10 @@ namespace Content.Client.GameObjects.EntitySystems
/// </summary> /// </summary>
internal sealed class SubFloorHideSystem : EntitySystem internal sealed class SubFloorHideSystem : EntitySystem
{ {
private bool _enableAll; [Dependency] private readonly IMapManager _mapManager = default!;
[Dependency] private readonly ITileDefinitionManager _tileDefinitionManager = default!;
#pragma warning disable 649 private bool _enableAll;
[Dependency] private readonly IMapManager _mapManager;
[Dependency] private readonly ITileDefinitionManager _tileDefinitionManager;
#pragma warning restore 649
[ViewVariables(VVAccess.ReadWrite)] [ViewVariables(VVAccess.ReadWrite)]
public bool EnableAll public bool EnableAll

18
Content.Client/GameObjects/EntitySystems/VerbSystem.cs
View File

@@ -42,16 +42,14 @@ namespace Content.Client.GameObjects.EntitySystems
[UsedImplicitly] [UsedImplicitly]
public sealed class VerbSystem : EntitySystem public sealed class VerbSystem : EntitySystem
{ {
#pragma warning disable 649 [Dependency] private readonly IStateManager _stateManager = default!;
[Dependency] private readonly IStateManager _stateManager; [Dependency] private readonly IEntityManager _entityManager = default!;
[Dependency] private readonly IEntityManager _entityManager; [Dependency] private readonly IPlayerManager _playerManager = default!;
[Dependency] private readonly IPlayerManager _playerManager; [Dependency] private readonly IInputManager _inputManager = default!;
[Dependency] private readonly IInputManager _inputManager; [Dependency] private readonly IItemSlotManager _itemSlotManager = default!;
[Dependency] private readonly IItemSlotManager _itemSlotManager; [Dependency] private readonly IGameTiming _gameTiming = default!;
[Dependency] private readonly IGameTiming _gameTiming; [Dependency] private readonly IUserInterfaceManager _userInterfaceManager = default!;
[Dependency] private readonly IUserInterfaceManager _userInterfaceManager; [Dependency] private readonly IMapManager _mapManager = default!;
[Dependency] private readonly IMapManager _mapManager;
#pragma warning restore 649
private EntityList _currentEntityList; private EntityList _currentEntityList;
private VerbPopup _currentVerbListRoot; private VerbPopup _currentVerbListRoot;

6
Content.Client/GameTicking/ClientGameTicker.cs
View File

@@ -17,10 +17,8 @@ namespace Content.Client.GameTicking
{ {
public class ClientGameTicker : SharedGameTicker, IClientGameTicker public class ClientGameTicker : SharedGameTicker, IClientGameTicker
{ {
#pragma warning disable 649 [Dependency] private readonly IClientNetManager _netManager = default!;
[Dependency] private IClientNetManager _netManager; [Dependency] private readonly IStateManager _stateManager = default!;
[Dependency] private IStateManager _stateManager;
#pragma warning restore 649
[ViewVariables] private bool _initialized; [ViewVariables] private bool _initialized;

6
Content.Client/Graphics/Overlays/CircleMaskOverlay.cs
View File

@@ -11,10 +11,8 @@ namespace Content.Client.Graphics.Overlays
{ {
public class CircleMaskOverlay : Overlay public class CircleMaskOverlay : Overlay
{ {
#pragma warning disable 649 [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
[Dependency] private readonly IPrototypeManager _prototypeManager; [Dependency] private readonly IEyeManager _eyeManager = default!;
[Dependency] private readonly IEyeManager _eyeManager;
#pragma warning restore 649
public override OverlaySpace Space => OverlaySpace.WorldSpace; public override OverlaySpace Space => OverlaySpace.WorldSpace;
private readonly ShaderInstance _shader; private readonly ShaderInstance _shader;

8
Content.Client/Graphics/Overlays/FlashOverlay.cs
View File

@@ -16,11 +16,9 @@ namespace Content.Client.Graphics.Overlays
{ {
public class FlashOverlay : Overlay, IConfigurable<TimedOverlayParameter> public class FlashOverlay : Overlay, IConfigurable<TimedOverlayParameter>
{ {
#pragma warning disable 649 [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
[Dependency] private readonly IPrototypeManager _prototypeManager; [Dependency] private readonly IClyde _displayManager = default!;
[Dependency] private readonly IClyde _displayManager; [Dependency] private readonly IGameTiming _gameTiming = default!;
[Dependency] private readonly IGameTiming _gameTiming;
#pragma warning restore 649
public override OverlaySpace Space => OverlaySpace.ScreenSpace; public override OverlaySpace Space => OverlaySpace.ScreenSpace;
private readonly ShaderInstance _shader; private readonly ShaderInstance _shader;

7
Content.Client/Graphics/Overlays/GradientCircleMask.cs
View File

@@ -11,10 +11,9 @@ namespace Content.Client.Graphics.Overlays
{ {
public class GradientCircleMaskOverlay : Overlay public class GradientCircleMaskOverlay : Overlay
{ {
#pragma warning disable 649 [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
[Dependency] private readonly IPrototypeManager _prototypeManager; [Dependency] private readonly IEyeManager _eyeManager = default!;
[Dependency] private readonly IEyeManager _eyeManager;
#pragma warning restore 649
public override OverlaySpace Space => OverlaySpace.WorldSpace; public override OverlaySpace Space => OverlaySpace.WorldSpace;
private readonly ShaderInstance _shader; private readonly ShaderInstance _shader;

6
Content.Client/Instruments/InstrumentMenu.cs
View File

@@ -20,10 +20,8 @@ namespace Content.Client.Instruments
{ {
public class InstrumentMenu : SS14Window public class InstrumentMenu : SS14Window
{ {
#pragma warning disable 649 [Dependency] private readonly IMidiManager _midiManager = default!;
[Dependency] private IMidiManager _midiManager; [Dependency] private readonly IFileDialogManager _fileDialogManager = default!;
[Dependency] private IFileDialogManager _fileDialogManager;
#pragma warning restore 649
private InstrumentBoundUserInterface _owner; private InstrumentBoundUserInterface _owner;
private Button midiLoopButton; private Button midiLoopButton;

8
Content.Client/Parallax/ParallaxManager.cs
View File

@@ -19,11 +19,9 @@ namespace Content.Client.Parallax
{ {
internal sealed class ParallaxManager : IParallaxManager, IPostInjectInit internal sealed class ParallaxManager : IParallaxManager, IPostInjectInit
{ {
#pragma warning disable 649 [Dependency] private readonly IResourceCache _resourceCache = default!;
[Dependency] private readonly IResourceCache _resourceCache; [Dependency] private readonly ILogManager _logManager = default!;
[Dependency] private readonly ILogManager _logManager; [Dependency] private readonly IConfigurationManager _configurationManager = default!;
[Dependency] private readonly IConfigurationManager _configurationManager;
#pragma warning restore 649
private static readonly ResourcePath ParallaxConfigPath = new ResourcePath("/parallax_config.toml"); private static readonly ResourcePath ParallaxConfigPath = new ResourcePath("/parallax_config.toml");

10
Content.Client/Parallax/ParallaxOverlay.cs
View File

@@ -13,12 +13,10 @@ namespace Content.Client.Parallax
{ {
public class ParallaxOverlay : Overlay public class ParallaxOverlay : Overlay
{ {
#pragma warning disable 649 [Dependency] private readonly IParallaxManager _parallaxManager = default!;
[Dependency] private readonly IParallaxManager _parallaxManager; [Dependency] private readonly IEyeManager _eyeManager = default!;
[Dependency] private readonly IEyeManager _eyeManager; [Dependency] private readonly IClyde _displayManager = default!;
[Dependency] private readonly IClyde _displayManager; [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
[Dependency] private readonly IPrototypeManager _prototypeManager;
#pragma warning restore 649
public override bool AlwaysDirty => true; public override bool AlwaysDirty => true;
private const float Slowness = 0.5f; private const float Slowness = 0.5f;

6
Content.Client/Research/LatheMenu.cs
View File

@@ -14,9 +14,7 @@ namespace Content.Client.Research
{ {
public class LatheMenu : SS14Window public class LatheMenu : SS14Window
{ {
#pragma warning disable CS0649 [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
[Dependency] private IPrototypeManager PrototypeManager;
#pragma warning restore
private ItemList Items; private ItemList Items;
private ItemList Materials; private ItemList Materials;
@@ -174,7 +172,7 @@ namespace Content.Client.Research
foreach (var (id, amount) in Owner.Storage) foreach (var (id, amount) in Owner.Storage)
{ {
if (!PrototypeManager.TryIndex(id, out MaterialPrototype materialPrototype)) continue; if (!_prototypeManager.TryIndex(id, out MaterialPrototype materialPrototype)) continue;
var material = materialPrototype.Material; var material = materialPrototype.Material;
Materials.AddItem($"{material.Name} {amount} cm³", material.Icon.Frame0(), false); Materials.AddItem($"{material.Name} {amount} cm³", material.Icon.Frame0(), false);
} }

4
Content.Client/Research/ResearchConsoleMenu.cs
View File

@@ -32,9 +32,7 @@ namespace Content.Client.Research
private ItemList _unlockableTechnologies; private ItemList _unlockableTechnologies;
private ItemList _futureTechnologies; private ItemList _futureTechnologies;
#pragma warning disable 649 [Dependency] private readonly ILocalizationManager _localizationManager = default!;
[Dependency] private readonly ILocalizationManager _localizationManager;
#pragma warning restore 649
public Button UnlockButton { get; private set; } public Button UnlockButton { get; private set; }
public Button ServerSelectionButton { get; private set; } public Button ServerSelectionButton { get; private set; }

21
Content.Client/Sandbox/SandboxManager.cs
View File

@@ -74,19 +74,18 @@ namespace Content.Client.Sandbox
vBox.AddChild(ShowBbButton); vBox.AddChild(ShowBbButton);
} }
} }
internal class SandboxManager : SharedSandboxManager, ISandboxManager internal class SandboxManager : SharedSandboxManager, ISandboxManager
{ {
#pragma warning disable 649 [Dependency] private readonly IClientConsole _console = default!;
[Dependency] private readonly IClientConsole _console; [Dependency] private readonly IGameHud _gameHud = default!;
[Dependency] private readonly IGameHud _gameHud; [Dependency] private readonly IClientNetManager _netManager = default!;
[Dependency] private readonly IClientNetManager _netManager; [Dependency] private readonly ILocalizationManager _localization = default!;
[Dependency] private readonly ILocalizationManager _localization; [Dependency] private readonly IPlacementManager _placementManager = default!;
[Dependency] private readonly IPlacementManager _placementManager; [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
[Dependency] private readonly IPrototypeManager _prototypeManager; [Dependency] private readonly IResourceCache _resourceCache = default!;
[Dependency] private readonly IResourceCache _resourceCache; [Dependency] private readonly ITileDefinitionManager _tileDefinitionManager = default!;
[Dependency] private readonly ITileDefinitionManager _tileDefinitionManager; [Dependency] private readonly IInputManager _inputManager = default!;
[Dependency] private readonly IInputManager _inputManager;
#pragma warning restore 649
public bool SandboxAllowed { get; private set; } public bool SandboxAllowed { get; private set; }

10
Content.Client/State/GameScreen.cs
View File

@@ -14,12 +14,10 @@ namespace Content.Client.State
{ {
public class GameScreen : GameScreenBase public class GameScreen : GameScreenBase
{ {
#pragma warning disable 649 [Dependency] private readonly IUserInterfaceManager _userInterfaceManager = default!;
[Dependency] private readonly IUserInterfaceManager _userInterfaceManager; [Dependency] private readonly IGameHud _gameHud = default!;
[Dependency] private readonly IGameHud _gameHud; [Dependency] private readonly IInputManager _inputManager = default!;
[Dependency] private readonly IInputManager _inputManager; [Dependency] private readonly IChatManager _chatManager = default!;
[Dependency] private readonly IChatManager _chatManager;
#pragma warning restore 649
[ViewVariables] private ChatBox _gameChat; [ViewVariables] private ChatBox _gameChat;

20
Content.Client/State/GameScreenBase.cs
View File

@@ -28,17 +28,15 @@ namespace Content.Client.State
// Instantiated dynamically through the StateManager, Dependencies will be resolved. // Instantiated dynamically through the StateManager, Dependencies will be resolved.
public partial class GameScreenBase : Robust.Client.State.State public partial class GameScreenBase : Robust.Client.State.State
{ {
#pragma warning disable 649 [Dependency] protected readonly IClientEntityManager EntityManager = default!;
[Dependency] protected readonly IClientEntityManager EntityManager; [Dependency] protected readonly IInputManager InputManager = default!;
[Dependency] protected readonly IInputManager InputManager; [Dependency] protected readonly IPlayerManager PlayerManager = default!;
[Dependency] protected readonly IPlayerManager PlayerManager; [Dependency] protected readonly IEyeManager EyeManager = default!;
[Dependency] protected readonly IEyeManager EyeManager; [Dependency] protected readonly IEntitySystemManager EntitySystemManager = default!;
[Dependency] protected readonly IEntitySystemManager EntitySystemManager; [Dependency] protected readonly IGameTiming Timing = default!;
[Dependency] protected readonly IGameTiming Timing; [Dependency] protected readonly IMapManager MapManager = default!;
[Dependency] protected readonly IMapManager MapManager; [Dependency] protected readonly IUserInterfaceManager UserInterfaceManager = default!;
[Dependency] protected readonly IUserInterfaceManager UserInterfaceManager; [Dependency] protected readonly IConfigurationManager ConfigurationManager = default!;
[Dependency] protected readonly IConfigurationManager ConfigurationManager;
#pragma warning restore 649
private IEntity _lastHoveredEntity; private IEntity _lastHoveredEntity;

12
Content.Client/State/LauncherConnecting.cs
View File

@@ -16,13 +16,11 @@ namespace Content.Client.State
{ {
public class LauncherConnecting : Robust.Client.State.State public class LauncherConnecting : Robust.Client.State.State
{ {
#pragma warning disable 649 [Dependency] private readonly IUserInterfaceManager _userInterfaceManager = default!;
[Dependency] private readonly IUserInterfaceManager _userInterfaceManager; [Dependency] private readonly IStylesheetManager _stylesheetManager = default!;
[Dependency] private readonly IStylesheetManager _stylesheetManager; [Dependency] private readonly IClientNetManager _clientNetManager = default!;
[Dependency] private readonly IClientNetManager _clientNetManager; [Dependency] private readonly IGameController _gameController = default!;
[Dependency] private readonly IGameController _gameController; [Dependency] private readonly IBaseClient _baseClient = default!;
[Dependency] private readonly IBaseClient _baseClient;
#pragma warning restore 649
private Control _control; private Control _control;
private Label _connectStatus; private Label _connectStatus;

26
Content.Client/State/LobbyState.cs
View File

@@ -24,19 +24,17 @@ namespace Content.Client.State
{ {
public class LobbyState : Robust.Client.State.State public class LobbyState : Robust.Client.State.State
{ {
#pragma warning disable 649 [Dependency] private readonly IBaseClient _baseClient = default!;
[Dependency] private readonly IBaseClient _baseClient; [Dependency] private readonly IClientConsole _console = default!;
[Dependency] private readonly IClientConsole _console; [Dependency] private readonly IChatManager _chatManager = default!;
[Dependency] private readonly IChatManager _chatManager; [Dependency] private readonly IInputManager _inputManager = default!;
[Dependency] private readonly IInputManager _inputManager; [Dependency] private readonly IEntityManager _entityManager = default!;
[Dependency] private readonly IEntityManager _entityManager; [Dependency] private readonly IPlayerManager _playerManager = default!;
[Dependency] private readonly IPlayerManager _playerManager; [Dependency] private readonly IResourceCache _resourceCache = default!;
[Dependency] private readonly IResourceCache _resourceCache; [Dependency] private readonly IClientGameTicker _clientGameTicker = default!;
[Dependency] private readonly IClientGameTicker _clientGameTicker; [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
[Dependency] private readonly IPrototypeManager _prototypeManager; [Dependency] private readonly IUserInterfaceManager _userInterfaceManager = default!;
[Dependency] private readonly IUserInterfaceManager _userInterfaceManager; [Dependency] private readonly IClientPreferencesManager _preferencesManager = default!;
[Dependency] private readonly IClientPreferencesManager _preferencesManager;
#pragma warning restore 649
[ViewVariables] private CharacterSetupGui _characterSetup; [ViewVariables] private CharacterSetupGui _characterSetup;
[ViewVariables] private LobbyGui _lobby; [ViewVariables] private LobbyGui _lobby;
@@ -215,7 +213,7 @@ namespace Content.Client.State
foreach (var session in _playerManager.Sessions.OrderBy(s => s.Name)) foreach (var session in _playerManager.Sessions.OrderBy(s => s.Name))
{ {
var readyState = ""; var readyState = "";
// Don't show ready state if we're ingame // Don't show ready state if we're ingame

24
Content.Client/State/MainMenu.cs
View File

@@ -27,15 +27,13 @@ namespace Content.Client.State
{ {
private const string PublicServerAddress = "server.spacestation14.io"; private const string PublicServerAddress = "server.spacestation14.io";
#pragma warning disable 649 [Dependency] private readonly IBaseClient _client = default!;
[Dependency] private readonly IBaseClient _client; [Dependency] private readonly IClientNetManager _netManager = default!;
[Dependency] private readonly IClientNetManager _netManager; [Dependency] private readonly IConfigurationManager _configurationManager = default!;
[Dependency] private readonly IConfigurationManager _configurationManager; [Dependency] private readonly IGameController _controllerProxy = default!;
[Dependency] private readonly IGameController _controllerProxy; [Dependency] private readonly ILocalizationManager _loc = default!;
[Dependency] private readonly ILocalizationManager _loc; [Dependency] private readonly IResourceCache _resourceCache = default!;
[Dependency] private readonly IResourceCache _resourceCache; [Dependency] private readonly IUserInterfaceManager _userInterfaceManager = default!;
[Dependency] private readonly IUserInterfaceManager userInterfaceManager;
#pragma warning restore 649
private MainMenuControl _mainMenuControl; private MainMenuControl _mainMenuControl;
private OptionsMenu OptionsMenu; private OptionsMenu OptionsMenu;
@@ -48,7 +46,7 @@ namespace Content.Client.State
public override void Startup() public override void Startup()
{ {
_mainMenuControl = new MainMenuControl(_resourceCache, _configurationManager); _mainMenuControl = new MainMenuControl(_resourceCache, _configurationManager);
userInterfaceManager.StateRoot.AddChild(_mainMenuControl); _userInterfaceManager.StateRoot.AddChild(_mainMenuControl);
_mainMenuControl.QuitButton.OnPressed += QuitButtonPressed; _mainMenuControl.QuitButton.OnPressed += QuitButtonPressed;
_mainMenuControl.OptionsButton.OnPressed += OptionsButtonPressed; _mainMenuControl.OptionsButton.OnPressed += OptionsButtonPressed;
@@ -108,7 +106,7 @@ namespace Content.Client.State
if (!UsernameHelpers.IsNameValid(inputName, out var reason)) if (!UsernameHelpers.IsNameValid(inputName, out var reason))
{ {
var invalidReason = _loc.GetString(reason.ToText()); var invalidReason = _loc.GetString(reason.ToText());
userInterfaceManager.Popup( _userInterfaceManager.Popup(
_loc.GetString("Invalid username:\n{0}", invalidReason), _loc.GetString("Invalid username:\n{0}", invalidReason),
_loc.GetString("Invalid Username")); _loc.GetString("Invalid Username"));
return; return;
@@ -130,7 +128,7 @@ namespace Content.Client.State
} }
catch (ArgumentException e) catch (ArgumentException e)
{ {
userInterfaceManager.Popup($"Unable to connect: {e.Message}", "Connection error."); _userInterfaceManager.Popup($"Unable to connect: {e.Message}", "Connection error.");
Logger.Warning(e.ToString()); Logger.Warning(e.ToString());
_netManager.ConnectFailed -= _onConnectFailed; _netManager.ConnectFailed -= _onConnectFailed;
} }
@@ -185,7 +183,7 @@ namespace Content.Client.State
private void _onConnectFailed(object _, NetConnectFailArgs args) private void _onConnectFailed(object _, NetConnectFailArgs args)
{ {
userInterfaceManager.Popup($"Failed to connect:\n{args.Reason}"); _userInterfaceManager.Popup($"Failed to connect:\n{args.Reason}");
_netManager.ConnectFailed -= _onConnectFailed; _netManager.ConnectFailed -= _onConnectFailed;
_setConnectingState(false); _setConnectingState(false);
} }

6
Content.Client/UserInterface/Cargo/CargoConsoleMenu.cs
View File

@@ -15,9 +15,7 @@ namespace Content.Client.UserInterface.Cargo
{ {
public class CargoConsoleMenu : SS14Window public class CargoConsoleMenu : SS14Window
{ {
#pragma warning disable 649 [Dependency] private readonly ILocalizationManager _loc = default!;
[Dependency] private readonly ILocalizationManager _loc;
#pragma warning restore 649
protected override Vector2? CustomSize => (400, 600); protected override Vector2? CustomSize => (400, 600);
@@ -287,7 +285,7 @@ namespace Content.Client.UserInterface.Cargo
public void PopulateOrders() public void PopulateOrders()
{ {
_orders.RemoveAllChildren(); _orders.RemoveAllChildren();
_requests.RemoveAllChildren(); _requests.RemoveAllChildren();
foreach (var order in Owner.Orders.Orders) foreach (var order in Owner.Orders.Orders)
{ {
var row = new CargoOrderRow(); var row = new CargoOrderRow();

4
Content.Client/UserInterface/Cargo/CargoConsoleOrderMenu.cs
View File

@@ -8,9 +8,7 @@ namespace Content.Client.UserInterface.Cargo
{ {
class CargoConsoleOrderMenu : SS14Window class CargoConsoleOrderMenu : SS14Window
{ {
#pragma warning disable 649 [Dependency] private readonly ILocalizationManager _loc = default!;
[Dependency] private readonly ILocalizationManager _loc;
#pragma warning restore 649
public LineEdit Requester { get; set; } public LineEdit Requester { get; set; }
public LineEdit Reason { get; set; } public LineEdit Reason { get; set; }

6
Content.Client/UserInterface/Cargo/GalacticBankSelectionMenu.cs
View File

@@ -10,16 +10,14 @@ namespace Content.Client.UserInterface.Cargo
{ {
public class GalacticBankSelectionMenu : SS14Window public class GalacticBankSelectionMenu : SS14Window
{ {
[Dependency] private readonly ILocalizationManager _loc = default!;
private ItemList _accounts; private ItemList _accounts;
private int _accountCount = 0; private int _accountCount = 0;
private string[] _accountNames = new string[] { }; private string[] _accountNames = new string[] { };
private int[] _accountIds = new int[] { }; private int[] _accountIds = new int[] { };
private int _selectedAccountId = -1; private int _selectedAccountId = -1;
#pragma warning disable 649
[Dependency] private readonly ILocalizationManager _loc;
#pragma warning restore 649
protected override Vector2? CustomSize => (300, 300); protected override Vector2? CustomSize => (300, 300);
public CargoConsoleBoundUserInterface Owner; public CargoConsoleBoundUserInterface Owner;

8
Content.Client/UserInterface/GameHud.cs
View File

@@ -74,11 +74,9 @@ namespace Content.Client.UserInterface
private Button _combatModeButton; private Button _combatModeButton;
private VBoxContainer _combatPanelContainer; private VBoxContainer _combatPanelContainer;
#pragma warning disable 649 [Dependency] private readonly IResourceCache _resourceCache = default!;
[Dependency] private readonly IResourceCache _resourceCache; [Dependency] private readonly ILocalizationManager _loc = default!;
[Dependency] private readonly ILocalizationManager _loc; [Dependency] private readonly IInputManager _inputManager = default!;
[Dependency] private readonly IInputManager _inputManager;
#pragma warning restore 649
public Control HandsContainer { get; private set; } public Control HandsContainer { get; private set; }
public Control InventoryQuickButtonContainer { get; private set; } public Control InventoryQuickButtonContainer { get; private set; }

8
Content.Client/UserInterface/HandsGui.cs
View File

@@ -17,11 +17,9 @@ namespace Content.Client.UserInterface
{ {
public class HandsGui : Control public class HandsGui : Control
{ {
#pragma warning disable 0649 [Dependency] private readonly IPlayerManager _playerManager = default!;
[Dependency] private readonly IPlayerManager _playerManager; [Dependency] private readonly IResourceCache _resourceCache = default!;
[Dependency] private readonly IResourceCache _resourceCache; [Dependency] private readonly IItemSlotManager _itemSlotManager = default!;
[Dependency] private readonly IItemSlotManager _itemSlotManager;
#pragma warning restore 0649
private readonly TextureRect _activeHandRect; private readonly TextureRect _activeHandRect;

16
Content.Client/UserInterface/ItemSlotManager.cs
View File

@@ -21,15 +21,13 @@ namespace Content.Client.UserInterface
{ {
public class ItemSlotManager : IItemSlotManager public class ItemSlotManager : IItemSlotManager
{ {
#pragma warning disable 0649 [Dependency] private readonly IPlayerManager _playerManager = default!;
[Dependency] private readonly IPlayerManager _playerManager; [Dependency] private readonly IGameTiming _gameTiming = default!;
[Dependency] private readonly IGameTiming _gameTiming; [Dependency] private readonly IInputManager _inputManager = default!;
[Dependency] private readonly IInputManager _inputManager; [Dependency] private readonly IEntitySystemManager _entitySystemManager = default!;
[Dependency] private readonly IEntitySystemManager _entitySystemManager; [Dependency] private readonly IEntityManager _entityManager = default!;
[Dependency] private readonly IEntityManager _entityManager; [Dependency] private readonly IEyeManager _eyeManager = default!;
[Dependency] private readonly IEyeManager _eyeManager; [Dependency] private readonly IMapManager _mapManager = default!;
[Dependency] private readonly IMapManager _mapManager;
#pragma warning restore 0649
public bool SetItemSlot(ItemSlotButton button, IEntity entity) public bool SetItemSlot(ItemSlotButton button, IEntity entity)
{ {

6
Content.Client/UserInterface/LateJoinGui.cs
View File

@@ -16,10 +16,8 @@ namespace Content.Client.UserInterface
{ {
public sealed class LateJoinGui : SS14Window public sealed class LateJoinGui : SS14Window
{ {
#pragma warning disable 649 [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
[Dependency] private readonly IPrototypeManager _prototypeManager; [Dependency] private readonly IClientConsole _console = default!;
[Dependency] private readonly IClientConsole _console;
#pragma warning restore 649
protected override Vector2? CustomSize => (360, 560); protected override Vector2? CustomSize => (360, 560);

6
Content.Client/UserInterface/Stylesheets/StylesheetManager.cs
View File

@@ -7,10 +7,8 @@ namespace Content.Client.UserInterface.Stylesheets
{ {
public sealed class StylesheetManager : IStylesheetManager public sealed class StylesheetManager : IStylesheetManager
{ {
#pragma warning disable 649 [Dependency] private readonly IUserInterfaceManager _userInterfaceManager = default!;
[Dependency] private readonly IUserInterfaceManager _userInterfaceManager; [Dependency] private readonly IResourceCache _resourceCache = default!;
[Dependency] private readonly IResourceCache _resourceCache;
#pragma warning restore 649
public Stylesheet SheetNano { get; private set; } public Stylesheet SheetNano { get; private set; }
public Stylesheet SheetSpace { get; private set; } public Stylesheet SheetSpace { get; private set; }

9
Content.Client/VendingMachines/VendingMachineMenu.cs
View File

@@ -15,17 +15,14 @@ namespace Content.Client.VendingMachines
{ {
class VendingMachineMenu : SS14Window class VendingMachineMenu : SS14Window
{ {
[Dependency] private readonly IResourceCache _resourceCache = default!;
[Dependency] private readonly IPrototypeManager _prototypeManager = default!;
protected override Vector2? CustomSize => (300, 450); protected override Vector2? CustomSize => (300, 450);
private readonly ItemList _items; private readonly ItemList _items;
private List<VendingMachineInventoryEntry> _cachedInventory; private List<VendingMachineInventoryEntry> _cachedInventory;
#pragma warning disable CS0649
[Dependency]
private IResourceCache _resourceCache;
[Dependency]
private readonly IPrototypeManager _prototypeManager;
#pragma warning restore
public VendingMachineBoundUserInterface Owner { get; set; } public VendingMachineBoundUserInterface Owner { get; set; }
public VendingMachineMenu() public VendingMachineMenu()

14
Content.Server/Chat/ChatManager.cs
View File

@@ -33,14 +33,12 @@ namespace Content.Server.Chat
/// </summary> /// </summary>
private const string MaxLengthExceededMessage = "Your message exceeded {0} character limit"; private const string MaxLengthExceededMessage = "Your message exceeded {0} character limit";
#pragma warning disable 649 [Dependency] private readonly IEntitySystemManager _entitySystemManager = default!;
[Dependency] private readonly IEntitySystemManager _entitySystemManager; [Dependency] private readonly IServerNetManager _netManager = default!;
[Dependency] private readonly IServerNetManager _netManager; [Dependency] private readonly IPlayerManager _playerManager = default!;
[Dependency] private readonly IPlayerManager _playerManager; [Dependency] private readonly ILocalizationManager _localizationManager = default!;
[Dependency] private readonly ILocalizationManager _localizationManager; [Dependency] private readonly IMoMMILink _mommiLink = default!;
[Dependency] private readonly IMoMMILink _mommiLink; [Dependency] private readonly IConGroupController _conGroupController = default!;
[Dependency] private readonly IConGroupController _conGroupController;
#pragma warning restore 649
public void Initialize() public void Initialize()
{ {

2
Content.Server/GameObjects/Components/Body/BodyManagerComponent.cs
View File

@@ -41,11 +41,9 @@ namespace Content.Server.GameObjects.Components.Body
[ComponentReference(typeof(IBodyManagerComponent))] [ComponentReference(typeof(IBodyManagerComponent))]
public class BodyManagerComponent : SharedBodyManagerComponent, IBodyPartContainer, IRelayMoveInput public class BodyManagerComponent : SharedBodyManagerComponent, IBodyPartContainer, IRelayMoveInput
{ {
#pragma warning disable CS0649
[Dependency] private readonly IPrototypeManager _prototypeManager = default!; [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
[Dependency] private readonly IBodyNetworkFactory _bodyNetworkFactory = default!; [Dependency] private readonly IBodyNetworkFactory _bodyNetworkFactory = default!;
[Dependency] private readonly IReflectionManager _reflectionManager = default!; [Dependency] private readonly IReflectionManager _reflectionManager = default!;
#pragma warning restore
[ViewVariables] private string _presetName = default!; [ViewVariables] private string _presetName = default!;

4
Content.Server/GameObjects/Components/Cargo/CargoConsoleComponent.cs
View File

@@ -147,7 +147,7 @@ namespace Content.Server.GameObjects.Components.Cargo
break; break;
} }
_prototypeManager.TryIndex(order.ProductId, out CargoProductPrototype product); PrototypeManager.TryIndex(order.ProductId, out CargoProductPrototype product);
if (product == null!) if (product == null!)
break; break;
var capacity = _cargoOrderDataManager.GetCapacity(orders.Database.Id); var capacity = _cargoOrderDataManager.GetCapacity(orders.Database.Id);
@@ -168,7 +168,7 @@ namespace Content.Server.GameObjects.Components.Cargo
// TEMPORARY loop for spawning stuff on top of console // TEMPORARY loop for spawning stuff on top of console
foreach (var order in approvedOrders) foreach (var order in approvedOrders)
{ {
if (!_prototypeManager.TryIndex(order.ProductId, out CargoProductPrototype product)) if (!PrototypeManager.TryIndex(order.ProductId, out CargoProductPrototype product))
continue; continue;
for (var i = 0; i < order.Amount; i++) for (var i = 0; i < order.Amount; i++)
{ {

4
Content.Server/GameObjects/Components/Cargo/CargoOrderDatabaseComponent.cs
View File

@@ -8,9 +8,7 @@ namespace Content.Server.GameObjects.Components.Cargo
[RegisterComponent] [RegisterComponent]
public class CargoOrderDatabaseComponent : SharedCargoOrderDatabaseComponent public class CargoOrderDatabaseComponent : SharedCargoOrderDatabaseComponent
{ {
#pragma warning disable 649 [Dependency] private readonly ICargoOrderDataManager _cargoOrderDataManager = default!;
[Dependency] private readonly ICargoOrderDataManager _cargoOrderDataManager;
#pragma warning restore 649
public CargoOrderDatabase Database { get; set; } public CargoOrderDatabase Database { get; set; }
public bool ConnectedToDatabase => Database != null; public bool ConnectedToDatabase => Database != null;

5
Content.Server/GameObjects/Components/Chemistry/PillComponent.cs
View File

@@ -20,9 +20,8 @@ namespace Content.Server.GameObjects.Components.Chemistry
[ComponentReference(typeof(IAfterInteract))] [ComponentReference(typeof(IAfterInteract))]
public class PillComponent : FoodComponent, IUse, IAfterInteract public class PillComponent : FoodComponent, IUse, IAfterInteract
{ {
#pragma warning disable 649 [Dependency] private readonly IEntitySystemManager _entitySystem = default!;
[Dependency] private readonly IEntitySystemManager _entitySystem;
#pragma warning restore 649
public override string Name => "Pill"; public override string Name => "Pill";
[ViewVariables] [ViewVariables]

4
Content.Server/GameObjects/Components/Chemistry/PourableComponent.cs
View File

@@ -19,9 +19,7 @@ namespace Content.Server.GameObjects.Components.Chemistry
[RegisterComponent] [RegisterComponent]
class PourableComponent : Component, IInteractUsing class PourableComponent : Component, IInteractUsing
{ {
#pragma warning disable 649 [Dependency] private readonly IServerNotifyManager _notifyManager = default!;
[Dependency] private readonly IServerNotifyManager _notifyManager;
#pragma warning restore 649
public override string Name => "Pourable"; public override string Name => "Pourable";

6
Content.Server/GameObjects/Components/Chemistry/SolutionComponent.cs
View File

@@ -29,10 +29,8 @@ namespace Content.Server.GameObjects.Components.Chemistry
[RegisterComponent] [RegisterComponent]
public class SolutionComponent : SharedSolutionComponent, IExamine public class SolutionComponent : SharedSolutionComponent, IExamine
{ {
#pragma warning disable 649 [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
[Dependency] private readonly IPrototypeManager _prototypeManager; [Dependency] private readonly IEntitySystemManager _entitySystemManager = default!;
[Dependency] private readonly IEntitySystemManager _entitySystemManager;
#pragma warning restore 649
private IEnumerable<ReactionPrototype> _reactions; private IEnumerable<ReactionPrototype> _reactions;
private AudioSystem _audioSystem; private AudioSystem _audioSystem;

6
Content.Server/GameObjects/Components/Damage/BreakableComponent.cs
View File

@@ -21,10 +21,8 @@ namespace Content.Server.GameObjects.Components.Damage
[ComponentReference(typeof(IDamageableComponent))] [ComponentReference(typeof(IDamageableComponent))]
public class BreakableComponent : RuinableComponent, IExAct public class BreakableComponent : RuinableComponent, IExAct
{ {
#pragma warning disable 649 [Dependency] private readonly IEntitySystemManager _entitySystemManager = default!;
[Dependency] private readonly IEntitySystemManager _entitySystemManager; [Dependency] private readonly IRobustRandom _random = default!;
[Dependency] private readonly IRobustRandom _random;
#pragma warning restore 649
public override string Name => "Breakable"; public override string Name => "Breakable";

4
Content.Server/GameObjects/Components/Damage/DestructibleComponent.cs
View File

@@ -16,9 +16,7 @@ namespace Content.Server.GameObjects.Components.Damage
[ComponentReference(typeof(IDamageableComponent))] [ComponentReference(typeof(IDamageableComponent))]
public class DestructibleComponent : RuinableComponent, IDestroyAct public class DestructibleComponent : RuinableComponent, IDestroyAct
{ {
#pragma warning disable 649 [Dependency] private readonly IEntitySystemManager _entitySystemManager = default!;
[Dependency] private readonly IEntitySystemManager _entitySystemManager;
#pragma warning restore 649
protected ActSystem ActSystem; protected ActSystem ActSystem;

4
Content.Server/GameObjects/Components/Disposal/DisposalJunctionComponent.cs
View File

@@ -14,9 +14,7 @@ namespace Content.Server.GameObjects.Components.Disposal
[ComponentReference(typeof(IDisposalTubeComponent))] [ComponentReference(typeof(IDisposalTubeComponent))]
public class DisposalJunctionComponent : DisposalTubeComponent public class DisposalJunctionComponent : DisposalTubeComponent
{ {
#pragma warning disable 649 [Dependency] private readonly IRobustRandom _random = default!;
[Dependency] private readonly IRobustRandom _random;
#pragma warning restore 649
/// <summary> /// <summary>
/// The angles to connect to. /// The angles to connect to.

4
Content.Server/GameObjects/Components/Fluids/PuddleComponent.cs
View File

@@ -46,9 +46,7 @@ namespace Content.Server.GameObjects.Components.Fluids
// based on behaviour (e.g. someone being punched vs slashed with a sword would have different blood sprite) // based on behaviour (e.g. someone being punched vs slashed with a sword would have different blood sprite)
// to check for low volumes for evaporation or whatever // to check for low volumes for evaporation or whatever
#pragma warning disable 649 [Dependency] private readonly IMapManager _mapManager = default!;
[Dependency] private readonly IMapManager _mapManager;
#pragma warning restore 649
public override string Name => "Puddle"; public override string Name => "Puddle";

6
Content.Server/GameObjects/Components/GUI/InventoryComponent.cs
View File

@@ -28,10 +28,8 @@ namespace Content.Server.GameObjects.Components.GUI
[RegisterComponent] [RegisterComponent]
public class InventoryComponent : SharedInventoryComponent, IExAct, IEffectBlocker, IPressureProtection public class InventoryComponent : SharedInventoryComponent, IExAct, IEffectBlocker, IPressureProtection
{ {
#pragma warning disable 649 [Dependency] private readonly IEntitySystemManager _entitySystemManager = default!;
[Dependency] private readonly IEntitySystemManager _entitySystemManager; [Dependency] private readonly IServerNotifyManager _serverNotifyManager = default!;
[Dependency] private readonly IServerNotifyManager _serverNotifyManager;
#pragma warning restore 649
[ViewVariables] [ViewVariables]
private readonly Dictionary<Slots, ContainerSlot> _slotContainers = new Dictionary<Slots, ContainerSlot>(); private readonly Dictionary<Slots, ContainerSlot> _slotContainers = new Dictionary<Slots, ContainerSlot>();

8
Content.Server/GameObjects/Components/Interactable/TilePryingComponent.cs
View File

@@ -14,11 +14,9 @@ namespace Content.Server.GameObjects.Components.Interactable
[RegisterComponent] [RegisterComponent]
public class TilePryingComponent : Component, IAfterInteract public class TilePryingComponent : Component, IAfterInteract
{ {
#pragma warning disable 649 [Dependency] private readonly IEntitySystemManager _entitySystemManager = default!;
[Dependency] private readonly IEntitySystemManager _entitySystemManager; [Dependency] private readonly ITileDefinitionManager _tileDefinitionManager = default!;
[Dependency] private readonly ITileDefinitionManager _tileDefinitionManager; [Dependency] private readonly IMapManager _mapManager = default!;
[Dependency] private readonly IMapManager _mapManager;
#pragma warning restore 649
public override string Name => "TilePrying"; public override string Name => "TilePrying";
private bool _toolComponentNeeded = true; private bool _toolComponentNeeded = true;

4
Content.Server/GameObjects/Components/Items/Clothing/ClothingComponent.cs
View File

@@ -20,9 +20,7 @@ namespace Content.Server.GameObjects.Components.Items.Clothing
[ComponentReference(typeof(IItemComponent))] [ComponentReference(typeof(IItemComponent))]
public class ClothingComponent : ItemComponent, IUse public class ClothingComponent : ItemComponent, IUse
{ {
#pragma warning disable 649 [Dependency] private readonly IServerNotifyManager _serverNotifyManager = default!;
[Dependency] private readonly IServerNotifyManager _serverNotifyManager;
#pragma warning restore 649
public override string Name => "Clothing"; public override string Name => "Clothing";
public override uint? NetID => ContentNetIDs.CLOTHING; public override uint? NetID => ContentNetIDs.CLOTHING;

6
Content.Server/GameObjects/Components/Items/DiceComponent.cs
View File

@@ -20,10 +20,8 @@ namespace Content.Server.GameObjects.Components.Items
[RegisterComponent] [RegisterComponent]
public class DiceComponent : Component, IActivate, IUse, ILand, IExamine public class DiceComponent : Component, IActivate, IUse, ILand, IExamine
{ {
#pragma warning disable 649 [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
[Dependency] private readonly IPrototypeManager _prototypeManager; [Dependency] private readonly IRobustRandom _random = default!;
[Dependency] private readonly IRobustRandom _random;
#pragma warning restore 649
public override string Name => "Dice"; public override string Name => "Dice";

6
Content.Server/GameObjects/Components/Items/FloorTileItemComponent.cs
View File

@@ -15,10 +15,8 @@ namespace Content.Server.GameObjects.Components.Items
[RegisterComponent] [RegisterComponent]
public class FloorTileItemComponent : Component, IAfterInteract public class FloorTileItemComponent : Component, IAfterInteract
{ {
#pragma warning disable 649 [Dependency] private readonly ITileDefinitionManager _tileDefinitionManager = default!;
[Dependency] private readonly ITileDefinitionManager _tileDefinitionManager; [Dependency] private readonly IMapManager _mapManager = default!;
[Dependency] private readonly IMapManager _mapManager;
#pragma warning restore 649
public override string Name => "FloorTile"; public override string Name => "FloorTile";
private string _outputTile; private string _outputTile;

4
Content.Server/GameObjects/Components/Items/RCD/RCDAmmoComponent.cs
View File

@@ -15,10 +15,8 @@ namespace Content.Server.GameObjects.Components.Items.RCD
[RegisterComponent] [RegisterComponent]
public class RCDAmmoComponent : Component, IAfterInteract, IExamine public class RCDAmmoComponent : Component, IAfterInteract, IExamine
{ {
[Dependency] private IServerNotifyManager _serverNotifyManager = default!;
#pragma warning disable 649
[Dependency] private IServerNotifyManager _serverNotifyManager;
#pragma warning restore 649
public override string Name => "RCDAmmo"; public override string Name => "RCDAmmo";
//How much ammo we refill //How much ammo we refill

12
Content.Server/GameObjects/Components/Items/RCD/RCDComponent.cs
View File

@@ -25,14 +25,12 @@ namespace Content.Server.GameObjects.Components.Items.RCD
[RegisterComponent] [RegisterComponent]
public class RCDComponent : Component, IAfterInteract, IUse, IExamine public class RCDComponent : Component, IAfterInteract, IUse, IExamine
{ {
[Dependency] private readonly ITileDefinitionManager _tileDefinitionManager = default!;
[Dependency] private readonly IEntitySystemManager _entitySystemManager = default!;
[Dependency] private readonly IMapManager _mapManager = default!;
[Dependency] private readonly IServerEntityManager _serverEntityManager = default!;
[Dependency] private readonly IServerNotifyManager _serverNotifyManager = default!;
#pragma warning disable 649
[Dependency] private readonly ITileDefinitionManager _tileDefinitionManager;
[Dependency] private readonly IEntitySystemManager _entitySystemManager;
[Dependency] private readonly IMapManager _mapManager;
[Dependency] private readonly IServerEntityManager _serverEntityManager;
[Dependency] private IServerNotifyManager _serverNotifyManager;
#pragma warning restore 649
public override string Name => "RCD"; public override string Name => "RCD";
private RcdMode _mode = 0; //What mode are we on? Can be floors, walls, deconstruct. private RcdMode _mode = 0; //What mode are we on? Can be floors, walls, deconstruct.
private readonly RcdMode[] _modes = (RcdMode[]) Enum.GetValues(typeof(RcdMode)); private readonly RcdMode[] _modes = (RcdMode[]) Enum.GetValues(typeof(RcdMode));

6
Content.Server/GameObjects/Components/Items/Storage/Fill/MedkitFillComponent.cs
View File

@@ -8,11 +8,9 @@ namespace Content.Server.GameObjects.Components.Items.Storage.Fill
[RegisterComponent] [RegisterComponent]
internal sealed class MedkitFillComponent : Component, IMapInit internal sealed class MedkitFillComponent : Component, IMapInit
{ {
public override string Name => "MedkitFill"; [Dependency] private readonly IEntityManager _entityManager = default!;
#pragma warning disable 649 public override string Name => "MedkitFill";
[Dependency] private readonly IEntityManager _entityManager;
#pragma warning restore 649
void IMapInit.MapInit() void IMapInit.MapInit()
{ {

6
Content.Server/GameObjects/Components/Items/Storage/Fill/StorageFillComponent.cs
View File

@@ -10,14 +10,12 @@ namespace Content.Server.GameObjects.Components.Items.Storage.Fill
[RegisterComponent] [RegisterComponent]
internal sealed class StorageFillComponent : Component, IMapInit internal sealed class StorageFillComponent : Component, IMapInit
{ {
[Dependency] private readonly IEntityManager _entityManager = default!;
public override string Name => "StorageFill"; public override string Name => "StorageFill";
private List<string> _contents = new List<string>(); private List<string> _contents = new List<string>();
#pragma warning disable 649
[Dependency] private readonly IEntityManager _entityManager;
#pragma warning restore 649
public override void ExposeData(ObjectSerializer serializer) public override void ExposeData(ObjectSerializer serializer)
{ {
base.ExposeData(serializer); base.ExposeData(serializer);

6
Content.Server/GameObjects/Components/Items/Storage/Fill/ToolboxElectricalFillComponent.cs
View File

@@ -10,11 +10,9 @@ namespace Content.Server.GameObjects.Components.Items.Storage.Fill
[RegisterComponent] [RegisterComponent]
internal sealed class ToolboxElectricalFillComponent : Component, IMapInit internal sealed class ToolboxElectricalFillComponent : Component, IMapInit
{ {
public override string Name => "ToolboxElectricalFill"; [Dependency] private readonly IEntityManager _entityManager = default!;
#pragma warning disable 649 public override string Name => "ToolboxElectricalFill";
[Dependency] private readonly IEntityManager _entityManager;
#pragma warning restore 649
void IMapInit.MapInit() void IMapInit.MapInit()
{ {

6
Content.Server/GameObjects/Components/Items/Storage/Fill/ToolboxEmergencyFillComponent.cs
View File

@@ -10,11 +10,9 @@ namespace Content.Server.GameObjects.Components.Items.Storage.Fill
[RegisterComponent] [RegisterComponent]
internal sealed class ToolboxEmergencyFillComponent : Component, IMapInit internal sealed class ToolboxEmergencyFillComponent : Component, IMapInit
{ {
public override string Name => "ToolboxEmergencyFill"; [Dependency] private readonly IEntityManager _entityManager = default!;
#pragma warning disable 649 public override string Name => "ToolboxEmergencyFill";
[Dependency] private readonly IEntityManager _entityManager;
#pragma warning restore 649
void IMapInit.MapInit() void IMapInit.MapInit()
{ {

6
Content.Server/GameObjects/Components/Items/Storage/Fill/ToolboxGoldFillComponent.cs
View File

@@ -10,11 +10,9 @@ namespace Content.Server.GameObjects.Components.Items.Storage.Fill
[RegisterComponent] [RegisterComponent]
internal sealed class ToolboxGoldFillComponent : Component, IMapInit internal sealed class ToolboxGoldFillComponent : Component, IMapInit
{ {
public override string Name => "ToolboxGoldFill"; [Dependency] private readonly IEntityManager _entityManager = default!;
#pragma warning disable 649 public override string Name => "ToolboxGoldFill";
[Dependency] private readonly IEntityManager _entityManager;
#pragma warning restore 649
void IMapInit.MapInit() void IMapInit.MapInit()
{ {

6
Content.Server/GameObjects/Components/Items/Storage/Fill/UtilityBeltClothingFillComponent.cs
View File

@@ -8,11 +8,9 @@ namespace Content.Server.GameObjects.Components.Items.Storage.Fill
[RegisterComponent] [RegisterComponent]
internal sealed class UtilityBeltClothingFillComponent : Component, IMapInit internal sealed class UtilityBeltClothingFillComponent : Component, IMapInit
{ {
public override string Name => "UtilityBeltClothingFill"; [Dependency] private readonly IEntityManager _entityManager = default!;
#pragma warning disable 649 public override string Name => "UtilityBeltClothingFill";
[Dependency] private readonly IEntityManager _entityManager;
#pragma warning restore 649
void IMapInit.MapInit() void IMapInit.MapInit()
{ {

6
Content.Server/GameObjects/Components/Items/Storage/ItemComponent.cs
View File

@@ -24,13 +24,11 @@ namespace Content.Server.GameObjects.Components.Items.Storage
[ComponentReference(typeof(IItemComponent))] [ComponentReference(typeof(IItemComponent))]
public class ItemComponent : StorableComponent, IInteractHand, IExAct, IEquipped, IUnequipped, IItemComponent public class ItemComponent : StorableComponent, IInteractHand, IExAct, IEquipped, IUnequipped, IItemComponent
{ {
[Dependency] private readonly IMapManager _mapManager = default!;
public override string Name => "Item"; public override string Name => "Item";
public override uint? NetID => ContentNetIDs.ITEM; public override uint? NetID => ContentNetIDs.ITEM;
#pragma warning disable 649
[Dependency] private readonly IMapManager _mapManager;
#pragma warning restore 649
private string _equippedPrefix; private string _equippedPrefix;
public string EquippedPrefix public string EquippedPrefix

6
Content.Server/GameObjects/Components/Items/ToysComponent.cs
View File

@@ -16,10 +16,8 @@ namespace Content.Server.GameObjects.Components.Items
[RegisterComponent] [RegisterComponent]
public class ToysComponent : Component, IActivate, IUse, ILand public class ToysComponent : Component, IActivate, IUse, ILand
{ {
#pragma warning disable 649 [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
[Dependency] private readonly IPrototypeManager _prototypeManager; [Dependency] private readonly IRobustRandom _random = default!;
[Dependency] private readonly IRobustRandom _random;
#pragma warning restore 649
public override string Name => "Toys"; public override string Name => "Toys";

12
Content.Server/GameObjects/Components/Markers/ConditionalSpawnerComponent.cs
View File

@@ -18,14 +18,12 @@ namespace Content.Server.GameObjects.Components.Markers
[RegisterComponent] [RegisterComponent]
public class ConditionalSpawnerComponent : Component, IMapInit public class ConditionalSpawnerComponent : Component, IMapInit
{ {
public override string Name => "ConditionalSpawner"; [Dependency] private readonly IGameTicker _gameTicker = default!;
[Dependency] private readonly IReflectionManager _reflectionManager = default!;
[Dependency] private readonly IEntityManager _entityManager = default!;
[Dependency] private readonly IRobustRandom _robustRandom = default!;
#pragma warning disable 649 public override string Name => "ConditionalSpawner";
[Dependency] private IGameTicker _gameTicker;
[Dependency] private IReflectionManager _reflectionManager;
[Dependency] private IEntityManager _entityManager;
[Dependency] private IRobustRandom _robustRandom;
#pragma warning restore 649
[ViewVariables(VVAccess.ReadWrite)] [ViewVariables(VVAccess.ReadWrite)]
public List<string> Prototypes { get; set; } = new List<string>(); public List<string> Prototypes { get; set; } = new List<string>();

4
Content.Server/GameObjects/Components/Markers/SpawnPointComponent.cs
View File

@@ -12,9 +12,7 @@ namespace Content.Server.GameObjects.Components.Markers
[ComponentReference(typeof(SharedSpawnPointComponent))] [ComponentReference(typeof(SharedSpawnPointComponent))]
public sealed class SpawnPointComponent : SharedSpawnPointComponent public sealed class SpawnPointComponent : SharedSpawnPointComponent
{ {
#pragma warning disable 649 [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
[Dependency] private IPrototypeManager _prototypeManager;
#pragma warning restore 649
[ViewVariables(VVAccess.ReadWrite)] [ViewVariables(VVAccess.ReadWrite)]
private SpawnPointType _spawnType; private SpawnPointType _spawnType;

6
Content.Server/GameObjects/Components/Markers/TimedSpawnerComponent.cs
View File

@@ -15,10 +15,8 @@ namespace Content.Server.GameObjects.Components.Markers
[RegisterComponent] [RegisterComponent]
public class TimedSpawnerComponent : Component public class TimedSpawnerComponent : Component
{ {
#pragma warning disable 649 [Dependency] private readonly IEntityManager _entityManager = default!;
[Dependency] private IEntityManager _entityManager; [Dependency] private readonly IRobustRandom _robustRandom = default!;
[Dependency] private IRobustRandom _robustRandom;
#pragma warning restore 649
public override string Name => "TimedSpawner"; public override string Name => "TimedSpawner";

8
Content.Server/GameObjects/Components/Markers/TrashSpawnerComponent.cs
View File

@@ -14,12 +14,10 @@ namespace Content.Server.GameObjects.Components.Markers
[RegisterComponent] [RegisterComponent]
public class TrashSpawnerComponent : ConditionalSpawnerComponent public class TrashSpawnerComponent : ConditionalSpawnerComponent
{ {
public override string Name => "TrashSpawner"; [Dependency] private readonly IEntityManager _entityManager = default!;
[Dependency] private readonly IRobustRandom _robustRandom = default!;
#pragma warning disable 649 public override string Name => "TrashSpawner";
[Dependency] private IEntityManager _entityManager;
[Dependency] private IRobustRandom _robustRandom;
#pragma warning restore 649
[ViewVariables(VVAccess.ReadWrite)] [ViewVariables(VVAccess.ReadWrite)]
public List<string> RarePrototypes { get; set; } = new List<string>(); public List<string> RarePrototypes { get; set; } = new List<string>();

4
Content.Server/GameObjects/Components/Metabolism/MetabolismComponent.cs
View File

@@ -20,9 +20,7 @@ namespace Content.Server.GameObjects.Components.Metabolism
[RegisterComponent] [RegisterComponent]
public class MetabolismComponent : Component public class MetabolismComponent : Component
{ {
#pragma warning disable 649 [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
[Dependency] private readonly IPrototypeManager _prototypeManager;
#pragma warning restore 649
public override string Name => "Metabolism"; public override string Name => "Metabolism";

6
Content.Server/GameObjects/Components/Mining/AsteroidRockComponent.cs
View File

@@ -17,13 +17,11 @@ namespace Content.Server.GameObjects.Components.Mining
[RegisterComponent] [RegisterComponent]
public class AsteroidRockComponent : Component, IInteractUsing public class AsteroidRockComponent : Component, IInteractUsing
{ {
[Dependency] private readonly IRobustRandom _random = default!;
public override string Name => "AsteroidRock"; public override string Name => "AsteroidRock";
private static readonly string[] SpriteStates = {"0", "1", "2", "3", "4"}; private static readonly string[] SpriteStates = {"0", "1", "2", "3", "4"};
#pragma warning disable 649
[Dependency] private readonly IRobustRandom _random;
#pragma warning restore 649
public override void Initialize() public override void Initialize()
{ {
base.Initialize(); base.Initialize();

4
Content.Server/GameObjects/Components/Mobs/StunnableComponent.cs
View File

@@ -12,9 +12,7 @@ namespace Content.Server.GameObjects.Components.Mobs
[ComponentReference(typeof(SharedStunnableComponent))] [ComponentReference(typeof(SharedStunnableComponent))]
public class StunnableComponent : SharedStunnableComponent public class StunnableComponent : SharedStunnableComponent
{ {
#pragma warning disable 649 [Dependency] private readonly IGameTiming _gameTiming = default!;
[Dependency] private IGameTiming _gameTiming;
#pragma warning restore 649
protected override void OnKnockdown() protected override void OnKnockdown()
{ {

8
Content.Server/GameObjects/Components/NodeContainer/NodeGroups/NodeGroupFactory.cs
View File

@@ -22,12 +22,10 @@ namespace Content.Server.GameObjects.Components.NodeContainer.NodeGroups
public class NodeGroupFactory : INodeGroupFactory public class NodeGroupFactory : INodeGroupFactory
{ {
private readonly Dictionary<NodeGroupID, Type> _groupTypes = new Dictionary<NodeGroupID, Type>(); [Dependency] private readonly IReflectionManager _reflectionManager = default!;
[Dependency] private readonly IDynamicTypeFactory _typeFactory = default!;
#pragma warning disable 649 private readonly Dictionary<NodeGroupID, Type> _groupTypes = new Dictionary<NodeGroupID, Type>();
[Dependency] private readonly IReflectionManager _reflectionManager;
[Dependency] private readonly IDynamicTypeFactory _typeFactory;
#pragma warning restore 649
public void Initialize() public void Initialize()
{ {

6
Content.Server/GameObjects/Components/NodeContainer/NodeGroups/PowerNetNodeGroup.cs
View File

@@ -29,6 +29,8 @@ namespace Content.Server.GameObjects.Components.NodeContainer.NodeGroups
[NodeGroup(NodeGroupID.HVPower, NodeGroupID.MVPower)] [NodeGroup(NodeGroupID.HVPower, NodeGroupID.MVPower)]
public class PowerNetNodeGroup : BaseNetConnectorNodeGroup<BasePowerNetComponent, IPowerNet>, IPowerNet public class PowerNetNodeGroup : BaseNetConnectorNodeGroup<BasePowerNetComponent, IPowerNet>, IPowerNet
{ {
[Dependency] private readonly IPowerNetManager _powerNetManager = default!;
[ViewVariables] [ViewVariables]
private readonly List<PowerSupplierComponent> _suppliers = new List<PowerSupplierComponent>(); private readonly List<PowerSupplierComponent> _suppliers = new List<PowerSupplierComponent>();
@@ -43,10 +45,6 @@ namespace Content.Server.GameObjects.Components.NodeContainer.NodeGroups
public static readonly IPowerNet NullNet = new NullPowerNet(); public static readonly IPowerNet NullNet = new NullPowerNet();
#pragma warning disable 649
[Dependency] private readonly IPowerNetManager _powerNetManager;
#pragma warning restore 649
public PowerNetNodeGroup() public PowerNetNodeGroup()
{ {
foreach (Priority priority in Enum.GetValues(typeof(Priority))) foreach (Priority priority in Enum.GetValues(typeof(Priority)))

7
Content.Server/GameObjects/Components/Nutrition/DrinkComponent.cs
View File

@@ -29,10 +29,9 @@ namespace Content.Server.GameObjects.Components.Nutrition
[ComponentReference(typeof(IAfterInteract))] [ComponentReference(typeof(IAfterInteract))]
public class DrinkComponent : Component, IUse, IAfterInteract, ISolutionChange, IExamine, ILand public class DrinkComponent : Component, IUse, IAfterInteract, ISolutionChange, IExamine, ILand
{ {
#pragma warning disable 649 [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
[Dependency] private readonly IPrototypeManager _prototypeManager; [Dependency] private readonly IRobustRandom _random = default!;
[Dependency] private readonly IRobustRandom _random;
#pragma warning restore 649
public override string Name => "Drink"; public override string Name => "Drink";
[ViewVariables] [ViewVariables]

Some files were not shown because too many files have changed in this diff Show More