diff --git a/.drone.yml b/.drone.yml
index 0bd7598..a3da061 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -10,7 +10,7 @@ trigger:
 steps:
   - name: publish
     pull: if-not-exists
-    image: openjdk:17-jdk
+    image: openjdk:21-jdk
     environment:
       PACKAGESKEY:
         from_secret: GITEA_PACKAGE_PUBLIC_RW
diff --git a/build.gradle b/build.gradle
index 81a48fa..2bd678e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -6,7 +6,7 @@ subprojects {
     version "2.0.0-netherite-snapshot"
 
     java {
-        toolchain.languageVersion.set(JavaLanguageVersion.of(17))
+        toolchain.languageVersion.set(JavaLanguageVersion.of(21))
     }
 
     dependencies {
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index e1bef7e..2733ed5 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/plugin/build.gradle b/plugin/build.gradle
index 4e8f9aa..eb6b59d 100644
--- a/plugin/build.gradle
+++ b/plugin/build.gradle
@@ -1,14 +1,6 @@
 plugins {
     id "java"
-    id "com.github.johnrengelman.shadow" version "8.1.1"
-    id "xyz.jpenilla.run-paper" version "2.2.0"
-}
-
-runServer {
-    javaLauncher = javaToolchains.launcherFor {
-        languageVersion = JavaLanguageVersion.of(21)
-    }
-    minecraftVersion "1.21.3"
+    id "io.github.goooler.shadow" version "8.1.8"
 }
 
 processResources {
@@ -17,15 +9,14 @@ processResources {
 
 dependencies {
     compileOnly "me.clip:placeholderapi:2.11.6" // Placeholder support
-    implementation "com.google.code.gson:gson:2.10.1" // JSON parsing
-    implementation "org.bstats:bstats-bukkit:3.0.2" // Plugin stats
+    implementation "com.google.code.gson:gson:2.12.1" // JSON parsing
     implementation "com.github.retrooper:packetevents-spigot:2.7.0" // Packets
     implementation "space.arim.dazzleconf:dazzleconf-ext-snakeyaml:1.2.1" // Configs
     implementation "lol.pyr:director-adventure:2.1.2" // Commands
 
     // Fancy text library
     implementation "net.kyori:adventure-platform-bukkit:4.3.4"
-    implementation "net.kyori:adventure-text-minimessage:4.17.0"
+    implementation "net.kyori:adventure-text-minimessage:4.18.0"
 
     implementation project(":api")
 }
diff --git a/plugin/src/main/java/lol/pyr/znpcsplus/ZNpcsPlus.java b/plugin/src/main/java/lol/pyr/znpcsplus/ZNpcsPlus.java
index 77b56b4..a0e076a 100644
--- a/plugin/src/main/java/lol/pyr/znpcsplus/ZNpcsPlus.java
+++ b/plugin/src/main/java/lol/pyr/znpcsplus/ZNpcsPlus.java
@@ -55,7 +55,6 @@ import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.format.NamedTextColor;
 import net.kyori.adventure.text.format.TextColor;
 import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer;
-import org.bstats.bukkit.Metrics;
 import org.bukkit.*;
 import org.bukkit.plugin.Plugin;
 import org.bukkit.plugin.PluginDescriptionFile;
@@ -155,7 +154,6 @@ public class ZNpcsPlus {
         actionRegistry.registerTypes(scheduler, adventure, textSerializer, bungeeConnector);
         packetEvents.getEventManager().registerListener(new InteractionPacketListener(userManager, npcRegistry, typeRegistry, scheduler), PacketListenerPriority.MONITOR);
         packetEvents.getEventManager().registerListener(new ClientPacketListener(configManager), PacketListenerPriority.LOWEST);
-        new Metrics(bootstrap, 18244);
         pluginManager.registerEvents(new UserListener(userManager), bootstrap);
 
         registerCommands(npcRegistry, skinCache, adventure, actionRegistry,