Remove bPermissions support
This commit is contained in:
@@ -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 + "'");
|
||||
}
|
||||
|
||||
@@ -15,11 +15,6 @@ public enum PermissionsSystemType {
|
||||
*/
|
||||
PERMISSIONS_EX("PermissionsEx", "PermissionsEx"),
|
||||
|
||||
/**
|
||||
* bPermissions.
|
||||
*/
|
||||
B_PERMISSIONS("bPermissions", "bPermissions"),
|
||||
|
||||
/**
|
||||
* zPermissions.
|
||||
*/
|
||||
|
||||
@@ -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 <a href="https://dev.bukkit.org/projects/bpermissions">bPermissions Bukkit page</a>
|
||||
* @see <a href="https://github.com/rymate1234/bPermissions/">bPermissions on Github</a>
|
||||
*/
|
||||
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<String> getGroups(OfflinePlayer player) {
|
||||
return Arrays.asList(ApiLayer.getGroups(null, CalculableType.USER, player.getName()));
|
||||
}
|
||||
|
||||
@Override
|
||||
public PermissionsSystemType getPermissionSystem() {
|
||||
return PermissionsSystemType.B_PERMISSIONS;
|
||||
}
|
||||
}
|
||||
@@ -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<PermissionsSystemType, Class<?>> 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);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user