SpigotMC-Mirrors/PlaceholderAPI
1
0
Fork 0
mirror of https://github.com/PlaceholderAPI/PlaceholderAPI synced 2024-11-18 00:46:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

Improve expansion sorting in /papi dump

Browse Source
This commit is contained in:
Andre601 2022-02-05 14:08:43 +01:00
parent 666ab468a1
commit 631609af74
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/main/java/me/clip/placeholderapi/commands/impl/local/CommandDump.java
View File

@ -106,7 +106,6 @@ public final class CommandDump extends PlaceholderCommand {
} }
try (final InputStream stream = connection.getInputStream()) { try (final InputStream stream = connection.getInputStream()) {
//noinspection UnstableApiUsage
final String json = CharStreams.toString(new InputStreamReader(stream, StandardCharsets.UTF_8)); final String json = CharStreams.toString(new InputStreamReader(stream, StandardCharsets.UTF_8));
return gson.fromJson(json, JsonObject.class).get("key").getAsString(); return gson.fromJson(json, JsonObject.class).get("key").getAsString();
} }
@ -134,8 +133,10 @@ public final class CommandDump extends PlaceholderCommand {
final List<PlaceholderExpansion> expansions = plugin.getLocalExpansionManager() final List<PlaceholderExpansion> expansions = plugin.getLocalExpansionManager()
.getExpansions() .getExpansions()
.stream() .stream()
.sorted(Comparator.comparing(PlaceholderExpansion::getIdentifier)) .sorted(
.sorted(Comparator.comparing(PlaceholderExpansion::getAuthor)) Comparator.comparing(PlaceholderExpansion::getIdentifier)
.thenComparing(PlaceholderExpansion::getAuthor)
)
.collect(Collectors.toList()); .collect(Collectors.toList());
int size = 0; int size = 0;
@ -167,10 +168,15 @@ public final class CommandDump extends PlaceholderCommand {
.getExpansionsFolder() .getExpansionsFolder()
.list((dir, name) -> name.toLowerCase().endsWith(".jar")); .list((dir, name) -> name.toLowerCase().endsWith(".jar"));
for (final String jar : jars) {
builder.append(" ") if (jars == null) {
.append(jar) builder.append(" WARN: Jars array was empty!");
.append('\n'); } else {
for (final String jar : jars) {
builder.append(" ")
.append(jar)
.append('\n');
}
} }
builder.append('\n'); builder.append('\n');