diff --git a/Bukkit/build.gradle.kts b/Bukkit/build.gradle.kts
index 07cffade9..71ef9699a 100644
--- a/Bukkit/build.gradle.kts
+++ b/Bukkit/build.gradle.kts
@@ -63,7 +63,7 @@ dependencies {
     compileOnly("com.sk89q:squirrelid:1.0.0-SNAPSHOT") { isTransitive = false }
 
     // Adventure
-    implementation("net.kyori:text-adapter-bukkit:3.0.3")
+    implementation("net.kyori:adventure-platform-bukkit:4.0.0-SNAPSHOT")
 }
 
 tasks.named<Copy>("processResources") {
diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/uuid/BungeePermsUUIDService.java b/Bukkit/src/main/java/com/plotsquared/bukkit/uuid/BungeePermsUUIDService.java
deleted file mode 100644
index 87f4334a6..000000000
--- a/Bukkit/src/main/java/com/plotsquared/bukkit/uuid/BungeePermsUUIDService.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- *       _____  _       _    _____                                _
- *      |  __ \| |     | |  / ____|                              | |
- *      | |__) | | ___ | |_| (___   __ _ _   _  __ _ _ __ ___  __| |
- *      |  ___/| |/ _ \| __|\___ \ / _` | | | |/ _` | '__/ _ \/ _` |
- *      | |    | | (_) | |_ ____) | (_| | |_| | (_| | | |  __/ (_| |
- *      |_|    |_|\___/ \__|_____/ \__, |\__,_|\__,_|_|  \___|\__,_|
- *                                    | |
- *                                    |_|
- *            PlotSquared plot management system for Minecraft
- *                  Copyright (C) 2020 IntellectualSites
- *
- *     This program is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation, either version 3 of the License, or
- *     (at your option) any later version.
- *
- *     This program is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package com.plotsquared.bukkit.uuid;
-
-import com.plotsquared.core.uuid.UUIDMapping;
-import com.plotsquared.core.uuid.UUIDService;
-import net.alpenblock.bungeeperms.BungeePerms;
-import net.alpenblock.bungeeperms.io.UUIDPlayerDB;
-import org.bukkit.Bukkit;
-import org.bukkit.plugin.RegisteredServiceProvider;
-
-import javax.annotation.Nonnull;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.UUID;
-
-/**
- * UUID service that uses the BungeePerms API
- */
-public class BungeePermsUUIDService implements UUIDService {
-
-    private final BungeePerms bp;
-
-    public BungeePermsUUIDService() {
-        final RegisteredServiceProvider<BungeePerms> provider = Bukkit.getServicesManager().getRegistration(BungeePerms.class);
-        if (provider != null) {
-            this.bp = provider.getProvider();
-        } else {
-            throw new IllegalStateException("BungeePerms is not available");
-        }
-    }
-
-    @Override @Nonnull public List<UUIDMapping> getNames(@Nonnull final List<UUID> uuids) {
-       final List<UUIDMapping> mappings = new ArrayList<>(uuids.size());
-       final UUIDPlayerDB uuiddb = BungeePerms.getInstance().getPermissionsManager().getUUIDPlayerDB();
-       for (final UUID uuid : uuids) {
-           try {
-               final String username = uuiddb.getPlayerName(uuid);
-               if (username != null) {
-                   mappings.add(new UUIDMapping(uuid, username));
-               }
-           } catch (final Exception ignored) {}
-       }
-       return mappings;
-    }
-
-    @Override @Nonnull public List<UUIDMapping> getUUIDs(@Nonnull final List<String> usernames) {
-        final List<UUIDMapping> mappings = new ArrayList<>(usernames.size());
-        final UUIDPlayerDB uuiddb = BungeePerms.getInstance().getPermissionsManager().getUUIDPlayerDB();
-        for (final String username : usernames) {
-            try {
-                final UUID uuid = uuiddb.getUUID(username);
-                if (username != null) {
-                    mappings.add(new UUIDMapping(uuid, username));
-                }
-            } catch (final Exception ignored) {}
-        }
-        return mappings;
-    }
-
-}
diff --git a/build.gradle.kts b/build.gradle.kts
index c3dc98b30..df23726f2 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -73,9 +73,6 @@ subprojects {
             exclude(group = "mockito-core")
             exclude(group = "dummypermscompat")
         }
-
-        // Tests
-        testImplementation("junit:junit:4.13")
     }
 
     tasks {
@@ -84,14 +81,15 @@ subprojects {
                 delete("../target")
             }
         }
-
-        withType<Test> {
-            useJUnitPlatform()
-        }
     }
 }
 
 allprojects {
+    dependencies {
+        // Tests
+        testImplementation("junit:junit:4.13")
+    }
+
     configure<JavaPluginConvention> {
         sourceCompatibility = JavaVersion.VERSION_1_8
         targetCompatibility = sourceCompatibility