diff --git a/pom.xml b/pom.xml index 15475e6ef..0bbe67387 100644 --- a/pom.xml +++ b/pom.xml @@ -382,36 +382,102 @@ spigotmc-repo https://hub.spigotmc.org/nexus/content/repositories/snapshots + + false + + + true + codemc-repo https://repo.codemc.org/repository/maven-public/ + + true + + + true + enderzone-repo - https://ci.ender.zone/plugin/repository/everything + https://ci.ender.zone/plugin/repository/everything/ + + true + + + true + - dmulloy2-repo - http://repo.dmulloy2.net/content/groups/public/ + dmulloy2-repo-releases + http://repo.dmulloy2.net/nexus/repository/releases/ + + true + + + false + + + + dmulloy2-repo-snapshots + http://repo.dmulloy2.net/nexus/repository/snapshots/ + + false + + + true + - onarandombox-repo - http://repo.onarandombox.com/content/groups/public + onarandombox-repo-releases + http://repo.onarandombox.com/content/repositories/multiverse/ + + true + + + false + + + + onarandombox-repo-snapshots + http://repo.onarandombox.com/content/repositories/multiverse-snapshots/ + + false + + + true + - vault-repo + vault-repo-releases http://nexus.hc.to/content/repositories/pub_releases + + true + + + false + + + + vault-repo-snapshots + http://nexus.hc.to/content/repositories/pub_snapshots + + false + + + true + @@ -622,20 +688,6 @@ - - - de.bananaco - bPermissions - 2.12-DEV - provided - - - org.bukkit - bukkit - - - - org.tyrannyofheaven.bukkit @@ -672,7 +724,7 @@ com.onarandombox.multiversecore Multiverse-Core - 2.6.0 + 3.0.0-SNAPSHOT jar provided @@ -735,8 +787,42 @@ net.ess3 EssentialsX - 2.15.0 + 2.16.1 provided + + + io.papermc + paperlib + + + net.ess3 + NMSProvider + + + net.ess3 + UpdatedMetaProvider + + + net.ess3 + 1_8_R1Provider + + + net.ess3 + 1_8_R2Provider + + + net.ess3 + LegacyProvider + + + net.ess3 + ReflectionProvider + + + net.ess3 + FlattenedProvider + + diff --git a/src/main/java/fr/xephi/authme/permission/PermissionsManager.java b/src/main/java/fr/xephi/authme/permission/PermissionsManager.java index 59a64f14e..b99b66c5e 100644 --- a/src/main/java/fr/xephi/authme/permission/PermissionsManager.java +++ b/src/main/java/fr/xephi/authme/permission/PermissionsManager.java @@ -4,7 +4,6 @@ import com.google.common.annotations.VisibleForTesting; import fr.xephi.authme.ConsoleLogger; import fr.xephi.authme.initialization.Reloadable; import fr.xephi.authme.listener.JoiningPlayer; -import fr.xephi.authme.permission.handlers.BPermissionsHandler; import fr.xephi.authme.permission.handlers.LuckPermsHandler; import fr.xephi.authme.permission.handlers.PermissionHandler; import fr.xephi.authme.permission.handlers.PermissionHandlerException; @@ -139,8 +138,6 @@ public class PermissionsManager implements Reloadable { return new ZPermissionsHandler(); case VAULT: return new VaultHandler(server); - case B_PERMISSIONS: - return new BPermissionsHandler(); default: throw new IllegalStateException("Unhandled permission type '" + type + "'"); } diff --git a/src/main/java/fr/xephi/authme/permission/PermissionsSystemType.java b/src/main/java/fr/xephi/authme/permission/PermissionsSystemType.java index 0a87d46cf..00f010362 100644 --- a/src/main/java/fr/xephi/authme/permission/PermissionsSystemType.java +++ b/src/main/java/fr/xephi/authme/permission/PermissionsSystemType.java @@ -15,11 +15,6 @@ public enum PermissionsSystemType { */ PERMISSIONS_EX("PermissionsEx", "PermissionsEx"), - /** - * bPermissions. - */ - B_PERMISSIONS("bPermissions", "bPermissions"), - /** * zPermissions. */ diff --git a/src/main/java/fr/xephi/authme/permission/handlers/BPermissionsHandler.java b/src/main/java/fr/xephi/authme/permission/handlers/BPermissionsHandler.java deleted file mode 100644 index ecf167ac0..000000000 --- a/src/main/java/fr/xephi/authme/permission/handlers/BPermissionsHandler.java +++ /dev/null @@ -1,62 +0,0 @@ -package fr.xephi.authme.permission.handlers; - -import de.bananaco.bpermissions.api.ApiLayer; -import de.bananaco.bpermissions.api.CalculableType; -import fr.xephi.authme.permission.PermissionNode; -import fr.xephi.authme.permission.PermissionsSystemType; -import org.bukkit.OfflinePlayer; - -import java.util.Arrays; -import java.util.List; - -/** - * Handler for bPermissions. - * - * @see bPermissions Bukkit page - * @see bPermissions on Github - */ -public class BPermissionsHandler implements PermissionHandler { - - @Override - public boolean addToGroup(OfflinePlayer player, String group) { - ApiLayer.addGroup(null, CalculableType.USER, player.getName(), group); - return true; - } - - @Override - public boolean hasGroupSupport() { - return true; - } - - @Override - public boolean hasPermissionOffline(String name, PermissionNode node) { - return ApiLayer.hasPermission(null, CalculableType.USER, name, node.getNode()); - } - - @Override - public boolean isInGroup(OfflinePlayer player, String group) { - return ApiLayer.hasGroup(null, CalculableType.USER, player.getName(), group); - } - - @Override - public boolean removeFromGroup(OfflinePlayer player, String group) { - ApiLayer.removeGroup(null, CalculableType.USER, player.getName(), group); - return true; - } - - @Override - public boolean setGroup(OfflinePlayer player, String group) { - ApiLayer.setGroup(null, CalculableType.USER, player.getName(), group); - return true; - } - - @Override - public List getGroups(OfflinePlayer player) { - return Arrays.asList(ApiLayer.getGroups(null, CalculableType.USER, player.getName())); - } - - @Override - public PermissionsSystemType getPermissionSystem() { - return PermissionsSystemType.B_PERMISSIONS; - } -} diff --git a/src/test/java/fr/xephi/authme/permission/PermissionsManagerInitializationTest.java b/src/test/java/fr/xephi/authme/permission/PermissionsManagerInitializationTest.java index 8efaa9540..26b29a83f 100644 --- a/src/test/java/fr/xephi/authme/permission/PermissionsManagerInitializationTest.java +++ b/src/test/java/fr/xephi/authme/permission/PermissionsManagerInitializationTest.java @@ -3,7 +3,6 @@ package fr.xephi.authme.permission; import com.google.common.collect.ImmutableMap; import fr.xephi.authme.ReflectionTestUtils; import fr.xephi.authme.TestHelper; -import fr.xephi.authme.permission.handlers.BPermissionsHandler; import fr.xephi.authme.permission.handlers.LuckPermsHandler; import fr.xephi.authme.permission.handlers.PermissionHandler; import fr.xephi.authme.permission.handlers.PermissionsExHandler; @@ -33,7 +32,6 @@ import java.util.Map; import java.util.stream.Collectors; import static com.google.common.collect.Sets.newHashSet; -import static fr.xephi.authme.permission.PermissionsSystemType.B_PERMISSIONS; import static fr.xephi.authme.permission.PermissionsSystemType.LUCK_PERMS; import static fr.xephi.authme.permission.PermissionsSystemType.PERMISSIONS_EX; import static fr.xephi.authme.permission.PermissionsSystemType.VAULT; @@ -147,7 +145,6 @@ public class PermissionsManagerInitializationTest { Map> handlersByPermissionSystemType = ImmutableMap.of( LUCK_PERMS, LuckPermsHandler.class, PERMISSIONS_EX, PermissionsExHandler.class, - B_PERMISSIONS, BPermissionsHandler.class, Z_PERMISSIONS, ZPermissionsHandler.class, VAULT, VaultHandler.class); @@ -175,7 +172,7 @@ public class PermissionsManagerInitializationTest { given(servicesManager.load(ZPermissionsService.class)).willReturn(zPermissionsService); } else if (permissionsSystemType == VAULT) { setUpForVault(); - } else if (permissionsSystemType != B_PERMISSIONS) { + } else { throw new IllegalStateException("Unhandled permission systems type: " + permissionsSystemType); } } diff --git a/src/test/java/tools/helptranslation/HelpTranslationVerifier.java b/src/test/java/tools/helptranslation/HelpTranslationVerifier.java index 9cbf12b5c..f40af5175 100644 --- a/src/test/java/tools/helptranslation/HelpTranslationVerifier.java +++ b/src/test/java/tools/helptranslation/HelpTranslationVerifier.java @@ -1,7 +1,6 @@ package tools.helptranslation; import com.google.common.collect.Sets; -import de.bananaco.bpermissions.imp.YamlConfiguration; import fr.xephi.authme.command.CommandDescription; import fr.xephi.authme.command.CommandInitializer; import fr.xephi.authme.command.CommandUtils; @@ -9,6 +8,7 @@ import fr.xephi.authme.command.help.HelpMessage; import fr.xephi.authme.command.help.HelpSection; import org.bukkit.configuration.MemorySection; import org.bukkit.configuration.file.FileConfiguration; +import org.bukkit.configuration.file.YamlConfiguration; import java.io.File; import java.util.ArrayList; diff --git a/src/test/java/tools/messages/VerifyMessagesTask.java b/src/test/java/tools/messages/VerifyMessagesTask.java index d665ce89a..e60fa0fd8 100644 --- a/src/test/java/tools/messages/VerifyMessagesTask.java +++ b/src/test/java/tools/messages/VerifyMessagesTask.java @@ -1,10 +1,10 @@ package tools.messages; import com.google.common.collect.Multimap; -import de.bananaco.bpermissions.imp.YamlConfiguration; import fr.xephi.authme.message.MessageKey; import fr.xephi.authme.util.StringUtils; import org.bukkit.configuration.file.FileConfiguration; +import org.bukkit.configuration.file.YamlConfiguration; import tools.utils.ToolTask; import tools.utils.ToolsConstants;