Update bStats and use dependency

Archy-X · Jun 15, 2024 · 0a31261 · 0a31261
1 parent c6f2dda
commit 0a31261
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 843 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -23,8 +23,9 @@ dependencies {
     implementation("com.github.Osiris-Team:Dream-Yaml:6.9")
     implementation("com.github.Archy-X:Polyglot:d6debe617a")
     implementation("co.aikar:acf-paper:0.5.1-SNAPSHOT")
-    compileOnly("dev.aurelium:auraskills-api-bukkit:2.1.0")
-    compileOnly("org.spigotmc:spigot-api:1.20.4-R0.1-SNAPSHOT")
+    implementation("org.bstats:bstats-bukkit:3.0.2")
+    compileOnly("dev.aurelium:auraskills-api-bukkit:2.1.2")
+    compileOnly("org.spigotmc:spigot-api:1.21-R0.1-SNAPSHOT")
     compileOnly("me.clip:placeholderapi:2.11.2")
     compileOnly("com.sk89q.worldguard:worldguard-bukkit:7.0.7-SNAPSHOT")
 }
@@ -36,6 +37,7 @@ tasks.withType<ShadowJar> {
     relocate("co.aikar.commands", "dev.aurelium.auramobs.acf")
     relocate("co.aikar.locales", "dev.aurelium.auramobs.locales")
     relocate("com.archyx.polyglot", "dev.aurelium.auramobs.polyglot")
+    relocate("org.bstats", "dev.aurelium.auramobs.bstats")
 }
 
 java.sourceCompatibility = JavaVersion.VERSION_17

diff --git a/src/main/java/dev/aurelium/auramobs/AuraMobs.java b/src/main/java/dev/aurelium/auramobs/AuraMobs.java
@@ -14,12 +14,12 @@
 import dev.aurelium.auramobs.config.OptionValue;
 import dev.aurelium.auramobs.listeners.*;
 import dev.aurelium.auramobs.util.Formatter;
-import dev.aurelium.auramobs.util.Metrics;
 import dev.aurelium.auraskills.api.AuraSkillsApi;
 import dev.aurelium.auraskills.api.skill.Skill;
 import dev.aurelium.auraskills.api.skill.Skills;
 import dev.aurelium.auraskills.api.user.SkillsUser;
 import net.objecthunter.exp4j.ExpressionBuilder;
+import org.bstats.bukkit.Metrics;
 import org.bukkit.Bukkit;
 import org.bukkit.NamespacedKey;
 import org.bukkit.entity.LivingEntity;
@@ -32,7 +32,7 @@
 
 public class AuraMobs extends JavaPlugin implements PolyglotProvider {
 
-    private static final int bstatsId = 12142;
+    private static final int bstatsId = 22266;
     private NamespacedKey mobKey;
     private WorldGuardHook worldGuard;
     private AuraSkillsApi auraSkills;

diff --git a/src/main/java/dev/aurelium/auramobs/util/ColorUtils.java b/src/main/java/dev/aurelium/auramobs/util/ColorUtils.java
@@ -22,7 +22,7 @@ public class ColorUtils {
 
     public static String legacyToJson(String legacyString) {
         if (legacyString == null) return "";
-        return ComponentSerializer.toString(TextComponent.fromLegacyText(legacyString));
+        return ComponentSerializer.toString(TextComponent.fromLegacy(legacyString));
     }