Merge remote-tracking branch 'lucko/master' into forge-1.7.10

6 files changed, 193 insertions, 290 deletions

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 a9e2229..d1481bd 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
@@ -88,12 +88,20 @@ public class CommandResponseHandler {
     }
 
     public void broadcast(Component message) {
-        allSenders(sender -> sender.sendMessage(message));
+        if (this.platform.shouldBroadcastResponse()) {
+            allSenders(sender -> sender.sendMessage(message));
+        } else {
+            reply(message);
+        }
     }
 
     public void broadcast(Iterable<Component> message) {
-        Component joinedMsg = Component.join(JoinConfiguration.separator(Component.newline()), message);
-        allSenders(sender -> sender.sendMessage(joinedMsg));
+        if (this.platform.shouldBroadcastResponse()) {
+            Component joinedMsg = Component.join(JoinConfiguration.separator(Component.newline()), message);
+            allSenders(sender -> sender.sendMessage(joinedMsg));
+        } else {
+            reply(message);
+        }
     }
 
     public void replyPrefixed(Component message) {
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 51fa905..16eadc8 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
@@ -20,8 +20,6 @@
 
 package me.lucko.spark.common.command.modules;
 
-import com.google.common.base.Strings;
-
 import me.lucko.spark.common.SparkPlatform;
 import me.lucko.spark.common.command.Arguments;
 import me.lucko.spark.common.command.Command;
@@ -30,25 +28,29 @@ import me.lucko.spark.common.command.CommandResponseHandler;
 import me.lucko.spark.common.command.sender.CommandSender;
 import me.lucko.spark.common.command.tabcomplete.TabCompleter;
 import me.lucko.spark.common.monitor.cpu.CpuMonitor;
+import me.lucko.spark.common.monitor.disk.DiskUsage;
+import me.lucko.spark.common.monitor.net.Direction;
+import me.lucko.spark.common.monitor.net.NetworkInterfaceAverages;
+import me.lucko.spark.common.monitor.net.NetworkMonitor;
+import me.lucko.spark.common.monitor.ping.PingStatistics;
+import me.lucko.spark.common.monitor.ping.PingSummary;
 import me.lucko.spark.common.monitor.tick.TickStatistics;
 import me.lucko.spark.common.util.FormatUtil;
 import me.lucko.spark.common.util.RollingAverage;
+import me.lucko.spark.common.util.StatisticFormatter;
 
 import net.kyori.adventure.text.Component;
-import net.kyori.adventure.text.TextComponent;
-import net.kyori.adventure.text.format.TextColor;
 
-import java.io.IOException;
 import java.lang.management.ManagementFactory;
 import java.lang.management.MemoryMXBean;
 import java.lang.management.MemoryPoolMXBean;
 import java.lang.management.MemoryType;
 import java.lang.management.MemoryUsage;
-import java.nio.file.FileStore;
-import java.nio.file.Files;
-import java.nio.file.Paths;
 import java.util.LinkedList;
 import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Set;
 import java.util.function.Consumer;
 
 import static net.kyori.adventure.text.Component.empty;
@@ -60,13 +62,10 @@ import static net.kyori.adventure.text.format.NamedTextColor.GRAY;
 import static net.kyori.adventure.text.format.NamedTextColor.GREEN;
 import static net.kyori.adventure.text.format.NamedTextColor.RED;
 import static net.kyori.adventure.text.format.NamedTextColor.WHITE;
-import static net.kyori.adventure.text.format.NamedTextColor.YELLOW;
 import static net.kyori.adventure.text.format.TextDecoration.BOLD;
 
 public class HealthModule implements CommandModule {
 
-    private static final double MSPT_95_PERCENTILE = 0.95d;
-
     @Override
     public void registerCommands(Consumer<Command> consumer) {
         consumer.accept(Command.builder()
@@ -77,10 +76,19 @@ public class HealthModule implements CommandModule {
         );
 
         consumer.accept(Command.builder()
+                .aliases("ping")
+                .argumentUsage("player", "username")
+                .executor(HealthModule::ping)
+                .tabCompleter((platform, sender, arguments) -> TabCompleter.completeForOpts(arguments, "--player"))
+                .build()
+        );
+
+        consumer.accept(Command.builder()
                 .aliases("healthreport", "health", "ht")
                 .argumentUsage("memory", null)
+                .argumentUsage("network", null)
                 .executor(HealthModule::healthReport)
-                .tabCompleter((platform, sender, arguments) -> TabCompleter.completeForOpts(arguments, "--memory"))
+                .tabCompleter((platform, sender, arguments) -> TabCompleter.completeForOpts(arguments, "--memory", "--network"))
                 .build()
         );
     }
@@ -91,11 +99,11 @@ public class HealthModule implements CommandModule {
             resp.replyPrefixed(text("TPS from last 5s, 10s, 1m, 5m, 15m:"));
             resp.replyPrefixed(text()
                     .content(" ")
-                    .append(formatTps(tickStatistics.tps5Sec())).append(text(", "))
-                    .append(formatTps(tickStatistics.tps10Sec())).append(text(", "))
-                    .append(formatTps(tickStatistics.tps1Min())).append(text(", "))
-                    .append(formatTps(tickStatistics.tps5Min())).append(text(", "))
-                    .append(formatTps(tickStatistics.tps15Min()))
+                    .append(StatisticFormatter.formatTps(tickStatistics.tps5Sec())).append(text(", "))
+                    .append(StatisticFormatter.formatTps(tickStatistics.tps10Sec())).append(text(", "))
+                    .append(StatisticFormatter.formatTps(tickStatistics.tps1Min())).append(text(", "))
+                    .append(StatisticFormatter.formatTps(tickStatistics.tps5Min())).append(text(", "))
+                    .append(StatisticFormatter.formatTps(tickStatistics.tps15Min()))
                     .build()
             );
             resp.replyPrefixed(empty());
@@ -104,8 +112,8 @@ public class HealthModule implements CommandModule {
                 resp.replyPrefixed(text("Tick durations (min/med/95%ile/max ms) from last 10s, 1m:"));
                 resp.replyPrefixed(text()
                         .content(" ")
-                        .append(formatTickDurations(tickStatistics.duration10Sec())).append(text(";  "))
-                        .append(formatTickDurations(tickStatistics.duration1Min()))
+                        .append(StatisticFormatter.formatTickDurations(tickStatistics.duration10Sec())).append(text(";  "))
+                        .append(StatisticFormatter.formatTickDurations(tickStatistics.duration1Min()))
                         .build()
                 );
                 resp.replyPrefixed(empty());
@@ -115,22 +123,67 @@ public class HealthModule implements CommandModule {
         resp.replyPrefixed(text("CPU usage from last 10s, 1m, 15m:"));
         resp.replyPrefixed(text()
                 .content(" ")
-                .append(formatCpuUsage(CpuMonitor.systemLoad10SecAvg())).append(text(", "))
-                .append(formatCpuUsage(CpuMonitor.systemLoad1MinAvg())).append(text(", "))
-                .append(formatCpuUsage(CpuMonitor.systemLoad15MinAvg()))
+                .append(StatisticFormatter.formatCpuUsage(CpuMonitor.systemLoad10SecAvg())).append(text(", "))
+                .append(StatisticFormatter.formatCpuUsage(CpuMonitor.systemLoad1MinAvg())).append(text(", "))
+                .append(StatisticFormatter.formatCpuUsage(CpuMonitor.systemLoad15MinAvg()))
                 .append(text("  (system)", DARK_GRAY))
                 .build()
         );
         resp.replyPrefixed(text()
                 .content(" ")
-                .append(formatCpuUsage(CpuMonitor.processLoad10SecAvg())).append(text(", "))
-                .append(formatCpuUsage(CpuMonitor.processLoad1MinAvg())).append(text(", "))
-                .append(formatCpuUsage(CpuMonitor.processLoad15MinAvg()))
+                .append(StatisticFormatter.formatCpuUsage(CpuMonitor.processLoad10SecAvg())).append(text(", "))
+                .append(StatisticFormatter.formatCpuUsage(CpuMonitor.processLoad1MinAvg())).append(text(", "))
+                .append(StatisticFormatter.formatCpuUsage(CpuMonitor.processLoad15MinAvg()))
                 .append(text("  (process)", DARK_GRAY))
                 .build()
         );
     }
 
+    private static void ping(SparkPlatform platform, CommandSender sender, CommandResponseHandler resp, Arguments arguments) {
+        PingStatistics pingStatistics = platform.getPingStatistics();
+        if (pingStatistics == null) {
+            resp.replyPrefixed(text("Ping data is not available on this platform."));
+            return;
+        }
+
+        // lookup for specific player
+        Set<String> players = arguments.stringFlag("player");
+        if (!players.isEmpty()) {
+            for (String player : players) {
+                PingStatistics.PlayerPing playerPing = pingStatistics.query(player);
+                if (playerPing == null) {
+                    resp.replyPrefixed(text("Ping data is not available for '" + player + "'."));
+                } else {
+                    resp.replyPrefixed(text()
+                            .content("Player ")
+                            .append(text(playerPing.name(), WHITE))
+                            .append(text(" has "))
+                            .append(StatisticFormatter.formatPingRtt(playerPing.ping()))
+                            .append(text(" ms ping."))
+                            .build()
+                    );
+                }
+            }
+            return;
+        }
+
+        PingSummary summary = pingStatistics.currentSummary();
+        RollingAverage average = pingStatistics.getPingAverage();
+
+        if (summary.total() == 0 && average.getSamples() == 0) {
+            resp.replyPrefixed(text("There is not enough data to show ping averages yet. Please try again later."));
+            return;
+        }
+
+        resp.replyPrefixed(text("Average Pings (min/med/95%ile/max ms) from now, last 15m:"));
+        resp.replyPrefixed(text()
+                .content(" ")
+                .append(StatisticFormatter.formatPingRtts(summary.min(), summary.median(), summary.percentile95th(), summary.max())).append(text(";  "))
+                .append(StatisticFormatter.formatPingRtts(average.min(), average.median(), average.percentile95th(), average.max()))
+                .build()
+        );
+    }
+
     private static void healthReport(SparkPlatform platform, CommandSender sender, CommandResponseHandler resp, Arguments arguments) {
         resp.replyPrefixed(text("Generating server health report..."));
         List<Component> report = new LinkedList<>();
@@ -150,11 +203,9 @@ public class HealthModule implements CommandModule {
             addDetailedMemoryStats(report, memoryMXBean);
         }
 
-        try {
-            addDiskStats(report);
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
+        addNetworkStats(report, arguments.boolFlag("network"));
+
+        addDiskStats(report);
 
         resp.reply(report);
     }
@@ -168,11 +219,11 @@ public class HealthModule implements CommandModule {
         );
         report.add(text()
                 .content("    ")
-                .append(formatTps(tickStatistics.tps5Sec())).append(text(", "))
-                .append(formatTps(tickStatistics.tps10Sec())).append(text(", "))
-                .append(formatTps(tickStatistics.tps1Min())).append(text(", "))
-                .append(formatTps(tickStatistics.tps5Min())).append(text(", "))
-                .append(formatTps(tickStatistics.tps15Min()))
+                .append(StatisticFormatter.formatTps(tickStatistics.tps5Sec())).append(text(", "))
+                .append(StatisticFormatter.formatTps(tickStatistics.tps10Sec())).append(text(", "))
+                .append(StatisticFormatter.formatTps(tickStatistics.tps1Min())).append(text(", "))
+                .append(StatisticFormatter.formatTps(tickStatistics.tps5Min())).append(text(", "))
+                .append(StatisticFormatter.formatTps(tickStatistics.tps15Min()))
                 .build()
         );
         report.add(empty());
@@ -186,8 +237,8 @@ public class HealthModule implements CommandModule {
             );
             report.add(text()
                     .content("    ")
-                    .append(formatTickDurations(tickStatistics.duration10Sec())).append(text("; "))
-                    .append(formatTickDurations(tickStatistics.duration1Min()))
+                    .append(StatisticFormatter.formatTickDurations(tickStatistics.duration10Sec())).append(text("; "))
+                    .append(StatisticFormatter.formatTickDurations(tickStatistics.duration1Min()))
                     .build()
             );
             report.add(empty());
@@ -203,17 +254,17 @@ public class HealthModule implements CommandModule {
         );
         report.add(text()
                 .content("    ")
-                .append(formatCpuUsage(CpuMonitor.systemLoad10SecAvg())).append(text(", "))
-                .append(formatCpuUsage(CpuMonitor.systemLoad1MinAvg())).append(text(", "))
-                .append(formatCpuUsage(CpuMonitor.systemLoad15MinAvg()))
+                .append(StatisticFormatter.formatCpuUsage(CpuMonitor.systemLoad10SecAvg())).append(text(", "))
+                .append(StatisticFormatter.formatCpuUsage(CpuMonitor.systemLoad1MinAvg())).append(text(", "))
+                .append(StatisticFormatter.formatCpuUsage(CpuMonitor.systemLoad15MinAvg()))
                 .append(text("  (system)", DARK_GRAY))
                 .build()
         );
         report.add(text()
                 .content("    ")
-                .append(formatCpuUsage(CpuMonitor.processLoad10SecAvg())).append(text(", "))
-                .append(formatCpuUsage(CpuMonitor.processLoad1MinAvg())).append(text(", "))
-                .append(formatCpuUsage(CpuMonitor.processLoad15MinAvg()))
+                .append(StatisticFormatter.formatCpuUsage(CpuMonitor.processLoad10SecAvg())).append(text(", "))
+                .append(StatisticFormatter.formatCpuUsage(CpuMonitor.processLoad1MinAvg())).append(text(", "))
+                .append(StatisticFormatter.formatCpuUsage(CpuMonitor.processLoad15MinAvg()))
                 .append(text("  (process)", DARK_GRAY))
                 .build()
         );
@@ -241,7 +292,7 @@ public class HealthModule implements CommandModule {
                 .append(text(")", GRAY))
                 .build()
         );
-        report.add(text().content("    ").append(generateMemoryUsageDiagram(heapUsage, 40)).build());
+        report.add(text().content("    ").append(StatisticFormatter.generateMemoryUsageDiagram(heapUsage, 60)).build());
         report.add(empty());
     }
 
@@ -292,7 +343,7 @@ public class HealthModule implements CommandModule {
                     .append(text(")", GRAY))
                     .build()
             );
-            report.add(text().content("    ").append(generateMemoryPoolDiagram(usage, collectionUsage, 40)).build());
+            report.add(text().content("    ").append(StatisticFormatter.generateMemoryPoolDiagram(usage, collectionUsage, 60)).build());
 
             if (collectionUsage != null) {
                 report.add(text()
@@ -309,10 +360,56 @@ public class HealthModule implements CommandModule {
         }
     }
 
-    private static void addDiskStats(List<Component> report) throws IOException {
-        FileStore fileStore = Files.getFileStore(Paths.get("."));
-        long totalSpace = fileStore.getTotalSpace();
-        long usedSpace = totalSpace - fileStore.getUsableSpace();
+    private static void addNetworkStats(List<Component> report, boolean detailed) {
+        List<Component> averagesReport = new LinkedList<>();
+
+        for (Map.Entry<String, NetworkInterfaceAverages> ent : NetworkMonitor.systemAverages().entrySet()) {
+            String interfaceName = ent.getKey();
+            NetworkInterfaceAverages averages = ent.getValue();
+
+            for (Direction direction : Direction.values()) {
+                long bytesPerSec = (long) averages.bytesPerSecond(direction).mean();
+                long packetsPerSec = (long) averages.packetsPerSecond(direction).mean();
+
+                if (detailed || bytesPerSec > 0 || packetsPerSec > 0) {
+                    averagesReport.add(text()
+                            .color(GRAY)
+                            .content("    ")
+                            .append(FormatUtil.formatBytes(bytesPerSec, GREEN, "/s"))
+                            .append(text(" / "))
+                            .append(text(String.format(Locale.ENGLISH, "%,d", packetsPerSec), WHITE))
+                            .append(text(" pps "))
+                            .append(text().color(DARK_GRAY)
+                                    .append(text('('))
+                                    .append(text(interfaceName + " " + direction.abbrev(), WHITE))
+                                    .append(text(')'))
+                            )
+                            .build()
+                    );
+                }
+            }
+        }
+
+        if (!averagesReport.isEmpty()) {
+            report.add(text()
+                    .append(text(">", DARK_GRAY, BOLD))
+                    .append(space())
+                    .append(text("Network usage: (system, last 15m)", GOLD))
+                    .build()
+            );
+            report.addAll(averagesReport);
+            report.add(empty());
+        }
+    }
+
+    private static void addDiskStats(List<Component> report) {
+        long total = DiskUsage.getTotal();
+        long used = DiskUsage.getUsed();
+        
+        if (total == 0 || used == 0) {
+            return;
+        }
+
         report.add(text()
                 .append(text(">", DARK_GRAY, BOLD))
                 .append(space())
@@ -321,138 +418,19 @@ public class HealthModule implements CommandModule {
         );
         report.add(text()
                 .content("    ")
-                .append(text(FormatUtil.formatBytes(usedSpace), WHITE))
+                .append(text(FormatUtil.formatBytes(used), WHITE))
                 .append(space())
                 .append(text("/", GRAY))
                 .append(space())
-                .append(text(FormatUtil.formatBytes(totalSpace), WHITE))
+                .append(text(FormatUtil.formatBytes(total), WHITE))
                 .append(text("   "))
                 .append(text("(", GRAY))
-                .append(text(FormatUtil.percent(usedSpace, totalSpace), GREEN))
+                .append(text(FormatUtil.percent(used, total), GREEN))
                 .append(text(")", GRAY))
                 .build()
         );
-        report.add(text().content("    ").append(generateDiskUsageDiagram(usedSpace, totalSpace, 40)).build());
+        report.add(text().content("    ").append(StatisticFormatter.generateDiskUsageDiagram(used, total, 60)).build());
         report.add(empty());
     }
 
-    public static TextComponent formatTps(double tps) {
-        TextColor color;
-        if (tps > 18.0) {
-            color = GREEN;
-        } else if (tps > 16.0) {
-            color = YELLOW;
-        } else {
-            color = RED;
-        }
-
-        return text((tps > 20.0 ? "*" : "") + Math.min(Math.round(tps * 100.0) / 100.0, 20.0), color);
-    }
-
-    public static TextComponent formatTickDurations(RollingAverage average) {
-        return text()
-                .append(formatTickDuration(average.min()))
-                .append(text('/', GRAY))
-                .append(formatTickDuration(average.median()))
-                .append(text('/', GRAY))
-                .append(formatTickDuration(average.percentile(MSPT_95_PERCENTILE)))
-                .append(text('/', GRAY))
-                .append(formatTickDuration(average.max()))
-                .build();
-    }
-
-    public static TextComponent formatTickDuration(double duration) {
-        TextColor color;
-        if (duration >= 50d) {
-            color = RED;
-        } else if (duration >= 40d) {
-            color = YELLOW;
-        } else {
-            color = GREEN;
-        }
-
-        return text(String.format("%.1f", duration), color);
-    }
-
-    public static TextComponent formatCpuUsage(double usage) {
-        TextColor color;
-        if (usage > 0.9) {
-            color = RED;
-        } else if (usage > 0.65) {
-            color = YELLOW;
-        } else {
-            color = GREEN;
-        }
-
-        return text(FormatUtil.percent(usage, 1d), color);
-    }
-
-    private static TextComponent generateMemoryUsageDiagram(MemoryUsage usage, int length) {
-        double used = usage.getUsed();
-        double committed = usage.getCommitted();
-        double max = usage.getMax();
-
-        int usedChars = (int) ((used * length) / max);
-        int committedChars = (int) ((committed * length) / max);
-
-        TextComponent.Builder line = text().content(Strings.repeat("/", usedChars)).color(GRAY);
-        if (committedChars > usedChars) {
-            line.append(text(Strings.repeat(" ", (committedChars - usedChars) - 1)));
-            line.append(text("|", YELLOW));
-        }
-        if (length > committedChars) {
-            line.append(text(Strings.repeat(" ", (length - committedChars))));
-        }
-
-        return text()
-                .append(text("[", DARK_GRAY))
-                .append(line.build())
-                .append(text("]", DARK_GRAY))
-                .build();
-    }
-
-    private static TextComponent generateMemoryPoolDiagram(MemoryUsage usage, MemoryUsage collectionUsage, int length) {
-        double used = usage.getUsed();
-        double collectionUsed = used;
-        if (collectionUsage != null) {
-            collectionUsed = collectionUsage.getUsed();
-        }
-        double committed = usage.getCommitted();
-        double max = usage.getMax();
-
-        int usedChars = (int) ((used * length) / max);
-        int collectionUsedChars = (int) ((collectionUsed * length) / max);
-        int committedChars = (int) ((committed * length) / max);
-
-        TextComponent.Builder line = text().content(Strings.repeat("/", collectionUsedChars)).color(GRAY);
-
-        if (usedChars > collectionUsedChars) {
-            line.append(text("|", RED));
-            line.append(text(Strings.repeat("/", (usedChars - collectionUsedChars) - 1), GRAY));
-        }
-        if (committedChars > usedChars) {
-            line.append(text(Strings.repeat(" ", (committedChars - usedChars) - 1)));
-            line.append(text("|", YELLOW));
-        }
-        if (length > committedChars) {
-            line.append(text(Strings.repeat(" ", (length - committedChars))));
-        }
-
-        return text()
-                .append(text("[", DARK_GRAY))
-                .append(line.build())
-                .append(text("]", DARK_GRAY))
-                .build();
-    }
-
-    private static TextComponent generateDiskUsageDiagram(double used, double max, int length) {
-        int usedChars = (int) ((used * length) / max);
-        String line = Strings.repeat("/", usedChars) + Strings.repeat(" ", length - usedChars);
-        return text()
-                .append(text("[", DARK_GRAY))
-                .append(text(line, GRAY))
-                .append(text("]", DARK_GRAY))
-                .build();
-    }
-
 }
diff --git a/spark-common/src/main/java/me/lucko/spark/common/command/modules/HeapAnalysisModule.java b/spark-common/src/main/java/me/lucko/spark/common/command/modules/HeapAnalysisModule.java
index 70f6c3c..1030f35 100644
--- a/spark-common/src/main/java/me/lucko/spark/common/command/modules/HeapAnalysisModule.java
+++ b/spark-common/src/main/java/me/lucko/spark/common/command/modules/HeapAnalysisModule.java
@@ -30,20 +30,15 @@ import me.lucko.spark.common.command.sender.CommandSender;
 import me.lucko.spark.common.command.tabcomplete.TabCompleter;
 import me.lucko.spark.common.heapdump.HeapDump;
 import me.lucko.spark.common.heapdump.HeapDumpSummary;
+import me.lucko.spark.common.util.Compression;
 import me.lucko.spark.common.util.FormatUtil;
-import me.lucko.spark.proto.SparkProtos;
+import me.lucko.spark.proto.SparkHeapProtos;
 
 import net.kyori.adventure.text.event.ClickEvent;
 
-import org.tukaani.xz.LZMA2Options;
-import org.tukaani.xz.LZMAOutputStream;
-import org.tukaani.xz.XZOutputStream;
-
 import okhttp3.MediaType;
 
 import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.Iterator;
@@ -51,7 +46,6 @@ import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicLong;
 import java.util.function.Consumer;
 import java.util.function.LongConsumer;
-import java.util.zip.GZIPOutputStream;
 
 import static net.kyori.adventure.text.Component.text;
 import static net.kyori.adventure.text.format.NamedTextColor.GOLD;
@@ -98,7 +92,7 @@ public class HeapAnalysisModule implements CommandModule {
             return;
         }
 
-        SparkProtos.HeapData output = heapDump.toProto(platform.getPlugin().getPlatformInfo(), sender);
+        SparkHeapProtos.HeapData output = heapDump.toProto(platform, sender);
 
         boolean saveToFile = false;
         if (arguments.boolFlag("save-to-file")) {
@@ -117,7 +111,7 @@ public class HeapAnalysisModule implements CommandModule {
                 );
 
                 platform.getActivityLog().addToLog(Activity.urlActivity(sender, System.currentTimeMillis(), "Heap dump summary", url));
-            } catch (IOException e) {
+            } catch (Exception e) {
                 resp.broadcastPrefixed(text("An error occurred whilst uploading the data. Attempting to save to disk instead.", RED));
                 e.printStackTrace();
                 saveToFile = true;
@@ -175,11 +169,11 @@ public class HeapAnalysisModule implements CommandModule {
         platform.getActivityLog().addToLog(Activity.fileActivity(sender, System.currentTimeMillis(), "Heap dump", file.toString()));
 
 
-        CompressionMethod compressionMethod = null;
+        Compression compressionMethod = null;
         Iterator<String> compressArgs = arguments.stringFlag("compress").iterator();
         if (compressArgs.hasNext()) {
             try {
-                compressionMethod = CompressionMethod.valueOf(compressArgs.next().toUpperCase());
+                compressionMethod = Compression.valueOf(compressArgs.next().toUpperCase());
             } catch (IllegalArgumentException e) {
                 // ignore
             }
@@ -194,7 +188,7 @@ public class HeapAnalysisModule implements CommandModule {
         }
     }
 
-    private static void heapDumpCompress(SparkPlatform platform, CommandResponseHandler resp, Path file, CompressionMethod method) throws IOException {
+    private static void heapDumpCompress(SparkPlatform platform, CommandResponseHandler resp, Path file, Compression method) throws IOException {
         resp.broadcastPrefixed(text("Compressing heap dump, please wait..."));
 
         long size = Files.size(file);
@@ -244,71 +238,4 @@ public class HeapAnalysisModule implements CommandModule {
         );
     }
 
-    public enum CompressionMethod {
-        GZIP {
-            @Override
-            public Path compress(Path file, LongConsumer progressHandler) throws IOException {
-                Path compressedFile = file.getParent().resolve(file.getFileName().toString() + ".gz");
-                try (InputStream in = Files.newInputStream(file)) {
-                    try (OutputStream out = Files.newOutputStream(compressedFile)) {
-                        try (GZIPOutputStream compressionOut = new GZIPOutputStream(out, 1024 * 64)) {
-                            copy(in, compressionOut, progressHandler);
-                        }
-                    }
-                }
-                return compressedFile;
-            }
-        },
-        XZ {
-            @Override
-            public Path compress(Path file, LongConsumer progressHandler) throws IOException {
-                Path compressedFile = file.getParent().resolve(file.getFileName().toString() + ".xz");
-                try (InputStream in = Files.newInputStream(file)) {
-                    try (OutputStream out = Files.newOutputStream(compressedFile)) {
-                        try (XZOutputStream compressionOut = new XZOutputStream(out, new LZMA2Options())) {
-                            copy(in, compressionOut, progressHandler);
-                        }
-                    }
-                }
-                return compressedFile;
-            }
-        },
-        LZMA {
-            @Override
-            public Path compress(Path file, LongConsumer progressHandler) throws IOException {
-                Path compressedFile = file.getParent().resolve(file.getFileName().toString() + ".lzma");
-                try (InputStream in = Files.newInputStream(file)) {
-                    try (OutputStream out = Files.newOutputStream(compressedFile)) {
-                        try (LZMAOutputStream compressionOut = new LZMAOutputStream(out, new LZMA2Options(), true)) {
-                            copy(in, compressionOut, progressHandler);
-                        }
-                    }
-                }
-                return compressedFile;
-            }
-        };
-
-        public abstract Path compress(Path file, LongConsumer progressHandler) throws IOException;
-
-        private static long copy(InputStream from, OutputStream to, LongConsumer progress) throws IOException {
-            byte[] buf = new byte[1024 * 64];
-            long total = 0;
-            long iterations = 0;
-            while (true) {
-                int r = from.read(buf);
-                if (r == -1) {
-                    break;
-                }
-                to.write(buf, 0, r);
-                total += r;
-
-                // report progress every 5MB
-                if (iterations++ % ((1024 / 64) * 5) == 0) {
-                    progress.accept(total);
-                }
-            }
-            return total;
-        }
-    }
-
 }
diff --git a/spark-common/src/main/java/me/lucko/spark/common/command/modules/SamplerModule.java b/spark-common/src/main/java/me/lucko/spark/common/command/modules/SamplerModule.java
index 2dd07c9..970d062 100644
--- a/spark-common/src/main/java/me/lucko/spark/common/command/modules/SamplerModule.java
+++ b/spark-common/src/main/java/me/lucko/spark/common/command/modules/SamplerModule.java
@@ -40,7 +40,7 @@ import me.lucko.spark.common.sampler.async.AsyncSampler;
 import me.lucko.spark.common.sampler.node.MergeMode;
 import me.lucko.spark.common.tick.TickHook;
 import me.lucko.spark.common.util.MethodDisambiguator;
-import me.lucko.spark.proto.SparkProtos;
+import me.lucko.spark.proto.SparkSamplerProtos;
 
 import net.kyori.adventure.text.event.ClickEvent;
 
@@ -305,7 +305,7 @@ public class SamplerModule implements CommandModule {
     }
 
     private void handleUpload(SparkPlatform platform, CommandResponseHandler resp, Sampler sampler, ThreadNodeOrder threadOrder, String comment, MergeMode mergeMode, boolean saveToFileFlag) {
-        SparkProtos.SamplerData output = sampler.toProto(platform.getPlugin().getPlatformInfo(), resp.sender(), threadOrder, comment, mergeMode, platform.createClassSourceLookup());
+        SparkSamplerProtos.SamplerData output = sampler.toProto(platform, resp.sender(), threadOrder, comment, mergeMode, platform.createClassSourceLookup());
 
         boolean saveToFile = false;
         if (saveToFileFlag) {
@@ -324,7 +324,7 @@ public class SamplerModule implements CommandModule {
                 );
 
                 platform.getActivityLog().addToLog(Activity.urlActivity(resp.sender(), System.currentTimeMillis(), "Profiler", url));
-            } catch (IOException e) {
+            } catch (Exception e) {
                 resp.broadcastPrefixed(text("An error occurred whilst uploading the results. Attempting to save to disk instead.", RED));
                 e.printStackTrace();
                 saveToFile = true;
diff --git a/spark-common/src/main/java/me/lucko/spark/common/command/tabcomplete/CompletionSupplier.java b/spark-common/src/main/java/me/lucko/spark/common/command/tabcomplete/CompletionSupplier.java
index f1a6d10..9975df5 100644
--- a/spark-common/src/main/java/me/lucko/spark/common/command/tabcomplete/CompletionSupplier.java
+++ b/spark-common/src/main/java/me/lucko/spark/common/command/tabcomplete/CompletionSupplier.java
@@ -1,26 +1,21 @@
 /*
- * This file is part of LuckPerms, licensed under the MIT License.
+ * This file is part of spark.
  *
  *  Copyright (c) lucko (Luck) <luck@lucko.me>
  *  Copyright (c) contributors
  *
- *  Permission is hereby granted, free of charge, to any person obtaining a copy
- *  of this software and associated documentation files (the "Software"), to deal
- *  in the Software without restriction, including without limitation the rights
- *  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- *  copies of the Software, and to permit persons to whom the Software is
- *  furnished to do so, subject to the following conditions:
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
  *
- *  The above copyright notice and this permission notice shall be included in all
- *  copies or substantial portions of the Software.
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
  *
- *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- *  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- *  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- *  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- *  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- *  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- *  SOFTWARE.
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 package me.lucko.spark.common.command.tabcomplete;
diff --git a/spark-common/src/main/java/me/lucko/spark/common/command/tabcomplete/TabCompleter.java b/spark-common/src/main/java/me/lucko/spark/common/command/tabcomplete/TabCompleter.java
index d2b2622..9707f55 100644
--- a/spark-common/src/main/java/me/lucko/spark/common/command/tabcomplete/TabCompleter.java
+++ b/spark-common/src/main/java/me/lucko/spark/common/command/tabcomplete/TabCompleter.java
@@ -1,26 +1,21 @@
 /*
- * This file is part of LuckPerms, licensed under the MIT License.
+ * This file is part of spark.
  *
  *  Copyright (c) lucko (Luck) <luck@lucko.me>
  *  Copyright (c) contributors
  *
- *  Permission is hereby granted, free of charge, to any person obtaining a copy
- *  of this software and associated documentation files (the "Software"), to deal
- *  in the Software without restriction, including without limitation the rights
- *  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- *  copies of the Software, and to permit persons to whom the Software is
- *  furnished to do so, subject to the following conditions:
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
  *
- *  The above copyright notice and this permission notice shall be included in all
- *  copies or substantial portions of the Software.
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
  *
- *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- *  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- *  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- *  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- *  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- *  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- *  SOFTWARE.
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 package me.lucko.spark.common.command.tabcomplete;