Only register tickmonitor command if supported

Author: lucko

spark-common/src/main/java/me/lucko/spark/common/SparkPlatform.java

@@ -74,7 +74,6 @@ public class SparkPlatform {
     private final BytebinClient bytebinClient;
     private final BytesocksClient bytesocksClient;
     private final TrustedKeyStore trustedKeyStore;
-    private final CommandManager commandManager;
     private final ActivityLog activityLog;
     private final SamplerContainer samplerContainer;
     private final BackgroundSamplerManager backgroundSamplerManager;
@@ -83,9 +82,10 @@ public class SparkPlatform {
     private final TickStatistics tickStatistics;
     private final PingStatistics pingStatistics;
     private final PlatformStatisticsProvider statisticsProvider;
+    private final CommandManager commandManager;
+    private final AtomicBoolean enabled = new AtomicBoolean(false);
     private Map<String, GarbageCollectorStatistics> startupGcStatistics = ImmutableMap.of();
     private long serverNormalOperationStartTime;
-    private final AtomicBoolean enabled = new AtomicBoolean(false);
 
     public SparkPlatform(SparkPlugin plugin) {
         this.plugin = plugin;
@@ -112,8 +112,6 @@ public SparkPlatform(SparkPlugin plugin) {
         this.activityLog = new ActivityLog(plugin.getPluginDirectory().resolve("activity.json"));
         this.activityLog.load();
 
-        this.commandManager = new CommandManager(this, this.configuration);
-
         this.samplerContainer = new SamplerContainer();
         this.backgroundSamplerManager = new BackgroundSamplerManager(this, this.configuration);
 
@@ -129,6 +127,8 @@ public SparkPlatform(SparkPlugin plugin) {
         this.pingStatistics = pingProvider != null ? new PingStatistics(pingProvider) : null;
 
         this.statisticsProvider = new PlatformStatisticsProvider(this);
+
+        this.commandManager = new CommandManager(this, this.configuration);
     }
 
     public void enable() {
@@ -164,6 +164,8 @@ public void enable() {
     }
 
     public void disable() {
+        this.commandManager.close();
+
         if (this.tickHook != null) {
             this.tickHook.close();
         }
@@ -174,8 +176,6 @@ public void disable() {
             this.pingStatistics.close();
         }
 
-        this.commandManager.close();
-
         this.samplerContainer.close();
 
         SparkApi.unregister();
@@ -279,15 +279,15 @@ public Path resolveSaveFile(String prefix, String extension) {
     }
 
     public boolean hasPermissionForAnyCommand(CommandSender sender) {
-        return commandManager.hasPermissionForAnyCommand(sender);
+        return this.commandManager.hasPermissionForAnyCommand(sender);
     }
 
     public CompletableFuture<Void> executeCommand(CommandSender sender, String[] args) {
-        return commandManager.executeCommand(sender, args);
+        return this.commandManager.executeCommand(sender, args);
     }
 
     public List<String> tabCompleteCommand(CommandSender sender, String[] args) {
-        return commandManager.tabCompleteCommand(sender, args);
+        return this.commandManager.tabCompleteCommand(sender, args);
     }
 
 }

spark-common/src/main/java/me/lucko/spark/common/command/CommandManager.java

@@ -72,14 +72,15 @@ public CommandManager(SparkPlatform platform, Configuration configuration) {
 
         this.disableResponseBroadcast = configuration.getBoolean("disableResponseBroadcast", false);
 
-        this.modules = ImmutableList.of(
-                new SamplerModule(),
-                new HealthModule(),
-                new TickMonitoringModule(),
-                new GcMonitoringModule(),
-                new HeapAnalysisModule(),
-                new ActivityLogModule()
-        );
+        this.modules = new ArrayList<>();
+        this.modules.add(new SamplerModule());
+        this.modules.add(new HealthModule());
+        if (platform.getTickHook() != null) {
+            this.modules.add(new TickMonitoringModule());
+        }
+        this.modules.add(new GcMonitoringModule());
+        this.modules.add(new HeapAnalysisModule());
+        this.modules.add(new ActivityLogModule());
 
         ImmutableList.Builder<Command> commandsBuilder = ImmutableList.builder();
         for (CommandModule module : this.modules) {