zhdev/griefus
1
0
Fork 0
Code Issues Pull requests Activity

Update Metrics

Browse source
This commit is contained in:
Intelli 2025-03-07 19:09:13 -07:00
parent 778be07e51
commit baf61099b8
5 changed files with 65 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/main/java/net/coreprotect/api/BlockAPI.java
View file

@ -11,10 +11,9 @@ import org.bukkit.block.Block;
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 {

4
src/main/java/net/coreprotect/services/PluginInitializationService.java
View file

@ -2,7 +2,7 @@ package net.coreprotect.services;
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 @@ public class PluginInitializationService {
*/
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

51
src/main/java/net/coreprotect/utility/SystemUtils.java
View file

@ -8,11 +8,32 @@ import oshi.hardware.CentralProcessor;
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 @@ public class SystemUtils {
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");
}
}