Fixed: bStats compatibility due to upstream PR merge

Bram1903 · Oct 28, 2024 · 6bef3bb · 6bef3bb
1 parent d84a307
commit 6bef3bb
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 29 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -25,14 +25,9 @@ tasks {
         archiveFileName = "${rootProject.name}-${project.version}.jar"
         archiveClassifier = null
 
-        relocate(
-            "net.kyori.adventure.text.serializer.gson",
-            "io.github.retrooper.packetevents.adventure.serializer.gson"
-        )
-        relocate(
-            "net.kyori.adventure.text.serializer.legacy",
-            "io.github.retrooper.packetevents.adventure.serializer.legacy"
-        )
+        relocate("net.kyori.adventure.text.serializer.gson", "io.github.retrooper.packetevents.adventure.serializer.gson")
+        relocate("net.kyori.adventure.text.serializer.legacy", "io.github.retrooper.packetevents.adventure.serializer.legacy")
+        relocate("org.bstats", "io.github.retrooper.packetevents.bstats")
 
         manifest {
             attributes["Implementation-Version"] = rootProject.version

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,6 +1,6 @@
 [versions]
 adventure = "4.16.0"
-packetevents = "2.4.1-SNAPSHOT"
+packetevents = "2.6.0-SNAPSHOT"
 paper = "1.21-R0.1-SNAPSHOT"
 velocity = "3.3.0-SNAPSHOT"
 bungeecord = "1.21-R0.1-SNAPSHOT"

diff --git a/platforms/bukkit/src/main/java/com/deathmotion/playercrasher/BukkitPlayerCrasher.java b/platforms/bukkit/src/main/java/com/deathmotion/playercrasher/BukkitPlayerCrasher.java
@@ -24,8 +24,9 @@
 import com.deathmotion.playercrasher.interfaces.Scheduler;
 import com.deathmotion.playercrasher.util.MessageSender;
 import io.github.retrooper.packetevents.adventure.serializer.legacy.LegacyComponentSerializer;
-import io.github.retrooper.packetevents.bstats.Metrics;
 import net.kyori.adventure.text.Component;
+import org.bstats.bukkit.Metrics;
+import org.bstats.charts.SimplePie;
 import org.bukkit.Bukkit;
 import org.bukkit.command.CommandSender;
 import org.bukkit.plugin.java.JavaPlugin;
@@ -103,8 +104,8 @@ public String getPluginDirectory() {
     protected void enableBStats() {
         try {
             Metrics metrics = new Metrics(this.plugin, 16190);
-            metrics.addCustomChart(new Metrics.SimplePie("playercrasher_version", () -> PCPlatform.class.getPackage().getImplementationVersion()));
-            metrics.addCustomChart(new Metrics.SimplePie("playercrasher_platform", () -> "Bukkit"));
+            metrics.addCustomChart(new SimplePie("playercrasher_version", () -> PCPlatform.class.getPackage().getImplementationVersion()));
+            metrics.addCustomChart(new SimplePie("playercrasher_platform", () -> "Bukkit"));
         } catch (Exception e) {
             this.plugin.getLogger().warning("Something went wrong while enabling bStats.\n" + e.getMessage());
         }

diff --git a/platforms/bungeecord/src/main/java/com/deathmotion/playercrasher/BungeePlayerCrasher.java b/platforms/bungeecord/src/main/java/com/deathmotion/playercrasher/BungeePlayerCrasher.java
@@ -24,11 +24,12 @@
 import com.deathmotion.playercrasher.commands.BungeePCCommand;
 import com.deathmotion.playercrasher.interfaces.Scheduler;
 import io.github.retrooper.packetevents.adventure.serializer.legacy.LegacyComponentSerializer;
-import io.github.retrooper.packetevents.bstats.Metrics;
 import net.kyori.adventure.text.Component;
 import net.md_5.bungee.api.ProxyServer;
 import net.md_5.bungee.api.connection.ProxiedPlayer;
 import net.md_5.bungee.api.plugin.Plugin;
+import org.bstats.bungeecord.Metrics;
+import org.bstats.charts.SimplePie;
 
 import java.util.UUID;
 
@@ -77,8 +78,8 @@ public String getPluginDirectory() {
     protected void enableBStats() {
         try {
             Metrics metrics = new Metrics(this.plugin, 16190);
-            metrics.addCustomChart(new Metrics.SimplePie("playercrasher_version", () -> PCPlatform.class.getPackage().getImplementationVersion()));
-            metrics.addCustomChart(new Metrics.SimplePie("playercrasher_platform", () -> "Bukkit"));
+            metrics.addCustomChart(new SimplePie("playercrasher_version", () -> PCPlatform.class.getPackage().getImplementationVersion()));
+            metrics.addCustomChart(new SimplePie("playercrasher_platform", () -> "BungeeCord"));
         } catch (Exception e) {
             this.plugin.getLogger().warning("Something went wrong while enabling bStats.\n" + e.getMessage());
         }

diff --git a/platforms/velocity/src/main/java/com/deathmotion/playercrasher/PCVelocity.java b/platforms/velocity/src/main/java/com/deathmotion/playercrasher/PCVelocity.java
@@ -28,22 +28,20 @@
 import com.velocitypowered.api.event.proxy.ProxyShutdownEvent;
 import com.velocitypowered.api.plugin.annotation.DataDirectory;
 import com.velocitypowered.api.proxy.ProxyServer;
-import io.github.retrooper.packetevents.bstats.Metrics;
-import org.slf4j.Logger;
+import org.bstats.charts.SimplePie;
+import org.bstats.velocity.Metrics;
 
 import java.nio.file.Path;
 
 public class PCVelocity {
     private final ProxyServer server;
-    private final Path dataDirectory;
-    private final Logger logger;
+    private final Metrics.Factory metricsFactory;
     private final VelocityPlayerCrasher pc;
 
     @Inject
-    public PCVelocity(ProxyServer server, @DataDirectory Path dataDirectory, Logger logger) {
+    public PCVelocity(ProxyServer server, @DataDirectory Path dataDirectory, Metrics.Factory metricsFactory) {
         this.server = server;
-        this.dataDirectory = dataDirectory;
-        this.logger = logger;
+        this.metricsFactory = metricsFactory;
         this.pc = new VelocityPlayerCrasher(server, dataDirectory);
     }
 
@@ -69,13 +67,9 @@ public void onProxyShutdown(ProxyShutdownEvent ignoredEvent) {
     }
 
     private void enableBStats() {
-        try {
-            Metrics metrics = Metrics.createInstance(this, this.pc.getPlatform(), logger, dataDirectory, 16190);
-            metrics.addCustomChart(new Metrics.SimplePie("playercrasher_version", () -> PCPlatform.class.getPackage().getImplementationVersion()));
-            metrics.addCustomChart(new Metrics.SimplePie("playercrasher_platform", () -> "Bukkit"));
-        } catch (Exception e) {
-            this.logger.warn("Something went wrong while enabling bStats.\n{}", e.getMessage());
-        }
+        Metrics metrics = metricsFactory.make(this, 16190);
+        metrics.addCustomChart(new SimplePie("playercrasher_version", () -> PCPlatform.class.getPackage().getImplementationVersion()));
+        metrics.addCustomChart(new SimplePie("playercrasher_platform", () -> "Velocity"));
     }
 
     private void registerCommands() {