From 2f0b2951f05e5db4bcf27d0bac4b186847e68db2 Mon Sep 17 00:00:00 2001 From: high Date: Thu, 18 Aug 2011 22:12:07 -0400 Subject: [PATCH] tidied the wall of commands a little --- TShockAPI/Commands.cs | 132 +++++++++++++++++++++--------------------- 1 file changed, 67 insertions(+), 65 deletions(-) diff --git a/TShockAPI/Commands.cs b/TShockAPI/Commands.cs index edc3edb2..eb5a78aa 100644 --- a/TShockAPI/Commands.cs +++ b/TShockAPI/Commands.cs @@ -107,78 +107,80 @@ namespace TShockAPI { public static List ChatCommands = new List(); + delegate void AddChatCommand(string permission, CommandDelegate command, params string[] names); public static void InitCommands() { //When adding new perm in here, add new perm to CommandList in DBEditor - ChatCommands.Add(new Command( Permissions.kick, Kick, "kick")); - ChatCommands.Add(new Command(Permissions.ban, Ban, "ban")); - ChatCommands.Add(new Command(Permissions.ban, BanIP, "banip")); - ChatCommands.Add(new Command(Permissions.ban, UnBan, "unban")); - ChatCommands.Add(new Command(Permissions.ban, UnBanIP, "unbanip")); - ChatCommands.Add(new Command(Permissions.maintenance, ClearBans, "clearbans")); - ChatCommands.Add(new Command(Permissions.whitelist, Whitelist, "whitelist")); - ChatCommands.Add(new Command(Permissions.maintenance, Off, "off")); - ChatCommands.Add(new Command(Permissions.maintenance, OffNoSave, "off-nosave")); - ChatCommands.Add(new Command(Permissions.maintenance, CheckUpdates, "checkupdates")); - ChatCommands.Add(new Command(Permissions.causeevents, DropMeteor, "dropmeteor")); - ChatCommands.Add(new Command(Permissions.causeevents, Star, "star")); - ChatCommands.Add(new Command(Permissions.causeevents, Bloodmoon, "bloodmoon")); - ChatCommands.Add(new Command(Permissions.causeevents, Invade, "invade")); - ChatCommands.Add(new Command(Permissions.spawnboss, Eater, "eater")); - ChatCommands.Add(new Command(Permissions.spawnboss, Eye, "eye")); - ChatCommands.Add(new Command(Permissions.spawnboss, King, "king")); - ChatCommands.Add(new Command(Permissions.spawnboss, Skeletron, "skeletron")); - ChatCommands.Add(new Command(Permissions.spawnboss, Hardcore, "hardcore")); - ChatCommands.Add(new Command(Permissions.spawnmob, SpawnMob, "spawnmob", "sm")); - ChatCommands.Add(new Command(Permissions.tp, Home, "home")); - ChatCommands.Add(new Command(Permissions.tp, Spawn, "spawn")); - ChatCommands.Add(new Command(Permissions.tp, TP, "tp")); - ChatCommands.Add(new Command(Permissions.tphere, TPHere, "tphere")); - ChatCommands.Add(new Command(Permissions.warp, UseWarp, "warp")); - ChatCommands.Add(new Command(Permissions.managewarp, SetWarp, "setwarp")); - ChatCommands.Add(new Command(Permissions.managewarp, DeleteWarp, "delwarp")); - ChatCommands.Add(new Command(Permissions.managewarp, HideWarp, "hidewarp")); - ChatCommands.Add(new Command(Permissions.managewarp, AddGroup, "addgroup")); - ChatCommands.Add(new Command(Permissions.managewarp, DeleteGroup, "delgroup")); - ChatCommands.Add(new Command(Permissions.managewarp, ModifyGroup, "modgroup")); - ChatCommands.Add(new Command(Permissions.manageitem, AddItem, "additem")); - ChatCommands.Add(new Command(Permissions.manageitem, DeleteItem, "delitem")); - ChatCommands.Add(new Command(Permissions.cfg, SetSpawn, "setspawn")); - ChatCommands.Add(new Command(Permissions.cfg, Reload, "reload")); - ChatCommands.Add(new Command(Permissions.cfg, ShowConfiguration, "showconfig")); - ChatCommands.Add(new Command(Permissions.cfg, ServerPassword, "serverpassword")); - ChatCommands.Add(new Command(Permissions.cfg, Save, "save")); - ChatCommands.Add(new Command(Permissions.cfg, MaxSpawns, "maxspawns")); - ChatCommands.Add(new Command(Permissions.cfg, SpawnRate, "spawnrate")); - ChatCommands.Add(new Command(Permissions.time, Time, "time")); - ChatCommands.Add(new Command(Permissions.pvpfun, Slap, "slap")); - ChatCommands.Add(new Command(Permissions.editspawn, ToggleAntiBuild, "antibuild")); - ChatCommands.Add(new Command(Permissions.editspawn, ProtectSpawn, "protectspawn")); - ChatCommands.Add(new Command(Permissions.manageregion, Region, "region")); - ChatCommands.Add(new Command(Permissions.manageregion, DebugRegions, "debugreg")); - ChatCommands.Add(new Command(Help, "help")); - ChatCommands.Add(new Command(Playing, "playing", "online", "who")); - ChatCommands.Add(new Command(AuthToken, "auth")); - ChatCommands.Add(new Command(ThirdPerson, "me")); - ChatCommands.Add(new Command(PartyChat, "p")); - ChatCommands.Add(new Command(Rules, "rules")); - ChatCommands.Add(new Command(Permissions.logs, DisplayLogs, "displaylogs")); + AddChatCommand add = (p, c, n) => ChatCommands.Add(new Command(p, c, n)); + add(Permissions.kick, Kick, "kick"); + add(Permissions.ban, Ban, "ban"); + add(Permissions.ban, BanIP, "banip"); + add(Permissions.ban, UnBan, "unban"); + add(Permissions.ban, UnBanIP, "unbanip"); + add(Permissions.maintenance, ClearBans, "clearbans"); + add(Permissions.whitelist, Whitelist, "whitelist"); + add(Permissions.maintenance, Off, "off"); + add(Permissions.maintenance, OffNoSave, "off-nosave"); + add(Permissions.maintenance, CheckUpdates, "checkupdates"); + add(Permissions.causeevents, DropMeteor, "dropmeteor"); + add(Permissions.causeevents, Star, "star"); + add(Permissions.causeevents, Bloodmoon, "bloodmoon"); + add(Permissions.causeevents, Invade, "invade"); + add(Permissions.spawnboss, Eater, "eater"); + add(Permissions.spawnboss, Eye, "eye"); + add(Permissions.spawnboss, King, "king"); + add(Permissions.spawnboss, Skeletron, "skeletron"); + add(Permissions.spawnboss, Hardcore, "hardcore"); + add(Permissions.spawnmob, SpawnMob, "spawnmob", "sm"); + add(Permissions.tp, Home, "home"); + add(Permissions.tp, Spawn, "spawn"); + add(Permissions.tp, TP, "tp"); + add(Permissions.tphere, TPHere, "tphere"); + add(Permissions.warp, UseWarp, "warp"); + add(Permissions.managewarp, SetWarp, "setwarp"); + add(Permissions.managewarp, DeleteWarp, "delwarp"); + add(Permissions.managewarp, HideWarp, "hidewarp"); + add(Permissions.managewarp, AddGroup, "addgroup"); + add(Permissions.managewarp, DeleteGroup, "delgroup"); + add(Permissions.managewarp, ModifyGroup, "modgroup"); + add(Permissions.manageitem, AddItem, "additem"); + add(Permissions.manageitem, DeleteItem, "delitem"); + add(Permissions.cfg, SetSpawn, "setspawn"); + add(Permissions.cfg, Reload, "reload"); + add(Permissions.cfg, ShowConfiguration, "showconfig"); + add(Permissions.cfg, ServerPassword, "serverpassword"); + add(Permissions.cfg, Save, "save"); + add(Permissions.cfg, MaxSpawns, "maxspawns"); + add(Permissions.cfg, SpawnRate, "spawnrate"); + add(Permissions.time, Time, "time"); + add(Permissions.pvpfun, Slap, "slap"); + add(Permissions.editspawn, ToggleAntiBuild, "antibuild"); + add(Permissions.editspawn, ProtectSpawn, "protectspawn"); + add(Permissions.manageregion, Region, "region"); + add(Permissions.manageregion, DebugRegions, "debugreg"); + add(null, Help, "help"); + add(null, Playing, "playing", "online", "who"); + add(null, AuthToken, "auth"); + add(null, ThirdPerson, "me"); + add(null, PartyChat, "p"); + add(null, Rules, "rules"); + add(Permissions.logs, DisplayLogs, "displaylogs"); ChatCommands.Add(new Command(PasswordUser, "password") { DoLog = false }); ChatCommands.Add(new Command(RegisterUser, "register") { DoLog = false }); ChatCommands.Add(new Command(Permissions.rootonly, ManageUsers, "user") { DoLog = false }); - ChatCommands.Add(new Command(Permissions.rootonly, GrabUserUserInfo, "userinfo", "ui")); - ChatCommands.Add(new Command(Permissions.rootonly, AuthVerify, "auth-verify")); + add(Permissions.rootonly, GrabUserUserInfo, "userinfo", "ui"); + add(Permissions.rootonly, AuthVerify, "auth-verify"); ChatCommands.Add(new Command(AttemptLogin, "login") { DoLog = false }); - ChatCommands.Add(new Command(Permissions.cfg, Broadcast, "broadcast", "bc")); - ChatCommands.Add(new Command(Permissions.whisper, Whisper, "whisper", "w", "tell")); - ChatCommands.Add(new Command(Permissions.whisper, Reply, "reply", "r")); - ChatCommands.Add(new Command(Permissions.annoy, Annoy, "annoy")); - ChatCommands.Add(new Command(Permissions.cfg, ConvertWaR, "convert")); - ChatCommands.Add(new Command(Permissions.kill, Kill, "kill")); - ChatCommands.Add(new Command(Permissions.butcher, Butcher, "butcher")); - ChatCommands.Add(new Command(Permissions.item, Item, "item", "i")); - ChatCommands.Add(new Command(Permissions.item, Give, "give")); - ChatCommands.Add(new Command(Permissions.heal, Heal, "heal")); + add(Permissions.cfg, Broadcast, "broadcast", "bc"); + add(Permissions.whisper, Whisper, "whisper", "w", "tell"); + add(Permissions.whisper, Reply, "reply", "r"); + add(Permissions.annoy, Annoy, "annoy"); + add(Permissions.cfg, ConvertWaR, "convert"); + add(Permissions.kill, Kill, "kill"); + add(Permissions.butcher, Butcher, "butcher"); + add(Permissions.item, Item, "item", "i"); + add(Permissions.item, Give, "give"); + add(Permissions.heal, Heal, "heal"); } public static bool HandleCommand(TSPlayer player, string text)