bPerms 2.6.x support, blech.

This commit is contained in:
Sleaker 2012-01-11 12:11:25 -08:00
parent 684822c0ef
commit a1fd8e0161
3 changed files with 232 additions and 7 deletions

BIN
lib/bpermissions2.jar Normal file

Binary file not shown.

View File

@ -54,6 +54,7 @@ import net.milkbowl.vault.permission.plugins.Permission_PermissionsBukkit;
import net.milkbowl.vault.permission.plugins.Permission_PermissionsEx;
import net.milkbowl.vault.permission.plugins.Permission_SuperPerms;
import net.milkbowl.vault.permission.plugins.Permission_bPermissions;
import net.milkbowl.vault.permission.plugins.Permission_bPermissions2;
import net.milkbowl.vault.permission.plugins.Permission_zPermissions;
import org.bukkit.command.Command;
@ -133,24 +134,24 @@ public class Vault extends JavaPlugin {
// Try to load PermissionsEx
if (packageExists(new String[] { "ru.tehkode.permissions.bukkit.PermissionsEx" })) {
Chat eChat = new Chat_PermissionsEx(this, perms);
sm.register(Chat.class, eChat, this, ServicePriority.High);
sm.register(Chat.class, eChat, this, ServicePriority.Highest);
log.info(String.format("[%s][Chat] PermissionsEx found: %s", getDescription().getName(), eChat.isEnabled() ? "Loaded" : "Waiting"));
}
//Try loading mChat
if (packageExists(new String[] {"net.D3GN.MiracleM4n.mChat"} )) {
Chat mChat = new Chat_mChat(this, perms);
sm.register(Chat.class, mChat, this, ServicePriority.High);
sm.register(Chat.class, mChat, this, ServicePriority.Highest);
log.info(String.format("[%s][Chat] mChat found: %s", getDescription().getName(), mChat.isEnabled() ? "Loaded" : "Waiting"));
}
//try loading bPermissions
if (packageExists(new String[] {"de.bananaco.permissions.worlds.WorldPermissionsManager"})) {
if (packageExists(new String[] {"de.bananaco.permissions.info.InfoReader"})) {
Chat bPerms = new Chat_bPermissions(this, perms);
sm.register(Chat.class, bPerms, this, ServicePriority.Normal);
log.info(String.format("[%s][Chat] bPermissions found: %s", getDescription().getName(), bPerms.isEnabled() ? "Loaded" : "Waiting"));
}
// Try to load GroupManager
if (packageExists(new String[] { "org.anjocaido.groupmanager.GroupManager" })) {
Chat gPerms = new Chat_GroupManager(this, perms);
@ -293,9 +294,16 @@ public class Vault extends JavaPlugin {
sm.register(Permission.class, pPerms, this, ServicePriority.Highest);
log.info(String.format("[%s][Permission] PermissionsBukkit found: %s", getDescription().getName(), pPerms.isEnabled() ? "Loaded" : "Waiting"));
}
//try loading bPermissions2
if (packageExists(new String[] {"de.bananaco.bpermissions.api.WorldManager"})) {
Permission bPerms = new Permission_bPermissions2(this);
sm.register(Permission.class, bPerms, this, ServicePriority.Highest);
log.info(String.format("[%s][Chat] bPermissions found: %s", getDescription().getName(), bPerms.isEnabled() ? "Loaded" : "Waiting"));
}
//Try to load bPermissions
if (packageExists(new String[] {"de.bananaco.permissions.worlds.WorldPermissionsManager"} )) {
if (packageExists(new String[] {"de.bananaco.permissions.SuperPermissionHandler"})) {
Permission bPerms = new Permission_bPermissions(this);
sm.register(Permission.class, bPerms, this, ServicePriority.Highest);
log.info(String.format("[%s][Permission] bPermissions found: %s", getDescription().getName(), bPerms.isEnabled() ? "Loaded" : "Waiting"));

View File

@ -0,0 +1,217 @@
package net.milkbowl.vault.permission.plugins;
import org.bukkit.event.Event.Priority;
import org.bukkit.event.Event.Type;
import org.bukkit.event.server.PluginDisableEvent;
import org.bukkit.event.server.PluginEnableEvent;
import org.bukkit.event.server.ServerListener;
import org.bukkit.plugin.Plugin;
import de.bananaco.bpermissions.api.Group;
import de.bananaco.bpermissions.api.User;
import de.bananaco.bpermissions.api.World;
import de.bananaco.bpermissions.api.WorldManager;
import net.milkbowl.vault.Vault;
import net.milkbowl.vault.permission.Permission;
public class Permission_bPermissions2 extends Permission {
private String name = "bPermissions2";
private WorldManager perms;
private PermissionServerListener permissionServerListener = null;
public Permission_bPermissions2(Vault plugin) {
this.plugin = plugin;
permissionServerListener = new PermissionServerListener();
this.plugin.getServer().getPluginManager().registerEvent(Type.PLUGIN_ENABLE, permissionServerListener, Priority.Monitor, plugin);
this.plugin.getServer().getPluginManager().registerEvent(Type.PLUGIN_DISABLE, permissionServerListener, Priority.Monitor, plugin);
// Load Plugin in case it was loaded before
if (perms == null) {
Plugin p = plugin.getServer().getPluginManager().getPlugin("bPermissions");
if (p != null) {
perms = WorldManager.getInstance();
log.info(String.format("[%s][Permission] %s hooked.", plugin.getDescription().getName(), name));
}
}
}
private class PermissionServerListener extends ServerListener {
public void onPluginEnable(PluginEnableEvent event) {
if (perms == null) {
Plugin p = event.getPlugin();
if(p.getDescription().getName().equals("bPermissions") && p.isEnabled()) {
perms = WorldManager.getInstance();
log.info(String.format("[%s][Permission] %s hooked.", plugin.getDescription().getName(), name));
}
}
}
public void onPluginDisable(PluginDisableEvent event) {
if (perms != null) {
if (event.getPlugin().getDescription().getName().equals("bPermissions")) {
perms = null;
log.info(String.format("[%s][Permission] %s un-hooked.", plugin.getDescription().getName(), name));
}
}
}
}
@Override
public String getName() {
return name;
}
@Override
public boolean isEnabled() {
return this.perms != null;
}
@Override
public boolean playerHas(String world, String player, String permission) {
World w = perms.getWorld(world);
if (w == null) {
return false;
}
User user = w.getUser(player);
return user == null ? false : user.hasPermission(permission);
}
@Override
public boolean playerAdd(String world, String player, String permission) {
World w = perms.getWorld(world);
if (w == null) {
return false;
}
User user = w.getUser(player);
if (user == null) {
return false;
}
user.addPermission(permission, true);
return true;
}
@Override
public boolean playerRemove(String world, String player, String permission) {
World w = perms.getWorld(world);
if (w == null) {
return false;
}
User user = w.getUser(player);
if (user == null) {
return false;
}
user.removePermission(permission);
return true;
}
// use superclass implementation of playerAddTransient() and playerRemoveTransient()
@Override
public boolean groupHas(String world, String group, String permission) {
World w = perms.getWorld(world);
if (w == null) {
return false;
}
Group g = w.getGroup(group);
return g != null ? g.getPermissionsAsString().contains(permission) : false;
}
@Override
public boolean groupAdd(String world, String group, String permission) {
World w = perms.getWorld(world);
if (w == null) {
return false;
}
Group g = w.getGroup(group);
if (g == null) {
return false;
}
g.addPermission(permission, true);
return true;
}
@Override
public boolean groupRemove(String world, String group, String permission) {
World w = perms.getWorld(world);
if (w == null) {
return false;
}
Group g = w.getGroup(group);
if (g == null) {
return false;
}
g.removePermission(permission);
return true;
}
@Override
public boolean playerInGroup(String world, String player, String group) {
World w = perms.getWorld(world);
if (w == null) {
return false;
}
User user = w.getUser(player);
return user != null ? user.getGroupsAsString().contains(group) : false;
}
@Override
public boolean playerAddGroup(String world, String player, String group) {
World w = perms.getWorld(world);
if (w == null) {
return false;
}
User user = w.getUser(player);
if (user == null) {
return false;
}
user.addGroup(group);
return true;
}
@Override
public boolean playerRemoveGroup(String world, String player, String group) {
World w = perms.getWorld(world);
if (w == null) {
return false;
}
User user = w.getUser(player);
if (user == null) {
return false;
}
user.removeGroup(group);
return true;
}
@Override
public String[] getPlayerGroups(String world, String player) {
World w = perms.getWorld(world);
if (w == null) {
return null;
}
User user = w.getUser(player);
return user != null ? user.getGroupsAsString().toArray(new String[0]) : null;
}
@Override
public String getPrimaryGroup(String world, String player) {
String[] groups = getPlayerGroups(world, player);
return groups != null ? groups[0] : null;
}
@Override
public String[] getGroups() {
throw new UnsupportedOperationException("bPermissions does not support server-wide groups");
}
@Override
public boolean hasSuperPermsCompat() {
return true;
}
}