Improve dump command (#412)

This commit is contained in:
Andre_601 2020-08-01 01:59:55 +02:00 committed by GitHub
parent 9412fed9ad
commit e43b7bf205
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -42,9 +42,10 @@ import java.time.Instant;
import java.time.ZoneId;
import java.time.format.DateTimeFormatter;
import java.time.format.FormatStyle;
import java.util.Arrays;
import java.util.Comparator;
import java.util.List;
import java.util.Locale;
import java.util.Map;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.CompletionException;
import java.util.logging.Level;
@ -133,29 +134,32 @@ public final class CommandDump extends PlaceholderCommand
builder.append("Expansions Registered:")
.append('\n');
final Map<String, List<PlaceholderExpansion>> expansions = plugin.getLocalExpansionManager()
final List<PlaceholderExpansion> expansions = plugin.getLocalExpansionManager()
.getExpansions()
.stream()
.collect(Collectors.groupingBy(PlaceholderExpansion::getAuthor));
.sorted(Comparator.comparing(PlaceholderExpansion::getIdentifier))
.sorted(Comparator.comparing(PlaceholderExpansion::getAuthor))
.collect(Collectors.toList());
for (final Map.Entry<String, List<PlaceholderExpansion>> expansionsByAuthor : expansions.entrySet())
{
builder.append(" ")
.append(expansionsByAuthor.getKey())
.append(": ")
.append('\n');
int size = 0;
for (final PlaceholderExpansion expansion : expansionsByAuthor.getValue())
{
builder.append(" ")
.append(expansion.getName())
.append(':')
.append(expansion.getVersion())
.append('\n');
for(final String name : expansions.stream().map(PlaceholderExpansion::getIdentifier).collect(Collectors.toList())){
if (name.length() > size) {
size = name.length();
}
}
for (final PlaceholderExpansion expansion : expansions) {
builder.append(" ")
.append(String.format("%-" + size + "s", expansion.getIdentifier()))
.append(" [Author: ")
.append(expansion.getAuthor())
.append(", Version: ")
.append(expansion.getVersion())
.append("]\n");
}
builder.append('\n');
builder.append("Expansions Directory:")
@ -184,16 +188,26 @@ public final class CommandDump extends PlaceholderCommand
builder.append("Plugin Info:")
.append('\n');
for (final Plugin other : plugin.getServer().getPluginManager().getPlugins())
List<Plugin> plugins = Arrays.stream(plugin.getServer().getPluginManager().getPlugins())
.sorted(Comparator.comparing(Plugin::getName))
.collect(Collectors.toList());
for (final String pluginName : plugins.stream().map(Plugin::getName).collect(Collectors.toList())) {
if (pluginName.length() > size) {
size = pluginName.length();
}
}
for (final Plugin other : plugins)
{
builder.append(" ")
.append(other.getName())
.append(": ")
.append(String.format("%-" + size + "s", other.getName()))
.append(" [Version: ")
.append(other.getDescription().getVersion())
.append('\n');
.append("]")
.append("\n");
}
return builder.toString();
}
}