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

19
Content.Server/Administration/Commands/WarpCommand.cs
View File

@@ -1,9 +1,9 @@
using System.Collections.Generic;
using System.Collections.Generic;
using System.Linq;
using Content.Server.GameObjects.Components.Markers;
using Content.Shared.Administration;
using Robust.Server.Interfaces.Console;
using Robust.Server.Interfaces.Player;
using Robust.Shared.Console;
using Robust.Shared.Enums;
using Robust.Shared.GameObjects.Components;
using Robust.Shared.Interfaces.GameObjects;
@@ -14,7 +14,7 @@ using Robust.Shared.Map;
namespace Content.Server.Administration.Commands
{
[AdminCommand(AdminFlags.Admin)]
public class WarpCommand : IClientCommand
public class WarpCommand : IConsoleCommand
{
public string Command => "warp";
public string Description => "Teleports you to predefined areas on the map.";
@@ -23,17 +23,18 @@ namespace Content.Server.Administration.Commands
"warp <location>\nLocations you can teleport to are predefined by the map. " +
"You can specify '?' as location to get a list of valid locations.";
public void Execute(IConsoleShell shell, IPlayerSession player, string[] args)
public void Execute(IConsoleShell shell, string argStr, string[] args)
{
var player = shell.Player as IPlayerSession;
if (player == null)
{
shell.SendText((IPlayerSession) null, "Only players can use this command");
shell.WriteLine("Only players can use this command");
return;
}
if (args.Length != 1)
{
shell.SendText(player, "Expected a single argument.");
shell.WriteLine("Expected a single argument.");
return;
}
@@ -48,13 +49,13 @@ namespace Content.Server.Administration.Commands
.OrderBy(p => p)
.Distinct());
shell.SendText(player, locations);
shell.WriteLine(locations);
}
else
{
if (player.Status != SessionStatus.InGame || player.AttachedEntity == null)
{
shell.SendText(player, "You are not in-game!");
shell.WriteLine("You are not in-game!");
return;
}
@@ -121,7 +122,7 @@ namespace Content.Server.Administration.Commands
}
else
{
shell.SendText(player, "That location does not exist!");
shell.WriteLine("That location does not exist!");
}
}
}