From 30deb83ab7f7120f5e8bc8581ee15dfb99013bac Mon Sep 17 00:00:00 2001 From: copokbl Date: Thu, 2 May 2024 12:58:20 +1000 Subject: [PATCH] Add bStats --- .gitignore | 1 + pom.xml | 16 +++++++++++++++- src/main/java/net/serble/estools/Main.java | 13 +++++++++++++ src/main/resources/config.yml | 4 ++++ 4 files changed, 33 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 009aa67..a93e7af 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ /.idea/ /EsTools.iml /out +dependency-reduced-pom.xml \ No newline at end of file diff --git a/pom.xml b/pom.xml index da96f30..7539883 100644 --- a/pom.xml +++ b/pom.xml @@ -31,11 +31,19 @@ org.apache.maven.plugins maven-shade-plugin 3.2.4 + + + + org.bstats + net.serble.estools + + + package - shade + shade @@ -77,5 +85,11 @@ 1.7 provided + + org.bstats + bstats-bukkit + 3.0.2 + compile + diff --git a/src/main/java/net/serble/estools/Main.java b/src/main/java/net/serble/estools/Main.java index 24a89ec..222e0d8 100644 --- a/src/main/java/net/serble/estools/Main.java +++ b/src/main/java/net/serble/estools/Main.java @@ -10,6 +10,8 @@ import net.serble.estools.Commands.Teleport.*; import net.serble.estools.Commands.Warps.*; import net.serble.estools.Signs.SignMain; +import org.bstats.bukkit.Metrics; +import org.bstats.charts.SimplePie; import org.bukkit.Bukkit; import org.bukkit.command.PluginCommand; import org.bukkit.plugin.java.JavaPlugin; @@ -22,6 +24,8 @@ public class Main extends JavaPlugin { public static int majorVersion; public static int minorVersion; public static boolean tabCompleteEnabled = true; + + private static final int bStatsId = 21760; @Override public void onEnable() { @@ -39,6 +43,15 @@ public void onEnable() { saveDefaultConfig(); } + // Metrics + if (getConfig().getBoolean("metrics", true)) { + Metrics metrics = new Metrics(this, bStatsId); + metrics.addCustomChart(new SimplePie("vault_enabled", () -> String.valueOf(Vault.economy != null))); + Bukkit.getLogger().info("Started bStat metrics"); + } else { + Bukkit.getLogger().info("Metrics are disabled"); + } + if (majorVersion <= 2) { Bukkit.getLogger().info("Tab completion is not supported for versions 1.2 and below."); tabCompleteEnabled = false; diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml index 378d338..3b459c8 100644 --- a/src/main/resources/config.yml +++ b/src/main/resources/config.yml @@ -1 +1,5 @@ +# Stops players taking fall damage when they teleport safetp: true + +# Toggle bStats metrics +metrics: true \ No newline at end of file