Removing tests. Since we don't do those.

Added /lastcmd.
Added /tfupdate, mainly for my own use.
This commit is contained in:
Steven Lawson
2012-12-21 22:22:08 -05:00
parent ca4e64cc0e
commit bfa0324af9
10 changed files with 156 additions and 36 deletions

View File

@ -0,0 +1,46 @@
package me.StevenLawson.TotalFreedomMod.Commands;
import me.StevenLawson.TotalFreedomMod.TFM_UserInfo;
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;
@CommandPermissions(level = ADMIN_LEVEL.SUPER, source = SOURCE_TYPE_ALLOWED.BOTH, ignore_permissions = false)
public class Command_lastcmd extends TFM_Command
{
@Override
public boolean run(CommandSender sender, Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
{
if (args.length == 0)
{
return false;
}
Player p;
try
{
p = getPlayer(args[0]);
}
catch (CantFindPlayerException ex)
{
sender.sendMessage(ex.getMessage());
return true;
}
TFM_UserInfo playerdata = TFM_UserInfo.getPlayerData(p);
if (playerdata != null)
{
String last_command = playerdata.getLastCommand();
if (last_command.isEmpty())
{
last_command = "(none)";
}
TFM_Util.playerMsg(sender, p.getName() + " - Last Command: " + last_command, ChatColor.GRAY);
}
return true;
}
}

View File

@ -0,0 +1,67 @@
package me.StevenLawson.TotalFreedomMod.Commands;
import java.io.File;
import me.StevenLawson.TotalFreedomMod.TFM_Log;
import me.StevenLawson.TotalFreedomMod.TFM_Util;
import me.StevenLawson.TotalFreedomMod.TotalFreedomMod;
import org.bukkit.command.Command;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
@CommandPermissions(level = ADMIN_LEVEL.SENIOR, source = SOURCE_TYPE_ALLOWED.ONLY_CONSOLE, block_host_console = true, ignore_permissions = false)
public class Command_tfupdate extends TFM_Command
{
public static final String[] FILES =
{
"http://s3.madgeekonline.com/totalfreedom/BukkitHttpd.jar",
"http://s3.madgeekonline.com/totalfreedom/BukkitTelnet.jar",
"http://s3.madgeekonline.com/totalfreedom/Essentials.jar",
"http://s3.madgeekonline.com/totalfreedom/EssentialsSpawn.jar",
"http://s3.madgeekonline.com/totalfreedom/TotalFreedomMod.jar",
"http://s3.madgeekonline.com/totalfreedom/craftbukkit.jar",
"http://s3.madgeekonline.com/totalfreedom/worldedit.jar"
};
@Override
public boolean run(CommandSender sender, Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
{
if (!sender.getName().equalsIgnoreCase("madgeek1450"))
{
sender.sendMessage(TotalFreedomMod.MSG_NO_PERMS);
return true;
}
for (final String url : FILES)
{
server.getScheduler().runTaskAsynchronously(plugin, new Runnable()
{
@Override
public void run()
{
try
{
TFM_Log.info("Downloading: " + url);
File file = new File("./updates/" + url.substring(url.lastIndexOf("/") + 1));
if (file.exists())
{
file.delete();
}
if (!file.getParentFile().exists())
{
file.getParentFile().mkdirs();
}
TFM_Util.downloadFile(url, file, true);
}
catch (Exception ex)
{
TFM_Log.severe(ex);
}
}
});
}
return true;
}
}

View File

@ -468,6 +468,8 @@ public class TFM_PlayerListener implements Listener
TFM_Log.info(String.format("[PREPROCESS_COMMAND] %s(%s): %s", p.getName(), ChatColor.stripColor(p.getDisplayName()), command), true);
}
playerdata.setLastCommand(command);
command = command.toLowerCase().trim();
boolean block_command = false;

View File

@ -48,6 +48,7 @@ public class TFM_UserInfo
private boolean in_adminchat = false;
private boolean all_commands_blocked = false;
private Boolean superadmin_id_verified = null;
private String last_command = "";
public TFM_UserInfo(Player player)
{
@ -453,4 +454,14 @@ public class TFM_UserInfo
{
this.superadmin_id_verified = superadmin_id_verified;
}
public String getLastCommand()
{
return last_command;
}
public void setLastCommand(String last_command)
{
this.last_command = last_command;
}
}

View File

@ -937,13 +937,23 @@ public class TFM_Util
return affected;
}
public static void downloadFile(String url, File output_file) throws Exception
public static void downloadFile(String url, File output_file) throws java.lang.Exception
{
downloadFile(url, output_file, false);
}
public static void downloadFile(String url, File output_file, boolean verbose) throws java.lang.Exception
{
URL website = new URL(url);
ReadableByteChannel rbc = Channels.newChannel(website.openStream());
FileOutputStream fos = new FileOutputStream(output_file);
fos.getChannel().transferFrom(rbc, 0, 1 << 24);
fos.close();
if (verbose)
{
TFM_Log.info("Downloaded " + url + " to " + output_file.toString() + ".");
}
}
public static void adminChatMessage(CommandSender sender, String message, boolean senderIsConsole)

View File

@ -98,6 +98,9 @@ commands:
landmine:
description: Set a landmine trap.
usage: /<command>
lastcmd:
description: Superadmin command - Show the last command that someone used.
usage: /<command> <player>
lavadmg:
description: Superadmin command - Enable/disable lava damage.
usage: /<command> <on | off>
@ -186,7 +189,7 @@ commands:
usage: /<command> <block> [radius (default=50)] [player]
saconfig:
description: Senior Command - Manage superadmins.
usage: /<command> <list | clean | <add|delete> <username>>
usage: /<command> <list | clean | <add|delete|info> <username>>
say:
description: Broadcasts the given message as the console, includes sender name.
usage: /<command> <message>
@ -227,6 +230,9 @@ commands:
tfipbanlist:
description: Shows all banned IPs. Superadmins may optionally use 'purge' to clear the list.
usage: /<command> [purge]
tfupdate:
description: Madgeek command - Update server files.
usave: /<command>
tossmob:
description: Throw a mob in the direction you are facing when you left click with a stick.
usage: /<command> <mobtype [speed] | off | list>