From 7deb75ab856250ef84934d578960b4850a313ec8 Mon Sep 17 00:00:00 2001 From: Gabriele C Date: Sun, 4 Sep 2016 13:29:01 +0200 Subject: [PATCH] Deprecate GroupManager handler --- pom.xml | 22 +---- .../authme/permission/PermissionsManager.java | 4 - .../permission/PermissionsSystemType.java | 5 -- .../handlers/GroupManagerHandler.java | 84 ------------------- src/main/resources/plugin.yml | 3 +- 5 files changed, 6 insertions(+), 112 deletions(-) delete mode 100644 src/main/java/fr/xephi/authme/permission/handlers/GroupManagerHandler.java diff --git a/pom.xml b/pom.xml index 0bf0a4fb..0f44e59c 100644 --- a/pom.xml +++ b/pom.xml @@ -515,11 +515,11 @@ - + com.comphenix.protocol - ProtocolLib - 3.6.5-SNAPSHOT + ProtocolLib-API + 4.1.0-SNAPSHOT provided @@ -537,7 +537,7 @@ ru.tehkode PermissionsEx - 1.23.1 + 1.23.4 provided @@ -559,20 +559,6 @@ - - - org.anjocaido - groupmanagerx - 2.2-SNAPSHOT - provided - - - org.bukkit - bukkit - - - - de.bananaco diff --git a/src/main/java/fr/xephi/authme/permission/PermissionsManager.java b/src/main/java/fr/xephi/authme/permission/PermissionsManager.java index 1db9fbfd..c0c6981a 100644 --- a/src/main/java/fr/xephi/authme/permission/PermissionsManager.java +++ b/src/main/java/fr/xephi/authme/permission/PermissionsManager.java @@ -3,7 +3,6 @@ package fr.xephi.authme.permission; import fr.xephi.authme.ConsoleLogger; import fr.xephi.authme.initialization.Reloadable; import fr.xephi.authme.permission.handlers.BPermissionsHandler; -import fr.xephi.authme.permission.handlers.GroupManagerHandler; import fr.xephi.authme.permission.handlers.PermissionHandler; import fr.xephi.authme.permission.handlers.PermissionHandlerException; import fr.xephi.authme.permission.handlers.PermissionsBukkitHandler; @@ -11,7 +10,6 @@ import fr.xephi.authme.permission.handlers.PermissionsExHandler; import fr.xephi.authme.permission.handlers.VaultHandler; import fr.xephi.authme.permission.handlers.ZPermissionsHandler; import fr.xephi.authme.util.StringUtils; -import org.anjocaido.groupmanager.GroupManager; import org.bukkit.OfflinePlayer; import org.bukkit.Server; import org.bukkit.command.CommandSender; @@ -110,8 +108,6 @@ public class PermissionsManager implements Reloadable { switch (type) { case PERMISSIONS_EX: return new PermissionsExHandler(); - case ESSENTIALS_GROUP_MANAGER: - return new GroupManagerHandler((GroupManager) plugin); case Z_PERMISSIONS: return new ZPermissionsHandler(); case VAULT: diff --git a/src/main/java/fr/xephi/authme/permission/PermissionsSystemType.java b/src/main/java/fr/xephi/authme/permission/PermissionsSystemType.java index 88b09d19..1410bc66 100644 --- a/src/main/java/fr/xephi/authme/permission/PermissionsSystemType.java +++ b/src/main/java/fr/xephi/authme/permission/PermissionsSystemType.java @@ -20,11 +20,6 @@ public enum PermissionsSystemType { */ B_PERMISSIONS("bPermissions", "bPermissions"), - /** - * Essentials Group Manager. - */ - ESSENTIALS_GROUP_MANAGER("Essentials Group Manager", "GroupManager"), - /** * zPermissions. */ diff --git a/src/main/java/fr/xephi/authme/permission/handlers/GroupManagerHandler.java b/src/main/java/fr/xephi/authme/permission/handlers/GroupManagerHandler.java deleted file mode 100644 index a952c124..00000000 --- a/src/main/java/fr/xephi/authme/permission/handlers/GroupManagerHandler.java +++ /dev/null @@ -1,84 +0,0 @@ -package fr.xephi.authme.permission.handlers; - -import fr.xephi.authme.permission.PermissionNode; -import fr.xephi.authme.permission.PermissionsSystemType; -import org.anjocaido.groupmanager.GroupManager; -import org.anjocaido.groupmanager.permissions.AnjoPermissionsHandler; -import org.bukkit.Bukkit; -import org.bukkit.entity.Player; - -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; - -public class GroupManagerHandler implements PermissionHandler { - - private GroupManager groupManager; - - public GroupManagerHandler(GroupManager groupManager) { - this.groupManager = groupManager; - } - - @Override - public boolean addToGroup(Player player, String group) { - return Bukkit.dispatchCommand(Bukkit.getConsoleSender(), "manuaddsub " + player.getName() + " " + group); - } - - @Override - public boolean hasGroupSupport() { - return true; - } - - @Override - public boolean hasPermissionOffline(String name, PermissionNode node) { - final AnjoPermissionsHandler handler = groupManager.getWorldsHolder().getWorldPermissionsByPlayerName(name); - if(handler == null) { - return false; - } - - List perms = handler.getAllPlayersPermissions(name); - return perms.contains(node.getNode()); - } - - @Override - public boolean isInGroup(Player player, String group) { - final AnjoPermissionsHandler handler = groupManager.getWorldsHolder().getWorldPermissions(player); - return handler != null && handler.inGroup(player.getName(), group); - } - - @Override - public boolean removeFromGroup(Player player, String group) { - return Bukkit.dispatchCommand(Bukkit.getConsoleSender(), "manudelsub " + player.getName() + " " + group); - } - - @Override - public boolean setGroup(Player player, String group) { - final AnjoPermissionsHandler handler = groupManager.getWorldsHolder().getWorldPermissions(player); - for (String groupName : handler.getGroups(player.getName())) { - removeFromGroup(player, groupName); - } - - return Bukkit.dispatchCommand(Bukkit.getConsoleSender(), "manuadd " + player.getName() + " " + group); - } - - @Override - public List getGroups(Player player) { - final AnjoPermissionsHandler handler = groupManager.getWorldsHolder().getWorldPermissions(player); - if (handler == null) - return new ArrayList<>(); - return Arrays.asList(handler.getGroups(player.getName())); - } - - @Override - public String getPrimaryGroup(Player player) { - final AnjoPermissionsHandler handler = groupManager.getWorldsHolder().getWorldPermissions(player); - if (handler == null) - return null; - return handler.getGroup(player.getName()); - } - - @Override - public PermissionsSystemType getPermissionSystem() { - return PermissionsSystemType.ESSENTIALS_GROUP_MANAGER; - } -} diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml index 769f9fff..f6af6d4c 100644 --- a/src/main/resources/plugin.yml +++ b/src/main/resources/plugin.yml @@ -8,7 +8,8 @@ softdepend: - Vault - PermissionsBukkit - PermissionsEX - - EssentialsGroupManager + - bPermissions + - zPermissions - Multiverse-Core - Essentials - EssentialsSpawn