diff --git a/pom.xml b/pom.xml index e92495db..1cead950 100644 --- a/pom.xml +++ b/pom.xml @@ -439,10 +439,15 @@ de.bananaco - bpermissions - 1.12-DEV - system - ${basedir}/lib/bPermissions-2.12-DEV.jar + bPermissions + 2.12-DEV + provided + + + org.bukkit + bukkit + + @@ -450,17 +455,33 @@ org.tyrannyofheaven.bukkit zPermissions 1.3-SNAPSHOT - system - ${basedir}/lib/zPermissions-1.3beta1.jar - - - - - com.nijiko - permissions - 3.1.6 - system - ${basedir}/lib/Permission-3.1.6.jar + provided + + + org.bukkit + bukkit + + + com.sk89q + worldguard + + + com.sk89q + worldedit + + + VaultAPI + net.milkbowl.vault + + + uuidprovider + net.kaikk.mc + + + ToHPluginUtils + org.tyrannyofheaven.bukkit + + @@ -692,6 +713,12 @@ test 2.0.5-beta true + + + hamcrest-core + org.hamcrest + + diff --git a/src/main/java/fr/xephi/authme/command/executable/authme/ResetNameCommand.java b/src/main/java/fr/xephi/authme/command/executable/authme/ResetNameCommand.java index 0029104f..dc884997 100644 --- a/src/main/java/fr/xephi/authme/command/executable/authme/ResetNameCommand.java +++ b/src/main/java/fr/xephi/authme/command/executable/authme/ResetNameCommand.java @@ -4,7 +4,6 @@ import fr.xephi.authme.AuthMe; import fr.xephi.authme.cache.auth.PlayerAuth; import fr.xephi.authme.command.CommandParts; import fr.xephi.authme.command.ExecutableCommand; -import org.bukkit.Bukkit; import org.bukkit.command.CommandSender; import java.util.List; diff --git a/src/main/java/fr/xephi/authme/command/executable/authme/UnregisterAdminCommand.java b/src/main/java/fr/xephi/authme/command/executable/authme/UnregisterAdminCommand.java index 46625aa1..5615061f 100644 --- a/src/main/java/fr/xephi/authme/command/executable/authme/UnregisterAdminCommand.java +++ b/src/main/java/fr/xephi/authme/command/executable/authme/UnregisterAdminCommand.java @@ -12,7 +12,6 @@ import fr.xephi.authme.settings.Settings; import fr.xephi.authme.task.MessageTask; import fr.xephi.authme.task.TimeoutTask; import fr.xephi.authme.util.Utils; -import org.bukkit.Bukkit; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; import org.bukkit.potion.PotionEffect; diff --git a/src/main/java/fr/xephi/authme/hooks/BungeeCordMessage.java b/src/main/java/fr/xephi/authme/hooks/BungeeCordMessage.java index f8a1b8d5..5b19348b 100644 --- a/src/main/java/fr/xephi/authme/hooks/BungeeCordMessage.java +++ b/src/main/java/fr/xephi/authme/hooks/BungeeCordMessage.java @@ -6,7 +6,6 @@ import fr.xephi.authme.AuthMe; import fr.xephi.authme.ConsoleLogger; import fr.xephi.authme.cache.auth.PlayerAuth; import fr.xephi.authme.cache.auth.PlayerCache; -import fr.xephi.authme.datasource.CacheDataSource; import org.bukkit.entity.Player; import org.bukkit.plugin.messaging.PluginMessageListener; diff --git a/src/main/java/fr/xephi/authme/permission/PermissionsManager.java b/src/main/java/fr/xephi/authme/permission/PermissionsManager.java index 63d755e8..a70230c1 100644 --- a/src/main/java/fr/xephi/authme/permission/PermissionsManager.java +++ b/src/main/java/fr/xephi/authme/permission/PermissionsManager.java @@ -1,8 +1,5 @@ package fr.xephi.authme.permission; -import com.nijiko.permissions.Group; -import com.nijiko.permissions.PermissionHandler; -import com.nijikokun.bukkit.Permissions.Permissions; import de.bananaco.bpermissions.api.ApiLayer; import de.bananaco.bpermissions.api.CalculableType; import fr.xephi.authme.command.CommandDescription; @@ -67,10 +64,6 @@ public class PermissionsManager implements PermissionsService { * Essentials group manager instance. */ private GroupManager groupManagerPerms; - /** - * Permissions manager instance for the legacy permissions system. - */ - private PermissionHandler defaultPerms; /** * zPermissions service instance. */ @@ -213,20 +206,6 @@ public class PermissionsManager implements PermissionsService { System.out.println("[" + plugin.getName() + "] Error while hooking into Vault Permissions!"); } - // Permissions, check if it's available - try { - Plugin testPerms = pm.getPlugin("Permissions"); - if (testPerms != null) { - permsType = PermissionsSystemType.PERMISSIONS; - this.defaultPerms = ((Permissions) testPerms).getHandler(); - System.out.println("[" + plugin.getName() + "] Hooked into Permissions!"); - return PermissionsSystemType.PERMISSIONS; - } - } catch (Exception ex) { - // An error occurred, show a warning message - System.out.println("[" + plugin.getName() + "] Error while hooking into Permissions!"); - } - // No recognized permissions system found permsType = PermissionsSystemType.NONE; System.out.println("[" + plugin.getName() + "] No supported permissions system found! Permissions disabled!"); @@ -398,10 +377,6 @@ public class PermissionsManager implements PermissionsService { // Vault return vaultPerms.has(player, permsNode); - case PERMISSIONS: - // Permissions - return this.defaultPerms.has(player, permsNode); - case NONE: // Not hooked into any permissions system, return default return def; @@ -493,18 +468,6 @@ public class PermissionsManager implements PermissionsService { // Vault return Arrays.asList(vaultPerms.getPlayerGroups(player)); - case PERMISSIONS: - // Permissions - // Create a list to put the groups in - List groups = new ArrayList<>(); - - // Get the groups and add each to the list - for (Group group : this.defaultPerms.getGroups(player.getName())) - groups.add(group.getName()); - - // Return the groups - return groups; - case NONE: // Not hooked into any permissions system, return an empty list return new ArrayList<>(); @@ -612,10 +575,6 @@ public class PermissionsManager implements PermissionsService { // Vault return vaultPerms.playerInGroup(player, groupName); - case PERMISSIONS: - // Permissions - return this.defaultPerms.inGroup(player.getWorld().getName(), player.getName(), groupName); - case NONE: // Not hooked into any permissions system, return an empty list return false;