Update Metrics

Author: Intelli

.gitignore

@@ -176,6 +176,8 @@ Desktop.ini
 .windsurfrules
 context.json
 run.sh
+run_*.sh
+no-log4j2.xml
 
 # Compiled class file
 *.class

pom.xml

@@ -126,10 +126,10 @@
       <id>codemc-repo</id>
       <url>https://repo.codemc.org/repository/maven-public/</url>
     </repository>
-      <repository>
+    <repository>
       <id>jitpack.io</id>
       <url>https://jitpack.io</url>
-      </repository>
+    </repository>
   </repositories>
   <dependencyManagement>
     <dependencies>
@@ -157,8 +157,8 @@
     </dependency>
     <dependency>
       <groupId>org.bstats</groupId>
-      <artifactId>bstats-bukkit-lite</artifactId>
-      <version>1.8</version>
+      <artifactId>bstats-bukkit</artifactId>
+      <version>3.1.0</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
@@ -223,5 +223,11 @@
       <version>5.10.0</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>com.github.seeseemelk</groupId>
+      <artifactId>MockBukkit-v1.21</artifactId>
+      <version>3.133.2</version>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 </project>

src/main/java/net/coreprotect/api/BlockAPI.java

@@ -11,10 +11,9 @@
 import net.coreprotect.config.ConfigHandler;
 import net.coreprotect.database.Database;
 import net.coreprotect.database.statement.UserStatement;
-import net.coreprotect.utility.Util;
-import net.coreprotect.utility.WorldUtils;
 import net.coreprotect.utility.BlockUtils;
 import net.coreprotect.utility.StringUtils;
+import net.coreprotect.utility.WorldUtils;
 
 public class BlockAPI {
 

src/main/java/net/coreprotect/services/PluginInitializationService.java

@@ -2,7 +2,7 @@
 
 import java.io.File;
 
-import org.bstats.bukkit.MetricsLite;
+import org.bstats.bukkit.Metrics;
 import org.bukkit.Bukkit;
 import org.bukkit.plugin.PluginDescriptionFile;
 import org.bukkit.plugin.java.JavaPlugin;
@@ -163,7 +163,7 @@ private static void startBackgroundServices(CoreProtect plugin) {
      */
     private static void enableMetrics(JavaPlugin plugin) {
         try {
-            new MetricsLite(plugin, 2876);
+            new Metrics(plugin, 2876);
         }
         catch (Exception e) {
             // Failed to connect to bStats server or something else went wrong

src/main/java/net/coreprotect/utility/SystemUtils.java

@@ -8,11 +8,32 @@
 
 public class SystemUtils {
 
+    private static boolean testMode = Boolean.getBoolean("net.coreprotect.test");
+    private static String processorInfo = null;
+
     private SystemUtils() {
         throw new IllegalStateException("Utility class");
     }
 
+    /**
+     * Set test mode to skip actual hardware operations
+     * 
+     * @param enabled
+     *            Whether to enable test mode
+     */
+    public static void setTestMode(boolean enabled) {
+        testMode = enabled;
+        if (enabled) {
+            processorInfo = "Test Processor";
+        }
+    }
+
     public static CentralProcessor getProcessorInfo() {
+        // In test mode, don't actually try to initialize hardware components
+        if (testMode || isLog4jDisabled()) {
+            return null;
+        }
+
         CentralProcessor result = null;
         try {
             Class.forName("com.sun.jna.Platform");
@@ -32,4 +53,32 @@ else if (System.getProperty("os.name").toLowerCase().contains("android") || Syst
 
         return result;
     }
-} 
+
+    /**
+     * Get processor information string (for testing)
+     * 
+     * @return The processor information string
+     */
+    public static String getProcessorInfoString() {
+        if (processorInfo != null) {
+            return processorInfo;
+        }
+
+        CentralProcessor processor = getProcessorInfo();
+        if (processor != null) {
+            processorInfo = processor.getProcessorIdentifier().getName();
+            return processorInfo;
+        }
+
+        return "Unknown";
+    }
+
+    /**
+     * Check if Log4j is disabled via system properties
+     * 
+     * @return true if Log4j is disabled
+     */
+    private static boolean isLog4jDisabled() {
+        return Boolean.getBoolean("log4j2.disable") || System.getProperty("log4j.configurationFile", "").contains("no-log4j2.xml");
+    }
+}