Upstream/VaultAPI
1
0
Fork 0
mirror of https://github.com/MilkBowl/VaultAPI.git synced 2024-11-22 18:35:17 +01:00
Code Issues Projects Releases Wiki Activity

Finish fixing up OfflinePlayer methods. Version increase as API changed

Browse Source 
again.
This commit is contained in:
Nick Minkler 2014-05-17 10:24:39 -07:00
parent c9087719d6
commit 7684863231
3 changed files with 363 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>net.milkbowl.vault</groupId>
<artifactId>VaultAPI</artifactId>
<version>1.3.01</version>
<version>1.3.02</version>
<name>VaultAPI</name>
<url>http://dev.bukkit.org/server-mods/vault/</url>

301
src/main/java/net/milkbowl/vault/chat/Chat.java
View File

@ -17,6 +17,7 @@ package net.milkbowl.vault.chat;
import net.milkbowl.vault.permission.Permission;
import org.bukkit.OfflinePlayer;
import org.bukkit.World;
import org.bukkit.entity.Player;
@ -44,111 +45,187 @@ public abstract class Chat {
abstract public boolean isEnabled();
/**
* @deprecated As of Vault 1.3.01 use {{@link #getPlayerPrefix(String, OfflinePlayer)} instead.
*
* Get players prefix
* @param world World name
* @param player Player name
* @return Prefix
*/
@Deprecated
abstract public String getPlayerPrefix(String world, String player);
/**
* Get a players prefix in the given world
* Use NULL for world if requesting a global prefix
*
* @param world World name
* @param player OfflinePlayer
* @return Prefix
*/
public String getPlayerPrefix(String world, OfflinePlayer player) {
return getPlayerPrefix(world, player.getName());
}
/**
* @deprecated As of Vault 1.3.01 use {{@link #getPlayerPrefix(String, OfflinePlayer)} instead.
*
* Get players prefix
* @param world World Object
* @param player Player name
* @return Prefix
*/
@Deprecated
public String getPlayerPrefix(World world, String player) {
return getPlayerPrefix(world.getName(), player);
}
/**
* Get players prefix
* Get players prefix from the world they are currently in.
* May or may not return the global prefix depending on implementation.
*
* @param player Player Object
* @return Prefix
*/
public String getPlayerPrefix(Player player) {
return getPlayerPrefix(player.getWorld().getName(), player.getName());
return getPlayerPrefix(player.getWorld().getName(), player);
}
/**
* @deprecated As of Vault 1.3.01 use {{@link #setPlayerPrefix(String, OfflinePlayer, String)} instead.
*
* Set players prefix
* @param world World name
* @param player Player name
* @param prefix Prefix
*/
@Deprecated
abstract public void setPlayerPrefix(String world, String player, String prefix);
/**
* Set players prefix
* Sets players prefix in the given world.
* Use NULL for world for setting in the Global scope.
*
* @param world World name
* @param player OfflinePlayer
* @param prefix Prefix
*/
public void setPlayerPrefix(String world, OfflinePlayer player, String prefix) {
setPlayerPrefix(world, player.getName(), prefix);
}
/**
* @deprecated As of Vault 1.3.01 use {{@link #setPlayerPrefix(String, OfflinePlayer, String)} instead.
*
* Set players prefix in the given world.
*
* @param world World Object
* @param player Player name
* @param prefix Prefix
*/
@Deprecated
public void setPlayerPrefix(World world, String player, String prefix) {
setPlayerPrefix(world.getName(), player, prefix);
}
/**
* Set players prefix
* Set players prefix in the world they are currently in.
*
* @param player Player Object
* @param prefix Prefix
*/
public void setPlayerPrefix(Player player, String prefix) {
setPlayerPrefix(player.getWorld().getName(), player.getName(), prefix);
setPlayerPrefix(player.getWorld().getName(), player, prefix);
}
/**
* @deprecated As of Vault 1.3.01 use {{@link #getPlayerSuffix(String, OfflinePlayer)} instead.
*
* Get players suffix
* @param world World name
* @param player Player name
* @return Suffix
*/
@Deprecated
abstract public String getPlayerSuffix(String world, String player);
/**
* Get players suffix in the specified world.
*
* @param world World name
* @param player OfflinePlayer name
* @return Suffix
*/
public String getPlayerSuffix(String world, OfflinePlayer player) {
return getPlayerSuffix(world, player.getName());
}
/**
* @deprecated As of Vault 1.3.01 use {{@link #getPlayerSuffix(String, OfflinePlayer)} instead.
*
* Get players suffix
* @param world World Object
* @param player Player name
* @return Suffix
*/
@Deprecated
public String getPlayerSuffix(World world, String player) {
return getPlayerSuffix(world.getName(), player);
}
/**
* Get players suffix
* Get players suffix in the world they are currently in.
*
* @param player Player Object
* @return Suffix
*/
public String getPlayerSuffix(Player player) {
return getPlayerSuffix(player.getWorld().getName(), player.getName());
return getPlayerSuffix(player.getWorld().getName(), player);
}
/**
* @deprecated As of Vault 1.3.01 use {{@link #setPlayerSuffix(String, OfflinePlayer, String)} instead.
*
* Set players suffix
* @param world World name
* @param player Player name
* @param suffix Suffix
*/
@Deprecated
abstract public void setPlayerSuffix(String world, String player, String suffix);
/**
* Set players suffix for the world specified
*
* @param world World name
* @param player OfflinePlayer
* @param suffix Suffix
*/
public void setPlayerSuffix(String world, OfflinePlayer player, String suffix) {
setPlayerSuffix(world, player.getName(), suffix);
}
/**
* @deprecated As of Vault 1.3.01 use {{@link #setPlayerSuffix(String, OfflinePlayer, String)} instead.
*
* Set players suffix
* @param world World Object
* @param player Player name
* @param suffix Suffix
*/
@Deprecated
public void setPlayerSuffix(World world, String player, String suffix) {
setPlayerSuffix(world.getName(), player, suffix);
}
/**
* Set players suffix
* Set players suffix in the world they currently occupy.
*
* @param player Player Object
* @param suffix Suffix
*/
public void setPlayerSuffix(Player player, String suffix) {
setPlayerSuffix(player.getWorld().getName(), player.getName(), suffix);
setPlayerSuffix(player.getWorld().getName(), player, suffix);
}
/**
@ -222,17 +299,34 @@ public abstract class Chat {
public void setGroupSuffix(World world, String group, String suffix) {
setGroupSuffix(world.getName(), group, suffix);
}
/**
* Get a players informational node (Integer) value
* @param world World name
* @param player OfflinePlayer
* @param node Permission node
* @param defaultValue Default value
* @return Value
*/
public int getPlayerInfoInteger(String world, OfflinePlayer player, String node, int defaultValue) {
return getPlayerInfoInteger(world, player.getName(), node, defaultValue);
}
/**
* @deprecated As of Vault 1.3.01 use {{@link #getPlayerInfoInteger(String, OfflinePlayer, String, int)} instead.
* Get a players informational node (Integer) value
* @param world World name
* @param player Player name
* @param node Permission node
* @param defaultValue Default value
* @return Value
*/
@Deprecated
abstract public int getPlayerInfoInteger(String world, String player, String node, int defaultValue);
/**
* @deprecated As of Vault 1.3.01 use {{@link #getPlayerInfoInteger(String, OfflinePlayer, String, int)} instead.
*
* Get a players informational node (Integer) value
* @param world World Object
* @param player Player name
@ -240,6 +334,7 @@ public abstract class Chat {
* @param defaultValue Default value
* @return Value
*/
@Deprecated
public int getPlayerInfoInteger(World world, String player, String node, int defaultValue) {
return getPlayerInfoInteger(world.getName(), player, node, defaultValue);
}
@ -252,25 +347,42 @@ public abstract class Chat {
* @return Value
*/
public int getPlayerInfoInteger(Player player, String node, int defaultValue) {
return getPlayerInfoInteger(player.getWorld().getName(), player.getName(), node, defaultValue);
return getPlayerInfoInteger(player.getWorld().getName(), player, node, defaultValue);
}
/**
* Set a players informational node (Integer) value
* @param world World name
* @param player OfflinePlayer
* @param node Permission node
* @param value Value to set
*/
public void setPlayerInfoInteger(String world, OfflinePlayer player, String node, int value) {
setPlayerInfoInteger(world, player.getName(), node, value);
}
/**
* @deprecated As of Vault 1.3.01 use {{@link #setPlayerInfoInteger(String, OfflinePlayer, String, int)} instead.
*
* Set a players informational node (Integer) value
* @param world World name
* @param player Player name
* @param node Permission node
* @param value Value to set
*/
@Deprecated
abstract public void setPlayerInfoInteger(String world, String player, String node, int value);
/**
* @deprecated As of Vault 1.3.01 use {{@link #setPlayerInfoInteger(String, OfflinePlayer, String, int)} instead.
*
* Set a players informational node (Integer) value
* @param world World Object
* @param player Player name
* @param node Permission node
* @param value Value to set
*/
@Deprecated
public void setPlayerInfoInteger(World world, String player, String node, int value) {
setPlayerInfoInteger(world.getName(), player, node, value);
}
@ -282,7 +394,7 @@ public abstract class Chat {
* @param value Value to set
*/
public void setPlayerInfoInteger(Player player, String node, int value) {
setPlayerInfoInteger(player.getWorld().getName(), player.getName(), node, value);
setPlayerInfoInteger(player.getWorld().getName(), player, node, value);
}
/**
@ -330,14 +442,31 @@ public abstract class Chat {
/**
* Get a players informational node (Double) value
* @param world World name
* @param player Group name
* @param player OfflinePlayer
* @param node Permission node
* @param defaultValue Default value
* @return Value
*/
public double getPlayerInfoDouble(String world, OfflinePlayer player, String node, double defaultValue) {
return getPlayerInfoDouble(world, player.getName(), node, defaultValue);
}
/**
* @deprecated As of Vault 1.3.01 use {{@link #getPlayerInfoDouble(String, OfflinePlayer, String, double)} instead.
*
* Get a players informational node (Double) value
* @param world World name
* @param player Player name
* @param node Permission node
* @param defaultValue Default value
* @return Value
*/
@Deprecated
abstract public double getPlayerInfoDouble(String world, String player, String node, double defaultValue);
/**
* @deprecated As of Vault 1.3.01 use {{@link #getPlayerInfoDouble(String, OfflinePlayer, String, double)} instead
*
* Get a players informational node (Double) value
* @param world World Object
* @param player Player name
@ -345,6 +474,7 @@ public abstract class Chat {
* @param defaultValue Default value
* @return Value
*/
@Deprecated
public double getPlayerInfoDouble(World world, String player, String node, double defaultValue) {
return getPlayerInfoDouble(world.getName(), player, node, defaultValue);
}
@ -357,25 +487,40 @@ public abstract class Chat {
* @return Value
*/
public double getPlayerInfoDouble(Player player, String node, double defaultValue) {
return getPlayerInfoDouble(player.getWorld().getName(), player.getName(), node, defaultValue);
return getPlayerInfoDouble(player.getWorld().getName(), player, node, defaultValue);
}
/**
* Set a players informational node (Double) value
* @param world World name
* @param player Group name
* @param player OfflinePlayer
* @param node Permission node
* @param value Value to set
*/
public void setPlayerInfoDouble(String world, OfflinePlayer player, String node, double value) {
setPlayerInfoDouble(world, player.getName(), node, value);
}
/**
* @deprecated As of Vault 1.3.01 use {{@link #setPlayerInfoDouble(String, OfflinePlayer, String, double)} instead.
* Set a players informational node (Double) value
* @param world World name
* @param player Player name
* @param node Permission node
* @param value Value to set
*/
@Deprecated
abstract public void setPlayerInfoDouble(String world, String player, String node, double value);
/**
* @deprecated As of Vault 1.3.01 use {{@link #setPlayerInfoDouble(String, OfflinePlayer, String, double)} instead.
* Set a players informational node (Double) value
* @param world World Object
* @param player Player name
* @param node Permission node
* @param value Value to set
*/
@Deprecated
public void setPlayerInfoDouble(World world, String player, String node, double value) {
setPlayerInfoDouble(world.getName(), player, node, value);
}
@ -387,7 +532,7 @@ public abstract class Chat {
* @param value Value to set
*/
public void setPlayerInfoDouble(Player player, String node, double value) {
setPlayerInfoDouble(player.getWorld().getName(), player.getName(), node, value);
setPlayerInfoDouble(player.getWorld().getName(), player, node, value);
}
/**
@ -433,6 +578,20 @@ public abstract class Chat {
}
/**
* Get a players informational node (Boolean) value
* @param world World name
* @param player OfflinePlayer
* @param node Permission node
* @param defaultValue Default value
* @return Value
*/
public boolean getPlayerInfoBoolean(String world, OfflinePlayer player, String node, boolean defaultValue) {
return getPlayerInfoBoolean(world, player.getName(), node, defaultValue);
}
/**
* @deprecated As of Vault 1.3.01 use {{@link #getPlayerInfoBoolean(String, OfflinePlayer, String, boolean)} instead.
*
* Get a players informational node (Boolean) value
* @param world World name
* @param player Player name
@ -440,9 +599,12 @@ public abstract class Chat {
* @param defaultValue Default value
* @return Value
*/
@Deprecated
abstract public boolean getPlayerInfoBoolean(String world, String player, String node, boolean defaultValue);
/**
* @deprecated As of Vault 1.3.01 use {{@link #getPlayerInfoBoolean(String, OfflinePlayer, String, boolean)} instead.
*
* Get a players informational node (Boolean) value
* @param world World Object
* @param player Player name
@ -450,6 +612,7 @@ public abstract class Chat {
* @param defaultValue Default value
* @return Value
*/
@Deprecated
public boolean getPlayerInfoBoolean(World world, String player, String node, boolean defaultValue) {
return getPlayerInfoBoolean(world.getName(), player, node, defaultValue);
}
@ -462,25 +625,40 @@ public abstract class Chat {
* @return Value
*/
public boolean getPlayerInfoBoolean(Player player, String node, boolean defaultValue) {
return getPlayerInfoBoolean(player.getWorld().getName(), player.getName(), node, defaultValue);
return getPlayerInfoBoolean(player.getWorld().getName(), player, node, defaultValue);
}
/**
* Set a players informational node (Boolean) value
* @param world World name
* @param player OfflinePlayer
* @param node Permission node
* @param value Value to set
*/
public void setPlayerInfoBoolean(String world, OfflinePlayer player, String node, boolean value) {
setPlayerInfoBoolean(world, player.getName(), node, value);
}
/**
* @deprecated As of Vault 1.3.01 use {{@link #setPlayerInfoBoolean(String, OfflinePlayer, String, boolean)} instead.
* Set a players informational node (Boolean) value
* @param world World name
* @param player Player name
* @param node Permission node
* @param value Value to set
*/
@Deprecated
abstract public void setPlayerInfoBoolean(String world, String player, String node, boolean value);
/**
* @deprecated As of Vault 1.3.01 use {{@link #setPlayerInfoBoolean(String, OfflinePlayer, String, boolean)} instead.
* Set a players informational node (Boolean) value
* @param world World Object
* @param player Player name
* @param node Permission node
* @param value Value to set
*/
@Deprecated
public void setPlayerInfoBoolean(World world, String player, String node, boolean value) {
setPlayerInfoBoolean(world.getName(), player, node, value);
}
@ -492,7 +670,7 @@ public abstract class Chat {
* @param value Value to set
*/
public void setPlayerInfoBoolean(Player player, String node, boolean value) {
setPlayerInfoBoolean(player.getWorld().getName(), player.getName(), node, value);
setPlayerInfoBoolean(player.getWorld().getName(), player, node, value);
}
/**
@ -538,6 +716,20 @@ public abstract class Chat {
}
/**
* Get a players informational node (String) value
* @param world World name
* @param player OfflinePlayer
* @param node Permission node
* @param defaultValue Default value
* @return Value
*/
public String getPlayerInfoString(String world, OfflinePlayer player, String node, String defaultValue) {
return getPlayerInfoString(world, player.getName(), node, defaultValue);
}
/**
* @deprecated As of Vault 1.3.01 use {{@link #getPlayerInfoString(String, OfflinePlayer, String, String)} instead.
*
* Get a players informational node (String) value
* @param world World name
* @param player Player name
@ -545,9 +737,11 @@ public abstract class Chat {
* @param defaultValue Default value
* @return Value
*/
@Deprecated
abstract public String getPlayerInfoString(String world, String player, String node, String defaultValue);
/**
* @deprecated As of Vault 1.3.01 use {{@link #getPlayerInfoString(String, OfflinePlayer, String, String)} instead.
* Get a players informational node (String) value
* @param world World Object
* @param player Player name
@ -555,6 +749,7 @@ public abstract class Chat {
* @param defaultValue Default value
* @return Value
*/
@Deprecated
public String getPlayerInfoString(World world, String player, String node, String defaultValue) {
return getPlayerInfoString(world.getName(), player, node, defaultValue);
}
@ -567,25 +762,40 @@ public abstract class Chat {
* @return Value
*/
public String getPlayerInfoString(Player player, String node, String defaultValue) {
return getPlayerInfoString(player.getWorld().getName(), player.getName(), node, defaultValue);
return getPlayerInfoString(player.getWorld().getName(), player, node, defaultValue);
}
/**
* Set a players informational node (String) value
* @param world World name
* @param player Player name
* @param player OfflinePlayer
* @param node Permission node
* @param value Value to set
*/
abstract public void setPlayerInfoString(String world, String player, String node, String value);
public void setPlayerInfoString(String world, OfflinePlayer player, String node, String value) {
setPlayerInfoString(world, player.getName(), node, value);
}
/**
* @deprecated As of Vault 1.3.01 use {{@link #setPlayerInfoString(String, OfflinePlayer, String, String)} instead.
* Set a players informational node (String) value
* @param world World name
* @param player Player name
* @param node Permission node
* @param value Value to set
*/
@Deprecated
abstract public void setPlayerInfoString(String world, String player, String node, String value);
/**
* @deprecated As of Vault 1.3.01 use {{@link #setPlayerInfoString(String, OfflinePlayer, String, String)} instead.
* Set a players informational node (String) value
* @param world World name
* @param player Player name
* @param node Permission node
* @param value Value to set
*/
@Deprecated
public void setPlayerInfoString(World world, String player, String node, String value) {
setPlayerInfoString(world.getName(), player, node, value);
}
@ -597,7 +807,7 @@ public abstract class Chat {
* @param value Value ot set
*/
public void setPlayerInfoString(Player player, String node, String value) {
setPlayerInfoString(player.getWorld().getName(), player.getName(), node, value);
setPlayerInfoString(player.getWorld().getName(), player, node, value);
}
/**
@ -643,23 +853,38 @@ public abstract class Chat {
}
/**
* Check if player is member of a group.
* @param world World name
* @param player OfflinePlayer
* @param group Group name
* @return Success or Failure
*/
public boolean playerInGroup(String world, OfflinePlayer player, String group) {
return perms.playerInGroup(world, player, group);
}
/**
* @deprecated As of Vault 1.3.01 use {{@link #playerInGroup(String, OfflinePlayer, String)} instead.
* Check if player is member of a group.
* @param world World name
* @param player Player name
* @param group Group name
* @return Success or Failure
*/
@Deprecated
public boolean playerInGroup(String world, String player, String group) {
return perms.playerInGroup(world, player, group);
}
/**
* @deprecated As of Vault 1.3.01 use {{@link #playerInGroup(String, OfflinePlayer, String)} instead.
* Check if player is member of a group.
* @param world World Object
* @param player Player name
* @param group Group name
* @return Success or Failure
*/
@Deprecated
public boolean playerInGroup(World world, String player, String group) {
return playerInGroup(world.getName(), player, group);
}
@ -671,25 +896,39 @@ public abstract class Chat {
* @return Success or Failure
*/
public boolean playerInGroup(Player player, String group) {
return playerInGroup(player.getWorld().getName(), player.getName(), group);
return playerInGroup(player.getWorld().getName(), player, group);
}
/**
* Gets the list of groups that this player has
* @param world World name
* @param player OfflinePlayer
* @return Array of groups
*/
public String[] getPlayerGroups(String world, OfflinePlayer player) {
return perms.getPlayerGroups(world, player);
}
/**
* @deprecated As of Vault 1.3.01 use {{@link #getPlayerGroups(String, OfflinePlayer)} instead.
* Gets the list of groups that this player has
* @param world World name
* @param player Player name
* @return Array of groups
*/
@Deprecated
public String[] getPlayerGroups(String world, String player) {
return perms.getPlayerGroups(world, player);
}
/**
* @deprecated As of Vault 1.3.01 use {{@link #getPlayerGroups(String, OfflinePlayer)} instead.
* Gets the list of groups that this player has
* @param world World Object
* @param player Player name
* @return Array of groups
*/
@Deprecated
public String[] getPlayerGroups(World world, String player) {
return getPlayerGroups(world.getName(), player);
}
@ -700,25 +939,39 @@ public abstract class Chat {
* @return Array of groups
*/
public String[] getPlayerGroups(Player player) {
return getPlayerGroups(player.getWorld().getName(), player.getName());
return getPlayerGroups(player.getWorld().getName(), player);
}
/**
* Gets players primary group
* @param world World name
* @param player OfflinePlayer
* @return Players primary group
*/
public String getPrimaryGroup(String world, OfflinePlayer player) {
return perms.getPrimaryGroup(world, player);
}
/**
* @deprecated As of Vault 1.3.01 use {{@link #getPrimaryGroup(String, OfflinePlayer)} instead.
* Gets players primary group
* @param world World name
* @param player Player name
* @return Players primary group
*/
@Deprecated
public String getPrimaryGroup(String world, String player) {
return perms.getPrimaryGroup(world, player);
}
/**
* @deprecated As of Vault 1.3.01 use {{@link #getPrimaryGroup(String, OfflinePlayer)} instead.
* Gets players primary group
* @param world World Object
* @param player Player name
* @return Players primary group
*/
@Deprecated
public String getPrimaryGroup(World world, String player) {
return getPrimaryGroup(world.getName(), player);
}
@ -729,7 +982,7 @@ public abstract class Chat {
* @return Players primary group
*/
public String getPrimaryGroup(Player player) {
return getPrimaryGroup(player.getWorld().getName(), player.getName());
return getPrimaryGroup(player.getWorld().getName(), player);
}
/**

124
src/main/java/net/milkbowl/vault/permission/Permission.java
View File

@ -53,6 +53,7 @@ public abstract class Permission {
abstract public boolean hasSuperPermsCompat();
/**
* @deprecated As of Vault 1.3.01 use {{@link #playerHas(String, OfflinePlayer, String)} instead.
* Checks if player has a permission node. (Short for playerHas(...)
* Supports NULL value for World if the permission system registered supports global permissions.
* But May return odd values if the servers registered permission system does not have a global permission store.
@ -62,6 +63,7 @@ public abstract class Permission {
* @param permission Permission node
* @return Success or Failure
*/
@Deprecated
public boolean has(String world, String player, String permission) {
if (world == null) {
return playerHas((String) null, player, permission);
@ -70,6 +72,7 @@ public abstract class Permission {
}
/**
* @deprecated As of Vault 1.3.01 use {{@link #playerHas(String, OfflinePlayer, String)} instead.
* Checks if player has a permission node. (Short for playerHas(...)
* Supports NULL value for World if the permission system registered supports global permissions.
* But May return odd values if the servers registered permission system does not have a global permission store.
@ -79,6 +82,7 @@ public abstract class Permission {
* @param permission Permission node
* @return Success or Failure
*/
@Deprecated
public boolean has(World world, String player, String permission) {
if (world == null) {
return playerHas((String) null, player, permission);
@ -111,6 +115,7 @@ public abstract class Permission {
}
/**
* @deprecated As of Vault 1.3.01 use {{@link #playerHas(String, OfflinePlayer, String)} instead.
* Checks if player has a permission node.
* Supports NULL value for World if the permission system registered supports global permissions.
* But May return odd values if the servers registered permission system does not have a global permission store.
@ -120,9 +125,11 @@ public abstract class Permission {
* @param permission Permission node
* @return Success or Failure
*/
@Deprecated
abstract public boolean playerHas(String world, String player, String permission);
/**
* @deprecated As of Vault 1.3.01 use {{@link #playerHas(String, OfflinePlayer, String)} instead.
* Checks if player has a permission node.
* Supports NULL value for World if the permission system registered supports global permissions.
* But May return odd values if the servers registered permission system does not have a global permission store.
@ -132,6 +139,7 @@ public abstract class Permission {
* @param permission Permission node
* @return Success or Failure
*/
@Deprecated
public boolean playerHas(World world, String player, String permission) {
if (world == null) {
return playerHas((String) null, player, permission);
@ -142,16 +150,16 @@ public abstract class Permission {
/**
* Checks if player has a permission node.
*
* @param world World Object
* @param world String world name
* @param player to check
* @param permission Permission node
* @return Success or Failure
*/
public boolean playerHas(World world, OfflinePlayer player, String permission) {
public boolean playerHas(String world, OfflinePlayer player, String permission) {
if (world == null) {
return has((String) null, player.getName(), permission);
}
return has(world.getName(), player.getName(), permission);
return has(world, player.getName(), permission);
}
/**
@ -165,6 +173,7 @@ public abstract class Permission {
}
/**
* @deprecated As of Vault 1.3.01 use {{@link #playerAdd(String, OfflinePlayer, String)} instead.
* Add permission to a player.
* Supports NULL value for World if the permission system registered supports global permissions.
* But May return odd values if the servers registered permission system does not have a global permission store.
@ -174,9 +183,11 @@ public abstract class Permission {
* @param permission Permission node
* @return Success or Failure
*/
@Deprecated
abstract public boolean playerAdd(String world, String player, String permission);
/**
* @deprecated As of Vault 1.3.01 use {{@link #playerAdd(String, OfflinePlayer, String)} instead.
* Add permission to a player.
* Supports NULL value for World if the permission system registered supports global permissions.
* But May return odd values if the servers registered permission system does not have a global permission store.
@ -186,6 +197,7 @@ public abstract class Permission {
* @param permission Permission node
* @return Success or Failure
*/
@Deprecated
public boolean playerAdd(World world, String player, String permission) {
if (world == null) {
return playerAdd((String) null, player, permission);
@ -198,16 +210,16 @@ public abstract class Permission {
* Supports NULL value for World if the permission system registered supports global permissions.
* But May return odd values if the servers registered permission system does not have a global permission store.
*
* @param world World Object
* @param world String world name
* @param player to add to
* @param permission Permission node
* @return Success or Failure
*/
public boolean playerAdd(World world, OfflinePlayer player, String permission) {
public boolean playerAdd(String world, OfflinePlayer player, String permission) {
if (world == null) {
return playerAdd((String) null, player.getName(), permission);
}
return playerAdd(world.getName(), player.getName(), permission);
return playerAdd(world, player.getName(), permission);
}
/**
@ -219,10 +231,11 @@ public abstract class Permission {
* @return Success or Failure
*/
public boolean playerAdd(Player player, String permission) {
return playerAdd(player.getWorld().getName(), player.getName(), permission);
return playerAdd(player.getWorld().getName(), player, permission);
}
/**
* @deprecated As of Vault 1.3.01 use {{@link #playerAddTransient(OfflinePlayer, String)} instead.
* Add transient permission to a player.
* This implementation can be used by any subclass which implements a "pure" superperms plugin, i.e.
* one that only needs the built-in Bukkit API to add transient permissions to a player. Any subclass
@ -232,6 +245,7 @@ public abstract class Permission {
* @param permission Permission node
* @return Success or Failure
*/
@Deprecated
public boolean playerAddTransient(String player, String permission) throws UnsupportedOperationException {
Player p = plugin.getServer().getPlayer(player);
if (p == null) {
@ -302,12 +316,14 @@ public abstract class Permission {
}
/**
* @deprecated As of Vault 1.3.01 use {{@link #playerAddTransient(String, OfflinePlayer, String)} instead.
* Adds a world specific transient permission to the player - ONLY WORKS IN PEX/P3 - otherwise it defaults to GLOBAL!
* @param worldName to check on
* @param player to check
* @param permission to check
* @return Success or Failure
*/
@Deprecated
public boolean playerAddTransient(String worldName, String player, String permission) {
Player p = plugin.getServer().getPlayer(player);
if (p == null) {
@ -317,12 +333,14 @@ public abstract class Permission {
}
/**
* @deprecated As of Vault 1.3.01 use {{@link #playerRemoveTransient(String, OfflinePlayer, String)} instead.
* Removes a world specific transient permission from the player - Only works in PEX/P3 - otherwise it defaults to Global!
* @param worldName to check on
* @param player to check
* @param permission to check for
* @return Success or Failure
*/
@Deprecated
public boolean playerRemoveTransient(String worldName, String player, String permission) {
Player p = plugin.getServer().getPlayer(player);
if (p == null)
@ -339,7 +357,7 @@ public abstract class Permission {
* @return Success or Failure
*/
public boolean playerRemoveTransient(String worldName, OfflinePlayer player, String permission) {
return playerRemoveTransient(player.getName(), permission);
return playerRemoveTransient(worldName, player.getName(), permission);
}
/**
@ -350,18 +368,37 @@ public abstract class Permission {
* @return Success or Failure
*/
public boolean playerRemoveTransient(String worldName, Player player, String permission) {
return playerRemoveTransient(player, permission);
return playerRemoveTransient(worldName, (OfflinePlayer) player, permission);
}
/**
* @deprecated As of Vault 1.3.01 use {{@link #playerRemove(String, OfflinePlayer, String)} instead.
* Remove permission from a player.
* @param world World name
* @param player Name of Player
* @param permission Permission node
* @return Success or Failure
*/
@Deprecated
abstract public boolean playerRemove(String world, String player, String permission);
/**
* Remove permission from a player.
* Supports NULL value for World if the permission system registered supports global permissions.
* But May return odd values if the servers registered permission system does not have a global permission store.
*
* @param world World name
* @param player OfflinePlayer
* @param permission Permission node
* @return Success or Failure
*/
public boolean playerRemove(String world, OfflinePlayer player, String permission) {
if (world == null) {
return playerRemove((String) null, player.getName(), permission);
}
return playerRemove(world, player.getName(), permission);
}
/**
* Remove permission from a player.
* Supports NULL value for World if the permission system registered supports global permissions.
@ -372,6 +409,7 @@ public abstract class Permission {
* @param permission Permission node
* @return Success or Failure
*/
@Deprecated
public boolean playerRemove(World world, String player, String permission) {
if (world == null) {
return playerRemove((String) null, player, permission);
@ -388,10 +426,11 @@ public abstract class Permission {
* @return Success or Failure
*/
public boolean playerRemove(Player player, String permission) {
return playerRemove(player.getWorld().getName(), player.getName(), permission);
return playerRemove(player.getWorld().getName(), player, permission);
}
/**
* @deprecated As of Vault 1.3.01 use {{@link #playerRemoveTransient(OfflinePlayer, String)} instead
* Remove transient permission from a player.
* This implementation can be used by any subclass which implements a "pure" superperms plugin, i.e.
* one that only needs the built-in Bukkit API to remove transient permissions from a player. Any subclass
@ -401,6 +440,7 @@ public abstract class Permission {
* @param permission Permission node
* @return Success or Failure
*/
@Deprecated
public boolean playerRemoveTransient(String player, String permission) {
Player p = plugin.getServer().getPlayer(player);
if (p == null)
@ -409,18 +449,6 @@ public abstract class Permission {
return playerRemoveTransient(p, permission);
}
/**
* Remove transient permission from a player.
*
* @param player to remove from
* @param permission Permission node
* @return Success or Failure
*/
public boolean playerRemoveTransient(OfflinePlayer player, String permission) {
return playerRemoveTransient(player.getName(), permission);
}
/**
* Remove transient permission from a player.
*
@ -526,6 +554,7 @@ public abstract class Permission {
}
/**
* @deprecated As of Vault 1.3.01 use {{@link #playerInGroup(String, OfflinePlayer, String)} instead.
* Check if player is member of a group.
* Supports NULL value for World if the permission system registered supports global permissions.
* But May return odd values if the servers registered permission system does not have a global permission store.
@ -538,9 +567,11 @@ public abstract class Permission {
* @param group Group name
* @return Success or Failure
*/
@Deprecated
abstract public boolean playerInGroup(String world, String player, String group);
/**
* @deprecated As of Vault 1.3.01 use {{@link #playerInGroup(String, OfflinePlayer, String)} instead.
* Check if player is member of a group.
* Supports NULL value for World if the permission system registered supports global permissions.
* But May return odd values if the servers registered permission system does not have a global permission store.
@ -550,6 +581,7 @@ public abstract class Permission {
* @param group Group name
* @return Success or Failure
*/
@Deprecated
public boolean playerInGroup(World world, String player, String group) {
if (world == null) {
return playerInGroup((String) null, player, group);
@ -567,11 +599,11 @@ public abstract class Permission {
* @param group Group name
* @return Success or Failure
*/
public boolean playerInGroup(World world, OfflinePlayer player, String group) {
public boolean playerInGroup(String world, OfflinePlayer player, String group) {
if (world == null) {
return playerInGroup((String) null, player.getName(), group);
}
return playerInGroup(world.getName(), player.getName(), group);
return playerInGroup(world, player.getName(), group);
}
/**
@ -584,10 +616,11 @@ public abstract class Permission {
* @return Success or Failure
*/
public boolean playerInGroup(Player player, String group) {
return playerInGroup(player.getWorld().getName(), player.getName(), group);
return playerInGroup(player.getWorld().getName(), player, group);
}
/**
* @deprecated As of Vault 1.3.01 use {{@link #playerAddGroup(String, OfflinePlayer, String)} instead.
* Add player to a group.
* Supports NULL value for World if the permission system registered supports global permissions.
* But May return odd values if the servers registered permission system does not have a global permission store.
@ -597,9 +630,11 @@ public abstract class Permission {
* @param group Group name
* @return Success or Failure
*/
@Deprecated
abstract public boolean playerAddGroup(String world, String player, String group);
/**
* @deprecated As of Vault 1.3.01 use {{@link #playerAddGroup(String, OfflinePlayer, String)} instead.
* Add player to a group.
* Supports NULL value for World if the permission system registered supports global permissions.
* But May return odd values if the servers registered permission system does not have a global permission store.
@ -609,6 +644,7 @@ public abstract class Permission {
* @param group Group name
* @return Success or Failure
*/
@Deprecated
public boolean playerAddGroup(World world, String player, String group) {
if (world == null) {
return playerAddGroup((String) null, player, group);
@ -621,16 +657,16 @@ public abstract class Permission {
* Supports NULL value for World if the permission system registered supports global permissions.
* But May return odd values if the servers registered permission system does not have a global permission store.
*
* @param world World Object
* @param world String world name
* @param player to add
* @param group Group name
* @return Success or Failure
*/
public boolean playerAddGroup(World world, OfflinePlayer player, String group) {
public boolean playerAddGroup(String world, OfflinePlayer player, String group) {
if (world == null) {
return playerAddGroup((String) null, player.getName(), group);
}
return playerAddGroup(world.getName(), player.getName(), group);
return playerAddGroup(world, player.getName(), group);
}
/**
@ -643,10 +679,11 @@ public abstract class Permission {
* @return Success or Failure
*/
public boolean playerAddGroup(Player player, String group) {
return playerAddGroup(player.getWorld().getName(), player.getName(), group);
return playerAddGroup(player.getWorld().getName(), player, group);
}
/**
* @deprecated As of Vault 1.3.01 use {{@link #playerRemoveGroup(String, OfflinePlayer, String)} instead.
* Remove player from a group.
* Supports NULL value for World if the permission system registered supports global permissions.
* But May return odd values if the servers registered permission system does not have a global permission store.
@ -656,9 +693,11 @@ public abstract class Permission {
* @param group Group name
* @return Success or Failure
*/
@Deprecated
abstract public boolean playerRemoveGroup(String world, String player, String group);
/**
* @deprecated As of Vault 1.3.01 use {{@link #playerRemoveGroup(String, OfflinePlayer, String)} instead.
* Remove player from a group.
* Supports NULL value for World if the permission system registered supports global permissions.
* But May return odd values if the servers registered permission system does not have a global permission store.
@ -668,6 +707,7 @@ public abstract class Permission {
* @param group Group name
* @return Success or Failure
*/
@Deprecated
public boolean playerRemoveGroup(World world, String player, String group) {
if (world == null) {
return playerRemoveGroup((String) null, player, group);
@ -685,11 +725,11 @@ public abstract class Permission {
* @param group Group name
* @return Success or Failure
*/
public boolean playerRemoveGroup(World world, OfflinePlayer player, String group) {
public boolean playerRemoveGroup(String world, OfflinePlayer player, String group) {
if (world == null) {
return playerRemoveGroup((String) null, player.getName(), group);
}
return playerRemoveGroup(world.getName(), player.getName(), group);
return playerRemoveGroup(world, player.getName(), group);
}
/**
@ -702,10 +742,11 @@ public abstract class Permission {
* @return Success or Failure
*/
public boolean playerRemoveGroup(Player player, String group) {
return playerRemoveGroup(player.getWorld().getName(), player.getName(), group);
return playerRemoveGroup(player.getWorld().getName(), player, group);
}
/**
* @deprecated As of Vault 1.3.01 use {{@link #getPlayerGroups(String, OfflinePlayer)} instead.
* Gets the list of groups that this player has.
* Supports NULL value for World if the permission system registered supports global permissions.
* But May return odd values if the servers registered permission system does not have a global permission store.
@ -714,9 +755,11 @@ public abstract class Permission {
* @param player Player name
* @return Array of groups
*/
@Deprecated
abstract public String[] getPlayerGroups(String world, String player);
/**
* @deprecated As of Vault 1.3.01 use {{@link #getPlayerGroups(String, OfflinePlayer)} instead.
* Gets the list of groups that this player has
* Supports NULL value for World if the permission system registered supports global permissions.
* But May return odd values if the servers registered permission system does not have a global permission store.
@ -725,6 +768,7 @@ public abstract class Permission {
* @param player Player name
* @return Array of groups
*/
@Deprecated
public String[] getPlayerGroups(World world, String player) {
if (world == null) {
return getPlayerGroups((String) null, player);
@ -737,11 +781,11 @@ public abstract class Permission {
* Supports NULL value for World if the permission system registered supports global permissions.
* But May return odd values if the servers registered permission system does not have a global permission store.
*
* @param world World Object
* @param world String world name
* @param player OfflinePlayer
* @return Array of groups
*/
public String[] getPlayerGroups(World world, OfflinePlayer player) {
public String[] getPlayerGroups(String world, OfflinePlayer player) {
return getPlayerGroups(world, player.getName());
}
@ -753,10 +797,11 @@ public abstract class Permission {
* @return Array of groups
*/
public String[] getPlayerGroups(Player player) {
return getPlayerGroups(player.getWorld().getName(), player.getName());
return getPlayerGroups(player.getWorld().getName(), player);
}
/**
* @deprecated As of Vault 1.3.01 use {{@link #getPrimaryGroup(String, OfflinePlayer)} instead.
* Gets players primary group
* Supports NULL value for World if the permission system registered supports global permissions.
* But May return odd values if the servers registered permission system does not have a global permission store.
@ -765,9 +810,11 @@ public abstract class Permission {
* @param player Player name
* @return Players primary group
*/
@Deprecated
abstract public String getPrimaryGroup(String world, String player);
/**
* @deprecated As of Vault 1.3.01 use {{@link #getPrimaryGroup(String, OfflinePlayer)} instead.
* Gets players primary group
* Supports NULL value for World if the permission system registered supports global permissions.
* But May return odd values if the servers registered permission system does not have a global permission store.
@ -776,6 +823,7 @@ public abstract class Permission {
* @param player Player name
* @return Players primary group
*/
@Deprecated
public String getPrimaryGroup(World world, String player) {
if (world == null) {
return getPrimaryGroup((String) null, player);
@ -788,11 +836,11 @@ public abstract class Permission {
* Supports NULL value for World if the permission system registered supports global permissions.
* But May return odd values if the servers registered permission system does not have a global permission store.
*
* @param world World Object
* @param world String world name
* @param player to get from
* @return Players primary group
*/
public String getPrimaryGroup(World world, OfflinePlayer player) {
public String getPrimaryGroup(String world, OfflinePlayer player) {
return getPrimaryGroup(world, player.getName());
}
@ -802,7 +850,7 @@ public abstract class Permission {
* @return Players primary group
*/
public String getPrimaryGroup(Player player) {
return getPrimaryGroup(player.getWorld().getName(), player.getName());
return getPrimaryGroup(player.getWorld().getName(), player);
}
/**