diff options
18 files changed, 416 insertions, 260 deletions
diff --git a/spark-bukkit/build.gradle b/spark-bukkit/build.gradle index 27c624c..e8c6721 100644 --- a/spark-bukkit/build.gradle +++ b/spark-bukkit/build.gradle @@ -1,5 +1,6 @@ dependencies { compile project(':spark-common') + compile 'net.kyori:text-adapter-bukkit:1.0.3' compileOnly 'org.spigotmc:spigot-api:1.12.2-R0.1-SNAPSHOT' } diff --git a/spark-bukkit/src/main/java/me/lucko/spark/bukkit/SparkBukkitPlugin.java b/spark-bukkit/src/main/java/me/lucko/spark/bukkit/SparkBukkitPlugin.java index c713a2c..15c725d 100644 --- a/spark-bukkit/src/main/java/me/lucko/spark/bukkit/SparkBukkitPlugin.java +++ b/spark-bukkit/src/main/java/me/lucko/spark/bukkit/SparkBukkitPlugin.java @@ -26,6 +26,9 @@ import me.lucko.spark.common.command.CommandResponseHandler; import me.lucko.spark.common.monitor.tick.TpsCalculator; import me.lucko.spark.common.sampler.ThreadDumper; import me.lucko.spark.common.sampler.TickCounter; +import net.kyori.text.Component; +import net.kyori.text.TextComponent; +import net.kyori.text.adapter.bukkit.TextAdapter; import org.bukkit.ChatColor; import org.bukkit.command.Command; import org.bukkit.command.CommandSender; @@ -55,8 +58,8 @@ public class SparkBukkitPlugin extends JavaPlugin implements SparkPlugin<Command CommandResponseHandler<CommandSender> resp = new CommandResponseHandler<>(this.platform, sender); TpsCalculator tpsCalculator = this.platform.getTpsCalculator(); - resp.replyPrefixed("TPS from last 5s, 10s, 1m, 5m, 15m:"); - resp.replyPrefixed(" " + tpsCalculator.toFormattedString()); + resp.replyPrefixed(TextComponent.of("TPS from last 5s, 10s, 1m, 5m, 15m:")); + resp.replyPrefixed(TextComponent.builder(" ").append(tpsCalculator.toFormattedComponent()).build()); return true; }, "tps"); } @@ -110,13 +113,8 @@ public class SparkBukkitPlugin extends JavaPlugin implements SparkPlugin<Command } @Override - public void sendMessage(CommandSender sender, String message) { - sender.sendMessage(ChatColor.translateAlternateColorCodes('&', message)); - } - - @Override - public void sendLink(CommandSender sender, String url) { - sendMessage(sender, "&7" + url); + public void sendMessage(CommandSender sender, Component message) { + TextAdapter.sendComponent(sender, message); } @Override diff --git a/spark-bungeecord/build.gradle b/spark-bungeecord/build.gradle index f94e651..55dcb4e 100644 --- a/spark-bungeecord/build.gradle +++ b/spark-bungeecord/build.gradle @@ -1,5 +1,6 @@ dependencies { compile project(':spark-common') + compile 'net.kyori:text-adapter-bungeecord:1.0.3' compileOnly 'net.md-5:bungeecord-api:1.12-SNAPSHOT' } diff --git a/spark-bungeecord/src/main/java/me/lucko/spark/bungeecord/SparkBungeeCordPlugin.java b/spark-bungeecord/src/main/java/me/lucko/spark/bungeecord/SparkBungeeCordPlugin.java index 0bc118a..ba2ee99 100644 --- a/spark-bungeecord/src/main/java/me/lucko/spark/bungeecord/SparkBungeeCordPlugin.java +++ b/spark-bungeecord/src/main/java/me/lucko/spark/bungeecord/SparkBungeeCordPlugin.java @@ -24,9 +24,10 @@ import me.lucko.spark.common.SparkPlatform; import me.lucko.spark.common.SparkPlugin; import me.lucko.spark.common.sampler.ThreadDumper; import me.lucko.spark.common.sampler.TickCounter; +import net.kyori.text.Component; +import net.kyori.text.adapter.bungeecord.TextAdapter; import net.md_5.bungee.api.ChatColor; import net.md_5.bungee.api.CommandSender; -import net.md_5.bungee.api.chat.ClickEvent; import net.md_5.bungee.api.chat.TextComponent; import net.md_5.bungee.api.plugin.Command; import net.md_5.bungee.api.plugin.Plugin; @@ -76,16 +77,8 @@ public class SparkBungeeCordPlugin extends Plugin implements SparkPlugin<Command } @Override - public void sendMessage(CommandSender sender, String message) { - sender.sendMessage(TextComponent.fromLegacyText(ChatColor.translateAlternateColorCodes('&', message))); - } - - @Override - public void sendLink(CommandSender sender, String url) { - TextComponent component = new TextComponent(url); - component.setColor(ChatColor.GRAY); - component.setClickEvent(new ClickEvent(ClickEvent.Action.OPEN_URL, url)); - sender.sendMessage(component); + public void sendMessage(CommandSender sender, Component message) { + TextAdapter.sendComponent(sender, message); } @Override diff --git a/spark-common/build.gradle b/spark-common/build.gradle index f51b703..a8b95c6 100644 --- a/spark-common/build.gradle +++ b/spark-common/build.gradle @@ -1,6 +1,7 @@ dependencies { compile 'com.squareup.okhttp3:okhttp:3.14.1' compile 'com.squareup.okio:okio:1.17.3' + compile 'net.kyori:text-api:2.0.0' compileOnly 'com.google.code.gson:gson:2.7' compileOnly 'com.google.guava:guava:19.0' } diff --git a/spark-common/src/main/java/me/lucko/spark/common/SparkPlatform.java b/spark-common/src/main/java/me/lucko/spark/common/SparkPlatform.java index 7a33c39..6b3eb21 100644 --- a/spark-common/src/main/java/me/lucko/spark/common/SparkPlatform.java +++ b/spark-common/src/main/java/me/lucko/spark/common/SparkPlatform.java @@ -33,6 +33,10 @@ import me.lucko.spark.common.command.tabcomplete.TabCompleter; import me.lucko.spark.common.monitor.tick.TpsCalculator; import me.lucko.spark.common.sampler.TickCounter; import me.lucko.spark.common.util.BytebinClient; +import net.kyori.text.Component; +import net.kyori.text.TextComponent; +import net.kyori.text.format.TextColor; +import net.kyori.text.format.TextDecoration; import okhttp3.OkHttpClient; import java.util.ArrayList; @@ -116,7 +120,7 @@ public class SparkPlatform<S> { command.executor().execute(this, sender, resp, new Arguments(rawArgs)); } catch (IllegalArgumentException e) { e.printStackTrace(); - resp.replyPrefixed("&c" + e.getMessage()); + resp.replyPrefixed(TextComponent.of(e.getMessage(), TextColor.RED)); } return; } @@ -146,14 +150,36 @@ public class SparkPlatform<S> { } private void sendUsage(CommandResponseHandler<S> sender) { - sender.replyPrefixed("&fspark &7v" + getPlugin().getVersion()); + sender.replyPrefixed(TextComponent.builder() + .append(TextComponent.of("spark", TextColor.WHITE)) + .append(Component.space()) + .append(TextComponent.of("v" + getPlugin().getVersion(), TextColor.GRAY)) + .build() + ); for (Command<S> command : this.commands) { - sender.reply("&6&l> &7/" + getPlugin().getLabel() + " " + command.aliases().get(0)); + sender.reply(TextComponent.builder() + .append(TextComponent.builder(">").color(TextColor.GOLD).decoration(TextDecoration.BOLD, true).build()) + .append(Component.space()) + .append(TextComponent.of("/" + getPlugin().getLabel() + " " + command.aliases().get(0), TextColor.GRAY)) + .build() + ); for (Command.ArgumentInfo arg : command.arguments()) { if (arg.requiresParameter()) { - sender.reply(" &8[&7--" + arg.argumentName() + "&8 <" + arg.parameterDescription() + ">]"); + sender.reply(TextComponent.builder(" ") + .append(TextComponent.of("[", TextColor.DARK_GRAY)) + .append(TextComponent.of("--" + arg.argumentName(), TextColor.GRAY)) + .append(Component.space()) + .append(TextComponent.of("<" + arg.parameterDescription() + ">", TextColor.DARK_GRAY)) + .append(TextComponent.of("]", TextColor.DARK_GRAY)) + .build() + ); } else { - sender.reply(" &8[&7--" + arg.argumentName() + "]"); + sender.reply(TextComponent.builder(" ") + .append(TextComponent.of("[", TextColor.DARK_GRAY)) + .append(TextComponent.of("--" + arg.argumentName(), TextColor.GRAY)) + .append(TextComponent.of("]", TextColor.DARK_GRAY)) + .build() + ); } } } diff --git a/spark-common/src/main/java/me/lucko/spark/common/SparkPlugin.java b/spark-common/src/main/java/me/lucko/spark/common/SparkPlugin.java index 481a615..19eb3d3 100644 --- a/spark-common/src/main/java/me/lucko/spark/common/SparkPlugin.java +++ b/spark-common/src/main/java/me/lucko/spark/common/SparkPlugin.java @@ -22,6 +22,7 @@ package me.lucko.spark.common; import me.lucko.spark.common.sampler.ThreadDumper; import me.lucko.spark.common.sampler.TickCounter; +import net.kyori.text.Component; import java.nio.file.Path; import java.util.Set; @@ -36,9 +37,7 @@ public interface SparkPlugin<S> { Set<S> getSendersWithPermission(String permission); - void sendMessage(S sender, String message); - - void sendLink(S sender, String url); + void sendMessage(S sender, Component message); void runAsync(Runnable r); diff --git a/spark-common/src/main/java/me/lucko/spark/common/command/CommandResponseHandler.java b/spark-common/src/main/java/me/lucko/spark/common/command/CommandResponseHandler.java index 9d604bd..94e1946 100644 --- a/spark-common/src/main/java/me/lucko/spark/common/command/CommandResponseHandler.java +++ b/spark-common/src/main/java/me/lucko/spark/common/command/CommandResponseHandler.java @@ -21,14 +21,24 @@ package me.lucko.spark.common.command; import me.lucko.spark.common.SparkPlatform; +import net.kyori.text.Component; +import net.kyori.text.TextComponent; +import net.kyori.text.event.ClickEvent; +import net.kyori.text.format.TextColor; +import net.kyori.text.format.TextDecoration; import java.util.Set; import java.util.function.Consumer; public class CommandResponseHandler<S> { - /** The prefix used in all messages */ - private static final String PREFIX = "&8[&e&l⚡&8] &7"; + /** The prefix used in all messages "&8[&e&l⚡&8] &7" */ + private static final TextComponent PREFIX = TextComponent.builder().color(TextColor.GRAY) + .append(TextComponent.of("[", TextColor.DARK_GRAY)) + .append(TextComponent.builder("⚡").color(TextColor.YELLOW).decoration(TextDecoration.BOLD, TextDecoration.State.TRUE).build()) + .append(TextComponent.of("]", TextColor.DARK_GRAY)) + .append(TextComponent.of(" ")) + .build(); private final SparkPlatform<S> platform; private final S sender; @@ -48,28 +58,21 @@ public class CommandResponseHandler<S> { senders.forEach(action); } - public void reply(String message) { + public void reply(Component message) { this.platform.getPlugin().sendMessage(this.sender, message); } - public void broadcast(String message) { + public void broadcast(Component message) { allSenders(sender -> this.platform.getPlugin().sendMessage(sender, message)); } - public void replyPrefixed(String message) { - this.platform.getPlugin().sendMessage(this.sender, PREFIX + message); + public void replyPrefixed(Component message) { + reply(PREFIX.append(message)); } - public void broadcastPrefixed(String message) { - allSenders(sender -> this.platform.getPlugin().sendMessage(sender, PREFIX + message)); + public void broadcastPrefixed(Component message) { + broadcast(PREFIX.append(message)); } - public void replyLink(String link) { - this.platform.getPlugin().sendLink(this.sender, link); - } - - public void broadcastLink(String link) { - allSenders(sender -> this.platform.getPlugin().sendLink(sender, link)); - } } diff --git a/spark-common/src/main/java/me/lucko/spark/common/command/modules/HealthModule.java b/spark-common/src/main/java/me/lucko/spark/common/command/modules/HealthModule.java index 66cee54..097d264 100644 --- a/spark-common/src/main/java/me/lucko/spark/common/command/modules/HealthModule.java +++ b/spark-common/src/main/java/me/lucko/spark/common/command/modules/HealthModule.java @@ -26,6 +26,10 @@ import me.lucko.spark.common.command.CommandModule; import me.lucko.spark.common.command.tabcomplete.TabCompleter; import me.lucko.spark.common.monitor.cpu.CpuMonitor; import me.lucko.spark.common.monitor.tick.TpsCalculator; +import net.kyori.text.Component; +import net.kyori.text.TextComponent; +import net.kyori.text.format.TextColor; +import net.kyori.text.format.TextDecoration; import java.io.IOException; import java.lang.management.ManagementFactory; @@ -45,50 +49,77 @@ public class HealthModule<S> implements CommandModule<S> { @Override public void registerCommands(Consumer<Command<S>> consumer) { consumer.accept(Command.<S>builder() - .aliases("tps") - .executor((platform, sender, resp, arguments) -> { - TpsCalculator tpsCalculator = platform.getTpsCalculator(); - if (tpsCalculator != null) { - resp.replyPrefixed("TPS from last 5s, 10s, 1m, 5m, 15m:"); - resp.replyPrefixed(" " + tpsCalculator.toFormattedString()); - } else { - resp.replyPrefixed("Not supported!"); - } - }) - .tabCompleter(Command.TabCompleter.empty()) - .build() + .aliases("tps") + .executor((platform, sender, resp, arguments) -> { + TpsCalculator tpsCalculator = platform.getTpsCalculator(); + if (tpsCalculator != null) { + resp.replyPrefixed(TextComponent.of("TPS from last 5s, 10s, 1m, 5m, 15m:")); + resp.replyPrefixed(TextComponent.builder(" ").append(tpsCalculator.toFormattedComponent()).build()); + } else { + resp.replyPrefixed(TextComponent.of("Not supported!")); + } + }) + .tabCompleter(Command.TabCompleter.empty()) + .build() ); consumer.accept(Command.<S>builder() .aliases("healthreport", "health", "ht") .argumentUsage("memory", null) .executor((platform, sender, resp, arguments) -> { - resp.replyPrefixed("&7Generating server health report..."); + resp.replyPrefixed(TextComponent.of("Generating server health report...")); platform.getPlugin().runAsync(() -> { - List<String> report = new ArrayList<>(15); - report.add(""); + List<Component> report = new ArrayList<>(15); + report.add(Component.empty()); TpsCalculator tpsCalculator = platform.getTpsCalculator(); if (tpsCalculator != null) { - report.add("&8&l>&6 TPS from last 5s, 10s, 1m, 5m, 15m:"); - report.add(" " + tpsCalculator.toFormattedString()); - report.add(""); + report.add(TextComponent.builder() + .append(TextComponent.builder(">").color(TextColor.DARK_GRAY).decoration(TextDecoration.BOLD, true).build()) + .append(Component.space()) + .append(TextComponent.of("TPS from last 5s, 10s, 1m, 5m, 15m:", TextColor.GOLD)) + .build() + ); + report.add(TextComponent.builder(" ").append(tpsCalculator.toFormattedComponent()).build()); + report.add(Component.empty()); } MemoryMXBean memoryMXBean = ManagementFactory.getMemoryMXBean(); - MemoryUsage heapUsage = memoryMXBean.getHeapMemoryUsage(); - report.add("&8&l>&6 Memory usage: "); - report.add(" &f" + formatBytes(heapUsage.getUsed()) + " &7/ &f" + formatBytes(heapUsage.getMax()) + - " &7(&a" + percent(heapUsage.getUsed(), heapUsage.getMax()) + "&7)"); - report.add(" " + generateMemoryUsageDiagram(heapUsage, 40)); - report.add(""); + report.add(TextComponent.builder() + .append(TextComponent.builder(">").color(TextColor.DARK_GRAY).decoration(TextDecoration.BOLD, true).build()) + .append(Component.space()) + .append(TextComponent.of("Memory usage:", TextColor.GOLD)) + .build() + ); + report.add(TextComponent.builder(" ") + .append(TextComponent.of(formatBytes(heapUsage.getUsed()), TextColor.WHITE)) + .append(Component.space()) + .append(TextComponent.of("/", TextColor.GRAY)) + .append(Component.space()) + .append(TextComponent.of(formatBytes(heapUsage.getMax()), TextColor.WHITE)) + .append(TextComponent.of(" ")) + .append(TextComponent.of("(", TextColor.GRAY)) + .append(TextComponent.of(percent(heapUsage.getUsed(), heapUsage.getMax()), TextColor.GREEN)) + .append(TextComponent.of(")", TextColor.GRAY)) + .build() + ); + report.add(TextComponent.builder(" ").append(generateMemoryUsageDiagram(heapUsage, 40)).build()); + report.add(Component.empty()); if (arguments.boolFlag("memory")) { MemoryUsage nonHeapUsage = memoryMXBean.getNonHeapMemoryUsage(); - report.add("&8&l>&6 Non-heap memory usage: "); - report.add(" &f" + formatBytes(nonHeapUsage.getUsed())); - report.add(""); + report.add(TextComponent.builder() + .append(TextComponent.builder(">").color(TextColor.DARK_GRAY).decoration(TextDecoration.BOLD, true).build()) + .append(Component.space()) + .append(TextComponent.of("Non-heap memory usage:", TextColor.GOLD)) + .build() + ); + report.add(TextComponent.builder(" ") + .append(TextComponent.of(formatBytes(nonHeapUsage.getUsed()), TextColor.WHITE)) + .build() + ); + report.add(Component.empty()); List<MemoryPoolMXBean> memoryPoolMXBeans = ManagementFactory.getMemoryPoolMXBeans(); for (MemoryPoolMXBean memoryPool : memoryPoolMXBeans) { @@ -103,16 +134,37 @@ public class HealthModule<S> implements CommandModule<S> { usage = new MemoryUsage(usage.getInit(), usage.getUsed(), usage.getCommitted(), usage.getCommitted()); } - report.add("&8&l>&6 " + memoryPool.getName() + " pool usage: "); - report.add(" &f" + formatBytes(usage.getUsed()) + " &7/ &f" + formatBytes(usage.getMax()) + - " &7(&a" + percent(usage.getUsed(), usage.getMax()) + "&7)"); - report.add(" " + generateMemoryPoolDiagram(usage, collectionUsage,40)); - + report.add(TextComponent.builder() + .append(TextComponent.builder(">").color(TextColor.DARK_GRAY).decoration(TextDecoration.BOLD, true).build()) + .append(Component.space()) + .append(TextComponent.of(memoryPool.getName() + " pool usage:", TextColor.GOLD)) + .build() + ); + report.add(TextComponent.builder(" ") + .append(TextComponent.of(formatBytes(usage.getUsed()), TextColor.WHITE)) + .append(Component.space()) + .append(TextComponent.of("/", TextColor.GRAY)) + .append(Component.space()) + .append(TextComponent.of(formatBytes(usage.getMax()), TextColor.WHITE)) + .append(TextComponent.of(" ")) + .append(TextComponent.of("(", TextColor.GRAY)) + .append(TextComponent.of(percent(usage.getUsed(), usage.getMax()), TextColor.GREEN)) + .append(TextComponent.of(")", TextColor.GRAY)) + .build() + ); + report.add(TextComponent.builder(" ").append(generateMemoryPoolDiagram(usage, collectionUsage, 40)).build()); if (collectionUsage != null) { - report.add(" &c- &7Usage at last GC: &f" + formatBytes(collectionUsage.getUsed())); + report.add(TextComponent.builder(" ") + .append(TextComponent.of("-", TextColor.RED)) + .append(Component.space()) + .append(TextComponent.of("Usage at last GC:", TextColor.GRAY)) + .append(Component.space()) + .append(TextComponent.of(formatBytes(collectionUsage.getUsed()), TextColor.WHITE)) + .build() + ); } - report.add(""); + report.add(Component.empty()); } } @@ -120,17 +172,30 @@ public class HealthModule<S> implements CommandModule<S> { double processCpuLoad = CpuMonitor.getProcessCpuLoad(); if (systemCpuLoad >= 0 || processCpuLoad >= 0) { - report.add("&8&l>&6 CPU usage: "); + report.add(TextComponent.builder() + .append(TextComponent.builder(">").color(TextColor.DARK_GRAY).decoration(TextDecoration.BOLD, true).build()) + .append(Component.space()) + .append(TextComponent.of("CPU usage:", TextColor.GOLD)) + .build() + ); if (systemCpuLoad >= 0) { - report.add(" &7System: &a" + percent(systemCpuLoad, 1.0d)); - report.add(" " + generateCpuUsageDiagram(systemCpuLoad, 40)); - report.add(""); + report.add(TextComponent.builder(" ") + .append(TextComponent.of("System: ", TextColor.GRAY)) + .append(TextComponent.of(percent(systemCpuLoad, 1.0d), TextColor.GREEN)) + .build() + ); + report.add(TextComponent.builder(" ").append(generateCpuUsageDiagram(systemCpuLoad, 40)).build()); + report.add(Component.empty()); } if (processCpuLoad >= 0) { - report.add(" &7Process: &a" + percent(processCpuLoad, 1.0d)); - report.add(" " + generateCpuUsageDiagram(processCpuLoad, 40)); - report.add(""); + report.add(TextComponent.builder(" ") + .append(TextComponent.of("Process: ", TextColor.GRAY)) + .append(TextComponent.of(percent(processCpuLoad, 1.0d), TextColor.GREEN)) + .build() + ); + report.add(TextComponent.builder(" ").append(generateCpuUsageDiagram(processCpuLoad, 40)).build()); + report.add(Component.empty()); } } @@ -138,17 +203,33 @@ public class HealthModule<S> implements CommandModule<S> { FileStore fileStore = Files.getFileStore(Paths.get(".")); long totalSpace = fileStore.getTotalSpace(); long usedSpace = totalSpace - fileStore.getUsableSpace(); - - report.add("&8&l>&6 Disk usage: "); - report.add(" &f" + formatBytes(usedSpace) + " &7/ &f" + formatBytes(totalSpace) + - " &7(&a" + percent(usedSpace, totalSpace) + "&7)"); - report.add(" " + generateDiskUsageDiagram(usedSpace, totalSpace, 40)); - report.add(""); + report.add(TextComponent.builder() + .append(TextComponent.builder(">").color(TextColor.DARK_GRAY).decoration(TextDecoration.BOLD, true).build()) + .append(Component.space()) + .append(TextComponent.of("Disk usage:", TextColor.GOLD)) + .build() + ); + report.add(TextComponent.builder(" ") + .append(TextComponent.of(formatBytes(usedSpace), TextColor.WHITE)) + .append(Component.space()) + .append(TextComponent.of("/", TextColor.GRAY)) + .append(Component.space()) + .append(TextComponent.of(formatBytes(totalSpace), TextColor.WHITE)) + .append(TextComponent.of(" ")) + .append(TextComponent.of("(", TextColor.GRAY)) + .append(TextComponent.of(percent(usedSpace, totalSpace), TextColor.GREEN)) + .append(TextComponent.of(")", TextColor.GRAY)) + .build() + ); + report.add(TextComponent.builder(" ").append(generateDiskUsageDiagram(usedSpace, totalSpace, 40)).build()); + report.add(Component.empty()); } catch (IOException e) { e.printStackTrace(); } - report.forEach(resp::reply); + TextComponent.Builder builder = TextComponent.builder(); + report.forEach(line -> builder.append(line).append(Component.newline())); + resp.reply(builder.build()); }); }) .tabCompleter((platform, sender, arguments) -> TabCompleter.completeForOpts(arguments, "--memory")) @@ -161,7 +242,7 @@ public class HealthModule<S> implements CommandModule<S> { return (int) percent + "%"; } - private static String generateMemoryUsageDiagram(MemoryUsage usage, int length) { + private static TextComponent generateMemoryUsageDiagram(MemoryUsage usage, int length) { double used = usage.getUsed(); double committed = usage.getCommitted(); double max = usage.getMax(); @@ -169,18 +250,23 @@ public class HealthModule<S> implements CommandModule<S> { int usedChars = (int) ((used * length) / max); int committedChars = (int) ((committed * length) / max); - String line = "&7" + Strings.repeat("/", usedChars); + TextComponent.Builder line = TextComponent.builder(Strings.repeat("/", usedChars)).color(TextColor.GRAY); if (committedChars > usedChars) { - line += Strings.repeat(" ", (committedChars - usedChars) - 1) + "&e|"; + line.append(TextComponent.of(Strings.repeat(" ", (committedChars - usedChars) - 1))); + line.append(TextComponent.of("|", TextColor.YELLOW)); } if (length > committedChars) { - line += Strings.repeat(" ", (length - committedChars)); + line.append(TextComponent.of(Strings.repeat(" ", (length - committedChars)))); } - return "&8[" + line + "&8]"; + return TextComponent.builder() + .append(TextComponent.of("[", TextColor.DARK_GRAY)) + .append(line.build()) + .append(TextComponent.of("]", TextColor.DARK_GRAY)) + .build(); } - private static String generateMemoryPoolDiagram(MemoryUsage usage, MemoryUsage collectionUsage, int length) { + private static TextComponent generateMemoryPoolDiagram(MemoryUsage usage, MemoryUsage collectionUsage, int length) { double used = usage.getUsed(); double collectionUsed = used; if (collectionUsage != null) { @@ -193,32 +279,45 @@ public class HealthModule<S> implements CommandModule<S> { int collectionUsedChars = (int) ((collectionUsed * length) / max); int committedChars = (int) ((committed * length) / max); - String line = "&7" + Strings.repeat("/", collectionUsedChars); + TextComponent.Builder line = TextComponent.builder(Strings.repeat("/", collectionUsedChars)).color(TextColor.GRAY); + if (usedChars > collectionUsedChars) { - line += "&c|&7" + Strings.repeat("/", (usedChars - collectionUsedChars) - 1); + line.append(TextComponent.of("|", TextColor.RED)); + line.append(TextComponent.of(Strings.repeat("/", (usedChars - collectionUsedChars) - 1), TextColor.GRAY)); } if (committedChars > usedChars) { - line += Strings.repeat(" ", (committedChars - usedChars) - 1) + "&e|"; + line.append(TextComponent.of(Strings.repeat(" ", (committedChars - usedChars) - 1))); + line.append(TextComponent.of("|", TextColor.YELLOW)); } if (length > committedChars) { - line += Strings.repeat(" ", (length - committedChars)); + line.append(TextComponent.of(Strings.repeat(" ", (length - committedChars)))); } - return "&8[" + line + "&8]"; + return TextComponent.builder() + .append(TextComponent.of("[", TextColor.DARK_GRAY)) + .append(line.build()) + .append(TextComponent.of("]", TextColor.DARK_GRAY)) + .build(); } - private static String generateCpuUsageDiagram(double usage, int length) { + private static TextComponent generateCpuUsageDiagram(double usage, int length) { int usedChars = (int) ((usage * length)); - - String line = "&7" + Strings.repeat("/", usedChars) + Strings.repeat(" ", length - usedChars); - return "&8[" + line + "&8]"; + String line = Strings.repeat("/", usedChars) + Strings.repeat(" ", length - usedChars); + return TextComponent.builder() + .append(TextComponent.of("[", TextColor.DARK_GRAY)) + .append(TextComponent.of(line, TextColor.GRAY)) + .append(TextComponent.of("]", TextColor.DARK_GRAY)) + .build(); } - private static String generateDiskUsageDiagram(double used, double max, int length) { + private static TextComponent generateDiskUsageDiagram(double used, double max, int length) { int usedChars = (int) ((used * length) / max); - - String line = "&7" + Strings.repeat("/", usedChars) + Strings.repeat(" ", length - usedChars); - return "&8[" + line + "&8]"; + String line = Strings.repeat("/", usedChars) + Strings.repeat(" ", length - usedChars); + return TextComponent.builder() + .append(TextComponent.of("[", TextColor.DARK_GRAY)) + .append(TextComponent.of(line, TextColor.GRAY)) + .append(TextComponent.of("]", TextColor.DARK_GRAY)) + .build(); } private static String formatBytes(long bytes) { diff --git a/spark-common/src/main/java/me/lucko/spark/common/command/modules/MemoryModule.java b/spark-common/src/main/java/me/lucko/spark/common/command/modules/MemoryModule.java index 583b1b6..e2d817d 100644 --- a/spark-common/src/main/java/me/lucko/spark/common/command/modules/MemoryModule.java +++ b/spark-common/src/main/java/me/lucko/spark/common/command/modules/MemoryModule.java @@ -26,6 +26,9 @@ import me.lucko.spark.common.command.CommandModule; import me.lucko.spark.common.command.tabcomplete.TabCompleter; import me.lucko.spark.common.heapdump.HeapDump; import me.lucko.spark.common.heapdump.HeapDumpSummary; +import net.kyori.text.TextComponent; +import net.kyori.text.event.ClickEvent; +import net.kyori.text.format.TextColor; import okhttp3.MediaType; import java.io.IOException; @@ -45,32 +48,38 @@ public class MemoryModule<S> implements CommandModule<S> { .argumentUsage("run-gc-before", null) .executor((platform, sender, resp, arguments) -> { platform.getPlugin().runAsync(() -> { - if (arguments.boolFlag("run-gc-before")) { - |