metrics and reload command

Author: bierdosenhalter

.idea/workspace.xml

@@ -1,6 +1,5 @@
 plugins {
     id 'java'
-    id 'io.github.goooler.shadow' version '8.1.8'
     id 'xyz.jpenilla.run-velocity' version '2.3.1'
     id 'xyz.jpenilla.run-paper' version '2.3.1'
 }
@@ -23,7 +22,6 @@ repositories {
 dependencies {
     compileOnly group: 'com.velocitypowered', name: 'velocity-api', version: "${project.velocity_api_version}"
     annotationProcessor group: 'com.velocitypowered', name: 'velocity-api', version: "${project.velocity_api_version}"
-    implementation group: 'org.bstats', name: 'bstats-velocity', version: '3.1.0'
 }
 
 java {
@@ -44,27 +42,12 @@ processResources {
     }
 }
 
-// https://imperceptiblethoughts.com/shadow/
-shadowJar {
-    configurations = [project.configurations.shadow]
-    archiveFileName = "${project.name}-${project.version}-velocity.jar"
-    destinationDirectory = layout.buildDirectory.dir('dist')
-
-    relocate 'org.bstats',            'org.zeroBzeroT.shaded.bstats'
-
-    // delete unshaded jar
-    doLast {
-        file(jar.archiveFile).delete()
-    }
-}
-build.finalizedBy(shadowJar)
-
 // test setup
 runPaper.disablePluginJarDetection()
 tasks {
     runVelocity {
         runDirectory = layout.projectDirectory.dir('run').dir('proxy')
-        dependsOn('shadowJar')
+        dependsOn('build')
         velocityVersion("${project.velocity_api_version}")
         downloadPlugins {
             url("https://github.com/ViaVersion/ViaBackwards/releases/download/5.3.2/ViaBackwards-5.3.2.jar")
@@ -78,7 +61,7 @@ tasks {
         systemProperty('com.mojang.eula.agree', 'true')
         systemProperty('Paper.skipServerPropertiesComments', 'true')
         runDirectory = layout.projectDirectory.dir('run').dir('main')
-        dependsOn('shadowJar')
+        dependsOn('build')
     }
 
     tasks.register('runServerQueue', runServer.getClass() as Class<Task>) {
@@ -90,6 +73,6 @@ tasks {
             url("https://github.com/zeroBzeroT/QueuePlugin/releases/download/v3.0.0/QueuePlugin-3.0.0+1.21-paper.jar")
             url("https://github.com/dmulloy2/ProtocolLib/releases/download/5.3.0/ProtocolLib.jar")
         }
-        dependsOn('shadowJar')
+        dependsOn('build')
     }
 }

build.gradle

@@ -1,3 +1,3 @@
-plugin_version=2.0.1
+plugin_version=2.0.2
 velocity_api_version=3.4.0-SNAPSHOT
 minecraft_version=1.20.4

gradle.properties

@@ -21,7 +21,6 @@ public class Main {
     private final ProxyServer server;
     private final Logger logger;
     private final Path dataDirectory;
-    //private final Factory factory;
 
     private Config config;
     private ServerListListener serverListListener;
@@ -31,11 +30,11 @@ public class Main {
     private volatile ServerPing mainPing;
 
     @Inject
-    public Main(ProxyServer server, Logger logger, @DataDirectory Path dataDirectory /*, Factory factory*/) {
+    public Main(ProxyServer server, Logger logger, Metrics.Factory metricsFactory, @DataDirectory final Path dataDirectory) {
         this.server = server;
         this.logger = logger;
         this.dataDirectory = dataDirectory;
-        //this.factory = factory;
+        this.metricsFactory = metricsFactory;
     }
 
     @Subscribe
@@ -59,7 +58,7 @@ public void onProxyInitialize(ProxyInitializeEvent event) {
 
         // Load Plugin Metrics
         if (config.getBoolean("bStats")) {
-            Metrics metrics = metricsFactory.make(this, 16229);
+            metricsFactory.make(this, 16229);
             logger.info("bStats metrics enabled.");
         }
     }

src/main/java/org/zeroBzeroT/serverPingPlayerList/Main.java

@@ -2,6 +2,7 @@
 
 import com.velocitypowered.api.command.CommandSource;
 import com.velocitypowered.api.command.SimpleCommand;
+import com.velocitypowered.api.proxy.ConsoleCommandSource;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.format.NamedTextColor;
 import org.slf4j.Logger;
@@ -19,6 +20,12 @@ public ReloadCommand(Main plugin, Logger logger) {
     public void execute(Invocation invocation) {
         CommandSource sender = invocation.source();
 
+        // Check if the command is run from the console
+        if (!(sender instanceof ConsoleCommandSource)) {
+            sender.sendMessage(Component.text("This command can only be run from the console.", NamedTextColor.RED));
+            return;
+        }
+
         sender.sendMessage(Component.text("Reloading config...", NamedTextColor.AQUA));
         try {
             plugin.reloadConfig();