diff --git a/Bukkit/build.gradle b/Bukkit/build.gradle
index 54645acad..b0c628c5c 100644
--- a/Bukkit/build.gradle
+++ b/Bukkit/build.gradle
@@ -14,7 +14,6 @@ repositories {
maven { url = "https://ci.ender.zone/plugin/repository/everything/" }
maven { url = "https://mvn.intellectualsites.com/content/repositories/releases" }
maven { url = "https://mvn.intellectualsites.com/content/repositories/snapshots" }
- maven { url = "https://repo.wea-ondara.net/repository/public/" }
maven { url = "http://repo.mvdw-software.be/content/groups/public/" }
mavenLocal()
}
@@ -39,7 +38,6 @@ dependencies {
implementation("net.ess3:EssentialsX:2.18.0") {
exclude(group: "io.papermc", module: "paperlib")
}
- implementation("net.alpenblock:BungeePerms:4.0-dev-106")
compile("se.hyperver.hyperverse:Core:0.6.0-SNAPSHOT"){ transitive = false }
compile('com.sk89q:squirrelid:1.0.0-SNAPSHOT'){ transitive = false }
compile('be.maximvdw:MVdWPlaceholderAPI:3.1.1'){ transitive = false }
diff --git a/Bukkit/pom.xml b/Bukkit/pom.xml
index 32c8c96e8..04de1ebca 100644
--- a/Bukkit/pom.xml
+++ b/Bukkit/pom.xml
@@ -182,12 +182,6 @@
-
- net.alpenblock
- BungeePerms
- 4.0-dev-106
- runtime
-
junit
junit
diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/BukkitMain.java b/Bukkit/src/main/java/com/plotsquared/bukkit/BukkitMain.java
index 4f149d126..e3f9f05da 100644
--- a/Bukkit/src/main/java/com/plotsquared/bukkit/BukkitMain.java
+++ b/Bukkit/src/main/java/com/plotsquared/bukkit/BukkitMain.java
@@ -58,7 +58,6 @@ import com.plotsquared.bukkit.util.BukkitTaskManager;
import com.plotsquared.bukkit.util.BukkitUtil;
import com.plotsquared.bukkit.util.SetGenCB;
import com.plotsquared.bukkit.util.UpdateUtility;
-import com.plotsquared.bukkit.uuid.BungeePermsUUIDService;
import com.plotsquared.bukkit.uuid.EssentialsUUIDService;
import com.plotsquared.bukkit.uuid.LuckPermsUUIDService;
import com.plotsquared.bukkit.uuid.OfflinePlayerUUIDService;
@@ -291,16 +290,6 @@ public final class BukkitMain extends JavaPlugin implements Listener, IPlotMain<
luckPermsUUIDService = null;
}
- final BungeePermsUUIDService bungeePermsUUIDService;
- if (Settings.UUID.SERVICE_BUNGEE_PERMS &&
- Bukkit.getPluginManager().getPlugin("BungeePerms") != null) {
- bungeePermsUUIDService = new BungeePermsUUIDService();
- PlotSquared
- .log(Captions.PREFIX + "(UUID) Using BungeePerms as a complementary UUID service");
- } else {
- bungeePermsUUIDService = null;
- }
-
final EssentialsUUIDService essentialsUUIDService;
if (Settings.UUID.SERVICE_ESSENTIALSX && Bukkit.getPluginManager().getPlugin("Essentials") != null) {
essentialsUUIDService = new EssentialsUUIDService();
@@ -335,10 +324,6 @@ public final class BukkitMain extends JavaPlugin implements Listener, IPlotMain<
impromptuPipeline.registerService(luckPermsUUIDService);
backgroundPipeline.registerService(luckPermsUUIDService);
}
- if (bungeePermsUUIDService != null) {
- impromptuPipeline.registerService(bungeePermsUUIDService);
- backgroundPipeline.registerService(bungeePermsUUIDService);
- }
if (essentialsUUIDService != null) {
impromptuPipeline.registerService(essentialsUUIDService);
backgroundPipeline.registerService(essentialsUUIDService);
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 4de1bdb92..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 .
- */
-package com.plotsquared.bukkit.uuid;
-
-import com.plotsquared.core.uuid.UUIDMapping;
-import com.plotsquared.core.uuid.UUIDService;
-import net.luckperms.api.model.user.UserManager;
-import org.bukkit.Bukkit;
-import org.bukkit.plugin.RegisteredServiceProvider;
-import org.jetbrains.annotations.NotNull;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.UUID;
-import net.alpenblock.bungeeperms.BungeePerms;
-import net.alpenblock.bungeeperms.io.UUIDPlayerDB;
-
-/**
- * UUID service that uses the BungeePerms API
- */
-public class BungeePermsUUIDService implements UUIDService {
-
- private final BungeePerms bp;
-
- public BungeePermsUUIDService() {
- final RegisteredServiceProvider provider = Bukkit.getServicesManager().getRegistration(BungeePerms.class);
- if (provider != null) {
- this.bp = provider.getProvider();
- } else {
- throw new IllegalStateException("BungeePerms is not available");
- }
- }
-
- @Override @NotNull public List getNames(@NotNull final List uuids) {
- final List 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 @NotNull public List getUUIDs(@NotNull final List usernames) {
- final List 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;
- }
-
-}