From 2a1aa2d320b2ba4900612dcd2238fc3541aaee04 Mon Sep 17 00:00:00 2001 From: tontito007 Date: Mon, 16 Sep 2024 22:31:43 +0100 Subject: [PATCH 1/3] support for folia --- bukkit/src/main/java/org/bstats/bukkit/Metrics.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/bukkit/src/main/java/org/bstats/bukkit/Metrics.java b/bukkit/src/main/java/org/bstats/bukkit/Metrics.java index c3002bf..bc0bbec 100644 --- a/bukkit/src/main/java/org/bstats/bukkit/Metrics.java +++ b/bukkit/src/main/java/org/bstats/bukkit/Metrics.java @@ -23,7 +23,7 @@ public class Metrics { /** * Creates a new Metrics instance. * - * @param plugin Your plugin instance. + * @param plugin Your plugin instance. * @param serviceId The id of the service. * It can be found at What is my plugin id? */ @@ -62,6 +62,9 @@ public Metrics(Plugin plugin, int serviceId) { boolean logSentData = config.getBoolean("logSentData", false); boolean logResponseStatusText = config.getBoolean("logResponseStatusText", false); + String minecraftVersion2 = Bukkit.getServer().getName(); + boolean folia = (minecraftVersion2.toUpperCase().contains("FOLIA")); + metricsBase = new MetricsBase( "bukkit", serverUUID, @@ -69,7 +72,7 @@ public Metrics(Plugin plugin, int serviceId) { enabled, this::appendPlatformData, this::appendServiceData, - submitDataTask -> Bukkit.getScheduler().runTask(plugin, submitDataTask), + folia ? null : submitDataTask -> Bukkit.getScheduler().runTask(plugin, submitDataTask), plugin::isEnabled, (message, error) -> this.plugin.getLogger().log(Level.WARNING, message, error), (message) -> this.plugin.getLogger().log(Level.INFO, message), @@ -78,6 +81,7 @@ public Metrics(Plugin plugin, int serviceId) { logResponseStatusText, false ); + } /** From 2453c544fd482deb97e4c3e94baae665bef1eb34 Mon Sep 17 00:00:00 2001 From: tontito007 Date: Tue, 17 Sep 2024 21:49:33 +0100 Subject: [PATCH 2/3] support for folia by checking for *.RegionizedServer class --- bukkit/src/main/java/org/bstats/bukkit/Metrics.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/bukkit/src/main/java/org/bstats/bukkit/Metrics.java b/bukkit/src/main/java/org/bstats/bukkit/Metrics.java index bc0bbec..b3c4107 100644 --- a/bukkit/src/main/java/org/bstats/bukkit/Metrics.java +++ b/bukkit/src/main/java/org/bstats/bukkit/Metrics.java @@ -62,8 +62,14 @@ public Metrics(Plugin plugin, int serviceId) { boolean logSentData = config.getBoolean("logSentData", false); boolean logResponseStatusText = config.getBoolean("logResponseStatusText", false); - String minecraftVersion2 = Bukkit.getServer().getName(); - boolean folia = (minecraftVersion2.toUpperCase().contains("FOLIA")); + Class clazz = null; + + try { + clazz = Class.forName("io.papermc.paper.threadedregions.RegionizedServer"); + } catch (Exception e) { + } + + boolean folia = (clazz != null); metricsBase = new MetricsBase( "bukkit", From f16d9e8c25ce08c2116a62b12a4cff013607269e Mon Sep 17 00:00:00 2001 From: Bastian Oppermann Date: Sun, 22 Sep 2024 19:01:53 +0200 Subject: [PATCH 3/3] Apply suggestions from code review --- bukkit/src/main/java/org/bstats/bukkit/Metrics.java | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/bukkit/src/main/java/org/bstats/bukkit/Metrics.java b/bukkit/src/main/java/org/bstats/bukkit/Metrics.java index b3c4107..2a57b49 100644 --- a/bukkit/src/main/java/org/bstats/bukkit/Metrics.java +++ b/bukkit/src/main/java/org/bstats/bukkit/Metrics.java @@ -62,14 +62,10 @@ public Metrics(Plugin plugin, int serviceId) { boolean logSentData = config.getBoolean("logSentData", false); boolean logResponseStatusText = config.getBoolean("logResponseStatusText", false); - Class clazz = null; - + boolean isFolia = false; try { - clazz = Class.forName("io.papermc.paper.threadedregions.RegionizedServer"); - } catch (Exception e) { - } - - boolean folia = (clazz != null); + isFolia = Class.forName("io.papermc.paper.threadedregions.RegionizedServer") != null; + } catch (Exception e) {} metricsBase = new MetricsBase( "bukkit", @@ -78,7 +74,8 @@ public Metrics(Plugin plugin, int serviceId) { enabled, this::appendPlatformData, this::appendServiceData, - folia ? null : submitDataTask -> Bukkit.getScheduler().runTask(plugin, submitDataTask), + // See https://github.com/Bastian/bstats-metrics/pull/126 + isFolia ? null : submitDataTask -> Bukkit.getScheduler().runTask(plugin, submitDataTask), plugin::isEnabled, (message, error) -> this.plugin.getLogger().log(Level.WARNING, message, error), (message) -> this.plugin.getLogger().log(Level.INFO, message),