themaster1970sf/TShock
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

-The command delegate of commands can now be set afterwards. This allows other plugins easily override / extend existing commands.

Browse source 
-Added another command reference list so that original tshock commands can easily be identified.
This commit is contained in:
CoderCow 2013-06-30 00:31:09 +02:00
parent deca922653
commit 790469c7b0
1 changed files with 46 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

67
TShockAPI/Commands.cs
View file

@ -16,7 +16,8 @@ You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Collections.ObjectModel;
using System.Diagnostics; using System.Diagnostics;
using System.Diagnostics.CodeAnalysis; using System.Diagnostics.CodeAnalysis;
using System.IO; using System.IO;
@ -68,7 +69,19 @@ namespace TShockAPI
public bool AllowServer { get; set; } public bool AllowServer { get; set; }
public bool DoLog { get; set; } public bool DoLog { get; set; }
public List<string> Permissions { get; protected set; } public List<string> Permissions { get; protected set; }
private CommandDelegate command;
private CommandDelegate commandDelegate;
public CommandDelegate CommandDelegate
{
get { return commandDelegate; }
set
{
if (value == null)
throw new ArgumentNullException();
commandDelegate = value;
}
}
public Command(List<string> permissionsneeded, CommandDelegate cmd, params string[] names) public Command(List<string> permissionsneeded, CommandDelegate cmd, params string[] names)
: this(cmd, names) : this(cmd, names)
@ -84,11 +97,13 @@ namespace TShockAPI
public Command(CommandDelegate cmd, params string[] names) public Command(CommandDelegate cmd, params string[] names)
{ {
if (cmd == null)
throw new ArgumentNullException("cmd");
if (names == null || names.Length < 1) if (names == null || names.Length < 1)
throw new NotSupportedException(); throw new ArgumentException("names");
Permissions = new List<string>(); Permissions = new List<string>();
Names = new List<string>(names); Names = new List<string>(names);
command = cmd; CommandDelegate = cmd;
AllowServer = true; AllowServer = true;
DoLog = true; DoLog = true;
} }
@ -100,7 +115,7 @@ namespace TShockAPI
try try
{ {
command(new CommandArgs(msg, ply, parms)); CommandDelegate(new CommandArgs(msg, ply, parms));
} }
catch (Exception e) catch (Exception e)
{ {
@ -132,27 +147,35 @@ namespace TShockAPI
public static class Commands public static class Commands
{ {
public static List<Command> ChatCommands = new List<Command>(); public static List<Command> ChatCommands = new List<Command>();
public static ReadOnlyCollection<Command> TShockCommands = new ReadOnlyCollection<Command>(new List<Command>());
private delegate void AddChatCommand(string permission, CommandDelegate command, params string[] names); private delegate void AddChatCommand(string permission, CommandDelegate command, params string[] names);
public static void InitCommands() public static void InitCommands()
{ {
AddChatCommand add = (p, c, n) => ChatCommands.Add(new Command(p, c, n)); List<Command> tshockCommands = new List<Command>(100);
ChatCommands.Add(new Command(AuthToken, "auth") { AllowServer = false }); Action<Command> add2 = (cmd) =>
ChatCommands.Add(new Command(Permissions.canchangepassword, PasswordUser, "password") { AllowServer = false, DoLog = false }); {
ChatCommands.Add(new Command(Permissions.canregister, RegisterUser, "register") { AllowServer = false, DoLog = false }); tshockCommands.Add(cmd);
ChatCommands.Add(new Command(Permissions.rootonly, ManageUsers, "user") { DoLog = false }); ChatCommands.Add(cmd);
ChatCommands.Add(new Command(Permissions.canlogin, AttemptLogin, "login") { AllowServer = false, DoLog = false }); };
ChatCommands.Add(new Command(Permissions.buff, Buff, "buff") { AllowServer = false }); AddChatCommand add = (p, c, n) => add2(new Command(p, c, n));
ChatCommands.Add(new Command(Permissions.cfg, SetSpawn, "setspawn") { AllowServer = false });
ChatCommands.Add(new Command(Permissions.grow, Grow, "grow") { AllowServer = false }); add2(new Command(AuthToken, "auth") { AllowServer = false });
ChatCommands.Add(new Command(Permissions.item, Item, "item", "i") { AllowServer = false }); add2(new Command(Permissions.canchangepassword, PasswordUser, "password") { AllowServer = false, DoLog = false });
ChatCommands.Add(new Command(Permissions.home, Home, "home") { AllowServer = false }); add2(new Command(Permissions.canregister, RegisterUser, "register") { AllowServer = false, DoLog = false });
ChatCommands.Add(new Command(Permissions.canpartychat, PartyChat, "p") { AllowServer = false }); add2(new Command(Permissions.rootonly, ManageUsers, "user") { DoLog = false });
ChatCommands.Add(new Command(Permissions.spawn, Spawn, "spawn") { AllowServer = false }); add2(new Command(Permissions.canlogin, AttemptLogin, "login") { AllowServer = false, DoLog = false });
ChatCommands.Add(new Command(Permissions.tp, TP, "tp") { AllowServer = false }); add2(new Command(Permissions.buff, Buff, "buff") { AllowServer = false });
ChatCommands.Add(new Command(Permissions.tphere, TPHere, "tphere") { AllowServer = false }); add2(new Command(Permissions.cfg, SetSpawn, "setspawn") { AllowServer = false });
ChatCommands.Add(new Command(Permissions.tpallow, TPAllow, "tpallow") { AllowServer = false }); add2(new Command(Permissions.grow, Grow, "grow") { AllowServer = false });
add2(new Command(Permissions.item, Item, "item", "i") { AllowServer = false });
add2(new Command(Permissions.home, Home, "home") { AllowServer = false });
add2(new Command(Permissions.canpartychat, PartyChat, "p") { AllowServer = false });
add2(new Command(Permissions.spawn, Spawn, "spawn") { AllowServer = false });
add2(new Command(Permissions.tp, TP, "tp") { AllowServer = false });
add2(new Command(Permissions.tphere, TPHere, "tphere") { AllowServer = false });
add2(new Command(Permissions.tpallow, TPAllow, "tpallow") { AllowServer = false });
add(Permissions.kick, Kick, "kick"); add(Permissions.kick, Kick, "kick");
add(Permissions.ban, DeprecateBans, "banip", "listbans", "unban", "unbanip", "clearbans"); add(Permissions.ban, DeprecateBans, "banip", "listbans", "unban", "unbanip", "clearbans");
add(Permissions.ban, Ban, "ban"); add(Permissions.ban, Ban, "ban");
@ -230,6 +253,8 @@ namespace TShockAPI
add(Permissions.xmas, ForceXmas, "forcexmas"); add(Permissions.xmas, ForceXmas, "forcexmas");
add(Permissions.settempgroup, TempGroup, "tempgroup"); add(Permissions.settempgroup, TempGroup, "tempgroup");
//add(null, TestCallbackCommand, "test"); //add(null, TestCallbackCommand, "test");
TShockCommands = new ReadOnlyCollection<Command>(tshockCommands);
} }
public static bool HandleCommand(TSPlayer player, string text) public static bool HandleCommand(TSPlayer player, string text)