From b1202c7871c5410fb9c1a31fa4d241a1b3391029 Mon Sep 17 00:00:00 2001 From: Wilee999 Date: Wed, 15 May 2013 12:03:45 -0600 Subject: [PATCH 01/10] hopefully this fixed /invis --- .../StevenLawson/TotalFreedomMod/Commands/Command_invis.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_invis.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_invis.java index 7f43e97a..ace971d0 100644 --- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_invis.java +++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_invis.java @@ -56,10 +56,10 @@ public class Command_invis extends TFM_Command { } else { - TFM_Util.playerMsg(sender, "Invisble players (" + players.size() + "): " + StringUtils.join(players, ",")); + TFM_Util.playerMsg(sender, "Invisble players (" + players.size() + "): " + StringUtils.join(players, ", ")); } return true; } -} \ No newline at end of file +} From a8b4f1d95077056af4f7ba9c16c09e1ce6249349 Mon Sep 17 00:00:00 2001 From: Wilee999 Date: Wed, 15 May 2013 20:56:18 -0700 Subject: [PATCH 02/10] Removed /cmdlist (useless) --- .../Commands/Command_cmdlist.java | 51 ------------------- 1 file changed, 51 deletions(-) delete mode 100644 src/me/StevenLawson/TotalFreedomMod/Commands/Command_cmdlist.java diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_cmdlist.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_cmdlist.java deleted file mode 100644 index 70a111b6..00000000 --- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_cmdlist.java +++ /dev/null @@ -1,51 +0,0 @@ -package me.StevenLawson.TotalFreedomMod.Commands; - -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; -import java.util.Map; -import java.util.Map.Entry; -import org.apache.commons.lang.StringUtils; -import org.bukkit.command.Command; -import org.bukkit.command.CommandSender; -import org.bukkit.entity.Player; -import org.bukkit.plugin.Plugin; -import org.bukkit.plugin.PluginDescriptionFile; - -@CommandPermissions(level = AdminLevel.ALL, source = SourceType.BOTH) -@CommandParameters(description = "Show all commands for all server plugins.", usage = "/") -public class Command_cmdlist extends TFM_Command -{ - @Override - public boolean run(CommandSender sender, Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) - { - List commands = new ArrayList(); - - for (Plugin p : server.getPluginManager().getPlugins()) - { - try - { - PluginDescriptionFile desc = p.getDescription(); - Map> map = (Map>) desc.getCommands(); - - if (map != null) - { - for (Entry> entry : map.entrySet()) - { - String command_name = (String) entry.getKey(); - commands.add(command_name); - } - } - } - catch (Throwable ex) - { - } - } - - Collections.sort(commands); - - sender.sendMessage(StringUtils.join(commands, ",")); - - return true; - } -} From fabbc78d226f181c006899f53a19925e7ff99157 Mon Sep 17 00:00:00 2001 From: Wilee999 Date: Wed, 15 May 2013 23:59:08 -0700 Subject: [PATCH 03/10] Replaced /clearall with /purgeall, this cleans more! --- ...nd_clearall.java => Command_purgeall.java} | 45 ++++++++++--------- 1 file changed, 25 insertions(+), 20 deletions(-) rename src/me/StevenLawson/TotalFreedomMod/Commands/{Command_clearall.java => Command_purgeall.java} (56%) diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_clearall.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_purgeall.java similarity index 56% rename from src/me/StevenLawson/TotalFreedomMod/Commands/Command_clearall.java rename to src/me/StevenLawson/TotalFreedomMod/Commands/Command_purgeall.java index 573b8700..4dec7c4f 100644 --- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_clearall.java +++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_purgeall.java @@ -1,20 +1,25 @@ -package me.StevenLawson.TotalFreedomMod.Commands; - -import org.bukkit.command.Command; -import org.bukkit.command.CommandSender; -import org.bukkit.entity.Player; - -@CommandPermissions(level = AdminLevel.SUPER, source = SourceType.BOTH) -@CommandParameters(description = "Removes all entities, nicks and disguises.", usage = "/") -public class Command_clearall extends TFM_Command -{ - @Override - public boolean run(CommandSender sender, Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) - { - server.dispatchCommand(sender, "rd"); - server.dispatchCommand(sender, "potion clearall"); - server.dispatchCommand(sender, "uall"); - - return true; - } -} +package me.StevenLawson.TotalFreedomMod.Commands; + +import org.bukkit.command.Command; +import org.bukkit.command.CommandSender; +import org.bukkit.entity.Player; + +@CommandPermissions(level = AdminLevel.SUPER, source = SourceType.BOTH) +@CommandParameters(description = "Superadmin command - Purge everything! (except for bans).", usage = "/") +public class Command_purgeall extends TFM_Command +{ + @Override + public boolean run(CommandSender sender, Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) + { + server.dispatchCommand(sender, "rd"); + server.dispatchCommand(sender, "potion clearall"); + server.dispatchCommand(sender, "uall"); + server.dispatchCommand(sender, "denick"); + server.dispatchCommand(sender, "mute purge"); + server.dispatchCommand(sender, "fr purge"); + server.dispatchCommand(sender, "mp"); + //If I'm missing any, lemme know. Or just add it yourself. + + return true; + } +} \ No newline at end of file From e29a820398fa7e41dbd2aa99a5078082ddf6fd0e Mon Sep 17 00:00:00 2001 From: Wilee999 Date: Thu, 16 May 2013 00:57:26 -0700 Subject: [PATCH 04/10] Added /spurgeall --- .../Commands/Command_purgeall.java | 2 ++ .../Commands/Command_spurgeall.java | 29 +++++++++++++++++++ 2 files changed, 31 insertions(+) create mode 100644 src/me/StevenLawson/TotalFreedomMod/Commands/Command_spurgeall.java diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_purgeall.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_purgeall.java index 4dec7c4f..29a42662 100644 --- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_purgeall.java +++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_purgeall.java @@ -18,6 +18,8 @@ public class Command_purgeall extends TFM_Command server.dispatchCommand(sender, "mute purge"); server.dispatchCommand(sender, "fr purge"); server.dispatchCommand(sender, "mp"); + server.dispatchCommand(sender, "blockcmd"); + server.dispatchCommand(sender, "halt purge"); //If I'm missing any, lemme know. Or just add it yourself. return true; diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_spurgeall.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_spurgeall.java new file mode 100644 index 00000000..147b419a --- /dev/null +++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_spurgeall.java @@ -0,0 +1,29 @@ +package me.StevenLawson.TotalFreedomMod.Commands; + +import org.bukkit.command.Command; +import org.bukkit.command.CommandSender; +import org.bukkit.entity.Player; + +@CommandPermissions(level = AdminLevel.SENIOR, source = SourceType.BOTH) +@CommandParameters(description = "Senioradmin command - Purge everything! (except for bans).", usage = "/") +public class Command_spurgeall extends TFM_Command +{ + @Override + public boolean run(CommandSender sender, Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) + { + server.dispatchCommand(sender, "rd"); + server.dispatchCommand(sender, "potion clearall"); + server.dispatchCommand(sender, "uall"); + server.dispatchCommand(sender, "denick"); + server.dispatchCommand(sender, "mute purge"); + server.dispatchCommand(sender, "fr purge"); + server.dispatchCommand(sender, "mp"); + server.dispatchCommand(sender, "blockcmd"); + server.dispatchCommand(sender, "halt purge"); + server.dispatchCommand(sender, "lockup purge"); + //If I'm missing any, lemme know. Or just add it yourself. + + return true; + + } +} \ No newline at end of file From 4aebf33006efc049215761fe7dfb8f301bd66018 Mon Sep 17 00:00:00 2001 From: Wilee999 Date: Thu, 16 May 2013 12:18:39 -0600 Subject: [PATCH 05/10] Added a broadcast to /purgeall --- .../TotalFreedomMod/Commands/Command_purgeall.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_purgeall.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_purgeall.java index 29a42662..3e759410 100644 --- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_purgeall.java +++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_purgeall.java @@ -1,5 +1,8 @@ package me.StevenLawson.TotalFreedomMod.Commands; +import me.StevenLawson.TotalFreedomMod.TFM_Util; + +import org.bukkit.ChatColor; import org.bukkit.command.Command; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; @@ -20,8 +23,10 @@ public class Command_purgeall extends TFM_Command server.dispatchCommand(sender, "mp"); server.dispatchCommand(sender, "blockcmd"); server.dispatchCommand(sender, "halt purge"); + + TFM_Util.bcastMsg("[Purge] Purged!", ChatColor.LIGHT_PURPLE); //If I'm missing any, lemme know. Or just add it yourself. return true; } -} \ No newline at end of file +} From 31b5c99007eab39b4a53ee0d833bfb6611c99c22 Mon Sep 17 00:00:00 2001 From: Wilee999 Date: Thu, 16 May 2013 12:19:47 -0600 Subject: [PATCH 06/10] Added broadcast to /spurgeall --- .../TotalFreedomMod/Commands/Command_spurgeall.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_spurgeall.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_spurgeall.java index 147b419a..c6f5dd99 100644 --- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_spurgeall.java +++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_spurgeall.java @@ -1,5 +1,8 @@ package me.StevenLawson.TotalFreedomMod.Commands; +import me.StevenLawson.TotalFreedomMod.TFM_Util; + +import org.bukkit.ChatColor; import org.bukkit.command.Command; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; @@ -21,9 +24,11 @@ public class Command_spurgeall extends TFM_Command server.dispatchCommand(sender, "blockcmd"); server.dispatchCommand(sender, "halt purge"); server.dispatchCommand(sender, "lockup purge"); + + TFM_Util.bcastMsg("[Purge] Purged!", ChatColor.LIGHT_PURPLE); //If I'm missing any, lemme know. Or just add it yourself. return true; } -} \ No newline at end of file +} From 6abd2491f19c103f68bed2116977a955f516ef27 Mon Sep 17 00:00:00 2001 From: Wilee999 Date: Thu, 16 May 2013 12:28:28 -0600 Subject: [PATCH 07/10] Removed /denick from /spurgeall --- .../StevenLawson/TotalFreedomMod/Commands/Command_spurgeall.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_spurgeall.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_spurgeall.java index c6f5dd99..da053ad1 100644 --- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_spurgeall.java +++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_spurgeall.java @@ -17,7 +17,6 @@ public class Command_spurgeall extends TFM_Command server.dispatchCommand(sender, "rd"); server.dispatchCommand(sender, "potion clearall"); server.dispatchCommand(sender, "uall"); - server.dispatchCommand(sender, "denick"); server.dispatchCommand(sender, "mute purge"); server.dispatchCommand(sender, "fr purge"); server.dispatchCommand(sender, "mp"); From aea65815a860e565fb1e7360d0f998e68761dc2e Mon Sep 17 00:00:00 2001 From: Wilee999 Date: Thu, 16 May 2013 12:29:06 -0600 Subject: [PATCH 08/10] removed /denick from /purgeall --- .../StevenLawson/TotalFreedomMod/Commands/Command_purgeall.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_purgeall.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_purgeall.java index 3e759410..f80c6694 100644 --- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_purgeall.java +++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_purgeall.java @@ -17,7 +17,6 @@ public class Command_purgeall extends TFM_Command server.dispatchCommand(sender, "rd"); server.dispatchCommand(sender, "potion clearall"); server.dispatchCommand(sender, "uall"); - server.dispatchCommand(sender, "denick"); server.dispatchCommand(sender, "mute purge"); server.dispatchCommand(sender, "fr purge"); server.dispatchCommand(sender, "mp"); From d2457adf68314723ae4dddf52d44b71be2423d49 Mon Sep 17 00:00:00 2001 From: Wilee999 Date: Thu, 16 May 2013 12:31:22 -0600 Subject: [PATCH 09/10] Create Command_cmdlist.java --- .../Commands/Command_cmdlist.java | 51 +++++++++++++++++++ 1 file changed, 51 insertions(+) create mode 100644 src/me/StevenLawson/TotalFreedomMod/Commands/Command_cmdlist.java diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_cmdlist.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_cmdlist.java new file mode 100644 index 00000000..70a111b6 --- /dev/null +++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_cmdlist.java @@ -0,0 +1,51 @@ +package me.StevenLawson.TotalFreedomMod.Commands; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import java.util.Map; +import java.util.Map.Entry; +import org.apache.commons.lang.StringUtils; +import org.bukkit.command.Command; +import org.bukkit.command.CommandSender; +import org.bukkit.entity.Player; +import org.bukkit.plugin.Plugin; +import org.bukkit.plugin.PluginDescriptionFile; + +@CommandPermissions(level = AdminLevel.ALL, source = SourceType.BOTH) +@CommandParameters(description = "Show all commands for all server plugins.", usage = "/") +public class Command_cmdlist extends TFM_Command +{ + @Override + public boolean run(CommandSender sender, Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) + { + List commands = new ArrayList(); + + for (Plugin p : server.getPluginManager().getPlugins()) + { + try + { + PluginDescriptionFile desc = p.getDescription(); + Map> map = (Map>) desc.getCommands(); + + if (map != null) + { + for (Entry> entry : map.entrySet()) + { + String command_name = (String) entry.getKey(); + commands.add(command_name); + } + } + } + catch (Throwable ex) + { + } + } + + Collections.sort(commands); + + sender.sendMessage(StringUtils.join(commands, ",")); + + return true; + } +} From ba834b6b92d323361e45c874fb140945f1beccbf Mon Sep 17 00:00:00 2001 From: Wilee999 Date: Thu, 16 May 2013 11:45:21 -0700 Subject: [PATCH 10/10] g --- .../Commands/Command_cmdlist.java | 51 +++++++++++++++++++ .../Commands/Command_spurgeall.java | 29 ----------- 2 files changed, 51 insertions(+), 29 deletions(-) create mode 100644 src/me/StevenLawson/TotalFreedomMod/Commands/Command_cmdlist.java delete mode 100644 src/me/StevenLawson/TotalFreedomMod/Commands/Command_spurgeall.java diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_cmdlist.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_cmdlist.java new file mode 100644 index 00000000..66de9a62 --- /dev/null +++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_cmdlist.java @@ -0,0 +1,51 @@ +package me.StevenLawson.TotalFreedomMod.Commands; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import java.util.Map; +import java.util.Map.Entry; +import org.apache.commons.lang.StringUtils; +import org.bukkit.command.Command; +import org.bukkit.command.CommandSender; +import org.bukkit.entity.Player; +import org.bukkit.plugin.Plugin; +import org.bukkit.plugin.PluginDescriptionFile; + +@CommandPermissions(level = AdminLevel.ALL, source = SourceType.BOTH) +@CommandParameters(description = "Show all commands for all server plugins.", usage = "/") +public class Command_cmdlist extends TFM_Command +{ + @Override + public boolean run(CommandSender sender, Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) + { + List commands = new ArrayList(); + + for (Plugin p : server.getPluginManager().getPlugins()) + { + try + { + PluginDescriptionFile desc = p.getDescription(); + Map> map = (Map>) desc.getCommands(); + + if (map != null) + { + for (Entry> entry : map.entrySet()) + { + String command_name = (String) entry.getKey(); + commands.add(command_name); + } + } + } + catch (Throwable ex) + { + } + } + + Collections.sort(commands); + + sender.sendMessage(StringUtils.join(commands, ",")); + + return true; + } +} \ No newline at end of file diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_spurgeall.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_spurgeall.java deleted file mode 100644 index 147b419a..00000000 --- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_spurgeall.java +++ /dev/null @@ -1,29 +0,0 @@ -package me.StevenLawson.TotalFreedomMod.Commands; - -import org.bukkit.command.Command; -import org.bukkit.command.CommandSender; -import org.bukkit.entity.Player; - -@CommandPermissions(level = AdminLevel.SENIOR, source = SourceType.BOTH) -@CommandParameters(description = "Senioradmin command - Purge everything! (except for bans).", usage = "/") -public class Command_spurgeall extends TFM_Command -{ - @Override - public boolean run(CommandSender sender, Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) - { - server.dispatchCommand(sender, "rd"); - server.dispatchCommand(sender, "potion clearall"); - server.dispatchCommand(sender, "uall"); - server.dispatchCommand(sender, "denick"); - server.dispatchCommand(sender, "mute purge"); - server.dispatchCommand(sender, "fr purge"); - server.dispatchCommand(sender, "mp"); - server.dispatchCommand(sender, "blockcmd"); - server.dispatchCommand(sender, "halt purge"); - server.dispatchCommand(sender, "lockup purge"); - //If I'm missing any, lemme know. Or just add it yourself. - - return true; - - } -} \ No newline at end of file