Clean permission/group providers

This commit is contained in:
Gabriele C
2015-12-18 17:10:57 +01:00
parent dcc365c22f
commit 7e6abf0441
5 changed files with 42 additions and 59 deletions
@@ -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;
@@ -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;
@@ -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;
@@ -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<String> 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;