From: Mervill Date: Fri, 23 Aug 2024 01:10:13 +0000 (-0700) Subject: Remove obsolete functions from tile commands. (#31112) X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=35c4e29db9148510f74dcd39e2392b768e29343a;p=space-station-14.git Remove obsolete functions from tile commands. (#31112) * first part * second part - file scope namespaces * missing peice --- diff --git a/Content.Server/Construction/Commands/FixRotationsCommand.cs b/Content.Server/Construction/Commands/FixRotationsCommand.cs index 9c99035573..1a42d4bf38 100644 --- a/Content.Server/Construction/Commands/FixRotationsCommand.cs +++ b/Content.Server/Construction/Commands/FixRotationsCommand.cs @@ -6,103 +6,102 @@ using Content.Shared.Tag; using Robust.Shared.Console; using Robust.Shared.Map.Components; -namespace Content.Server.Construction.Commands +namespace Content.Server.Construction.Commands; + +[AdminCommand(AdminFlags.Mapping)] +public sealed class FixRotationsCommand : IConsoleCommand { - [AdminCommand(AdminFlags.Mapping)] - public sealed class FixRotationsCommand : IConsoleCommand - { - [Dependency] private readonly IEntityManager _entManager = default!; + [Dependency] private readonly IEntityManager _entManager = default!; - // ReSharper disable once StringLiteralTypo - public string Command => "fixrotations"; - public string Description => "Sets the rotation of all occluders, low walls and windows to south."; - public string Help => $"Usage: {Command} | {Command}"; + // ReSharper disable once StringLiteralTypo + public string Command => "fixrotations"; + public string Description => "Sets the rotation of all occluders, low walls and windows to south."; + public string Help => $"Usage: {Command} | {Command}"; - public void Execute(IConsoleShell shell, string argsOther, string[] args) + public void Execute(IConsoleShell shell, string argsOther, string[] args) + { + var player = shell.Player; + EntityUid? gridId; + var xformQuery = _entManager.GetEntityQuery(); + + switch (args.Length) { - var player = shell.Player; - EntityUid? gridId; - var xformQuery = _entManager.GetEntityQuery(); + case 0: + if (player?.AttachedEntity is not { Valid: true } playerEntity) + { + shell.WriteError("Only a player can run this command."); + return; + } - switch (args.Length) - { - case 0: - if (player?.AttachedEntity is not {Valid: true} playerEntity) - { - shell.WriteError("Only a player can run this command."); - return; - } - - gridId = xformQuery.GetComponent(playerEntity).GridUid; - break; - case 1: - if (!NetEntity.TryParse(args[0], out var idNet) || !_entManager.TryGetEntity(idNet, out var id)) - { - shell.WriteError($"{args[0]} is not a valid entity."); - return; - } - - gridId = id; - break; - default: - shell.WriteLine(Help); + gridId = xformQuery.GetComponent(playerEntity).GridUid; + break; + case 1: + if (!NetEntity.TryParse(args[0], out var idNet) || !_entManager.TryGetEntity(idNet, out var id)) + { + shell.WriteError($"{args[0]} is not a valid entity."); return; - } + } - if (!_entManager.TryGetComponent(gridId, out MapGridComponent? grid)) - { - shell.WriteError($"No grid exists with id {gridId}"); + gridId = id; + break; + default: + shell.WriteLine(Help); return; - } + } - if (!_entManager.EntityExists(gridId)) - { - shell.WriteError($"Grid {gridId} doesn't have an associated grid entity."); - return; - } + if (!_entManager.TryGetComponent(gridId, out MapGridComponent? grid)) + { + shell.WriteError($"No grid exists with id {gridId}"); + return; + } - var changed = 0; - var tagSystem = _entManager.EntitySysManager.GetEntitySystem(); + if (!_entManager.EntityExists(gridId)) + { + shell.WriteError($"Grid {gridId} doesn't have an associated grid entity."); + return; + } + var changed = 0; + var tagSystem = _entManager.EntitySysManager.GetEntitySystem(); - var enumerator = xformQuery.GetComponent(gridId.Value).ChildEnumerator; - while (enumerator.MoveNext(out var child)) + + var enumerator = xformQuery.GetComponent(gridId.Value).ChildEnumerator; + while (enumerator.MoveNext(out var child)) + { + if (!_entManager.EntityExists(child)) { - if (!_entManager.EntityExists(child)) - { - continue; - } + continue; + } - var valid = false; + var valid = false; - // Occluders should only count if the state of it right now is enabled. - // This prevents issues with edge firelocks. - if (_entManager.TryGetComponent(child, out var occluder)) - { - valid |= occluder.Enabled; - } - // low walls & grilles - valid |= _entManager.HasComponent(child); - // cables - valid |= _entManager.HasComponent(child); - // anything else that might need this forced - valid |= tagSystem.HasTag(child, "ForceFixRotations"); - // override - valid &= !tagSystem.HasTag(child, "ForceNoFixRotations"); + // Occluders should only count if the state of it right now is enabled. + // This prevents issues with edge firelocks. + if (_entManager.TryGetComponent(child, out var occluder)) + { + valid |= occluder.Enabled; + } + // low walls & grilles + valid |= _entManager.HasComponent(child); + // cables + valid |= _entManager.HasComponent(child); + // anything else that might need this forced + valid |= tagSystem.HasTag(child, "ForceFixRotations"); + // override + valid &= !tagSystem.HasTag(child, "ForceNoFixRotations"); - if (!valid) - continue; + if (!valid) + continue; - var childXform = xformQuery.GetComponent(child); + var childXform = xformQuery.GetComponent(child); - if (childXform.LocalRotation != Angle.Zero) - { - childXform.LocalRotation = Angle.Zero; - changed++; - } + if (childXform.LocalRotation != Angle.Zero) + { + childXform.LocalRotation = Angle.Zero; + changed++; } - - shell.WriteLine($"Changed {changed} entities. If things seem wrong, reconnect."); } + + shell.WriteLine($"Changed {changed} entities. If things seem wrong, reconnect."); } } diff --git a/Content.Server/Construction/Commands/TileReplaceCommand.cs b/Content.Server/Construction/Commands/TileReplaceCommand.cs index f63fd4c13e..e297099c3a 100644 --- a/Content.Server/Construction/Commands/TileReplaceCommand.cs +++ b/Content.Server/Construction/Commands/TileReplaceCommand.cs @@ -7,7 +7,7 @@ using Robust.Shared.Map.Components; namespace Content.Server.Construction.Commands; [AdminCommand(AdminFlags.Mapping)] -sealed class TileReplaceCommand : IConsoleCommand +public sealed class TileReplaceCommand : IConsoleCommand { [Dependency] private readonly IEntityManager _entManager = default!; [Dependency] private readonly ITileDefinitionManager _tileDef = default!; @@ -27,9 +27,9 @@ sealed class TileReplaceCommand : IConsoleCommand switch (args.Length) { case 2: - if (player?.AttachedEntity is not {Valid: true} playerEntity) + if (player?.AttachedEntity is not { Valid: true } playerEntity) { - shell.WriteLine("Only a player can run this command without a grid ID."); + shell.WriteError("Only a player can run this command without a grid ID."); return; } @@ -41,7 +41,7 @@ sealed class TileReplaceCommand : IConsoleCommand if (!NetEntity.TryParse(args[0], out var idNet) || !_entManager.TryGetEntity(idNet, out var id)) { - shell.WriteLine($"{args[0]} is not a valid entity."); + shell.WriteError($"{args[0]} is not a valid entity."); return; } @@ -59,23 +59,25 @@ sealed class TileReplaceCommand : IConsoleCommand if (!_entManager.TryGetComponent(gridId, out MapGridComponent? grid)) { - shell.WriteLine($"No grid exists with id {gridId}"); + shell.WriteError($"No grid exists with id {gridId}"); return; } if (!_entManager.EntityExists(gridId)) { - shell.WriteLine($"Grid {gridId} doesn't have an associated grid entity."); + shell.WriteError($"Grid {gridId} doesn't have an associated grid entity."); return; } + var mapSystem = _entManager.System(); + var changed = 0; - foreach (var tile in grid.GetAllTiles()) + foreach (var tile in mapSystem.GetAllTiles(gridId.Value, grid)) { var tileContent = tile.Tile; if (tileContent.TypeId == tileA.TileId) { - grid.SetTile(tile.GridIndices, new Tile(tileB.TileId)); + mapSystem.SetTile(gridId.Value, grid, tile.GridIndices, new Tile(tileB.TileId)); changed++; } } diff --git a/Content.Server/Construction/Commands/TileWallsCommand.cs b/Content.Server/Construction/Commands/TileWallsCommand.cs index 14d16dfb98..001b33913b 100644 --- a/Content.Server/Construction/Commands/TileWallsCommand.cs +++ b/Content.Server/Construction/Commands/TileWallsCommand.cs @@ -7,105 +7,104 @@ using Robust.Shared.Map; using Robust.Server.GameObjects; using Robust.Shared.Map.Components; -namespace Content.Server.Construction.Commands +namespace Content.Server.Construction.Commands; + +[AdminCommand(AdminFlags.Mapping)] +public sealed class TileWallsCommand : IConsoleCommand { - [AdminCommand(AdminFlags.Mapping)] - sealed class TileWallsCommand : IConsoleCommand - { - [Dependency] private readonly IEntityManager _entManager = default!; - [Dependency] private readonly ITileDefinitionManager _tileDefManager = default!; + [Dependency] private readonly IEntityManager _entManager = default!; + [Dependency] private readonly ITileDefinitionManager _tileDefManager = default!; - // ReSharper disable once StringLiteralTypo - public string Command => "tilewalls"; - public string Description => "Puts an underplating tile below every wall on a grid."; - public string Help => $"Usage: {Command} | {Command}"; + // ReSharper disable once StringLiteralTypo + public string Command => "tilewalls"; + public string Description => "Puts an underplating tile below every wall on a grid."; + public string Help => $"Usage: {Command} | {Command}"; - [ValidatePrototypeId] - public const string TilePrototypeId = "Plating"; + [ValidatePrototypeId] + public const string TilePrototypeId = "Plating"; - [ValidatePrototypeId] - public const string WallTag = "Wall"; + [ValidatePrototypeId] + public const string WallTag = "Wall"; - public void Execute(IConsoleShell shell, string argStr, string[] args) + public void Execute(IConsoleShell shell, string argStr, string[] args) + { + var player = shell.Player; + EntityUid? gridId; + + switch (args.Length) { - var player = shell.Player; - EntityUid? gridId; + case 0: + if (player?.AttachedEntity is not { Valid: true } playerEntity) + { + shell.WriteError("Only a player can run this command."); + return; + } - switch (args.Length) - { - case 0: - if (player?.AttachedEntity is not {Valid: true} playerEntity) - { - shell.WriteLine("Only a player can run this command."); - return; - } - - gridId = _entManager.GetComponent(playerEntity).GridUid; - break; - case 1: - if (!NetEntity.TryParse(args[0], out var idNet) || !_entManager.TryGetEntity(idNet, out var id)) - { - shell.WriteLine($"{args[0]} is not a valid entity."); - return; - } - - gridId = id; - break; - default: - shell.WriteLine(Help); + gridId = _entManager.GetComponent(playerEntity).GridUid; + break; + case 1: + if (!NetEntity.TryParse(args[0], out var idNet) || !_entManager.TryGetEntity(idNet, out var id)) + { + shell.WriteError($"{args[0]} is not a valid entity."); return; - } + } - if (!_entManager.TryGetComponent(gridId, out MapGridComponent? grid)) - { - shell.WriteLine($"No grid exists with id {gridId}"); + gridId = id; + break; + default: + shell.WriteLine(Help); return; - } + } - if (!_entManager.EntityExists(gridId)) + if (!_entManager.TryGetComponent(gridId, out MapGridComponent? grid)) + { + shell.WriteError($"No grid exists with id {gridId}"); + return; + } + + if (!_entManager.EntityExists(gridId)) + { + shell.WriteError($"Grid {gridId} doesn't have an associated grid entity."); + return; + } + + var tagSystem = _entManager.EntitySysManager.GetEntitySystem(); + var underplating = _tileDefManager[TilePrototypeId]; + var underplatingTile = new Tile(underplating.TileId); + var changed = 0; + var enumerator = _entManager.GetComponent(gridId.Value).ChildEnumerator; + while (enumerator.MoveNext(out var child)) + { + if (!_entManager.EntityExists(child)) { - shell.WriteLine($"Grid {gridId} doesn't have an associated grid entity."); - return; + continue; } - var tagSystem = _entManager.EntitySysManager.GetEntitySystem(); - var underplating = _tileDefManager[TilePrototypeId]; - var underplatingTile = new Tile(underplating.TileId); - var changed = 0; - var enumerator = _entManager.GetComponent(gridId.Value).ChildEnumerator; - while (enumerator.MoveNext(out var child)) + if (!tagSystem.HasTag(child, WallTag)) { - if (!_entManager.EntityExists(child)) - { - continue; - } - - if (!tagSystem.HasTag(child, WallTag)) - { - continue; - } - - var childTransform = _entManager.GetComponent(child); + continue; + } - if (!childTransform.Anchored) - { - continue; - } + var childTransform = _entManager.GetComponent(child); - var mapSystem = _entManager.System(); - var tile = mapSystem.GetTileRef(gridId.Value, grid, childTransform.Coordinates); - var tileDef = (ContentTileDefinition) _tileDefManager[tile.Tile.TypeId]; + if (!childTransform.Anchored) + { + continue; + } - if (tileDef.ID == TilePrototypeId) - { - continue; - } + var mapSystem = _entManager.System(); + var tile = mapSystem.GetTileRef(gridId.Value, grid, childTransform.Coordinates); + var tileDef = (ContentTileDefinition)_tileDefManager[tile.Tile.TypeId]; - grid.SetTile(childTransform.Coordinates, underplatingTile); - changed++; + if (tileDef.ID == TilePrototypeId) + { + continue; } - shell.WriteLine($"Changed {changed} tiles."); + mapSystem.SetTile(gridId.Value, grid, childTransform.Coordinates, underplatingTile); + changed++; } + + shell.WriteLine($"Changed {changed} tiles."); } } diff --git a/Content.Server/Interaction/TilePryCommand.cs b/Content.Server/Interaction/TilePryCommand.cs index 006a245ead..e8999a7d18 100644 --- a/Content.Server/Interaction/TilePryCommand.cs +++ b/Content.Server/Interaction/TilePryCommand.cs @@ -6,66 +6,66 @@ using Robust.Shared.Console; using Robust.Shared.Map; using Robust.Shared.Map.Components; -namespace Content.Server.Interaction +namespace Content.Server.Interaction; + +[AdminCommand(AdminFlags.Debug)] +public sealed class TilePryCommand : IConsoleCommand { - [AdminCommand(AdminFlags.Debug)] - sealed class TilePryCommand : IConsoleCommand - { - [Dependency] private readonly IEntityManager _entities = default!; + [Dependency] private readonly IEntityManager _entities = default!; - public string Command => "tilepry"; - public string Description => "Pries up all tiles in a radius around the user."; - public string Help => $"Usage: {Command} "; + public string Command => "tilepry"; + public string Description => "Pries up all tiles in a radius around the user."; + public string Help => $"Usage: {Command} "; - public void Execute(IConsoleShell shell, string argStr, string[] args) + public void Execute(IConsoleShell shell, string argStr, string[] args) + { + var player = shell.Player; + if (player?.AttachedEntity is not { } attached) { - var player = shell.Player; - if (player?.AttachedEntity is not {} attached) - { - return; - } + return; + } - if (args.Length != 1) - { - shell.WriteLine(Help); - return; - } + if (args.Length != 1) + { + shell.WriteLine(Help); + return; + } - if (!int.TryParse(args[0], out var radius)) - { - shell.WriteLine($"{args[0]} isn't a valid integer."); - return; - } + if (!int.TryParse(args[0], out var radius)) + { + shell.WriteError($"{args[0]} isn't a valid integer."); + return; + } - if (radius < 0) - { - shell.WriteLine("Radius must be positive."); - return; - } + if (radius < 0) + { + shell.WriteError("Radius must be positive."); + return; + } - var mapManager = IoCManager.Resolve(); - var xform = _entities.GetComponent(attached); - var playerGrid = xform.GridUid; + var mapSystem = _entities.System(); + var xform = _entities.GetComponent(attached); - if (!_entities.TryGetComponent(playerGrid, out var mapGrid)) - return; + var playerGrid = xform.GridUid; - var playerPosition = xform.Coordinates; - var tileDefinitionManager = IoCManager.Resolve(); + if (!_entities.TryGetComponent(playerGrid, out var mapGrid)) + return; - for (var i = -radius; i <= radius; i++) + var playerPosition = xform.Coordinates; + var tileDefinitionManager = IoCManager.Resolve(); + + for (var i = -radius; i <= radius; i++) + { + for (var j = -radius; j <= radius; j++) { - for (var j = -radius; j <= radius; j++) - { - var tile = mapGrid.GetTileRef(playerPosition.Offset(new Vector2(i, j))); - var coordinates = mapGrid.GridTileToLocal(tile.GridIndices); - var tileDef = (ContentTileDefinition) tileDefinitionManager[tile.Tile.TypeId]; + var tile = mapSystem.GetTileRef(playerGrid.Value, mapGrid, playerPosition.Offset(new Vector2(i, j))); + var coordinates = mapSystem.GridTileToLocal(playerGrid.Value, mapGrid, tile.GridIndices); + var tileDef = (ContentTileDefinition)tileDefinitionManager[tile.Tile.TypeId]; - if (!tileDef.CanCrowbar) continue; + if (!tileDef.CanCrowbar) continue; - var plating = tileDefinitionManager["Plating"]; - mapGrid.SetTile(coordinates, new Tile(plating.TileId)); - } + var plating = tileDefinitionManager["Plating"]; + mapSystem.SetTile(playerGrid.Value, mapGrid, coordinates, new Tile(plating.TileId)); } } }