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

Console Unify API Changes (#3059)

Browse Source 
* Remove unused IChatCommand.

* Lots of refactoring into a shared context.

* Removed ICommonSession from server concmd Execute.

* Added argStr parameter to concmd execute.

* The execute function of client concmds now returns void, use the new shell.RemoteExecuteCommand function to forward commands.

* Finally move shells and commands into shared.

* Console commands can now be registered directly without a class in a shared context.

* Engine API Changes.

* Repair rebase damage.

* Update Submodule.
This commit is contained in:
Acruid
2021-02-01 16:49:43 -08:00
committed by GitHub
parent 80ad2ef5b7
commit 8b5d66050a
119 changed files with 820 additions and 796 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -78,7 +78,7 @@ namespace Content.Client.Chat
private ChatChannel _filteredChannels;
[Dependency] private readonly IClientNetManager _netManager = default!;
[Dependency] private readonly IClientConsole _console = default!;
[Dependency] private readonly IClientConsoleHost _consoleHost = default!;
[Dependency] private readonly IEntityManager _entityManager = default!;
[Dependency] private readonly IEyeManager _eyeManager = default!;
[Dependency] private readonly IUserInterfaceManager _userInterfaceManager = default!;
@@ -255,7 +255,7 @@ namespace Content.Client.Chat
{
// run locally
var conInput = text.Substring(1);
_console.ProcessCommand(conInput);
_consoleHost.ExecuteCommand(conInput);
break;
}
case OOCAlias:
@@ -263,7 +263,7 @@ namespace Content.Client.Chat
var conInput = text.Substring(1);
if (string.IsNullOrWhiteSpace(conInput))
return;
_console.ProcessCommand($"ooc \"{CommandParsing.Escape(conInput)}\"");
_consoleHost.ExecuteCommand($"ooc \"{CommandParsing.Escape(conInput)}\"");
break;
}
case AdminChatAlias:
@@ -273,11 +273,11 @@ namespace Content.Client.Chat
return;
if (_groupController.CanCommand("asay"))
{
_console.ProcessCommand($"asay \"{CommandParsing.Escape(conInput)}\"");
_consoleHost.ExecuteCommand($"asay \"{CommandParsing.Escape(conInput)}\"");
}
else
{
_console.ProcessCommand($"ooc \"{CommandParsing.Escape(conInput)}\"");
_consoleHost.ExecuteCommand($"ooc \"{CommandParsing.Escape(conInput)}\"");
}
break;
@@ -287,7 +287,7 @@ namespace Content.Client.Chat
var conInput = text.Substring(1);
if (string.IsNullOrWhiteSpace(conInput))
return;
_console.ProcessCommand($"me \"{CommandParsing.Escape(conInput)}\"");
_consoleHost.ExecuteCommand($"me \"{CommandParsing.Escape(conInput)}\"");
break;
}
default:
@@ -295,7 +295,7 @@ namespace Content.Client.Chat
var conInput = _currentChatBox?.DefaultChatFormat != null
? string.Format(_currentChatBox.DefaultChatFormat, CommandParsing.Escape(text))
: text;
_console.ProcessCommand(conInput);
_consoleHost.ExecuteCommand(conInput);
break;
}
}

5
Content.Client/ClientNotifyManager.cs
View File

@@ -4,12 +4,12 @@ using System.Collections.Generic;
using Content.Client.Interfaces;
using Content.Client.UserInterface.Stylesheets;
using Content.Shared;
using Robust.Client.Interfaces.Console;
using Robust.Client.Interfaces.Graphics.ClientEye;
using Robust.Client.Interfaces.Input;
using Robust.Client.Interfaces.UserInterface;
using Robust.Client.Player;
using Robust.Client.UserInterface.Controls;
using Robust.Shared.Console;
using Robust.Shared.Interfaces.GameObjects;
using Robust.Shared.Interfaces.Network;
using Robust.Shared.IoC;
@@ -168,12 +168,11 @@ namespace Content.Client
public string Description => "";
public string Help => "";
public bool Execute(IDebugConsole console, params string[] args)
public void Execute(IConsoleShell shell, string argStr, string[] args)
{
var arg = args[0];
var mgr = IoCManager.Resolve<IClientNotifyManager>();
mgr.PopupMessage(arg);
return false;
}
}
}

55
Content.Client/Commands/AtmosDebugCommands.cs
View File

@@ -1,9 +1,9 @@
using JetBrains.Annotations;
using Robust.Client.Interfaces.Console;
using Content.Client.GameObjects.EntitySystems;
using Robust.Shared.GameObjects.Systems;
using Content.Shared.Atmos;
using System;
using Robust.Shared.Console;
namespace Content.Client.Commands
{
@@ -13,32 +13,31 @@ namespace Content.Client.Commands
public string Command => "atvrange";
public string Description => "Sets the atmos debug range (as two floats, start [red] and end [blue])";
public string Help => "atvrange <start> <end>";
public bool Execute(IDebugConsole console, params string[] args)
public void Execute(IConsoleShell shell, string argStr, string[] args)
{
if (args.Length != 2)
{
console.AddLine(Help);
return false;
shell.WriteLine(Help);
return;
}
if (!float.TryParse(args[0], out var xStart))
{
console.AddLine("Bad float START");
return false;
shell.WriteLine("Bad float START");
return;
}
if (!float.TryParse(args[1], out var xEnd))
{
console.AddLine("Bad float END");
return false;
shell.WriteLine("Bad float END");
return;
}
if (xStart == xEnd)
{
console.AddLine("Scale cannot be zero, as this would cause a division by zero in AtmosDebugOverlay.");
return false;
shell.WriteLine("Scale cannot be zero, as this would cause a division by zero in AtmosDebugOverlay.");
return;
}
var sys = EntitySystem.Get<AtmosDebugOverlaySystem>();
sys.CfgBase = xStart;
sys.CfgScale = xEnd - xStart;
return false;
}
}
@@ -48,17 +47,17 @@ namespace Content.Client.Commands
public string Command => "atvmode";
public string Description => "Sets the atmos debug mode. This will automatically reset the scale.";
public string Help => "atvmode <TotalMoles/GasMoles/Temperature> [<gas ID (for GasMoles)>]";
public bool Execute(IDebugConsole console, params string[] args)
public void Execute(IConsoleShell shell, string argStr, string[] args)
{
if (args.Length < 1)
{
console.AddLine(Help);
return false;
shell.WriteLine(Help);
return;
}
if (!Enum.TryParse<AtmosDebugOverlayMode>(args[0], out var xMode))
{
console.AddLine("Invalid mode");
return false;
shell.WriteLine("Invalid mode");
return;
}
int xSpecificGas = 0;
float xBase = 0;
@@ -67,21 +66,21 @@ namespace Content.Client.Commands
{
if (args.Length != 2)
{
console.AddLine("A target gas must be provided for this mode.");
return false;
shell.WriteLine("A target gas must be provided for this mode.");
return;
}
if (!AtmosCommandUtils.TryParseGasID(args[1], out xSpecificGas))
{
console.AddLine("Gas ID not parsable or out of range.");
return false;
shell.WriteLine("Gas ID not parsable or out of range.");
return;
}
}
else
{
if (args.Length != 1)
{
console.AddLine("No further information is required for this mode.");
return false;
shell.WriteLine("No further information is required for this mode.");
return;
}
if (xMode == AtmosDebugOverlayMode.Temperature)
{
@@ -95,7 +94,6 @@ namespace Content.Client.Commands
sys.CfgSpecificGas = xSpecificGas;
sys.CfgBase = xBase;
sys.CfgScale = xScale;
return false;
}
}
@@ -105,21 +103,20 @@ namespace Content.Client.Commands
public string Command => "atvcbm";
public string Description => "Changes from red/green/blue to greyscale";
public string Help => "atvcbm <true/false>";
public bool Execute(IDebugConsole console, params string[] args)
public void Execute(IConsoleShell shell, string argStr, string[] args)
{
if (args.Length != 1)
{
console.AddLine(Help);
return false;
shell.WriteLine(Help);
return;
}
if (!bool.TryParse(args[0], out var xFlag))
{
console.AddLine("Invalid flag");
return false;
shell.WriteLine("Invalid flag");
return;
}
var sys = EntitySystem.Get<AtmosDebugOverlaySystem>();
sys.CfgCBM = xFlag;
return false;
}
}
}

5
Content.Client/Commands/CreditsCommand.cs
View File

@@ -1,6 +1,6 @@
using Content.Client.UserInterface;
using JetBrains.Annotations;
using Robust.Client.Interfaces.Console;
using Robust.Shared.Console;
namespace Content.Client.Commands
{
@@ -11,10 +11,9 @@ namespace Content.Client.Commands
public string Description => "Opens the credits window";
public string Help => "credits";
public bool Execute(IDebugConsole console, params string[] args)
public void Execute(IConsoleShell shell, string argStr, string[] args)
{
new CreditsWindow().Open();
return false;
}
}
}

12
Content.Client/Commands/DebugAiCommand.cs
View File

@@ -1,6 +1,6 @@
using Content.Client.GameObjects.EntitySystems.AI;
using JetBrains.Annotations;
using Robust.Client.Interfaces.Console;
using Robust.Shared.Console;
using Robust.Shared.GameObjects.Systems;
namespace Content.Client.Commands
@@ -16,12 +16,13 @@ namespace Content.Client.Commands
public string Description => "Handles all tooltip debugging above AI mobs";
public string Help => "debugai [hide/paths/thonk]";
public bool Execute(IDebugConsole console, params string[] args)
public void Execute(IConsoleShell shell, string argStr, string[] args)
{
#if DEBUG
if (args.Length < 1)
{
return true;
shell.RemoteExecuteCommand(argStr);
return;
}
var anyAction = false;
@@ -50,9 +51,10 @@ namespace Content.Client.Commands
}
}
return !anyAction;
if(!anyAction)
shell.RemoteExecuteCommand(argStr);
#else
return true;
shell.RemoteExecuteCommand(argStr);
#endif
}
}

31
Content.Client/Commands/DebugCommands.cs
View File

@@ -1,9 +1,10 @@
using System;
using Content.Client.GameObjects.Components;
using Content.Client.GameObjects.EntitySystems;
using Content.Client.Interfaces;
using Content.Shared.GameObjects;
using Robust.Client.Interfaces.Console;
using Robust.Client.Interfaces.GameObjects.Components;
using Robust.Shared.Console;
using Robust.Shared.GameObjects.Systems;
using Robust.Shared.Interfaces.GameObjects;
using Robust.Shared.IoC;
@@ -17,12 +18,10 @@ namespace Content.Client.Commands
public string Description => "Toggles visibility of markers such as spawn points.";
public string Help => "";
public bool Execute(IDebugConsole console, params string[] args)
public void Execute(IConsoleShell shell, string argStr, string[] args)
{
EntitySystem.Get<MarkerSystem>()
.MarkersVisible ^= true;
return false;
}
}
@@ -33,12 +32,10 @@ namespace Content.Client.Commands
public string Description => "Makes entities below the floor always visible.";
public string Help => $"Usage: {Command}";
public bool Execute(IDebugConsole console, params string[] args)
public void Execute(IConsoleShell shell, string argStr, string[] args)
{
EntitySystem.Get<SubFloorHideSystem>()
.EnableAll ^= true;
return false;
}
}
@@ -49,7 +46,7 @@ namespace Content.Client.Commands
public string Description => "Makes entities below the floor always visible until the client is restarted.";
public string Help => $"Usage: {Command}";
public bool Execute(IDebugConsole console, params string[] args)
public void Execute(IConsoleShell shell, string argStr, string[] args)
{
EntitySystem.Get<SubFloorHideSystem>()
.EnableAll = true;
@@ -64,8 +61,6 @@ namespace Content.Client.Commands
sprite.DrawDepth = (int) DrawDepth.Overlays;
}
}
return false;
}
}
@@ -75,14 +70,12 @@ namespace Content.Client.Commands
public string Description => "Send a notify client side.";
public string Help => "notify <message>";
public bool Execute(IDebugConsole console, params string[] args)
public void Execute(IConsoleShell shell, string argStr, string[] args)
{
var message = args[0];
var notifyManager = IoCManager.Resolve<IClientNotifyManager>();
notifyManager.PopupMessage(message);
return false;
}
}
@@ -92,18 +85,18 @@ namespace Content.Client.Commands
public string Description => "Creates and teleports you to a new uninitialized map for mapping.";
public string Help => $"Usage: {Command} <mapname> / {Command} <id> <mapname>";
public bool Execute(IDebugConsole console, params string[] args)
public void Execute(IConsoleShell shell, string argStr, string[] args)
{
if (args.Length == 0)
{
console.AddLine(Help);
return false;
shell.WriteLine(Help);
return;
}
console.Commands["togglelight"].Execute(console);
console.Commands["showsubfloorforever"].Execute(console);
shell.ConsoleHost.RegisteredCommands["togglelight"].Execute(shell, string.Empty, Array.Empty<string>());
shell.ConsoleHost.RegisteredCommands["showsubfloorforever"].Execute(shell, string.Empty, Array.Empty<string>());
return true;
shell.RemoteExecuteCommand(argStr);
}
}
}

12
Content.Client/Commands/DebugPathfindingCommand.cs
View File

@@ -1,6 +1,6 @@
using Content.Client.GameObjects.EntitySystems.AI;
using JetBrains.Annotations;
using Robust.Client.Interfaces.Console;
using Robust.Shared.Console;
using Robust.Shared.GameObjects.Systems;
namespace Content.Client.Commands
@@ -13,12 +13,13 @@ namespace Content.Client.Commands
public string Description => "Toggles visibility of pathfinding debuggers.";
public string Help => "pathfinder [hide/nodes/routes/graph/regioncache/regions]";
public bool Execute(IDebugConsole console, params string[] args)
public void Execute(IConsoleShell shell, string argStr, string[] args)
{
#if DEBUG
if (args.Length < 1)
{
return true;
shell.RemoteExecuteCommand(argStr);
return;
}
var anyAction = false;
@@ -63,9 +64,10 @@ namespace Content.Client.Commands
}
}
return !anyAction;
if(!anyAction)
shell.RemoteExecuteCommand(argStr);
#else
return true;
shell.RemoteExecuteCommand(argStr);
#endif
}
}

8
Content.Client/Commands/HideMechanismsCommand.cs
View File

@@ -1,7 +1,7 @@
using Content.Shared.GameObjects.Components.Body.Mechanism;
using Robust.Client.Console;
using Robust.Client.GameObjects;
using Robust.Client.Interfaces.Console;
using Robust.Shared.Console;
using Robust.Shared.Containers;
using Robust.Shared.Interfaces.GameObjects;
using Robust.Shared.IoC;
@@ -14,7 +14,7 @@ namespace Content.Client.Commands
public string Description => $"Reverts the effects of {ShowMechanismsCommand.CommandName}";
public string Help => $"{Command}";
public bool Execute(IDebugConsole console, params string[] args)
public void Execute(IConsoleShell shell, string argStr, string[] args)
{
var componentManager = IoCManager.Resolve<IComponentManager>();
var mechanisms = componentManager.EntityQuery<IMechanism>();
@@ -41,9 +41,7 @@ namespace Content.Client.Commands
}
}
IoCManager.Resolve<IClientConsole>().ProcessCommand("hidecontainedcontext");
return false;
IoCManager.Resolve<IClientConsoleHost>().ExecuteCommand("hidecontainedcontext");
}
}
}

8
Content.Client/Commands/ShowMechanismsCommand.cs
View File

@@ -1,7 +1,7 @@
using Content.Shared.GameObjects.Components.Body.Mechanism;
using Robust.Client.Console;
using Robust.Client.GameObjects;
using Robust.Client.Interfaces.Console;
using Robust.Shared.Console;
using Robust.Shared.Interfaces.GameObjects;
using Robust.Shared.IoC;
@@ -16,7 +16,7 @@ namespace Content.Client.Commands
public string Description => "Makes mechanisms visible, even when they shouldn't be.";
public string Help => $"{Command}";
public bool Execute(IDebugConsole console, params string[] args)
public void Execute(IConsoleShell shell, string argStr, string[] args)
{
var componentManager = IoCManager.Resolve<IComponentManager>();
var mechanisms = componentManager.EntityQuery<IMechanism>();
@@ -29,9 +29,7 @@ namespace Content.Client.Commands
}
}
IoCManager.Resolve<IClientConsole>().ProcessCommand("showcontainedcontext");
return false;
IoCManager.Resolve<IClientConsoleHost>().ExecuteCommand("showcontainedcontext");
}
}
}

8
Content.Client/Commands/ToggleOutlineCommand.cs
View File

@@ -1,5 +1,5 @@
using Content.Shared;
using Robust.Client.Interfaces.Console;
using Robust.Shared.Console;
using Robust.Shared.Interfaces.Configuration;
using Robust.Shared.IoC;
@@ -13,16 +13,14 @@ namespace Content.Client.Commands
public string Help => "";
public bool Execute(IDebugConsole console, params string[] args)
public void Execute(IConsoleShell shell, string argStr, string[] args)
{
var configurationManager = IoCManager.Resolve<IConfigurationManager>();
var cvar = CCVars.OutlineEnabled;
var old = configurationManager.GetCVar(cvar);
configurationManager.SetCVar(cvar, !old);
console.AddLine($"Draw outlines set to: {configurationManager.GetCVar(cvar)}");
return false;
shell.WriteLine($"Draw outlines set to: {configurationManager.GetCVar(cvar)}");
}
}
}

6
Content.Client/EscapeMenuOwner.cs
View File

@@ -1,4 +1,4 @@
using Content.Client.State;
using Content.Client.State;
using Content.Client.UserInterface;
using Robust.Client.Console;
using Robust.Client.Interfaces.Input;
@@ -12,7 +12,7 @@ namespace Content.Client
{
internal sealed class EscapeMenuOwner : IEscapeMenuOwner
{
[Dependency] private readonly IClientConsole _clientConsole = default!;
[Dependency] private readonly IClientConsoleHost _consoleHost = default!;
[Dependency] private readonly IInputManager _inputManager = default!;
[Dependency] private readonly IStateManager _stateManager = default!;
[Dependency] private readonly IGameHud _gameHud = default!;
@@ -31,7 +31,7 @@ namespace Content.Client
if (obj.NewState is GameScreenBase)
{
// Switched TO GameScreen.
_escapeMenu = new EscapeMenu(_clientConsole);
_escapeMenu = new EscapeMenu(_consoleHost);
_escapeMenu.OnClose += () => _gameHud.EscapeButtonDown = false;

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

@@ -102,7 +102,7 @@ namespace Content.Client.Sandbox
internal class SandboxManager : SharedSandboxManager, ISandboxManager
{
[Dependency] private readonly IClientConsole _console = default!;
[Dependency] private readonly IClientConsoleHost _consoleHost = default!;
[Dependency] private readonly IGameHud _gameHud = default!;
[Dependency] private readonly IClientNetManager _netManager = default!;
[Dependency] private readonly IPlacementManager _placementManager = default!;
@@ -314,37 +314,37 @@ namespace Content.Client.Sandbox
private void ToggleLight()
{
_console.ProcessCommand("togglelight");
_consoleHost.ExecuteCommand("togglelight");
}
private void ToggleFov()
{
_console.ProcessCommand("togglefov");
_consoleHost.ExecuteCommand("togglefov");
}
private void ToggleShadows()
{
_console.ProcessCommand("toggleshadows");
_consoleHost.ExecuteCommand("toggleshadows");
}
private void ToggleSubFloor()
{
_console.ProcessCommand("showsubfloor");
_consoleHost.ExecuteCommand("showsubfloor");
}
private void ShowMarkers()
{
_console.ProcessCommand("showmarkers");
_consoleHost.ExecuteCommand("showmarkers");
}
private void ShowBb()
{
_console.ProcessCommand("showbb");
_consoleHost.ExecuteCommand("showbb");
}
private void LinkMachines()
{
_console.ProcessCommand("signallink");
_consoleHost.ExecuteCommand("signallink");
}
}
}

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

@@ -26,7 +26,7 @@ namespace Content.Client.State
public class LobbyState : Robust.Client.State.State
{
[Dependency] private readonly IBaseClient _baseClient = default!;
[Dependency] private readonly IClientConsole _console = default!;
[Dependency] private readonly IClientConsoleHost _consoleHost = default!;
[Dependency] private readonly IChatManager _chatManager = default!;
[Dependency] private readonly IInputManager _inputManager = default!;
[Dependency] private readonly IEntityManager _entityManager = default!;
@@ -87,7 +87,7 @@ namespace Content.Client.State
_userInterfaceManager.StateRoot.AddChild(_characterSetup);
};
_lobby.ObserveButton.OnPressed += args => _console.ProcessCommand("observe");
_lobby.ObserveButton.OnPressed += args => _consoleHost.ExecuteCommand("observe");
_lobby.ReadyButton.OnPressed += args =>
{
if (!_clientGameTicker.IsGameStarted)
@@ -104,7 +104,7 @@ namespace Content.Client.State
SetReady(args.Pressed);
};
_lobby.LeaveButton.OnPressed += args => _console.ProcessCommand("disconnect");
_lobby.LeaveButton.OnPressed += args => _consoleHost.ExecuteCommand("disconnect");
_lobby.OptionsButton.OnPressed += args => new OptionsMenu().Open();
UpdatePlayerList();
@@ -259,7 +259,7 @@ namespace Content.Client.State
return;
}
_console.ProcessCommand($"toggleready {newReady}");
_consoleHost.ExecuteCommand($"toggleready {newReady}");
UpdatePlayerList();
}
}

16
Content.Client/UserInterface/AdminMenu/AdminMenuWindow.cs
View File

@@ -440,7 +440,7 @@ namespace Content.Client.UserInterface.AdminMenu
public override void ButtonPressed(ButtonEventArgs args)
{
IoCManager.Resolve<IClientConsole>().ProcessCommand(RequiredCommand);
IoCManager.Resolve<IClientConsoleHost>().ExecuteCommand(RequiredCommand);
}
}
#endregion
@@ -504,7 +504,7 @@ namespace Content.Client.UserInterface.AdminMenu
Name = "Pause",
Handler = () =>
{
IoCManager.Resolve<IClientConsole>().ProcessCommand("events pause");
IoCManager.Resolve<IClientConsoleHost>().ExecuteCommand("events pause");
},
},
new CommandUIButton
@@ -512,14 +512,14 @@ namespace Content.Client.UserInterface.AdminMenu
Name = "Resume",
Handler = () =>
{
IoCManager.Resolve<IClientConsole>().ProcessCommand("events resume");
IoCManager.Resolve<IClientConsoleHost>().ExecuteCommand("events resume");
},
},
};
public override void Submit()
{
IoCManager.Resolve<IClientConsole>().ProcessCommand($"events run \"{_eventsDropDown.GetValue()}\"");
IoCManager.Resolve<IClientConsoleHost>().ExecuteCommand($"events run \"{_eventsDropDown.GetValue()}\"");
}
}
@@ -548,7 +548,7 @@ namespace Content.Client.UserInterface.AdminMenu
public override void Submit()
{
IoCManager.Resolve<IClientConsole>().ProcessCommand($"kick \"{_playerDropDown.GetValue()}\" \"{CommandParsing.Escape(_reason.GetValue())}\"");
IoCManager.Resolve<IClientConsoleHost>().ExecuteCommand($"kick \"{_playerDropDown.GetValue()}\" \"{CommandParsing.Escape(_reason.GetValue())}\"");
}
}
@@ -572,7 +572,7 @@ namespace Content.Client.UserInterface.AdminMenu
public override void Submit()
{
IoCManager.Resolve<IClientConsole>().ProcessCommand($"tpto \"{_playerDropDown.GetValue()}\"");
IoCManager.Resolve<IClientConsoleHost>().ExecuteCommand($"tpto \"{_playerDropDown.GetValue()}\"");
}
}
@@ -596,7 +596,7 @@ namespace Content.Client.UserInterface.AdminMenu
public override void Submit()
{
IoCManager.Resolve<IClientConsole>().ProcessCommand($"addatmos {_grid.GetValue()}");
IoCManager.Resolve<IClientConsoleHost>().ExecuteCommand($"addatmos {_grid.GetValue()}");
}
}
@@ -639,7 +639,7 @@ namespace Content.Client.UserInterface.AdminMenu
public override void Submit()
{
IoCManager.Resolve<IClientConsole>().ProcessCommand($"fillgas {_grid.GetValue()} {_gas.GetValue()} {_amount.GetValue()}");
IoCManager.Resolve<IClientConsoleHost>().ExecuteCommand($"fillgas {_grid.GetValue()} {_gas.GetValue()} {_amount.GetValue()}");
}
}
#endregion

4
Content.Client/UserInterface/AdminMenu/SetOutfit/SetOutfitMenu.xaml.cs
View File

@@ -22,7 +22,7 @@ namespace Content.Client.UserInterface.AdminMenu.SetOutfit
public partial class SetOutfitMenu : SS14Window
{
[Dependency] private readonly IPrototypeManager _prototypeManager = default!;
[Dependency] private readonly IClientConsole _console = default!;
[Dependency] private readonly IClientConsoleHost _consoleHost = default!;
public EntityUid? TargetEntityId { get; set; }
protected override Vector2? CustomSize => (250, 320);
@@ -49,7 +49,7 @@ namespace Content.Client.UserInterface.AdminMenu.SetOutfit
if (TargetEntityId == null || _selectedOutfit == null)
return;
var command = $"setoutfit {TargetEntityId} {_selectedOutfit.ID}";
_console.ProcessCommand(command);
_consoleHost.ExecuteCommand(command);
Close();
}

10
Content.Client/UserInterface/EscapeMenu.cs
View File

@@ -8,16 +8,16 @@ namespace Content.Client.UserInterface
{
internal sealed class EscapeMenu : SS14Window
{
private readonly IClientConsole _console;
private readonly IClientConsoleHost _consoleHost;
private BaseButton DisconnectButton;
private BaseButton QuitButton;
private BaseButton OptionsButton;
private OptionsMenu optionsMenu;
public EscapeMenu(IClientConsole console)
public EscapeMenu(IClientConsoleHost consoleHost)
{
_console = console;
_consoleHost = consoleHost;
IoCManager.InjectDependencies(this);
@@ -50,13 +50,13 @@ namespace Content.Client.UserInterface
private void OnQuitButtonClicked(BaseButton.ButtonEventArgs args)
{
_console.ProcessCommand("quit");
_consoleHost.ExecuteCommand("quit");
Dispose();
}
private void OnDisconnectButtonClicked(BaseButton.ButtonEventArgs args)
{
_console.ProcessCommand("disconnect");
_consoleHost.ExecuteCommand("disconnect");
Dispose();
}

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

@@ -21,7 +21,7 @@ namespace Content.Client.UserInterface
public sealed class LateJoinGui : SS14Window
{
[Dependency] private readonly IPrototypeManager _prototypeManager = default!;
[Dependency] private readonly IClientConsole _console = default!;
[Dependency] private readonly IClientConsoleHost _consoleHost = default!;
[Dependency] private readonly IClientGameTicker _gameTicker = default!;
protected override Vector2? CustomSize => (360, 560);
@@ -147,7 +147,7 @@ namespace Content.Client.UserInterface
SelectedId += jobId =>
{
Logger.InfoS("latejoin", $"Late joining as ID: {jobId}");
_console.ProcessCommand($"joingame {CommandParsing.Escape(jobId)}");
_consoleHost.ExecuteCommand($"joingame {CommandParsing.Escape(jobId)}");
Close();
};