mirror of https://github.com/MilkBowl/Vault.git
added SimplyPerms support - thanks Xefir
This commit is contained in:
Sleaker
parent
6a04b59866
commit
a3baeb2133
Binary file not shown.
7
pom.xml
7
pom.xml
|
|
@ -202,6 +202,13 @@
|
|||
<scope>system</scope>
|
||||
<systemPath>${project.basedir}/lib/Craftconomy.jar</systemPath>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>net.crystalyx.bukkit.simplyperms</groupId>
|
||||
<artifactId>SimplyPerms</artifactId>
|
||||
<version>1.6.2</version>
|
||||
<scope>system</scope>
|
||||
<systemPath>${project.basedir}/lib/SimplyPerms.jar</systemPath>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
<build>
|
||||
<resources>
|
||||
|
|
|
|||
|
|
@ -55,6 +55,7 @@ import net.milkbowl.vault.permission.plugins.Permission_GroupManager;
|
|||
import net.milkbowl.vault.permission.plugins.Permission_Permissions3;
|
||||
import net.milkbowl.vault.permission.plugins.Permission_PermissionsBukkit;
|
||||
import net.milkbowl.vault.permission.plugins.Permission_PermissionsEx;
|
||||
import net.milkbowl.vault.permission.plugins.Permission_SimplyPerms;
|
||||
import net.milkbowl.vault.permission.plugins.Permission_Starburst;
|
||||
import net.milkbowl.vault.permission.plugins.Permission_SuperPerms;
|
||||
import net.milkbowl.vault.permission.plugins.Permission_bPermissions;
|
||||
|
|
@ -352,6 +353,12 @@ public class Vault extends JavaPlugin {
|
|||
log.info(String.format("[%s][Permission] PermissionsBukkit found: %s", getDescription().getName(), pPerms.isEnabled() ? "Loaded" : "Waiting"));
|
||||
}
|
||||
|
||||
//Try loading SimplyPerms
|
||||
if (packageExists("net.crystalyx.bukkit.simplyperms.SimplyPlugin")) {
|
||||
Permission sPerms = new Permission_SimplyPerms(this);
|
||||
sm.register(Permission.class, sPerms, this, ServicePriority.Highest);
|
||||
log.info(String.format("[%s][Permission] SimplyPerms found: %s", getDescription().getName(), sPerms.isEnabled() ? "Loaded" : "Waiting"));
|
||||
}
|
||||
|
||||
//try loading bPermissions2
|
||||
if (packageExists("de.bananaco.bpermissions.api.WorldManager")) {
|
||||
|
|
|
|||
|
|
@ -0,0 +1,225 @@
|
|||
/* This file is part of Vault.
|
||||
|
||||
Vault is free software: you can redistribute it and/or modify
|
||||
it under the terms of the GNU Lesser General Public License as published by
|
||||
the Free Software Foundation, either version 3 of the License, or
|
||||
(at your option) any later version.
|
||||
|
||||
Vault is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU Lesser General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU Lesser General Public License
|
||||
along with Vault. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
package net.milkbowl.vault.permission.plugins;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
import net.crystalyx.bukkit.simplyperms.SimplyAPI;
|
||||
import net.crystalyx.bukkit.simplyperms.SimplyPlugin;
|
||||
import net.milkbowl.vault.Vault;
|
||||
import net.milkbowl.vault.permission.Permission;
|
||||
|
||||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.event.EventHandler;
|
||||
import org.bukkit.event.EventPriority;
|
||||
import org.bukkit.event.Listener;
|
||||
import org.bukkit.event.server.PluginDisableEvent;
|
||||
import org.bukkit.event.server.PluginEnableEvent;
|
||||
import org.bukkit.plugin.Plugin;
|
||||
|
||||
public class Permission_SimplyPerms extends Permission{
|
||||
|
||||
private final String name = "SimplyPerms";
|
||||
private SimplyAPI perms;
|
||||
|
||||
public Permission_SimplyPerms(Vault plugin) {
|
||||
this.plugin = plugin;
|
||||
Bukkit.getServer().getPluginManager().registerEvents(new PermissionServerListener(this), plugin);
|
||||
// Load service in case it was loaded before
|
||||
if (perms == null) {
|
||||
Plugin perms = plugin.getServer().getPluginManager().getPlugin("SimplyPerms");
|
||||
if (perms != null && perms.isEnabled()) {
|
||||
this.perms = ((SimplyPlugin) perms).getAPI();
|
||||
log.info(String.format("[%s][Permission] %s hooked.", plugin.getDescription().getName(), name));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public class PermissionServerListener implements Listener {
|
||||
Permission_SimplyPerms permission = null;
|
||||
|
||||
public PermissionServerListener(Permission_SimplyPerms permission) {
|
||||
this.permission = permission;
|
||||
}
|
||||
|
||||
@EventHandler(priority = EventPriority.MONITOR)
|
||||
public void onPluginEnable(PluginEnableEvent event) {
|
||||
if (permission.perms == null) {
|
||||
Plugin perms = plugin.getServer().getPluginManager().getPlugin("SimplyPerms");
|
||||
|
||||
if (perms != null) {
|
||||
if (perms.isEnabled()) {
|
||||
permission.perms = ((SimplyPlugin) perms).getAPI();
|
||||
log.info(String.format("[%s][Permission] %s hooked.", plugin.getDescription().getName(), permission.name));
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@EventHandler(priority = EventPriority.MONITOR)
|
||||
public void onPluginDisable(PluginDisableEvent event) {
|
||||
if (permission.perms != null) {
|
||||
if (event.getPlugin().getDescription().getName().equals("SimplyPerms")) {
|
||||
permission.perms = null;
|
||||
log.info(String.format("[%s][Permission] %s un-hooked.", plugin.getDescription().getName(), permission.name));
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getName() {
|
||||
return name;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isEnabled() {
|
||||
return perms != null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean hasSuperPermsCompat() {
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean playerHas(String world, String player, String permission) {
|
||||
permission = permission.toLowerCase();
|
||||
Map<String, Boolean> playerPermissions = this.perms.getPlayerPermissions(player, world);
|
||||
return playerPermissions.containsKey(permission) && playerPermissions.get(permission);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean playerAdd(String world, String player, String permission) {
|
||||
permission = permission.toLowerCase();
|
||||
if (world != null) {
|
||||
this.perms.addPlayerPermission(player, world, permission, true);
|
||||
} else {
|
||||
this.perms.addPlayerPermission(player, permission, true);
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean playerRemove(String world, String player, String permission) {
|
||||
permission = permission.toLowerCase();
|
||||
if (world != null) {
|
||||
this.perms.removePlayerPermission(player, world, permission);
|
||||
} else {
|
||||
this.perms.removePlayerPermission(player, permission);
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean groupHas(String world, String group, String permission) {
|
||||
permission = permission.toLowerCase();
|
||||
Map<String, Boolean> groupPermissions = this.perms.getGroupPermissions(group, world);
|
||||
return groupPermissions.containsKey(permission) && groupPermissions.get(permission);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean groupAdd(String world, String group, String permission) {
|
||||
permission = permission.toLowerCase();
|
||||
if (world != null) {
|
||||
this.perms.addGroupPermission(group, world, permission, true);
|
||||
} else {
|
||||
this.perms.addGroupPermission(group, permission, true);
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean groupRemove(String world, String group, String permission) {
|
||||
permission = permission.toLowerCase();
|
||||
if (world != null) {
|
||||
this.perms.removeGroupPermission(group, world, permission);
|
||||
permission = world + ":" + permission;
|
||||
} else {
|
||||
this.perms.removeGroupPermission(group, permission);
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean playerInGroup(String world, String player, String group) {
|
||||
if (world != null) {
|
||||
for (String g : perms.getPlayerGroups(player)) {
|
||||
if (g.equals(group)) {
|
||||
return perms.getGroupWorlds(group).contains(world);
|
||||
}
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
if (!perms.getAllGroups().contains(group)) {
|
||||
return false;
|
||||
}
|
||||
return perms.getPlayerGroups(player).contains(group);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean playerAddGroup(String world, String player, String group) {
|
||||
group = group.toLowerCase();
|
||||
this.perms.addPlayerGroup(player, group);
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean playerRemoveGroup(String world, String player, String group) {
|
||||
group = group.toLowerCase();
|
||||
this.perms.removePlayerGroup(player, group);
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String[] getPlayerGroups(String world, String player) {
|
||||
List<String> groupList = new ArrayList<String>();
|
||||
if (world != null && perms.isPlayerInDB(player)) {
|
||||
for (String group : perms.getPlayerGroups(player)) {
|
||||
if (perms.getGroupWorlds(group).contains(world)) {
|
||||
groupList.add(group);
|
||||
}
|
||||
}
|
||||
return groupList.toArray(new String[0]);
|
||||
}
|
||||
if (perms.isPlayerInDB(player)) {
|
||||
for (String group : perms.getPlayerGroups(player)) {
|
||||
groupList.add(group);
|
||||
}
|
||||
}
|
||||
return groupList.toArray(new String[0]);
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getPrimaryGroup(String world, String player) {
|
||||
if (!perms.isPlayerInDB(player)) {
|
||||
return null;
|
||||
} else if (perms.getPlayerGroups(player) != null && !perms.getPlayerGroups(player).isEmpty() ) {
|
||||
return perms.getPlayerGroups(player).get(0);
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String[] getGroups() {
|
||||
return perms.getAllGroups().toArray(new String[0]);
|
||||
}
|
||||
|
||||
}
|
||||
Loading…
Reference in New Issue