Added --include-plugin-list to mv version command.
This commit is contained in:
parent
540b6abcab
commit
841598232c
|
@ -16,12 +16,15 @@ import com.onarandombox.MultiverseCore.utils.webpaste.PasteService;
|
||||||
import com.onarandombox.MultiverseCore.utils.webpaste.PasteServiceFactory;
|
import com.onarandombox.MultiverseCore.utils.webpaste.PasteServiceFactory;
|
||||||
import com.onarandombox.MultiverseCore.utils.webpaste.PasteServiceType;
|
import com.onarandombox.MultiverseCore.utils.webpaste.PasteServiceType;
|
||||||
import com.onarandombox.MultiverseCore.utils.webpaste.URLShortener;
|
import com.onarandombox.MultiverseCore.utils.webpaste.URLShortener;
|
||||||
|
import com.pneumaticraft.commandhandler.CommandHandler;
|
||||||
|
import org.apache.commons.lang.StringUtils;
|
||||||
import org.bukkit.ChatColor;
|
import org.bukkit.ChatColor;
|
||||||
import org.bukkit.command.CommandSender;
|
import org.bukkit.command.CommandSender;
|
||||||
import org.bukkit.command.ConsoleCommandSender;
|
import org.bukkit.command.ConsoleCommandSender;
|
||||||
import org.bukkit.entity.Player;
|
import org.bukkit.entity.Player;
|
||||||
import org.bukkit.permissions.PermissionDefault;
|
import org.bukkit.permissions.PermissionDefault;
|
||||||
import org.bukkit.scheduler.BukkitRunnable;
|
import org.bukkit.scheduler.BukkitRunnable;
|
||||||
|
import org.bukkit.util.StringUtil;
|
||||||
|
|
||||||
import java.io.*;
|
import java.io.*;
|
||||||
import java.util.HashMap;
|
import java.util.HashMap;
|
||||||
|
@ -37,8 +40,8 @@ public class VersionCommand extends MultiverseCommand {
|
||||||
public VersionCommand(MultiverseCore plugin) {
|
public VersionCommand(MultiverseCore plugin) {
|
||||||
super(plugin);
|
super(plugin);
|
||||||
this.setName("Multiverse Version");
|
this.setName("Multiverse Version");
|
||||||
this.setCommandUsage("/mv version " + ChatColor.GOLD + "-[bh]");
|
this.setCommandUsage("/mv version " + ChatColor.GOLD + "-[bh] [--include-plugin-list]");
|
||||||
this.setArgRange(0, 1);
|
this.setArgRange(0, 2);
|
||||||
this.addKey("mv version");
|
this.addKey("mv version");
|
||||||
this.addKey("mvv");
|
this.addKey("mvv");
|
||||||
this.addKey("mvversion");
|
this.addKey("mvversion");
|
||||||
|
@ -149,22 +152,31 @@ public class VersionCommand extends MultiverseCommand {
|
||||||
final Map<String, String> files = this.getVersionFiles();
|
final Map<String, String> files = this.getVersionFiles();
|
||||||
this.plugin.getServer().getPluginManager().callEvent(versionEvent);
|
this.plugin.getServer().getPluginManager().callEvent(versionEvent);
|
||||||
|
|
||||||
|
String versionInfo = versionEvent.getVersionInfo();
|
||||||
|
|
||||||
|
if (CommandHandler.hasFlag("--include-plugin-list", args)) {
|
||||||
|
versionInfo = versionInfo + "\nPlugins: " + getPluginList();
|
||||||
|
}
|
||||||
|
|
||||||
|
final String data = versionInfo;
|
||||||
|
|
||||||
// log to console
|
// log to console
|
||||||
final String data = versionEvent.getVersionInfo();
|
|
||||||
String[] lines = data.split("\n");
|
String[] lines = data.split("\n");
|
||||||
for (String line : lines) {
|
for (String line : lines) {
|
||||||
Logging.info(line);
|
if (!line.isEmpty()) {
|
||||||
|
Logging.info(line);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
BukkitRunnable logPoster = new BukkitRunnable() {
|
BukkitRunnable logPoster = new BukkitRunnable() {
|
||||||
@Override
|
@Override
|
||||||
public void run() {
|
public void run() {
|
||||||
if (args.size() == 1) {
|
if (args.size() > 0) {
|
||||||
String pasteUrl;
|
String pasteUrl;
|
||||||
if (args.get(0).equalsIgnoreCase("-b")) {
|
if (CommandHandler.hasFlag("-b", args)) {
|
||||||
// private post to pastebin
|
// private post to pastebin
|
||||||
pasteUrl = postToService(PasteServiceType.PASTEBIN, true, data, files);
|
pasteUrl = postToService(PasteServiceType.PASTEBIN, true, data, files);
|
||||||
} else if (args.get(0).equalsIgnoreCase("-h")) {
|
} else if (CommandHandler.hasFlag("-h", args)) {
|
||||||
// private post to pastebin
|
// private post to pastebin
|
||||||
pasteUrl = postToService(PasteServiceType.HASTEBIN, true, data, files);
|
pasteUrl = postToService(PasteServiceType.HASTEBIN, true, data, files);
|
||||||
} else {
|
} else {
|
||||||
|
@ -208,4 +220,8 @@ public class VersionCommand extends MultiverseCommand {
|
||||||
return "Error posting to service";
|
return "Error posting to service";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private String getPluginList() {
|
||||||
|
return StringUtils.join(plugin.getServer().getPluginManager().getPlugins(), ", ");
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue