From 2073eb33d0a8b54fad0d4692129b581fa416f480 Mon Sep 17 00:00:00 2001 From: Kyle Tyo <36606155+VerinSenpai@users.noreply.github.com> Date: Thu, 26 Jun 2025 05:54:07 -0400 Subject: [PATCH] ShowHealthBarsCommand to LEC. (#38588) * mfw * Update Content.Client/Commands/ShowHealthBarsCommand.cs --------- Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> --- .../Commands/ShowHealthBarsCommand.cs | 33 +++++++------------ .../commands/show-health-bars-command.ftl | 6 ++-- 2 files changed, 13 insertions(+), 26 deletions(-) diff --git a/Content.Client/Commands/ShowHealthBarsCommand.cs b/Content.Client/Commands/ShowHealthBarsCommand.cs index 6ea9d06c8c..a0408cc97d 100644 --- a/Content.Client/Commands/ShowHealthBarsCommand.cs +++ b/Content.Client/Commands/ShowHealthBarsCommand.cs @@ -1,57 +1,46 @@ using Content.Shared.Damage.Prototypes; using Content.Shared.Overlays; -using Robust.Client.Player; using Robust.Shared.Console; using Robust.Shared.Prototypes; using System.Linq; namespace Content.Client.Commands; -public sealed class ShowHealthBarsCommand : LocalizedCommands +public sealed class ShowHealthBarsCommand : LocalizedEntityCommands { - [Dependency] private readonly IPlayerManager _playerManager = default!; - [Dependency] private readonly IEntityManager _entityManager = default!; - public override string Command => "showhealthbars"; - public override string Help => LocalizationManager.GetString($"cmd-{Command}-help", ("command", Command)); - public override void Execute(IConsoleShell shell, string argStr, string[] args) { - var player = _playerManager.LocalSession; + var player = shell.Player; if (player == null) { - shell.WriteError(LocalizationManager.GetString($"cmd-{Command}-error-not-player")); + shell.WriteError(Loc.GetString("shell-only-players-can-run-this-command")); return; } - var playerEntity = player?.AttachedEntity; - if (!playerEntity.HasValue) + if (player.AttachedEntity is not { } playerEntity) { - shell.WriteError(LocalizationManager.GetString($"cmd-{Command}-error-no-entity")); + shell.WriteError(Loc.GetString("shell-must-be-attached-to-entity")); return; } - if (!_entityManager.HasComponent(playerEntity)) + if (!EntityManager.HasComponent(playerEntity)) { var showHealthBarsComponent = new ShowHealthBarsComponent { DamageContainers = args.Select(arg => new ProtoId(arg)).ToList(), HealthStatusIcon = null, - NetSyncEnabled = false + NetSyncEnabled = false, }; - _entityManager.AddComponent(playerEntity.Value, showHealthBarsComponent, true); + EntityManager.AddComponent(playerEntity, showHealthBarsComponent, true); - shell.WriteLine(LocalizationManager.GetString($"cmd-{Command}-notify-enabled", ("args", string.Join(", ", args)))); + shell.WriteLine(Loc.GetString("cmd-showhealthbars-notify-enabled", ("args", string.Join(", ", args)))); return; } - else - { - _entityManager.RemoveComponentDeferred(playerEntity.Value); - shell.WriteLine(LocalizationManager.GetString($"cmd-{Command}-notify-disabled")); - } - return; + EntityManager.RemoveComponentDeferred(playerEntity); + shell.WriteLine(Loc.GetString("cmd-showhealthbars-notify-disabled")); } } diff --git a/Resources/Locale/en-US/commands/show-health-bars-command.ftl b/Resources/Locale/en-US/commands/show-health-bars-command.ftl index d660e93ce1..6020835d59 100644 --- a/Resources/Locale/en-US/commands/show-health-bars-command.ftl +++ b/Resources/Locale/en-US/commands/show-health-bars-command.ftl @@ -1,6 +1,4 @@ cmd-showhealthbars-desc = Toggles health bars above mobs. -cmd-showhealthbars-help = Usage: {$command} [] -cmd-showhealthbars-error-not-player = You aren't a player. -cmd-showhealthbars-error-no-entity = You do not have an attached entity. +cmd-showhealthbars-help = Usage: showhealthbars [] cmd-showhealthbars-notify-enabled = Enabled health overlay for DamageContainers: {$args}. -cmd-showhealthbars-notify-disabled = Disabled health overlay. \ No newline at end of file +cmd-showhealthbars-notify-disabled = Disabled health overlay.