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

16
Content.Server/Commands/Atmos/RemoveGasCommand.cs
View File

@@ -2,8 +2,8 @@
using Content.Server.Administration;
using Content.Server.GameObjects.Components.Atmos;
using Content.Shared.Administration;
using Robust.Server.Interfaces.Console;
using Robust.Server.Interfaces.Player;
using Robust.Shared.Console;
using Robust.Shared.Interfaces.GameObjects;
using Robust.Shared.Interfaces.Map;
using Robust.Shared.IoC;
@@ -13,13 +13,13 @@ using Robust.Shared.Maths;
namespace Content.Server.Commands.Atmos
{
[AdminCommand(AdminFlags.Debug)]
public class RemoveGasCommand : IClientCommand
public class RemoveGasCommand : IConsoleCommand
{
public string Command => "removegas";
public string Description => "Removes an amount of gases.";
public string Help => "removegas <X> <Y> <GridId> <amount> <ratio>\nIf <ratio> is true, amount will be treated as the ratio of gas to be removed.";
public void Execute(IConsoleShell shell, IPlayerSession? player, string[] args)
public void Execute(IConsoleShell shell, string argStr, string[] args)
{
if (args.Length < 5) return;
if(!int.TryParse(args[0], out var x)
@@ -34,7 +34,7 @@ namespace Content.Server.Commands.Atmos
if (!gridId.IsValid() || !mapMan.TryGetGrid(gridId, out var gridComp))
{
shell.SendText(player, "Invalid grid ID.");
shell.WriteLine("Invalid grid ID.");
return;
}
@@ -42,13 +42,13 @@ namespace Content.Server.Commands.Atmos
if (!entMan.TryGetEntity(gridComp.GridEntityId, out var grid))
{
shell.SendText(player, "Failed to get grid entity.");
shell.WriteLine("Failed to get grid entity.");
return;
}
if (!grid.HasComponent<GridAtmosphereComponent>())
{
shell.SendText(player, "Grid doesn't have an atmosphere.");
shell.WriteLine("Grid doesn't have an atmosphere.");
return;
}
@@ -58,13 +58,13 @@ namespace Content.Server.Commands.Atmos
if (tile == null)
{
shell.SendText(player, "Invalid coordinates.");
shell.WriteLine("Invalid coordinates.");
return;
}
if (tile.Air == null)
{
shell.SendText(player, "Can't remove gas from that tile.");
shell.WriteLine("Can't remove gas from that tile.");
return;
}