Add server pulse command with reload and status functionality

Author: renvins

fabric/build.gradle.kts

@@ -38,6 +38,8 @@ dependencies {
     implementation(project(":api"))
     implementation(project(":common"))
     implementation("com.github.Carleslc.Simple-YAML:Simple-Yaml:1.8.4")
+    modImplementation("me.lucko:fabric-permissions-api:0.3.1")
+    include("me.lucko:fabric-permissions-api:0.3.1") // automatically include the dependency in the jar
 }
 
 tasks.processResources {

fabric/src/main/java/it/renvins/serverpulse/fabric/ServerPulseFabric.java

@@ -16,6 +16,7 @@
 import it.renvins.serverpulse.common.metrics.DiskRetriever;
 import it.renvins.serverpulse.common.platform.Platform;
 import it.renvins.serverpulse.common.scheduler.TaskScheduler;
+import it.renvins.serverpulse.fabric.command.ServerPulseCommand;
 import it.renvins.serverpulse.fabric.config.FabricConfiguration;
 import it.renvins.serverpulse.fabric.config.FabricDatabaseConfiguration;
 import it.renvins.serverpulse.fabric.config.FabricMetricsConfiguration;
@@ -26,6 +27,7 @@
 import it.renvins.serverpulse.fabric.task.FabricScheduler;
 import lombok.Getter;
 import net.fabricmc.api.ModInitializer;
+import net.fabricmc.fabric.api.command.v2.CommandRegistrationCallback;
 import net.fabricmc.fabric.api.event.lifecycle.v1.ServerLifecycleEvents;
 import net.fabricmc.loader.api.FabricLoader;
 import net.minecraft.server.MinecraftServer;
@@ -71,6 +73,8 @@ public ServerPulseFabric() {
     public void onInitialize() {
         ServerLifecycleEvents.SERVER_STARTING.register(this::onServerStarting);
         ServerLifecycleEvents.SERVER_STOPPING.register(this::onServerStopped);
+        CommandRegistrationCallback.EVENT.register((dispatcher, registryAccess, environment) ->
+                dispatcher.register(new ServerPulseCommand(config).createCommand()));
 
         LOGGER.info("ServerPulse for Fabric initialized - waiting for server starting...");
     }

fabric/src/main/java/it/renvins/serverpulse/fabric/command/ServerPulseCommand.java

@@ -0,0 +1,66 @@
+package it.renvins.serverpulse.fabric.command;
+
+import com.mojang.brigadier.Command;
+import com.mojang.brigadier.builder.LiteralArgumentBuilder;
+import com.mojang.brigadier.context.CommandContext;
+import it.renvins.serverpulse.api.ServerPulseProvider;
+import it.renvins.serverpulse.common.utils.ChatUtils;
+import it.renvins.serverpulse.fabric.config.FabricConfiguration;
+import lombok.RequiredArgsConstructor;
+import me.lucko.fabric.api.permissions.v0.Permissions;
+import net.minecraft.server.command.CommandManager;
+import net.minecraft.server.command.ServerCommandSource;
+import net.minecraft.text.Text;
+
+@RequiredArgsConstructor
+public class ServerPulseCommand {
+
+    private final FabricConfiguration config;
+
+    public LiteralArgumentBuilder<ServerCommandSource> createCommand() {
+        // Create the main command
+        LiteralArgumentBuilder<ServerCommandSource> command =
+                CommandManager.literal("serverpulse")
+                              .executes(context -> {
+                                    ServerCommandSource source = context.getSource();
+                                    source.sendMessage(Text.of(ChatUtils.format(config.getConfig().getString("messages.usage"))));
+
+                                    return Command.SINGLE_SUCCESS;
+                                });
+
+        command.then(CommandManager.literal("reload")
+                                   .requires(source -> Permissions.check(source, "serverpulse.reload", 2))
+                                   .executes(this::executeReload));
+        command.then(CommandManager.literal("status")
+                                     .requires(source -> Permissions.check(source, "serverpulse.status", 2))
+                                     .executes(this::executeStatus));
+
+        return command;
+    }
+
+    private int executeReload(CommandContext<ServerCommandSource> context) {
+        ServerCommandSource source = context.getSource();
+
+        Text message;
+        if (config.load()) {
+            message = Text.of(ChatUtils.format(config.getConfig().getString("messages.reloadConfig")));
+        } else {
+            message = Text.of(ChatUtils.format(config.getConfig().getString("messages.reloadConfigError")));
+        }
+
+        source.sendMessage(message);
+        return Command.SINGLE_SUCCESS;
+    }
+
+    private int executeStatus(CommandContext<ServerCommandSource> context) {
+        ServerCommandSource source = context.getSource();
+
+        Text message = Text.of(
+                ChatUtils.format(ServerPulseProvider.get().getDatabaseService().isConnected() ?
+                        config.getConfig().getString("messages.statusConnected") :
+                        config.getConfig().getString("messages.statusNotConnected")));
+
+        source.sendMessage(message);
+        return Command.SINGLE_SUCCESS;
+    }
+}

fabric/src/main/java/it/renvins/serverpulse/fabric/task/FabricScheduler.java

@@ -3,7 +3,6 @@
 import java.util.Queue;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ConcurrentLinkedDeque;
-import java.util.concurrent.ForkJoinPool;
 
 import it.renvins.serverpulse.common.scheduler.Task;
 import it.renvins.serverpulse.common.scheduler.TaskScheduler;

fabric/src/main/resources/config.yml

@@ -9,13 +9,8 @@ metrics:
   tags:
     server: "fabric1"
 messages:
-  noPerms: "&7[&bServer&7Pulse] &7You don't have &bpermission &7to use this &bcommand&7."
+  usage: "&7[&bServer&7Pulse] &7Please use &b/serverpulsevelocity [status|reload]&7."
   reloadConfig: "&7[&bServer&7Pulse] &7Configuration &breloaded&7."
   reloadConfigError: "&7[&bServer&7Pulse] &7Error &breloading &7configuration..."
-  noArgs: "&7[&bServer&7Pulse] &7You need to specify a &bcommand&7: &breload&7, &bstatus&7."
-  playerOnly: "&7[&bServer&7Pulse] &7This command can only be used by &bplayers&7."
-  noCommand: "&7[&bServer&7Pulse] &7This command is not &bavailable&7."
-  reloadConfigUsage: "&7[&bServer&7Pulse] &7Usage: &b/serverpulse reload&7."
-  statusConfigUsage: "&7[&bServer&7Pulse] &7Usage: &b/serverpulse status&7."
   statusConnected: "&7[&bServer&7Pulse] &7Connected to &bInfluxDB&7."
   statusNotConnected: "&7[&bServer&7Pulse] &7Not connected to &bInfluxDB&7."