Remove obsolete functions from tile commands. (#31112)

* first part

* second part - file scope namespaces

* missing peice
This commit is contained in:
Mervill
2024-08-22 18:10:13 -07:00
committed by GitHub
parent e1093ca36f
commit 35c4e29db9
4 changed files with 244 additions and 244 deletions

View File

@@ -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!;
// 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} <gridId> | {Command}";
public void Execute(IConsoleShell shell, string argsOther, string[] args)
{
[Dependency] private readonly IEntityManager _entManager = default!;
var player = shell.Player;
EntityUid? gridId;
var xformQuery = _entManager.GetEntityQuery<TransformComponent>();
// 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} <gridId> | {Command}";
public void Execute(IConsoleShell shell, string argsOther, string[] args)
switch (args.Length)
{
var player = shell.Player;
EntityUid? gridId;
var xformQuery = _entManager.GetEntityQuery<TransformComponent>();
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);
case 0:
if (player?.AttachedEntity is not { Valid: true } playerEntity)
{
shell.WriteError("Only a player can run this command.");
return;
}
}
if (!_entManager.TryGetComponent(gridId, out MapGridComponent? grid))
{
shell.WriteError($"No grid exists with id {gridId}");
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);
return;
}
if (!_entManager.EntityExists(gridId))
{
shell.WriteError($"Grid {gridId} doesn't have an associated grid entity.");
return;
}
var changed = 0;
var tagSystem = _entManager.EntitySysManager.GetEntitySystem<TagSystem>();
var enumerator = xformQuery.GetComponent(gridId.Value).ChildEnumerator;
while (enumerator.MoveNext(out var child))
{
if (!_entManager.EntityExists(child))
{
continue;
}
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<OccluderComponent>(child, out var occluder))
{
valid |= occluder.Enabled;
}
// low walls & grilles
valid |= _entManager.HasComponent<SharedCanBuildWindowOnTopComponent>(child);
// cables
valid |= _entManager.HasComponent<CableComponent>(child);
// anything else that might need this forced
valid |= tagSystem.HasTag(child, "ForceFixRotations");
// override
valid &= !tagSystem.HasTag(child, "ForceNoFixRotations");
if (!valid)
continue;
var childXform = xformQuery.GetComponent(child);
if (childXform.LocalRotation != Angle.Zero)
{
childXform.LocalRotation = Angle.Zero;
changed++;
}
}
shell.WriteLine($"Changed {changed} entities. If things seem wrong, reconnect.");
}
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 changed = 0;
var tagSystem = _entManager.EntitySysManager.GetEntitySystem<TagSystem>();
var enumerator = xformQuery.GetComponent(gridId.Value).ChildEnumerator;
while (enumerator.MoveNext(out var child))
{
if (!_entManager.EntityExists(child))
{
continue;
}
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<OccluderComponent>(child, out var occluder))
{
valid |= occluder.Enabled;
}
// low walls & grilles
valid |= _entManager.HasComponent<SharedCanBuildWindowOnTopComponent>(child);
// cables
valid |= _entManager.HasComponent<CableComponent>(child);
// anything else that might need this forced
valid |= tagSystem.HasTag(child, "ForceFixRotations");
// override
valid &= !tagSystem.HasTag(child, "ForceNoFixRotations");
if (!valid)
continue;
var childXform = xformQuery.GetComponent(child);
if (childXform.LocalRotation != Angle.Zero)
{
childXform.LocalRotation = Angle.Zero;
changed++;
}
}
shell.WriteLine($"Changed {changed} entities. If things seem wrong, reconnect.");
}
}