Start implementing activity log feature

8 files changed, 190 insertions, 63 deletions

diff --git a/spark-common/src/main/java/me/lucko/spark/common/command/Command.java b/spark-common/src/main/java/me/lucko/spark/common/command/Command.java
index c9f6551..ab95cb6 100644
--- a/spark-common/src/main/java/me/lucko/spark/common/command/Command.java
+++ b/spark-common/src/main/java/me/lucko/spark/common/command/Command.java
@@ -21,24 +21,25 @@
 package me.lucko.spark.common.command;
 
 import com.google.common.collect.ImmutableList;
+import me.lucko.spark.common.CommandSender;
 import me.lucko.spark.common.SparkPlatform;
 
 import java.util.Collections;
 import java.util.List;
 import java.util.Objects;
 
-public class Command<S> {
+public class Command {
 
-    public static <S> Builder<S> builder() {
-        return new Builder<>();
+    public static Builder builder() {
+        return new Builder();
     }
 
     private final List<String> aliases;
     private final List<ArgumentInfo> arguments;
-    private final Executor<S> executor;
-    private final TabCompleter<S> tabCompleter;
+    private final Executor executor;
+    private final TabCompleter tabCompleter;
 
-    private Command(List<String> aliases, List<ArgumentInfo> arguments, Executor<S> executor, TabCompleter<S> tabCompleter) {
+    private Command(List<String> aliases, List<ArgumentInfo> arguments, Executor executor, TabCompleter tabCompleter) {
         this.aliases = aliases;
         this.arguments = arguments;
         this.executor = executor;
@@ -53,45 +54,45 @@ public class Command<S> {
         return this.arguments;
     }
 
-    public Executor<S> executor() {
+    public Executor executor() {
         return this.executor;
     }
 
-    public TabCompleter<S> tabCompleter() {
+    public TabCompleter tabCompleter() {
         return this.tabCompleter;
     }
 
-    public static final class Builder<S> {
+    public static final class Builder {
         private final ImmutableList.Builder<String> aliases = ImmutableList.builder();
         private final ImmutableList.Builder<ArgumentInfo> arguments = ImmutableList.builder();
-        private Executor<S> executor = null;
-        private TabCompleter<S> tabCompleter = null;
+        private Executor executor = null;
+        private TabCompleter tabCompleter = null;
 
         Builder() {
 
         }
 
-        public Builder<S> aliases(String... aliases) {
+        public Builder aliases(String... aliases) {
             this.aliases.add(aliases);
             return this;
         }
 
-        public Builder<S> argumentUsage(String argumentName, String parameterDescription) {
+        public Builder argumentUsage(String argumentName, String parameterDescription) {
             this.arguments.add(new ArgumentInfo(argumentName, parameterDescription));
             return this;
         }
 
-        public Builder<S> executor(Executor<S> executor) {
+        public Builder executor(Executor executor) {
             this.executor = Objects.requireNonNull(executor, "executor");
             return this;
         }
 
-        public Builder<S> tabCompleter(TabCompleter<S> tabCompleter) {
+        public Builder tabCompleter(TabCompleter tabCompleter) {
             this.tabCompleter = Objects.requireNonNull(tabCompleter, "tabCompleter");
             return this;
         }
 
-        public Command<S> build() {
+        public Command build() {
             List<String> aliases = this.aliases.build();
             if (aliases.isEmpty()) {
                 throw new IllegalStateException("No aliases defined");
@@ -102,22 +103,22 @@ public class Command<S> {
             if (this.tabCompleter == null) {
                 this.tabCompleter = TabCompleter.empty();
             }
-            return new Command<>(aliases, this.arguments.build(), this.executor, this.tabCompleter);
+            return new Command(aliases, this.arguments.build(), this.executor, this.tabCompleter);
         }
     }
 
     @FunctionalInterface
-    public interface Executor<S> {
-        void execute(SparkPlatform<S> platform, S sender, CommandResponseHandler resp, Arguments arguments);
+    public interface Executor {
+        void execute(SparkPlatform platform, CommandSender sender, CommandResponseHandler resp, Arguments arguments);
     }
 
     @FunctionalInterface
-    public interface TabCompleter<S> {
-        static <S> TabCompleter<S> empty() {
+    public interface TabCompleter {
+        static <S> TabCompleter empty() {
             return (platform, sender, arguments) -> Collections.emptyList();
         }
 
-        List<String> completions(SparkPlatform<S> platform, S sender, List<String> arguments);
+        List<String> completions(SparkPlatform platform, CommandSender sender, List<String> arguments);
     }
 
     public static final class ArgumentInfo {
diff --git a/spark-common/src/main/java/me/lucko/spark/common/command/CommandModule.java b/spark-common/src/main/java/me/lucko/spark/common/command/CommandModule.java
index f195ef2..76c24b3 100644
--- a/spark-common/src/main/java/me/lucko/spark/common/command/CommandModule.java
+++ b/spark-common/src/main/java/me/lucko/spark/common/command/CommandModule.java
@@ -22,8 +22,8 @@ package me.lucko.spark.common.command;
 
 import java.util.function.Consumer;
 
-public interface CommandModule<S> {
+public interface CommandModule {
 
-    void registerCommands(Consumer<Command<S>> consumer);
+    void registerCommands(Consumer<Command> consumer);
 
 }
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 94e1946..d31d1cf 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
@@ -20,50 +20,50 @@
 
 package me.lucko.spark.common.command;
 
+import me.lucko.spark.common.CommandSender;
 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> {
+public class CommandResponseHandler {
 
     /** The prefix used in all messages "&8[&e&l⚡&8] &7" */
-    private static final TextComponent PREFIX = TextComponent.builder().color(TextColor.GRAY)
+    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;
+    private final SparkPlatform platform;
+    private final CommandSender sender;
 
-    public CommandResponseHandler(SparkPlatform<S> platform, S sender) {
+    public CommandResponseHandler(SparkPlatform platform, CommandSender sender) {
         this.platform = platform;
         this.sender = sender;
     }
 
-    public S sender() {
+    public CommandSender sender() {
         return this.sender;
     }
 
-    public void allSenders(Consumer<? super S> action) {
-        Set<S> senders = this.platform.getPlugin().getSendersWithPermission("spark");
+    public void allSenders(Consumer<? super CommandSender> action) {
+        Set<CommandSender> senders = this.platform.getPlugin().getSendersWithPermission("spark");
         senders.add(this.sender);
         senders.forEach(action);
     }
 
     public void reply(Component message) {
-        this.platform.getPlugin().sendMessage(this.sender, message);
+        this.sender.sendMessage(message);
     }
 
     public void broadcast(Component message) {
-        allSenders(sender -> this.platform.getPlugin().sendMessage(sender, message));
+        allSenders(sender -> sender.sendMessage(message));
     }
 
     public void replyPrefixed(Component message) {
diff --git a/spark-common/src/main/java/me/lucko/spark/common/command/modules/ActivityLogModule.java b/spark-common/src/main/java/me/lucko/spark/common/command/modules/ActivityLogModule.java
new file mode 100644
index 0000000..ad6b3e8
--- /dev/null
+++ b/spark-common/src/main/java/me/lucko/spark/common/command/modules/ActivityLogModule.java
@@ -0,0 +1,120 @@
+/*
+ * This file is part of spark.
+ *
+ *  Copyright (c) lucko (Luck) <luck@lucko.me>
+ *  Copyright (c) contributors
+ *
+ *  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.
+ *
+ *  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.
+ *
+ *  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.modules;
+
+import me.lucko.spark.common.ActivityLog;
+import me.lucko.spark.common.command.Command;
+import me.lucko.spark.common.command.CommandModule;
+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.List;
+import java.util.function.Consumer;
+
+public class ActivityLogModule implements CommandModule {
+
+    @Override
+    public void registerCommands(Consumer<Command> consumer) {
+        consumer.accept(Command.builder()
+                .aliases("activity", "activitylog", "log")
+                .executor((platform, sender, resp, arguments) -> {
+                    List<ActivityLog.Activity> log = platform.getActivityLog().getLog();
+                    log.removeIf(ActivityLog.Activity::shouldExpire);
+
+                    if (log.isEmpty()) {
+                        resp.replyPrefixed(TextComponent.of("There are no entries present in the log."));
+                        return;
+                    }
+
+                    resp.replyPrefixed(TextComponent.of("Showing recent spark activity...", TextColor.GOLD));
+
+                    int count = 0;
+                    for (ActivityLog.Activity activity : log) {
+                        count++;
+
+                        resp.replyPrefixed(TextComponent.builder("")
+                                .append(TextComponent.builder(">").color(TextColor.DARK_GRAY).decoration(TextDecoration.BOLD, true).build())
+                                .append(Component.space())
+                                .append(TextComponent.of("#" + count, TextColor.WHITE))
+                                .append(TextComponent.of(" - ", TextColor.DARK_GRAY))
+                                .append(TextComponent.of(activity.getType(), TextColor.YELLOW))
+                                .append(TextComponent.of(" - ", TextColor.DARK_GRAY))
+                                .append(TextComponent.of(formatDateDiff(activity.getTime()), TextColor.GRAY))
+                                .build()
+                        );
+                        resp.replyPrefixed(TextComponent.builder("  ")
+                                .append(TextComponent.of("Created by: ", TextColor.GRAY))
+                                .append(TextComponent.of(activity.getUser(), TextColor.WHITE))
+                                .build()
+                        );
+                        resp.replyPrefixed(TextComponent.builder("  ")
+                                .append(TextComponent.of("Link: ", TextColor.GRAY))
+                                .append(TextComponent.builder(activity.getUrl())
+                                        .color(TextColor.WHITE)
+                                        .decoration(TextDecoration.UNDERLINED, true)
+                                        .clickEvent(new ClickEvent(ClickEvent.Action.OPEN_URL, activity.getUrl()))
+                                        .build()
+                                )
+                                .build()
+                        );
+                        resp.reply(Component.space());
+                    }
+                })
+                .tabCompleter(Command.TabCompleter.empty())
+                .build()
+        );
+    }
+
+    private static String formatDateDiff(long time) {
+        long seconds = (System.currentTimeMillis() - time) / 1000;
+
+        if (seconds <= 0) {
+            return "now";
+        }
+
+        long minute = seconds / 60;
+        seconds = seconds % 60;
+        long hour = minute / 60;
+        minute = minute % 60;
+        long day = hour / 24;
+        hour = hour % 24;
+
+        StringBuilder sb = new StringBuilder();
+        if (day != 0) {
+            sb.append(day).append("d ");
+        }
+        if (hour != 0) {
+            sb.append(hour).append("h ");
+        }
+        if (minute != 0) {
+            sb.append(minute).append("m ");
+        }
+        if (seconds != 0) {
+            sb.append(seconds).append("s");
+        }
+
+        return sb.toString().trim() + " ago";
+    }
+
+}
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 097d264..83f9006 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
@@ -44,11 +44,11 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.function.Consumer;
 
-public class HealthModule<S> implements CommandModule<S> {
+public class HealthModule implements CommandModule {
 
     @Override
-    public void registerCommands(Consumer<Command<S>> consumer) {
-        consumer.accept(Command.<S>builder()
+    public void registerCommands(Consumer<Command> consumer) {
+        consumer.accept(Command.builder()
                 .aliases("tps")
                 .executor((platform, sender, resp, arguments) -> {
                     TpsCalculator tpsCalculator = platform.getTpsCalculator();
@@ -63,7 +63,7 @@ public class HealthModule<S> implements CommandModule<S> {
                 .build()
         );
 
-        consumer.accept(Command.<S>builder()
+        consumer.accept(Command.builder()
                 .aliases("healthreport", "health", "ht")
                 .argumentUsage("memory", null)
                 .executor((platform, sender, resp, arguments) -> {
@@ -74,7 +74,7 @@ public class HealthModule<S> implements CommandModule<S> {
 
                         TpsCalculator tpsCalculator = platform.getTpsCalculator();
                         if (tpsCalculator != null) {
-                            report.add(TextComponent.builder()
+                            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))
@@ -86,7 +86,7 @@ public class HealthModule<S> implements CommandModule<S> {
 
                         MemoryMXBean memoryMXBean = ManagementFactory.getMemoryMXBean();
                         MemoryUsage heapUsage = memoryMXBean.getHeapMemoryUsage();
-                        report.add(TextComponent.builder()
+                        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))
@@ -109,7 +109,7 @@ public class HealthModule<S> implements CommandModule<S> {
 
                         if (arguments.boolFlag("memory")) {
                             MemoryUsage nonHeapUsage = memoryMXBean.getNonHeapMemoryUsage();
-                            report.add(TextComponent.builder()
+                            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))
@@ -134,7 +134,7 @@ public class HealthModule<S> implements CommandModule<S> {
                                     usage = new MemoryUsage(usage.getInit(), usage.getUsed(), usage.getCommitted(), usage.getCommitted());
                                 }
 
-                                report.add(TextComponent.builder()
+                                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))
@@ -172,7 +172,7 @@ public class HealthModule<S> implements CommandModule<S> {
                         double processCpuLoad = CpuMonitor.getProcessCpuLoad();
 
                         if (systemCpuLoad >= 0 || processCpuLoad >= 0) {
-                            report.add(TextComponent.builder()
+                            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))
@@ -203,7 +203,7 @@ public class HealthModule<S> implements CommandModule<S> {
                             FileStore fileStore = Files.getFileStore(Paths.get("."));
                             long totalSpace = fileStore.getTotalSpace();
                             long usedSpace = totalSpace - fileStore.getUsableSpace();
-                            report.add(TextComponent.builder()
+                            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))
@@ -227,7 +227,7 @@ public class HealthModule<S> implements CommandModule<S> {
                             e.printStackTrace();
                         }
 
-                        TextComponent.Builder builder = TextComponent.builder();
+                        TextComponent.Builder builder = TextComponent.builder("");
                         report.forEach(line -> builder.append(line).append(Component.newline()));
                         resp.reply(builder.build());
                     });
@@ -259,7 +259,7 @@ public class HealthModule<S> implements CommandModule<S> {
             line.append(TextComponent.of(Strings.repeat(" ", (length - committedChars))));
         }
 
-        return TextComponent.builder()
+        return TextComponent.builder("")
                 .append(TextComponent.of("[", TextColor.DARK_GRAY))
                 .append(line.build())
                 .append(TextComponent.of("]", TextColor.DARK_GRAY))
@@ -293,7 +293,7 @@ public class HealthModule<S> implements CommandModule<S> {
             line.append(TextComponent.of(Strings.repeat(" ", (length - committedChars))));
         }
 
-        return TextComponent.builder()
+        return TextComponent.builder("")
                 .append(TextComponent.of("[", TextColor.DARK_GRAY))
                 .append(line.build())
                 .append(TextComponent.of("]", TextColor.DARK_GRAY))
@@ -303,7 +303,7 @@ public class HealthModule<S> implements CommandModule<S> {
     private static TextComponent generateCpuUsageDiagram(double usage, int length) {
         int usedChars = (int) ((usage * length));
         String line = Strings.repeat("/", usedChars) + Strings.repeat(" ", length - usedChars);
-        return TextComponent.builder()
+        return TextComponent.builder("")
                 .append(TextComponent.of("[", TextColor.DARK_GRAY))
                 .append(TextComponent.of(line, TextColor.GRAY))
                 .append(TextComponent.of("]", TextColor.DARK_GRAY))
@@ -313,7 +313,7 @@ public class HealthModule<S> implements CommandModule<S> {
     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 TextComponent.builder()
+        return TextComponent.builder("")
                 .append(TextComponent.of("[", TextColor.DARK_GRAY))
                 .append(TextComponent.of(line, TextColor.GRAY))
                 .append(TextComponent.of("]", TextColor.DARK_GRAY))
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 e2d817d..b65db78 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
@@ -20,6 +20,7 @@
 
 package me.lucko.spark.common.command.modules;
 
+import me.lucko.spark.common.ActivityLog;
 import me.lucko.spark.common.SparkPlatform;
 import me.lucko.spark.common.command.Command;
 import me.lucko.spark.common.command.CommandModule;
@@ -38,12 +39,12 @@ import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.function.Consumer;
 
-public class MemoryModule<S> implements CommandModule<S> {
+public class MemoryModule implements CommandModule {
     private static final MediaType JSON_TYPE = MediaType.parse("application/json; charset=utf-8");
 
     @Override
-    public void registerCommands(Consumer<Command<S>> consumer) {
-        consumer.accept(Command.<S>builder()
+    public void registerCommands(Consumer<Command> consumer) {
+        consumer.accept(Command.builder()
                 .aliases("heapsummary")
                 .argumentUsage("run-gc-before", null)
                 .executor((platform, sender, resp, arguments) -> {
@@ -75,6 +76,8 @@ public class MemoryModule<S> implements CommandModule<S> {
                                     .clickEvent(new ClickEvent(ClickEvent.Action.OPEN_URL, url))
                                     .build()
                             );
+
+                            platform.getActivityLog().addToLog(new ActivityLog.Activity(sender.getName(), System.currentTimeMillis(), "Heap dump summary", url));
                         } catch (IOException e) {
                             resp.broadcastPrefixed(TextComponent.of("An error occurred whilst uploading the data.", TextColor.RED));
                             e.printStackTrace();
@@ -85,7 +88,7 @@ public class MemoryModule<S> implements CommandModule<S> {
                 .build()
         );
 
-        consumer.accept(Command.<S>builder()
+        consumer.accept(Command.builder()
                 .aliases("heapdump")
                 .argumentUsage("run-gc-before", null)
                 .argumentUsage("include-non-live", null)
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 e450b0b..fb1bc72 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
@@ -20,6 +20,7 @@
 
 package me.lucko.spark.common.command.modules;
 
+import me.lucko.spark.common.ActivityLog;
 import me.lucko.spark.common.SparkPlatform;
 import me.lucko.spark.common.command.Command;
 import me.lucko.spark.common.command.CommandModule;
@@ -46,7 +47,7 @@ import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.TimeUnit;
 import java.util.function.Consumer;
 
-public class SamplerModule<S> implements CommandModule<S> {
+public class SamplerModule implements CommandModule {
     private static final MediaType JSON_TYPE = MediaType.parse("application/json; charset=utf-8");
 
     /** Guards {@link #activeSampler} */
@@ -55,8 +56,8 @@ public class SamplerModule<S> implements CommandModule<S> {
     private Sampler activeSampler = null;
 
     @Override
-    public void registerCommands(Consumer<Command<S>> consumer) {
-        consumer.accept(Command.<S>builder()
+    public void registerCommands(Consumer<Command> consumer) {
+        consumer.accept(Command.builder()
                 .aliases("sampler")
                 .argumentUsage("info", null)
                 .argumentUsage("stop", null)
@@ -246,7 +247,7 @@ public class SamplerModule<S> implements CommandModule<S> {
         );
     }
 
-    private void handleUpload(SparkPlatform<S> platform, CommandResponseHandler<S> resp, Sampler sampler) {
+    private void handleUpload(SparkPlatform platform, CommandResponseHandler resp, Sampler sampler) {
         platform.getPlugin().runAsync(() -> {
             byte[] output = sampler.formCompressedDataPayload();
             try {
@@ -259,6 +260,8 @@ public class SamplerModule<S> implements CommandModule<S> {
                         .clickEvent(new ClickEvent(ClickEvent.Action.OPEN_URL, url))
                         .build()
                 );
+
+                platform.getActivityLog().addToLog(new ActivityLog.Activity(resp.sender().getName(), System.currentTimeMillis(), "Sampler", url));
             } catch (IOException e) {
                 resp.broadcastPrefixed(TextComponent.of("An error occurred whilst uploading the results.", TextColor.RED));
                 e.printStackTrace();
diff --git a/spark-common/src/main/java/me/lucko/spark/common/command/modules/TickMonitoringModule.java b/spark-common/src/main/java/me/lucko/spark/common/command/modules/TickMonitoringModule.java
index 3b26018..cbcf557 100644
--- a/spark-common/src/main/java/me/lucko/spark/common/command/modules/TickMonitoringModule.java
+++ b/spark-common/src/main/java/me/lucko/spark/common/command/modules/TickMonitoringModule.java
@@ -32,14 +32,14 @@ import net.kyori.text.format.TextColor;
 
 import java.util.function.Consumer;
 
-public class TickMonitoringModule<S> implements CommandModule<S> {
+public class TickMonitoringModule implements CommandModule {
 
     /** The tick monitor instance currently running, if any */
     private ReportingTickMonitor activeTickMonitor = null;
 
     @Override
-    public void registerCommands(Consumer<Command<S>> consumer) {
-        consumer.accept(Command.<S>builder()
+    public void registerCommands(Consumer<Command> consumer) {
+        consumer.accept(Command.builder()
                 .aliases("tickmonitoring")
                 .argumentUsage("threshold", "percentage increase")
                 .argumentUsage("without-gc", null)
@@ -71,9 +71,9 @@ public class TickMonitoringModule<S> implements CommandModule<S> {
     }
 
     private class ReportingTickMonitor extends TickMonitor {
-        private final CommandResponseHandler<S> resp;
+        private final CommandResponseHandler resp;
 
-        ReportingTickMonitor(CommandResponseHandler<S> resp, TickCounter tickCounter, int percentageChangeThreshold, boolean monitorGc) {
+        ReportingTickMonitor(CommandResponseHandler resp, TickCounter tickCounter, int percentageChangeThreshold, boolean monitorGc) {
             super(tickCounter, percentageChangeThreshold, monitorGc);
             this.resp = resp;
         }