Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
3 changes: 3 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -202,6 +202,9 @@ csharp_preserve_single_line_blocks = true
#dotnet_naming_style.begins_with_i.capitalization = pascal_case

dotnet_diagnostic.ide0055.severity = warning
dotnet_diagnostic.CS0618.severity = none
dotnet_diagnostic.CS0612.severity = none
dotnet_diagnostic.CS0672.severity = none

dotnet_naming_rule.constants_rule.severity = warning
dotnet_naming_rule.constants_rule.style = upper_camel_case_style
Expand Down
3 changes: 2 additions & 1 deletion Content.Benchmarks/ColorInterpolateBenchmark.cs
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,8 @@ public class ColorInterpolateBenchmark
[GlobalSetup]
public void Setup()
{
var random = new Random(3005);
var random = new RobustRandom();
random.SetSeed(3005);

_colors = new (Color, Color)[N];
_output = new Color[N];
Expand Down
12 changes: 6 additions & 6 deletions Content.Benchmarks/DependencyInjectBenchmark.cs
Original file line number Diff line number Diff line change
Expand Up @@ -57,13 +57,13 @@ private sealed class X3 { }
private sealed class X4 { }
private sealed class X5 { }

private sealed class TestDummy
private sealed partial class TestDummy
{
[Dependency] private readonly X1 _x1;
[Dependency] private readonly X2 _x2;
[Dependency] private readonly X3 _x3;
[Dependency] private readonly X4 _x4;
[Dependency] private readonly X5 _x5;
[Dependency] private X1 _x1;
[Dependency] private X2 _x2;
[Dependency] private X3 _x3;
[Dependency] private X4 _x4;
[Dependency] private X5 _x5;
}
}
}
Expand Down
8 changes: 4 additions & 4 deletions Content.Client/Access/Commands/ShowAccessReadersCommand.cs
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@

namespace Content.Client.Access.Commands;

public sealed class ShowAccessReadersCommand : LocalizedEntityCommands
public sealed partial class ShowAccessReadersCommand : LocalizedEntityCommands
{
[Dependency] private readonly IOverlayManager _overlay = default!;
[Dependency] private readonly IResourceCache _cache = default!;
[Dependency] private readonly SharedTransformSystem _xform = default!;
[Dependency] private IOverlayManager _overlay = default!;
[Dependency] private IResourceCache _cache = default!;
[Dependency] private SharedTransformSystem _xform = default!;

public override string Command => "showaccessreaders";

Expand Down
8 changes: 4 additions & 4 deletions Content.Client/Access/Systems/JobStatusSystem.cs
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@

namespace Content.Client.Access.Systems;

public sealed class JobStatusSystem : SharedJobStatusSystem
public sealed partial class JobStatusSystem : SharedJobStatusSystem
{
[Dependency] private readonly ShowJobIconsSystem _showJobIcons = default!;
[Dependency] private readonly ShowCrewIconsSystem _showCrewIcons = default!;
[Dependency] private readonly IPrototypeManager _prototype = default!;
[Dependency] private ShowJobIconsSystem _showJobIcons = default!;
[Dependency] private ShowCrewIconsSystem _showCrewIcons = default!;
[Dependency] private IPrototypeManager _prototype = default!;

private static readonly ProtoId<SecurityIconPrototype> CrewBorderIcon = "CrewBorderIcon";
private static readonly ProtoId<SecurityIconPrototype> CrewUncertainBorderIcon = "CrewUncertainBorderIcon";
Expand Down
2 changes: 1 addition & 1 deletion Content.Client/Access/UI/AccessLevelControl.xaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ namespace Content.Client.Access.UI;
[GenerateTypedNameReferences]
public sealed partial class AccessLevelControl : GridContainer
{
[Dependency] private readonly ILogManager _logManager = default!;
[Dependency] private ILogManager _logManager = default!;

private ISawmill _sawmill = default!;

Expand Down
4 changes: 2 additions & 2 deletions Content.Client/Access/UI/AccessOverriderBoundUserInterface.cs
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@

namespace Content.Client.Access.UI
{
public sealed class AccessOverriderBoundUserInterface : BoundUserInterface
public sealed partial class AccessOverriderBoundUserInterface : BoundUserInterface
{
[Dependency] private readonly IPrototypeManager _prototypeManager = default!;
[Dependency] private IPrototypeManager _prototypeManager = default!;
private readonly SharedAccessOverriderSystem _accessOverriderSystem = default!;

private AccessOverriderWindow? _window;
Expand Down
4 changes: 2 additions & 2 deletions Content.Client/Access/UI/AgentIDCardWindow.xaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ namespace Content.Client.Access.UI
[GenerateTypedNameReferences]
public sealed partial class AgentIDCardWindow : DefaultWindow
{
[Dependency] private readonly IPrototypeManager _prototypeManager = default!;
[Dependency] private readonly IEntitySystemManager _entitySystem = default!;
[Dependency] private IPrototypeManager _prototypeManager = default!;
[Dependency] private IEntitySystemManager _entitySystem = default!;
private readonly SpriteSystem _spriteSystem;

private const int JobIconColumnCount = 10;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ public sealed partial class GroupedAccessLevelChecklist : BoxContainer
{
private static readonly ProtoId<AccessGroupPrototype> GeneralAccessGroup = "General";

[Dependency] private readonly IPrototypeManager _protoManager = default!;
[Dependency] private IPrototypeManager _protoManager = default!;

private bool _isMonotone;
private string? _labelStyleClass;
Expand Down
4 changes: 2 additions & 2 deletions Content.Client/Access/UI/IdCardConsoleBoundUserInterface.cs
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@

namespace Content.Client.Access.UI
{
public sealed class IdCardConsoleBoundUserInterface : BoundUserInterface
public sealed partial class IdCardConsoleBoundUserInterface : BoundUserInterface
{
[Dependency] private readonly IPrototypeManager _prototypeManager = default!;
[Dependency] private IPrototypeManager _prototypeManager = default!;
private readonly SharedIdCardConsoleSystem _idCardConsoleSystem = default!;

private IdCardConsoleWindow? _window;
Expand Down
2 changes: 1 addition & 1 deletion Content.Client/Access/UI/IdCardConsoleWindow.xaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ namespace Content.Client.Access.UI
[GenerateTypedNameReferences]
public sealed partial class IdCardConsoleWindow : DefaultWindow
{
[Dependency] private readonly IConfigurationManager _cfgManager = default!;
[Dependency] private IConfigurationManager _cfgManager = default!;

private readonly IdCardConsoleBoundUserInterface _owner;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@

namespace Content.Client.Access.UI
{
public sealed class IdPrinterConsoleBoundUserInterface : BoundUserInterface
public sealed partial class IdPrinterConsoleBoundUserInterface : BoundUserInterface
{
[Dependency] private readonly IPrototypeManager _prototypeManager = default!;
[Dependency] private IPrototypeManager _prototypeManager = default!;
private IdPrinterConsoleWindow? _window;


Expand Down
14 changes: 7 additions & 7 deletions Content.Client/Actions/ActionsSystem.cs
Original file line number Diff line number Diff line change
Expand Up @@ -24,16 +24,16 @@
namespace Content.Client.Actions
{
[UsedImplicitly]
public sealed class ActionsSystem : SharedActionsSystem
public sealed partial class ActionsSystem : SharedActionsSystem
{
public delegate void OnActionReplaced(EntityUid actionId);

[Dependency] private readonly SharedChargesSystem _sharedCharges = default!;
[Dependency] private readonly IPlayerManager _playerManager = default!;
[Dependency] private readonly IPrototypeManager _proto = default!;
[Dependency] private readonly IResourceManager _resources = default!;
[Dependency] private readonly MetaDataSystem _metaData = default!;
[Dependency] private readonly ISerializationManager _serialization = default!;
[Dependency] private SharedChargesSystem _sharedCharges = default!;
[Dependency] private IPlayerManager _playerManager = default!;
[Dependency] private IPrototypeManager _proto = default!;
[Dependency] private IResourceManager _resources = default!;
[Dependency] private MetaDataSystem _metaData = default!;
[Dependency] private ISerializationManager _serialization = default!;

public event Action<EntityUid>? OnActionAdded;
public event Action<EntityUid>? OnActionRemoved;
Expand Down
16 changes: 8 additions & 8 deletions Content.Client/Administration/Managers/ClientAdminManager.cs
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,15 @@

namespace Content.Client.Administration.Managers
{
public sealed class ClientAdminManager : IClientAdminManager, IClientConGroupImplementation, IPostInjectInit, ISharedAdminManager
public sealed partial class ClientAdminManager : IClientAdminManager, IClientConGroupImplementation, IPostInjectInit, ISharedAdminManager
{
[Dependency] private readonly IPlayerManager _player = default!;
[Dependency] private readonly IClientNetManager _netMgr = default!;
[Dependency] private readonly IClientConGroupController _conGroup = default!;
[Dependency] private readonly IClientConsoleHost _host = default!;
[Dependency] private readonly IResourceManager _res = default!;
[Dependency] private readonly ILogManager _logManager = default!;
[Dependency] private readonly IUserInterfaceManager _userInterface = default!;
[Dependency] private IPlayerManager _player = default!;
[Dependency] private IClientNetManager _netMgr = default!;
[Dependency] private IClientConGroupController _conGroup = default!;
[Dependency] private IClientConsoleHost _host = default!;
[Dependency] private IResourceManager _res = default!;
[Dependency] private ILogManager _logManager = default!;
[Dependency] private IUserInterfaceManager _userInterface = default!;

private AdminData? _adminData;
private readonly HashSet<string> _availableCommands = new();
Expand Down
18 changes: 9 additions & 9 deletions Content.Client/Administration/Systems/AdminSystem.Overlay.cs
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,15 @@ namespace Content.Client.Administration.Systems
{
public sealed partial class AdminSystem
{
[Dependency] private readonly IOverlayManager _overlayManager = default!;
[Dependency] private readonly IResourceCache _resourceCache = default!;
[Dependency] private readonly IClientAdminManager _adminManager = default!;
[Dependency] private readonly IEyeManager _eyeManager = default!;
[Dependency] private readonly EntityLookupSystem _entityLookup = default!;
[Dependency] private readonly IUserInterfaceManager _userInterfaceManager = default!;
[Dependency] private readonly IConfigurationManager _configurationManager = default!;
[Dependency] private readonly SharedRoleSystem _roles = default!;
[Dependency] private readonly IPrototypeManager _proto = default!;
[Dependency] private IOverlayManager _overlayManager = default!;
[Dependency] private IResourceCache _resourceCache = default!;
[Dependency] private IClientAdminManager _adminManager = default!;
[Dependency] private IEyeManager _eyeManager = default!;
[Dependency] private EntityLookupSystem _entityLookup = default!;
[Dependency] private IUserInterfaceManager _userInterfaceManager = default!;
[Dependency] private IConfigurationManager _configurationManager = default!;
[Dependency] private SharedRoleSystem _roles = default!;
[Dependency] private IPrototypeManager _proto = default!;

private AdminNameOverlay _adminNameOverlay = default!;

Expand Down
8 changes: 4 additions & 4 deletions Content.Client/Administration/Systems/AdminVerbSystem.cs
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@ namespace Content.Client.Administration.Systems
/// <summary>
/// Client-side admin verb system. These usually open some sort of UIs.
/// </summary>
sealed class AdminVerbSystem : EntitySystem
sealed partial class AdminVerbSystem : EntitySystem
{
[Dependency] private readonly IClientConGroupController _clientConGroupController = default!;
[Dependency] private readonly IClientConsoleHost _clientConsoleHost = default!;
[Dependency] private readonly ISharedAdminManager _admin = default!;
[Dependency] private IClientConGroupController _clientConGroupController = default!;
[Dependency] private IClientConsoleHost _clientConsoleHost = default!;
[Dependency] private ISharedAdminManager _admin = default!;

public override void Initialize()
{
Expand Down
4 changes: 2 additions & 2 deletions Content.Client/Administration/Systems/BwoinkSystem.cs
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
namespace Content.Client.Administration.Systems
{
[UsedImplicitly]
public sealed class BwoinkSystem : SharedBwoinkSystem
public sealed partial class BwoinkSystem : SharedBwoinkSystem
{
[Dependency] private readonly IGameTiming _timing = default!;
[Dependency] private IGameTiming _timing = default!;

public event EventHandler<BwoinkTextMessage>? OnBwoinkTextMessageRecieved;
private (TimeSpan Timestamp, bool Typing) _lastTypingUpdateSent;
Expand Down
6 changes: 3 additions & 3 deletions Content.Client/Administration/Systems/KillSignSystem.cs
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@

namespace Content.Client.Administration.Systems;

public sealed class KillSignSystem : EntitySystem
public sealed partial class KillSignSystem : EntitySystem
{
[Dependency] private readonly SpriteSystem _sprite = default!;
[Dependency] private readonly IPlayerManager _player = default!;
[Dependency] private SpriteSystem _sprite = default!;
[Dependency] private IPlayerManager _player = default!;

public override void Initialize()
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ namespace Content.Client.Administration.UI
[GenerateTypedNameReferences]
public sealed partial class AdminAnnounceWindow : DefaultWindow
{
[Dependency] private readonly ILocalizationManager _localization = default!;
[Dependency] private ILocalizationManager _localization = default!;

public AdminAnnounceWindow()
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ namespace Content.Client.Administration.UI.AdminCamera;
[GenerateTypedNameReferences]
public sealed partial class AdminCameraControl : Control
{
[Dependency] private readonly IEntityManager _entManager = default!;
[Dependency] private readonly IClientGameTiming _timing = default!;
[Dependency] private IEntityManager _entManager = default!;
[Dependency] private IClientGameTiming _timing = default!;

public event Action? OnFollow;
public event Action? OnPopoutControl;
Expand Down
1 change: 1 addition & 0 deletions Content.Client/Administration/UI/AdminMenuWindow.xaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ private void OnTabChanged(int tabIndex)
protected override void Dispose(bool disposing)
{
OnDisposed?.Invoke();
#pragma warning disable 0618
base.Dispose(disposing);
OnDisposed = null;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ namespace Content.Client.Administration.UI.AdminRemarks;
[GenerateTypedNameReferences]
public sealed partial class AdminMessagePopupWindow : Control
{
[Dependency] private readonly IStylesheetManager _styleMan = default!;
[Dependency] private IStylesheetManager _styleMan = default!;

private float _timer = float.MaxValue;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ namespace Content.Client.Administration.UI.AdminRemarks;
[GenerateTypedNameReferences]
public sealed partial class AdminRemarksWindow : FancyWindow
{
[Dependency] private readonly IEntitySystemManager _entitySystem = default!;
[Dependency] private IEntitySystemManager _entitySystem = default!;
private readonly SpriteSystem _sprites;
private readonly Dictionary<(int, NoteType), AdminNotesLine> _inputs = new();

Expand Down
4 changes: 2 additions & 2 deletions Content.Client/Administration/UI/BanList/BanListEui.cs
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@
namespace Content.Client.Administration.UI.BanList;

[UsedImplicitly]
public sealed class BanListEui : BaseEui
public sealed partial class BanListEui : BaseEui
{
[Dependency] private readonly IUserInterfaceManager _ui = default!;
[Dependency] private IUserInterfaceManager _ui = default!;

private BanListIdsPopup? _popup;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,10 @@ private void IdsPressed(ButtonEventArgs buttonEventArgs)
{
IdsClicked?.Invoke(this);
}

#pragma warning disable 0672
protected override void Dispose(bool disposing)
{
#pragma warning disable 0618
base.Dispose(disposing);

IdsHidden.OnPressed -= IdsPressed;
Expand Down
10 changes: 5 additions & 5 deletions Content.Client/Administration/UI/BanPanel/BanPanel.xaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -40,11 +40,11 @@ public sealed partial class BanPanel : DefaultWindow
private readonly Dictionary<string, List<(Button, IPrototype)>> _roleCheckboxes = new();
private readonly ISawmill _banPanelSawmill;

[Dependency] private readonly IGameTiming _gameTiming = default!;
[Dependency] private readonly IConfigurationManager _cfg = default!;
[Dependency] private readonly ILogManager _logManager = default!;
[Dependency] private readonly IEntityManager _entMan = default!;
[Dependency] private readonly IPrototypeManager _protoMan = default!;
[Dependency] private IGameTiming _gameTiming = default!;
[Dependency] private IConfigurationManager _cfg = default!;
[Dependency] private ILogManager _logManager = default!;
[Dependency] private IEntityManager _entMan = default!;
[Dependency] private IPrototypeManager _protoMan = default!;

private const string ExpandedArrow = "▼";
private const string ContractedArrow = "▶";
Expand Down
8 changes: 4 additions & 4 deletions Content.Client/Administration/UI/Bwoink/BwoinkControl.xaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@ namespace Content.Client.Administration.UI.Bwoink
[GenerateTypedNameReferences]
public sealed partial class BwoinkControl : Control
{
[Dependency] private readonly IClientAdminManager _adminManager = default!;
[Dependency] private readonly IClientConsoleHost _console = default!;
[Dependency] private readonly IUserInterfaceManager _ui = default!;
[Dependency] private readonly IConfigurationManager _cfg = default!;
[Dependency] private IClientAdminManager _adminManager = default!;
[Dependency] private IClientConsoleHost _console = default!;
[Dependency] private IUserInterfaceManager _ui = default!;
[Dependency] private IConfigurationManager _cfg = default!;
public AdminAHelpUIHandler AHelpHelper = default!;

private PlayerInfo? _currentPlayer;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ namespace Content.Client.Administration.UI.CustomControls
[Virtual]
public class CommandButton : Button, IDocumentTag
{
private ISawmill _sawmill = default!;
public string? Command { get; set; }

public CommandButton()
Expand Down Expand Up @@ -41,7 +42,7 @@ public bool TryParseTag(Dictionary<string, string> args, [NotNullWhen(true)] out
{
if (args.Count != 2 || !args.TryGetValue("Text", out var text) || !args.TryGetValue("Command", out var command))
{
Logger.Error($"Invalid arguments passed to {nameof(CommandButton)}");
_sawmill.Error($"Invalid arguments passed to {nameof(CommandButton)}");
control = null;
return false;
}
Expand Down
Loading
Loading