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

9
Content.Server/Commands/Chat/AdminChatCommand.cs
View File

@@ -1,22 +1,23 @@
#nullable enable
#nullable enable
using Content.Server.Administration;
using Content.Server.Interfaces.Chat;
using Content.Shared.Administration;
using Robust.Server.Interfaces.Console;
using Robust.Server.Interfaces.Player;
using Robust.Shared.Console;
using Robust.Shared.IoC;
namespace Content.Server.Commands.Chat
{
[AdminCommand(AdminFlags.Admin)]
internal class AdminChatCommand : IClientCommand
internal class AdminChatCommand : IConsoleCommand
{
public string Command => "asay";
public string Description => "Send chat messages to the private admin chat channel.";
public string Help => "asay <text>";
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 (args.Length < 1)
return;

13
Content.Server/Commands/Chat/MeCommand.cs
View File

@@ -1,26 +1,27 @@
#nullable enable
#nullable enable
using Content.Server.Administration;
using Content.Server.Interfaces.Chat;
using Content.Server.Players;
using Robust.Server.Interfaces.Console;
using Robust.Server.Interfaces.Player;
using Robust.Shared.Console;
using Robust.Shared.Enums;
using Robust.Shared.IoC;
namespace Content.Server.Commands.Chat
{
[AnyCommand]
internal class MeCommand : IClientCommand
internal class MeCommand : IConsoleCommand
{
public string Command => "me";
public string Description => "Perform an action.";
public string Help => "me <text>";
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(player, "This command cannot be run from the server.");
shell.WriteLine("This command cannot be run from the server.");
return;
}
@@ -39,7 +40,7 @@ namespace Content.Server.Commands.Chat
if (mindComponent == null)
{
shell.SendText(player, "You don't have a mind!");
shell.WriteLine("You don't have a mind!");
return;
}

9
Content.Server/Commands/Chat/OOCCommand.cs
View File

@@ -1,21 +1,22 @@
#nullable enable
#nullable enable
using Content.Server.Administration;
using Content.Server.Interfaces.Chat;
using Robust.Server.Interfaces.Console;
using Robust.Server.Interfaces.Player;
using Robust.Shared.Console;
using Robust.Shared.IoC;
namespace Content.Server.Commands.Chat
{
[AnyCommand]
internal class OOCCommand : IClientCommand
internal class OOCCommand : IConsoleCommand
{
public string Command => "ooc";
public string Description => "Send Out Of Character chat messages.";
public string Help => "ooc <text>";
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 (args.Length < 1)
return;

15
Content.Server/Commands/Chat/SayCommand.cs
View File

@@ -1,27 +1,28 @@
#nullable enable
#nullable enable
using Content.Server.Administration;
using Content.Server.GameObjects.Components.Observer;
using Content.Server.Interfaces.Chat;
using Content.Server.Players;
using Robust.Server.Interfaces.Console;
using Robust.Server.Interfaces.Player;
using Robust.Shared.Console;
using Robust.Shared.Enums;
using Robust.Shared.IoC;
namespace Content.Server.Commands.Chat
{
[AnyCommand]
internal class SayCommand : IClientCommand
internal class SayCommand : IConsoleCommand
{
public string Command => "say";
public string Description => "Send chat messages to the local channel or a specified radio channel.";
public string Help => "say <text>";
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(player, "This command cannot be run from the server.");
shell.WriteLine("This command cannot be run from the server.");
return;
}
@@ -40,7 +41,7 @@ namespace Content.Server.Commands.Chat
if (playerEntity == null)
{
shell.SendText(player, "You don't have an entity!");
shell.WriteLine("You don't have an entity!");
return;
}
@@ -52,7 +53,7 @@ namespace Content.Server.Commands.Chat
if (mindComponent == null)
{
shell.SendText(player, "You don't have a mind!");
shell.WriteLine("You don't have a mind!");
return;
}

15
Content.Server/Commands/Chat/SuicideCommand.cs
View File

@@ -1,4 +1,4 @@
#nullable enable
#nullable enable
using System;
using System.Linq;
using Content.Server.Administration;
@@ -12,8 +12,8 @@ using Content.Server.Utility;
using Content.Shared.Damage;
using Content.Shared.GameObjects.Components.Damage;
using Content.Shared.Interfaces;
using Robust.Server.Interfaces.Console;
using Robust.Server.Interfaces.Player;
using Robust.Shared.Console;
using Robust.Shared.Enums;
using Robust.Shared.Interfaces.GameObjects;
using Robust.Shared.IoC;
@@ -22,7 +22,7 @@ using Robust.Shared.Localization;
namespace Content.Server.Commands.Chat
{
[AnyCommand]
internal class SuicideCommand : IClientCommand
internal class SuicideCommand : IConsoleCommand
{
public string Command => "suicide";
@@ -56,11 +56,12 @@ namespace Content.Server.Commands.Chat
}
}
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(player, "You cannot run this command from the server.");
shell.WriteLine("You cannot run this command from the server.");
return;
}
@@ -72,7 +73,7 @@ namespace Content.Server.Commands.Chat
if (owner == null)
{
shell.SendText(player, "You don't have a mind!");
shell.WriteLine("You don't have a mind!");
return;
}
@@ -122,7 +123,7 @@ namespace Content.Server.Commands.Chat
// Prevent the player from returning to the body. Yes, this is an ugly hack.
var ghost = new Ghost(){CanReturn = false};
ghost.Execute(shell, player, Array.Empty<string>());
ghost.Execute(shell, argStr, Array.Empty<string>());
}
}
}