Admin Command for Velocity

Author: Xinecraft

assembly/build.gradle

@@ -22,6 +22,12 @@ shadowJar {
     relocate('dev.dejvokep.boostedyaml', 'com.xinecraft.minetrax.libs.dejvokep.boostedyaml')
     relocate('okio', 'com.xinecraft.minetrax.libs.okio')
     relocate('okhttp3', 'com.xinecraft.minetrax.libs.okhttp3')
-    relocate('net.kyori', 'com.xinecraft.minetrax.libs.kyori')
     relocate('de.themoep', 'com.xinecraft.minetrax.libs.themoep')
+
+    /**
+     * Note: Kyori's relocation causes issue with Velocity.
+     * We can't use adventure functions in velocity if its relocated.
+     * Keeping it commented for sometime to see if not relocating it fixes the issue with Bukkit.
+     */
+     // relocate('net.kyori', 'com.xinecraft.minetrax.libs.kyori')
 }

velocity/src/main/java/com/xinecraft/minetrax/velocity/MinetraxVelocity.java

@@ -17,6 +17,7 @@
 import com.xinecraft.minetrax.common.interfaces.MinetraxPlugin;
 import com.xinecraft.minetrax.common.utils.LoggingUtil;
 import com.xinecraft.minetrax.common.webquery.WebQueryServer;
+import com.xinecraft.minetrax.velocity.commands.MinetraxAdminCommand;
 import com.xinecraft.minetrax.velocity.hooks.skinsrestorer.SkinsRestorerHook;
 import com.xinecraft.minetrax.velocity.listeners.ServerConnectedListener;
 import com.xinecraft.minetrax.velocity.logging.VelocityLogger;
@@ -47,15 +48,7 @@
 import java.util.concurrent.TimeUnit;
 
 @Getter
-@Plugin(
-        id = "minetrax",
-        name = "Minetrax",
-        authors = {"Xinecraft"},
-        version = BuildConstants.VERSION,
-        dependencies = {
-                @Dependency(id = "skinsrestorer", optional = true)
-        }
-)
+@Plugin(id = "minetrax", name = "Minetrax", authors = {"Xinecraft"}, version = BuildConstants.VERSION, dependencies = {@Dependency(id = "skinsrestorer", optional = true)})
 public class MinetraxVelocity implements MinetraxPlugin {
     @Inject
     private Logger logger;
@@ -108,19 +101,13 @@ public void onProxyInitialization(ProxyInitializeEvent event) {
             return;
         }
         // Disable plugin if host, key, secret or server-id is not there
-        if (
-                apiHost == null || apiKey == null || apiSecret == null || apiServerId == null ||
-                        apiHost.isEmpty() || apiKey.isEmpty() || apiSecret.isEmpty() || apiServerId.isEmpty()
-        ) {
+        if (apiHost == null || apiKey == null || apiSecret == null || apiServerId == null || apiHost.isEmpty() || apiKey.isEmpty() || apiSecret.isEmpty() || apiServerId.isEmpty()) {
             logger.error("Plugin disabled due to no API information");
             return;
         }
 
         // GSON builder
-        gson = new GsonBuilder()
-                .serializeNulls()
-                .disableHtmlEscaping()
-                .create();
+        gson = new GsonBuilder().serializeNulls().disableHtmlEscaping().create();
 
         // Setup Common
         common = new MinetraxCommon();
@@ -149,13 +136,12 @@ public void onProxyInitialization(ProxyInitializeEvent event) {
         // Register Listeners
         proxyServer.getEventManager().register(this, new ServerConnectedListener());
 
+        // Register Commands
+        proxyServer.getCommandManager().register("minetraxv", new MinetraxAdminCommand(this), "mtxv");
+
         // Register Tasks
         if (isServerIntelEnabled) {
-            proxyServer.getScheduler()
-                    .buildTask(plugin, new ServerIntelReportTask())
-                    .delay(60L, TimeUnit.SECONDS)
-                    .repeat(60L, TimeUnit.SECONDS)
-                    .schedule();
+            proxyServer.getScheduler().buildTask(plugin, new ServerIntelReportTask()).delay(60L, TimeUnit.SECONDS).repeat(60L, TimeUnit.SECONDS).schedule();
         }
     }
 
@@ -167,9 +153,7 @@ private void startWebQueryServer() {
     private void loadConfig() {
         // Create and update the file
         try {
-            config = YamlDocument.create(new File(getDataPath().toFile(), "config.yml"),
-                    Objects.requireNonNull(getClass().getResourceAsStream("/velocityConfig.yml")),
-                    GeneralSettings.DEFAULT, LoaderSettings.builder().setAutoUpdate(true).build(), DumperSettings.DEFAULT, UpdaterSettings.builder().setVersioning(new BasicVersioning("file-version")).build());
+            config = YamlDocument.create(new File(getDataPath().toFile(), "config.yml"), Objects.requireNonNull(getClass().getResourceAsStream("/velocityConfig.yml")), GeneralSettings.DEFAULT, LoaderSettings.builder().setAutoUpdate(true).build(), DumperSettings.DEFAULT, UpdaterSettings.builder().setVersioning(new BasicVersioning("file-version")).build());
         } catch (IOException ex) {
             LoggingUtil.warntrace(ex);
         }

velocity/src/main/java/com/xinecraft/minetrax/velocity/commands/MinetraxAdminCommand.java

@@ -0,0 +1,74 @@
+package com.xinecraft.minetrax.velocity.commands;
+
+import com.velocitypowered.api.command.SimpleCommand;
+import com.velocitypowered.api.command.CommandSource;
+import com.velocitypowered.api.proxy.ConsoleCommandSource;
+import com.xinecraft.minetrax.common.MinetraxCommon;
+import com.xinecraft.minetrax.common.enums.BanWardenSyncType;
+import com.xinecraft.minetrax.velocity.MinetraxVelocity;
+import net.kyori.adventure.text.Component;
+import net.kyori.adventure.text.format.NamedTextColor;
+
+public class MinetraxAdminCommand implements SimpleCommand {
+    private final MinetraxVelocity plugin;
+
+    public MinetraxAdminCommand(MinetraxVelocity plugin) {
+        this.plugin = plugin;
+    }
+
+    @Override
+    public void execute(Invocation invocation) {
+        CommandSource source = invocation.source();
+        String[] args = invocation.arguments();
+
+        if (args.length == 0) {
+            usage(source);
+            return;
+        }
+
+        String firstArg = args[0];
+        if (firstArg.equalsIgnoreCase("help") || firstArg.equalsIgnoreCase("?")) {
+            usage(source);
+            return;
+        }
+
+        if (firstArg.equalsIgnoreCase("banwarden:sync")) {
+            if (!(source instanceof ConsoleCommandSource)) {
+                source.sendMessage(Component.text("This command can only be run from console.", NamedTextColor.RED));
+                return;
+            }
+
+            String secondArg = args.length > 1 ? args[1].toLowerCase() : "all";
+            source.sendMessage(Component.text("[BanWarden] Syncing " + secondArg + " punishments to web, plz check server logs for progress...", NamedTextColor.GREEN));
+            banwardenSyncBans(secondArg);
+            return;
+        }
+    }
+
+    private void usage(CommandSource source) {
+        source.sendMessage(Component.text("Minetrax Admin Commands:", NamedTextColor.AQUA));
+        source.sendMessage(Component.text("/mtxv banwarden:sync", NamedTextColor.GREEN));
+        source.sendMessage(Component.text("   Sync bans from ban plugin to minetrax website.", NamedTextColor.GRAY));
+        source.sendMessage(Component.text("/mtxv help", NamedTextColor.GREEN));
+        source.sendMessage(Component.text("   Shows help message.", NamedTextColor.GRAY));
+    }
+
+    private void banwardenSyncBans(String typeString) {
+        if (!plugin.getIsBanWardenEnabled()) {
+            plugin.getLogger().warn("BanWarden is not enabled, cannot sync bans.");
+            return;
+        }
+
+        BanWardenSyncType syncType = switch (typeString) {
+            case "active" -> BanWardenSyncType.ACTIVE;
+            case "inactive" -> BanWardenSyncType.INACTIVE;
+            default -> BanWardenSyncType.ALL;
+        };
+        MinetraxCommon.getInstance().getBanWarden().sync(syncType);
+    }
+
+    @Override
+    public boolean hasPermission(final Invocation invocation) {
+        return invocation.source().hasPermission("minetrax.admin");
+    }
+}