From f638e1f4988764e9484fbdde4e5c989d8b3a58fc Mon Sep 17 00:00:00 2001 From: Ryder Belserion Date: Fri, 5 Jul 2024 13:13:17 -0400 Subject: [PATCH] [ci-skip] enable metrics --- .../chatmanager/api/CustomMetrics.java | 24 +++++++++++++++ .../h1dd3nxn1nja/chatmanager/ChatManager.java | 8 +++-- .../chatmanager/utils/MetricsHandler.java | 30 ------------------- 3 files changed, 29 insertions(+), 33 deletions(-) create mode 100644 src/main/java/com/ryderbelserion/chatmanager/api/CustomMetrics.java delete mode 100644 src/main/java/me/h1dd3nxn1nja/chatmanager/utils/MetricsHandler.java diff --git a/src/main/java/com/ryderbelserion/chatmanager/api/CustomMetrics.java b/src/main/java/com/ryderbelserion/chatmanager/api/CustomMetrics.java new file mode 100644 index 00000000..4ba5b7ae --- /dev/null +++ b/src/main/java/com/ryderbelserion/chatmanager/api/CustomMetrics.java @@ -0,0 +1,24 @@ +package com.ryderbelserion.chatmanager.api; + +import com.ryderbelserion.chatmanager.enums.Files; +import com.ryderbelserion.vital.paper.bStats; +import me.h1dd3nxn1nja.chatmanager.ChatManager; +import org.bukkit.configuration.file.FileConfiguration; +import org.bukkit.plugin.java.JavaPlugin; + +public class CustomMetrics extends bStats { + + public CustomMetrics() { + super(JavaPlugin.getPlugin(ChatManager.class), 3291); + } + + public void start() { + FileConfiguration config = Files.CONFIG.getConfiguration(); + + addCustomChart(new SimplePie("chat_format", () -> config.getString("Chat_Format.Enable"))); + + addCustomChart(new SimplePie("chat_radius", () -> config.getString("Chat_Radius.Enable"))); + + addCustomChart(new SimplePie("per_world_chat", () -> config.getString("Per_World_Chat.Enable"))); + } +} \ No newline at end of file diff --git a/src/main/java/me/h1dd3nxn1nja/chatmanager/ChatManager.java b/src/main/java/me/h1dd3nxn1nja/chatmanager/ChatManager.java index 70897f65..6b526adc 100644 --- a/src/main/java/me/h1dd3nxn1nja/chatmanager/ChatManager.java +++ b/src/main/java/me/h1dd3nxn1nja/chatmanager/ChatManager.java @@ -1,10 +1,10 @@ package me.h1dd3nxn1nja.chatmanager; import com.ryderbelserion.chatmanager.ApiLoader; +import com.ryderbelserion.chatmanager.api.CustomMetrics; import com.ryderbelserion.chatmanager.enums.Files; import com.ryderbelserion.chatmanager.plugins.PlaceholderAPISupport; import com.ryderbelserion.chatmanager.plugins.VanishSupport; -import com.ryderbelserion.chatmanager.plugins.VaultSupport; import com.ryderbelserion.vital.paper.VitalPaper; import com.ryderbelserion.vital.paper.files.config.FileManager; import com.ryderbelserion.vital.paper.plugins.PluginManager; @@ -40,6 +40,10 @@ public static ChatManager get() { private PluginHandler pluginHandler; public void onEnable() { + new VitalPaper(this).setLogging(true); + + new CustomMetrics().start(); + List.of( //new VaultSupport(), new VanishSupport(), @@ -48,8 +52,6 @@ public void onEnable() { PluginManager.printPlugins(getLogger()); - new VitalPaper(this); - this.fileManager = new FileManager(); this.fileManager .addFile("config.yml") diff --git a/src/main/java/me/h1dd3nxn1nja/chatmanager/utils/MetricsHandler.java b/src/main/java/me/h1dd3nxn1nja/chatmanager/utils/MetricsHandler.java deleted file mode 100644 index a8d7e592..00000000 --- a/src/main/java/me/h1dd3nxn1nja/chatmanager/utils/MetricsHandler.java +++ /dev/null @@ -1,30 +0,0 @@ -package me.h1dd3nxn1nja.chatmanager.utils; - -import com.ryderbelserion.chatmanager.enums.Files; -import me.h1dd3nxn1nja.chatmanager.ChatManager; -import org.bstats.bukkit.Metrics; -import org.bstats.charts.SimplePie; -import org.bukkit.configuration.file.FileConfiguration; -import org.jetbrains.annotations.NotNull; - -public class MetricsHandler { - - @NotNull - private final ChatManager plugin = ChatManager.get(); - - public void start() { - Metrics metrics = new Metrics(this.plugin, 3291); - - FileConfiguration config = Files.CONFIG.getConfiguration(); - - metrics.addCustomChart(new SimplePie("chat_format", () -> config.getString("Chat_Format.Enable"))); - - metrics.addCustomChart(new SimplePie("chat_radius", () -> config.getString("Chat_Radius.Enable"))); - - metrics.addCustomChart(new SimplePie("per_world_chat", () -> config.getString("Per_World_Chat.Enable"))); - - metrics.addCustomChart(new SimplePie("update_checker", () -> config.getString("Update_Checker"))); - - this.plugin.getLogger().info("Metrics has been enabled."); - } -} \ No newline at end of file