diff --git a/allclasses-frame.html b/allclasses-frame.html index a37b618..4345b48 100644 --- a/allclasses-frame.html +++ b/allclasses-frame.html @@ -2,21 +2,21 @@ - + + All Classes (Vault) + -

All Classes

+

All Classes

diff --git a/allclasses-noframe.html b/allclasses-noframe.html index 1b7df0c..7af36ad 100644 --- a/allclasses-noframe.html +++ b/allclasses-noframe.html @@ -2,21 +2,21 @@ - + + All Classes (Vault) + -

All Classes

+

All Classes

diff --git a/constant-values.html b/constant-values.html index be1595d..ce3c7d9 100644 --- a/constant-values.html +++ b/constant-values.html @@ -2,14 +2,20 @@ - + + Constant Field Values (Vault) + @@ -17,9 +23,11 @@
JavaScript is disabled on your browser.
-
+
- + + +
- +
@@ -66,9 +74,11 @@

Contents

-
+
- + + +
- +
-

Milkbowl, 2014

+

Milkbowl, 2020

diff --git a/deprecated-list.html b/deprecated-list.html index 043a2f7..215a402 100644 --- a/deprecated-list.html +++ b/deprecated-list.html @@ -2,14 +2,20 @@ - + + Deprecated List (Vault) + @@ -17,9 +23,11 @@
JavaScript is disabled on your browser.
-
+
- + + +
- +
@@ -73,401 +81,372 @@
-
+
- + + +
- +
-

Milkbowl, 2014

+

Milkbowl, 2020

diff --git a/net/milkbowl/vault/economy/class-use/EconomyResponse.ResponseType.html b/net/milkbowl/vault/economy/class-use/EconomyResponse.ResponseType.html index 9995621..887f297 100644 --- a/net/milkbowl/vault/economy/class-use/EconomyResponse.ResponseType.html +++ b/net/milkbowl/vault/economy/class-use/EconomyResponse.ResponseType.html @@ -2,14 +2,20 @@ - + + Uses of Class net.milkbowl.vault.economy.EconomyResponse.ResponseType (Vault) + @@ -17,9 +23,11 @@
JavaScript is disabled on your browser.
-
+
- + + +
- +
@@ -67,7 +75,7 @@
  • - +
    @@ -87,7 +95,7 @@

    Uses of EconomyResponse.ResponseType in net.milkbowl.vault.economy

    -
    Packages that use EconomyResponse.ResponseType 
    Package
    +
    @@ -96,13 +104,13 @@ -
    Fields in net.milkbowl.vault.economy declared as EconomyResponse.ResponseType 
    Modifier and Type
    EconomyResponse.ResponseTypeEconomyResponse.type +EconomyResponse.type
    Success or failure of call.
    - +
    @@ -111,30 +119,30 @@ - -
    Methods in net.milkbowl.vault.economy that return EconomyResponse.ResponseType 
    Modifier and Type
    static EconomyResponse.ResponseTypeEconomyResponse.ResponseType.valueOf(String name) +EconomyResponse.ResponseType.valueOf(String name)
    Returns the enum constant of this type with the specified name.
    static EconomyResponse.ResponseType[]EconomyResponse.ResponseType.values() +EconomyResponse.ResponseType.values()
    Returns an array containing the constants of this enum type, in the order they are declared.
    - +
    - @@ -146,9 +154,11 @@ the order they are declared. -
    +
    - + + +
    - +
    -

    Milkbowl, 2014

    +

    Milkbowl, 2020

    diff --git a/net/milkbowl/vault/economy/class-use/EconomyResponse.html b/net/milkbowl/vault/economy/class-use/EconomyResponse.html index f99b8d4..fd2eb7d 100644 --- a/net/milkbowl/vault/economy/class-use/EconomyResponse.html +++ b/net/milkbowl/vault/economy/class-use/EconomyResponse.html @@ -2,14 +2,20 @@ - + +Uses of Class net.milkbowl.vault.economy.EconomyResponse (Vault) + @@ -17,9 +23,11 @@
    JavaScript is disabled on your browser.
    -
    +
    - + + +
    - +
    @@ -67,7 +75,7 @@
    • -
    Constructors in net.milkbowl.vault.economy with parameters of type EconomyResponse.ResponseType 
    Constructor and Description
    EconomyResponse(double amount, - double balance, - EconomyResponse.ResponseType type, - String errorMessage) +EconomyResponse(double amount, + double balance, + EconomyResponse.ResponseType type, + String errorMessage)
    Constructor for EconomyResponse
    +
    @@ -87,7 +95,7 @@

    Uses of EconomyResponse in net.milkbowl.vault.economy

    -
    Packages that use EconomyResponse 
    Package
    +
    @@ -96,189 +104,189 @@ - - - - - - + - - - - + - - + - - - - + - - - + - - - + - - + - - @@ -290,9 +298,11 @@ -
    +
    - + + +
    - +
    -

    Milkbowl, 2014

    +

    Milkbowl, 2020

    diff --git a/net/milkbowl/vault/economy/package-frame.html b/net/milkbowl/vault/economy/package-frame.html index fc64d3f..d880331 100644 --- a/net/milkbowl/vault/economy/package-frame.html +++ b/net/milkbowl/vault/economy/package-frame.html @@ -2,16 +2,18 @@ - + + net.milkbowl.vault.economy (Vault) +

    net.milkbowl.vault.economy

    Interfaces

    Classes

      diff --git a/net/milkbowl/vault/economy/package-summary.html b/net/milkbowl/vault/economy/package-summary.html index 8789ba1..4b70a63 100644 --- a/net/milkbowl/vault/economy/package-summary.html +++ b/net/milkbowl/vault/economy/package-summary.html @@ -2,14 +2,20 @@ - + + net.milkbowl.vault.economy (Vault) + @@ -17,9 +23,11 @@
      JavaScript is disabled on your browser.
      -
      +
      - + + +
      @@ -67,7 +75,7 @@
      • -
    Methods in net.milkbowl.vault.economy that return EconomyResponse 
    Modifier and Type
    EconomyResponseEconomy.bankBalance(String name) +Economy.bankBalance(String name)
    Returns the amount the bank has
    EconomyResponseEconomy.bankDeposit(String name, - double amount) +Economy.bankDeposit(String name, + double amount)
    Deposit an amount into a bank account - DO NOT USE NEGATIVE AMOUNTS
    EconomyResponseEconomy.bankHas(String name, - double amount) +Economy.bankHas(String name, + double amount)
    Returns true or false whether the bank has the amount specified - DO NOT USE NEGATIVE AMOUNTS
    EconomyResponseEconomy.bankWithdraw(String name, - double amount) +Economy.bankWithdraw(String name, + double amount)
    Withdraw an amount from a bank account - DO NOT USE NEGATIVE AMOUNTS
    EconomyResponseEconomy.createBank(String name, - org.bukkit.OfflinePlayer player) +Economy.createBank(String name, + org.bukkit.OfflinePlayer player)
    Creates a bank account with the specified name and the player as the owner
    EconomyResponseAbstractEconomy.createBank(String name, - org.bukkit.OfflinePlayer player) AbstractEconomy.createBank(String name, + org.bukkit.OfflinePlayer player) 
    EconomyResponseEconomy.createBank(String name, - String player) -
    Deprecated.  -
    As of VaultAPI 1.4 use {Economy.createBank(String, OfflinePlayer) instead.
    +
    Economy.createBank(String name, + String player) +
    Deprecated.  +
    As of VaultAPI 1.4 use {Economy.createBank(String, OfflinePlayer) instead.
    EconomyResponseEconomy.deleteBank(String name) +Economy.deleteBank(String name)
    Deletes a bank account with the specified name.
    EconomyResponseEconomy.depositPlayer(org.bukkit.OfflinePlayer player, - double amount) +Economy.depositPlayer(org.bukkit.OfflinePlayer player, + double amount)
    Deposit an amount to a player - DO NOT USE NEGATIVE AMOUNTS
    EconomyResponseAbstractEconomy.depositPlayer(org.bukkit.OfflinePlayer player, - double amount) AbstractEconomy.depositPlayer(org.bukkit.OfflinePlayer player, + double amount) 
    EconomyResponseEconomy.depositPlayer(org.bukkit.OfflinePlayer player, - String worldName, - double amount) +Economy.depositPlayer(org.bukkit.OfflinePlayer player, + String worldName, + double amount)
    Deposit an amount to a player - DO NOT USE NEGATIVE AMOUNTS IMPLEMENTATION SPECIFIC - if an economy plugin does not support this the global balance will be returned.
    EconomyResponseAbstractEconomy.depositPlayer(org.bukkit.OfflinePlayer player, - String worldName, - double amount) AbstractEconomy.depositPlayer(org.bukkit.OfflinePlayer player, + String worldName, + double amount) 
    EconomyResponseEconomy.depositPlayer(String playerName, - double amount) -
    Deprecated.  -
    As of VaultAPI 1.4 use Economy.depositPlayer(OfflinePlayer, double) instead.
    +
    Economy.depositPlayer(String playerName, + double amount) +
    Deprecated.  +
    As of VaultAPI 1.4 use Economy.depositPlayer(OfflinePlayer, double) instead.
    EconomyResponseEconomy.depositPlayer(String playerName, - String worldName, - double amount) -
    Deprecated.  - +
    Economy.depositPlayer(String playerName, + String worldName, + double amount) +
    Deprecated.  +
    EconomyResponseEconomy.isBankMember(String name, - org.bukkit.OfflinePlayer player) +Economy.isBankMember(String name, + org.bukkit.OfflinePlayer player)
    Check if the player is a member of the bank account
    EconomyResponseAbstractEconomy.isBankMember(String name, - org.bukkit.OfflinePlayer player) AbstractEconomy.isBankMember(String name, + org.bukkit.OfflinePlayer player) 
    EconomyResponseEconomy.isBankMember(String name, - String playerName) -
    Deprecated.  -
    As of VaultAPI 1.4 use {Economy.isBankMember(String, OfflinePlayer) instead.
    +
    Economy.isBankMember(String name, + String playerName) +
    Deprecated.  +
    As of VaultAPI 1.4 use {Economy.isBankMember(String, OfflinePlayer) instead.
    EconomyResponseEconomy.isBankOwner(String name, - org.bukkit.OfflinePlayer player) +Economy.isBankOwner(String name, + org.bukkit.OfflinePlayer player)
    Check if a player is the owner of a bank account
    EconomyResponseAbstractEconomy.isBankOwner(String name, - org.bukkit.OfflinePlayer player) AbstractEconomy.isBankOwner(String name, + org.bukkit.OfflinePlayer player) 
    EconomyResponseEconomy.isBankOwner(String name, - String playerName) -
    Deprecated.  -
    As of VaultAPI 1.4 use {Economy.isBankOwner(String, OfflinePlayer) instead.
    +
    Economy.isBankOwner(String name, + String playerName) +
    Deprecated.  +
    As of VaultAPI 1.4 use {Economy.isBankOwner(String, OfflinePlayer) instead.
    EconomyResponseEconomy.withdrawPlayer(org.bukkit.OfflinePlayer player, - double amount) +Economy.withdrawPlayer(org.bukkit.OfflinePlayer player, + double amount)
    Withdraw an amount from a player - DO NOT USE NEGATIVE AMOUNTS
    EconomyResponseAbstractEconomy.withdrawPlayer(org.bukkit.OfflinePlayer player, - double amount) AbstractEconomy.withdrawPlayer(org.bukkit.OfflinePlayer player, + double amount) 
    EconomyResponseEconomy.withdrawPlayer(org.bukkit.OfflinePlayer player, - String worldName, - double amount) +Economy.withdrawPlayer(org.bukkit.OfflinePlayer player, + String worldName, + double amount)
    Withdraw an amount from a player on a given world - DO NOT USE NEGATIVE AMOUNTS IMPLEMENTATION SPECIFIC - if an economy plugin does not support this the global balance will be returned.
    EconomyResponseAbstractEconomy.withdrawPlayer(org.bukkit.OfflinePlayer player, - String worldName, - double amount) AbstractEconomy.withdrawPlayer(org.bukkit.OfflinePlayer player, + String worldName, + double amount) 
    EconomyResponseEconomy.withdrawPlayer(String playerName, - double amount) -
    Deprecated.  -
    As of VaultAPI 1.4 use Economy.withdrawPlayer(OfflinePlayer, double) instead.
    +
    Economy.withdrawPlayer(String playerName, + double amount) +
    Deprecated.  +
    As of VaultAPI 1.4 use Economy.withdrawPlayer(OfflinePlayer, double) instead.
    EconomyResponseEconomy.withdrawPlayer(String playerName, - String worldName, - double amount) -
    Deprecated.  - +
    Economy.withdrawPlayer(String playerName, + String worldName, + double amount) +
    Deprecated.  +
    +
    @@ -84,7 +92,7 @@
    Interface Summary 
    Interface
  • - +
    @@ -105,7 +113,7 @@
    Class Summary 
    Class
  • - +
    @@ -124,9 +132,11 @@ -
    +
    - + + +
    -

    Milkbowl, 2014

    +

    Milkbowl, 2020

    diff --git a/net/milkbowl/vault/economy/package-tree.html b/net/milkbowl/vault/economy/package-tree.html index a2a7f91..401dad9 100644 --- a/net/milkbowl/vault/economy/package-tree.html +++ b/net/milkbowl/vault/economy/package-tree.html @@ -2,14 +2,20 @@ - + + net.milkbowl.vault.economy Class Hierarchy (Vault) + @@ -17,9 +23,11 @@
    JavaScript is disabled on your browser.
    -
    +
    - + + +
    Enum Summary 
    Enum
    +
    @@ -84,7 +92,7 @@
  • -
  • Packages that use net.milkbowl.vault.economy 
    Package
    +
    @@ -111,9 +119,11 @@ -
    +
    - + + +
    - +
    -

    Milkbowl, 2014

    +

    Milkbowl, 2020

    diff --git a/net/milkbowl/vault/permission/Permission.html b/net/milkbowl/vault/permission/Permission.html index 0f8ab3c..20c1718 100644 --- a/net/milkbowl/vault/permission/Permission.html +++ b/net/milkbowl/vault/permission/Permission.html @@ -2,24 +2,38 @@ - + + Permission (Vault) + -
    +
    - + + +
    Classes in net.milkbowl.vault.economy used by net.milkbowl.vault.economy 
    Class and Description
    +
    @@ -87,14 +95,14 @@

    Uses of Permission in net.milkbowl.vault.chat

    -
    Packages that use Permission 
    Package
    +
    - +
    Constructors in net.milkbowl.vault.chat with parameters of type Permission 
    Constructor and Description
    Chat(Permission perms) Chat(Permission perms) 
    @@ -104,9 +112,11 @@
-
+
- + + +
- +
-

Milkbowl, 2014

+

Milkbowl, 2020

diff --git a/net/milkbowl/vault/permission/package-frame.html b/net/milkbowl/vault/permission/package-frame.html index 6b23905..332f78e 100644 --- a/net/milkbowl/vault/permission/package-frame.html +++ b/net/milkbowl/vault/permission/package-frame.html @@ -2,9 +2,11 @@ - + + net.milkbowl.vault.permission (Vault) +

net.milkbowl.vault.permission

diff --git a/net/milkbowl/vault/permission/package-summary.html b/net/milkbowl/vault/permission/package-summary.html index 21e2912..98f766b 100644 --- a/net/milkbowl/vault/permission/package-summary.html +++ b/net/milkbowl/vault/permission/package-summary.html @@ -2,14 +2,20 @@ - + + net.milkbowl.vault.permission (Vault) + @@ -17,9 +23,11 @@
JavaScript is disabled on your browser.
-
+
- + + +
@@ -67,7 +75,7 @@
-
+
- + + +
- +
-

Milkbowl, 2014

+

Milkbowl, 2020

diff --git a/overview-tree.html b/overview-tree.html index bbf3c31..b6394ac 100644 --- a/overview-tree.html +++ b/overview-tree.html @@ -2,14 +2,20 @@ - + + Class Hierarchy (Vault) + @@ -17,9 +23,11 @@
JavaScript is disabled on your browser.
-
+
- + + +
- +

Hierarchy For All Packages

-Package Hierarchies: +Package Hierarchies:

Class Hierarchy

Interface Hierarchy

    -
  • net.milkbowl.vault.economy.Economy
  • +
  • net.milkbowl.vault.economy.Economy

Enum Hierarchy

-
+
- + + +
- +
-

Milkbowl, 2014

+

Milkbowl, 2020

diff --git a/package-list b/package-list index c88179a..9adc4dc 100644 --- a/package-list +++ b/package-list @@ -1,4 +1,3 @@ net.milkbowl.vault.chat net.milkbowl.vault.economy -net.milkbowl.vault.item net.milkbowl.vault.permission diff --git a/src-html/net/milkbowl/vault/economy/AbstractEconomy.html b/src-html/net/milkbowl/vault/economy/AbstractEconomy.html index 228c469..c859a38 100644 --- a/src-html/net/milkbowl/vault/economy/AbstractEconomy.html +++ b/src-html/net/milkbowl/vault/economy/AbstractEconomy.html @@ -15,80 +15,84 @@ 007 008 @Override 009 public boolean hasAccount(OfflinePlayer player) { -010 return hasAccount(player.getName()); -011 } -012 -013 @Override -014 public boolean hasAccount(OfflinePlayer player, String worldName) { -015 return hasAccount(player.getName(), worldName); -016 } -017 -018 @Override -019 public double getBalance(OfflinePlayer player) { -020 return getBalance(player.getName()); -021 } -022 -023 @Override -024 public double getBalance(OfflinePlayer player, String world) { -025 return getBalance(player.getName(), world); -026 } -027 -028 @Override -029 public boolean has(OfflinePlayer player, double amount) { -030 return has(player.getName(), amount); -031 } -032 -033 @Override -034 public boolean has(OfflinePlayer player, String worldName, double amount) { -035 return has(player.getName(), worldName, amount); -036 } -037 -038 @Override -039 public EconomyResponse withdrawPlayer(OfflinePlayer player, double amount) { -040 return withdrawPlayer(player.getName(), amount); -041 } -042 -043 @Override -044 public EconomyResponse withdrawPlayer(OfflinePlayer player, String worldName, double amount) { -045 return withdrawPlayer(player.getName(), worldName, amount); -046 } -047 -048 @Override -049 public EconomyResponse depositPlayer(OfflinePlayer player, double amount) { -050 return depositPlayer(player.getName(), amount); -051 } -052 -053 @Override -054 public EconomyResponse depositPlayer(OfflinePlayer player, String worldName, double amount) { -055 return depositPlayer(player.getName(), worldName, amount); -056 } -057 -058 @Override -059 public EconomyResponse createBank(String name, OfflinePlayer player) { -060 return createBank(name, player.getName()); -061 } -062 -063 @Override -064 public EconomyResponse isBankOwner(String name, OfflinePlayer player) { -065 return isBankOwner(name, player.getName()); -066 } -067 -068 @Override -069 public EconomyResponse isBankMember(String name, OfflinePlayer player) { -070 return isBankMember(name, player.getName()); -071 } -072 -073 @Override -074 public boolean createPlayerAccount(OfflinePlayer player) { -075 return createPlayerAccount(player.getName()); -076 } -077 -078 @Override -079 public boolean createPlayerAccount(OfflinePlayer player, String worldName) { -080 return createPlayerAccount(player.getName(), worldName); -081 } -082 -083} +010 if (player.getName() == null) return false; +011 return hasAccount(player.getName()); +012 } +013 +014 @Override +015 public boolean hasAccount(OfflinePlayer player, String worldName) { +016 if (player.getName() == null) return false; +017 return hasAccount(player.getName(), worldName); +018 } +019 +020 @Override +021 public double getBalance(OfflinePlayer player) { +022 return getBalance(player.getName()); +023 } +024 +025 @Override +026 public double getBalance(OfflinePlayer player, String world) { +027 return getBalance(player.getName(), world); +028 } +029 +030 @Override +031 public boolean has(OfflinePlayer player, double amount) { +032 if (player.getName() == null) return false; +033 return has(player.getName(), amount); +034 } +035 +036 @Override +037 public boolean has(OfflinePlayer player, String worldName, double amount) { +038 if (player.getName() == null) return false; +039 return has(player.getName(), worldName, amount); +040 } +041 +042 @Override +043 public EconomyResponse withdrawPlayer(OfflinePlayer player, double amount) { +044 return withdrawPlayer(player.getName(), amount); +045 } +046 +047 @Override +048 public EconomyResponse withdrawPlayer(OfflinePlayer player, String worldName, double amount) { +049 return withdrawPlayer(player.getName(), worldName, amount); +050 } +051 +052 @Override +053 public EconomyResponse depositPlayer(OfflinePlayer player, double amount) { +054 return depositPlayer(player.getName(), amount); +055 } +056 +057 @Override +058 public EconomyResponse depositPlayer(OfflinePlayer player, String worldName, double amount) { +059 return depositPlayer(player.getName(), worldName, amount); +060 } +061 +062 @Override +063 public EconomyResponse createBank(String name, OfflinePlayer player) { +064 return createBank(name, player.getName()); +065 } +066 +067 @Override +068 public EconomyResponse isBankOwner(String name, OfflinePlayer player) { +069 return isBankOwner(name, player.getName()); +070 } +071 +072 @Override +073 public EconomyResponse isBankMember(String name, OfflinePlayer player) { +074 return isBankMember(name, player.getName()); +075 } +076 +077 @Override +078 public boolean createPlayerAccount(OfflinePlayer player) { +079 return createPlayerAccount(player.getName()); +080 } +081 +082 @Override +083 public boolean createPlayerAccount(OfflinePlayer player, String worldName) { +084 return createPlayerAccount(player.getName(), worldName); +085 } +086 +087} diff --git a/src-html/net/milkbowl/vault/economy/Economy.html b/src-html/net/milkbowl/vault/economy/Economy.html index d27fcf3..80ad8e2 100644 --- a/src-html/net/milkbowl/vault/economy/Economy.html +++ b/src-html/net/milkbowl/vault/economy/Economy.html @@ -356,7 +356,7 @@ 348 349 /** 350 * Attempts to create a player account for the given player on the specified world -351 * IMPLEMENTATION SPECIFIC - if an economy plugin does not support this the global balance will be returned. +351 * IMPLEMENTATION SPECIFIC - if an economy plugin does not support this then false will always be returned. 352 * @param player OfflinePlayer 353 * @param worldName String name of the world 354 * @return if the account creation was successful diff --git a/src-html/net/milkbowl/vault/permission/Permission.html b/src-html/net/milkbowl/vault/permission/Permission.html index 34767a7..24d66b9 100644 --- a/src-html/net/milkbowl/vault/permission/Permission.html +++ b/src-html/net/milkbowl/vault/permission/Permission.html @@ -207,403 +207,403 @@ 199 public boolean playerAdd(Player player, String permission) { 200 return playerAdd(player.getWorld().getName(), player, permission); 201 } -202 +202 203 /** -204 * @deprecated As of VaultAPI 1.4 use {@link #playerAddTransient(OfflinePlayer, String)} instead. -205 */ -206 @Deprecated -207 public boolean playerAddTransient(String player, String permission) throws UnsupportedOperationException { -208 Player p = plugin.getServer().getPlayer(player); -209 if (p == null) { -210 throw new UnsupportedOperationException(getName() + " does not support offline player transient permissions!"); -211 } -212 return playerAddTransient(p, permission); -213 } -214 -215 /** -216 * Add transient permission to a player. -217 * This implementation can be used by any subclass which implements a "pure" superperms plugin, i.e. -218 * one that only needs the built-in Bukkit API to add transient permissions to a player. -219 * -220 * @param player to add to -221 * @param permission Permission node -222 * @return Success or Failure -223 */ -224 public boolean playerAddTransient(OfflinePlayer player, String permission) throws UnsupportedOperationException { -225 if (player.isOnline()) { -226 return playerAddTransient((Player) player, permission); -227 } -228 throw new UnsupportedOperationException(getName() + " does not support offline player transient permissions!"); -229 } -230 -231 /** -232 * Add transient permission to a player. -233 * This operation adds a permission onto the player object in bukkit via Bukkit's permission interface. -234 * -235 * @param player Player Object -236 * @param permission Permission node -237 * @return Success or Failure -238 */ -239 public boolean playerAddTransient(Player player, String permission) { -240 for (PermissionAttachmentInfo paInfo : player.getEffectivePermissions()) { -241 if (paInfo.getAttachment() != null && paInfo.getAttachment().getPlugin().equals(plugin)) { -242 paInfo.getAttachment().setPermission(permission, true); -243 return true; -244 } -245 } -246 -247 PermissionAttachment attach = player.addAttachment(plugin); -248 attach.setPermission(permission, true); -249 -250 return true; -251 } -252 -253 /** -254 * Adds a world specific transient permission to the player, may only work with some permission managers. -255 * Defaults to GLOBAL permissions for any permission system that does not support world-specific transient permissions! -256 * -257 * @param worldName to check on -258 * @param player to add to -259 * @param permission to test -260 * @return Success or Failure -261 */ -262 public boolean playerAddTransient(String worldName, OfflinePlayer player, String permission) { -263 return playerAddTransient(worldName, player.getName(), permission); -264 } -265 -266 /** -267 * Adds a world specific transient permission to the player, may only work with some permission managers. -268 * Defaults to GLOBAL permissions for any permission system that does not support world-specific transient permissions! -269 * -270 * @param worldName to check on -271 * @param player to check -272 * @param permission to check for -273 * @return Success or Failure -274 */ -275 public boolean playerAddTransient(String worldName, Player player, String permission) { -276 return playerAddTransient(player, permission); -277 } -278 -279 /** -280 * @deprecated As of VaultAPI 1.4 use {@link #playerAddTransient(String, OfflinePlayer, String)} instead. -281 */ -282 @Deprecated -283 public boolean playerAddTransient(String worldName, String player, String permission) { -284 Player p = plugin.getServer().getPlayer(player); -285 if (p == null) { -286 throw new UnsupportedOperationException(getName() + " does not support offline player transient permissions!"); -287 } -288 return playerAddTransient(p, permission); -289 } -290 -291 /** -292 * @deprecated As of VaultAPI 1.4 use {@link #playerRemoveTransient(String, OfflinePlayer, String)} instead. -293 */ -294 @Deprecated -295 public boolean playerRemoveTransient(String worldName, String player, String permission) { -296 Player p = plugin.getServer().getPlayer(player); -297 if (p == null) -298 return false; -299 -300 return playerRemoveTransient(p, permission); -301 } -302 -303 /** -304 * Removes a world specific transient permission from the player, may only work with some permission managers. -305 * Defaults to GLOBAL permissions for any permission system that does not support world-specific transient permissions! -306 * -307 * @param worldName to remove for -308 * @param player to remove for -309 * @param permission to remove -310 * @return Success or Failure -311 */ -312 public boolean playerRemoveTransient(String worldName, OfflinePlayer player, String permission) { -313 return playerRemoveTransient(worldName, player.getName(), permission); +204 * Add transient permission to a player. +205 * This implementation can be used by any subclass which implements a "pure" superperms plugin, i.e. +206 * one that only needs the built-in Bukkit API to add transient permissions to a player. +207 * +208 * @param player to add to +209 * @param permission Permission node +210 * @return Success or Failure +211 */ +212 public boolean playerAddTransient(OfflinePlayer player, String permission) throws UnsupportedOperationException { +213 if (player.isOnline()) { +214 return playerAddTransient((Player) player, permission); +215 } +216 throw new UnsupportedOperationException(getName() + " does not support offline player transient permissions!"); +217 } +218 +219 /** +220 * Add transient permission to a player. +221 * This operation adds a permission onto the player object in bukkit via Bukkit's permission interface. +222 * +223 * @param player Player Object +224 * @param permission Permission node +225 * @return Success or Failure +226 */ +227 public boolean playerAddTransient(Player player, String permission) { +228 for (PermissionAttachmentInfo paInfo : player.getEffectivePermissions()) { +229 if (paInfo.getAttachment() != null && paInfo.getAttachment().getPlugin().equals(plugin)) { +230 paInfo.getAttachment().setPermission(permission, true); +231 return true; +232 } +233 } +234 +235 PermissionAttachment attach = player.addAttachment(plugin); +236 attach.setPermission(permission, true); +237 +238 return true; +239 } +240 +241 /** +242 * Adds a world specific transient permission to the player, may only work with some permission managers. +243 * Defaults to GLOBAL permissions for any permission system that does not support world-specific transient permissions! +244 * +245 * @param worldName to check on +246 * @param player to add to +247 * @param permission to test +248 * @return Success or Failure +249 */ +250 public boolean playerAddTransient(String worldName, OfflinePlayer player, String permission) { +251 return playerAddTransient(player, permission); +252 } +253 +254 /** +255 * Adds a world specific transient permission to the player, may only work with some permission managers. +256 * Defaults to GLOBAL permissions for any permission system that does not support world-specific transient permissions! +257 * +258 * @param worldName to check on +259 * @param player to check +260 * @param permission to check for +261 * @return Success or Failure +262 */ +263 public boolean playerAddTransient(String worldName, Player player, String permission) { +264 return playerAddTransient(player, permission); +265 } +266 +267 /** +268 * Removes a world specific transient permission from the player, may only work with some permission managers. +269 * Defaults to GLOBAL permissions for any permission system that does not support world-specific transient permissions! +270 * +271 * @param worldName to remove for +272 * @param player to remove for +273 * @param permission to remove +274 * @return Success or Failure +275 */ +276 public boolean playerRemoveTransient(String worldName, OfflinePlayer player, String permission) { +277 return playerRemoveTransient(player, permission); +278 } +279 +280 /** +281 * Removes a world specific transient permission from the player, may only work with some permission managers. +282 * Defaults to GLOBAL permissions for any permission system that does not support world-specific transient permissions! +283 * +284 * @param worldName to check on +285 * @param player to check +286 * @param permission to check for +287 * @return Success or Failure +288 */ +289 public boolean playerRemoveTransient(String worldName, Player player, String permission) { +290 return playerRemoveTransient((OfflinePlayer) player, permission); +291 } +292 +293 /** +294 * @deprecated As of VaultAPI 1.4 use {@link #playerRemove(String, OfflinePlayer, String)} instead. +295 */ +296 @Deprecated +297 abstract public boolean playerRemove(String world, String player, String permission); +298 +299 /** +300 * Remove permission from a player. +301 * Supports NULL value for World if the permission system registered supports global permissions. +302 * But May return odd values if the servers registered permission system does not have a global permission store. +303 * +304 * @param world World name +305 * @param player OfflinePlayer +306 * @param permission Permission node +307 * @return Success or Failure +308 */ +309 public boolean playerRemove(String world, OfflinePlayer player, String permission) { +310 if (world == null) { +311 return playerRemove((String) null, player.getName(), permission); +312 } +313 return playerRemove(world, player.getName(), permission); 314 } -315 +315 316 /** -317 * Removes a world specific transient permission from the player, may only work with some permission managers. -318 * Defaults to GLOBAL permissions for any permission system that does not support world-specific transient permissions! -319 * -320 * @param worldName to check on -321 * @param player to check -322 * @param permission to check for -323 * @return Success or Failure -324 */ -325 public boolean playerRemoveTransient(String worldName, Player player, String permission) { -326 return playerRemoveTransient(worldName, (OfflinePlayer) player, permission); -327 } -328 -329 /** -330 * @deprecated As of VaultAPI 1.4 use {@link #playerRemove(String, OfflinePlayer, String)} instead. -331 */ -332 @Deprecated -333 abstract public boolean playerRemove(String world, String player, String permission); -334 -335 /** -336 * Remove permission from a player. -337 * Supports NULL value for World if the permission system registered supports global permissions. -338 * But May return odd values if the servers registered permission system does not have a global permission store. -339 * -340 * @param world World name -341 * @param player OfflinePlayer -342 * @param permission Permission node -343 * @return Success or Failure -344 */ -345 public boolean playerRemove(String world, OfflinePlayer player, String permission) { -346 if (world == null) { -347 return playerRemove((String) null, player.getName(), permission); -348 } -349 return playerRemove(world, player.getName(), permission); -350 } -351 -352 /** -353 * Remove permission from a player. -354 * Supports NULL value for World if the permission system registered supports global permissions. -355 * But May return odd values if the servers registered permission system does not have a global permission store. -356 * -357 * @param world World name -358 * @param player Player name -359 * @param permission Permission node -360 * @return Success or Failure -361 */ -362 @Deprecated -363 public boolean playerRemove(World world, String player, String permission) { -364 if (world == null) { -365 return playerRemove((String) null, player, permission); -366 } -367 return playerRemove(world.getName(), player, permission); -368 } -369 -370 /** -371 * Remove permission from a player. -372 * Will attempt to remove permission from the player on the player's current world. This is NOT a global operation. -373 * -374 * @param player Player Object -375 * @param permission Permission node -376 * @return Success or Failure -377 */ -378 public boolean playerRemove(Player player, String permission) { -379 return playerRemove(player.getWorld().getName(), player, permission); +317 * Remove permission from a player. +318 * Supports NULL value for World if the permission system registered supports global permissions. +319 * But May return odd values if the servers registered permission system does not have a global permission store. +320 * +321 * @param world World name +322 * @param player Player name +323 * @param permission Permission node +324 * @return Success or Failure +325 */ +326 @Deprecated +327 public boolean playerRemove(World world, String player, String permission) { +328 if (world == null) { +329 return playerRemove((String) null, player, permission); +330 } +331 return playerRemove(world.getName(), player, permission); +332 } +333 +334 /** +335 * Remove permission from a player. +336 * Will attempt to remove permission from the player on the player's current world. This is NOT a global operation. +337 * +338 * @param player Player Object +339 * @param permission Permission node +340 * @return Success or Failure +341 */ +342 public boolean playerRemove(Player player, String permission) { +343 return playerRemove(player.getWorld().getName(), player, permission); +344 } +345 +346 +347 /** +348 * Remove transient permission from a player. +349 * This implementation can be used by any subclass which implements a "pure" superperms plugin, i.e. +350 * one that only needs the built-in Bukkit API to remove transient permissions from a player. Any subclass +351 * implementing a plugin which provides its own API for this needs to override this method. +352 * +353 * @param player OfflinePlayer +354 * @param permission Permission node +355 * @return Success or Failure +356 */ +357 public boolean playerRemoveTransient(OfflinePlayer player, String permission) { +358 if (player.isOnline()) { +359 return playerRemoveTransient((Player) player, permission); +360 } else { +361 return false; +362 } +363 } +364 +365 /** +366 * Remove transient permission from a player. +367 * +368 * @param player Player Object +369 * @param permission Permission node +370 * @return Success or Failure +371 */ +372 public boolean playerRemoveTransient(Player player, String permission) { +373 for (PermissionAttachmentInfo paInfo : player.getEffectivePermissions()) { +374 if (paInfo.getAttachment() != null && paInfo.getAttachment().getPlugin().equals(plugin)) { +375 paInfo.getAttachment().unsetPermission(permission); +376 return true; +377 } +378 } +379 return false; 380 } 381 382 /** -383 * @deprecated As of VaultAPI 1.4 use {@link #playerRemoveTransient(OfflinePlayer, String)} instead. -384 */ -385 @Deprecated -386 public boolean playerRemoveTransient(String player, String permission) { -387 Player p = plugin.getServer().getPlayer(player); -388 if (p == null) -389 return false; -390 -391 return playerRemoveTransient(p, permission); -392 } +383 * Checks if group has a permission node. +384 * Supports NULL value for World if the permission system registered supports global permissions. +385 * But May return odd values if the servers registered permission system does not have a global permission store. +386 * +387 * @param world World name +388 * @param group Group name +389 * @param permission Permission node +390 * @return Success or Failure +391 */ +392 abstract public boolean groupHas(String world, String group, String permission); 393 394 /** -395 * Remove transient permission from a player. -396 * This implementation can be used by any subclass which implements a "pure" superperms plugin, i.e. -397 * one that only needs the built-in Bukkit API to remove transient permissions from a player. Any subclass -398 * implementing a plugin which provides its own API for this needs to override this method. -399 * -400 * @param player OfflinePlayer +395 * Checks if group has a permission node. +396 * Supports NULL value for World if the permission system registered supports global permissions. +397 * But May return odd values if the servers registered permission system does not have a global permission store. +398 * +399 * @param world World Object +400 * @param group Group name 401 * @param permission Permission node 402 * @return Success or Failure 403 */ -404 public boolean playerRemoveTransient(OfflinePlayer player, String permission) { -405 if (player.isOnline()) { -406 return playerRemoveTransient((Player) player, permission); -407 } else { -408 return false; -409 } -410 } -411 -412 /** -413 * Remove transient permission from a player. -414 * -415 * @param player Player Object -416 * @param permission Permission node -417 * @return Success or Failure -418 */ -419 public boolean playerRemoveTransient(Player player, String permission) { -420 for (PermissionAttachmentInfo paInfo : player.getEffectivePermissions()) { -421 if (paInfo.getAttachment() != null && paInfo.getAttachment().getPlugin().equals(plugin)) { -422 paInfo.getAttachment().unsetPermission(permission); -423 return true; -424 } -425 } -426 return false; -427 } -428 -429 /** -430 * Checks if group has a permission node. -431 * Supports NULL value for World if the permission system registered supports global permissions. -432 * But May return odd values if the servers registered permission system does not have a global permission store. -433 * -434 * @param world World name -435 * @param group Group name -436 * @param permission Permission node -437 * @return Success or Failure -438 */ -439 abstract public boolean groupHas(String world, String group, String permission); -440 -441 /** -442 * Checks if group has a permission node. -443 * Supports NULL value for World if the permission system registered supports global permissions. -444 * But May return odd values if the servers registered permission system does not have a global permission store. -445 * -446 * @param world World Object -447 * @param group Group name -448 * @param permission Permission node -449 * @return Success or Failure -450 */ -451 public boolean groupHas(World world, String group, String permission) { -452 if (world == null) { -453 return groupHas((String) null, group, permission); -454 } -455 return groupHas(world.getName(), group, permission); -456 } -457 -458 /** -459 * Add permission to a group. -460 * Supports NULL value for World if the permission system registered supports global permissions. -461 * But May return odd values if the servers registered permission system does not have a global permission store. -462 * -463 * @param world World name -464 * @param group Group name -465 * @param permission Permission node -466 * @return Success or Failure -467 */ -468 abstract public boolean groupAdd(String world, String group, String permission); -469 -470 /** -471 * Add permission to a group. -472 * Supports NULL value for World if the permission system registered supports global permissions. -473 * But May return odd values if the servers registered permission system does not have a global permission store. -474 * -475 * @param world World Object -476 * @param group Group name -477 * @param permission Permission node -478 * @return Success or Failure -479 */ -480 public boolean groupAdd(World world, String group, String permission) { -481 if (world == null) { -482 return groupAdd((String) null, group, permission); -483 } -484 return groupAdd(world.getName(), group, permission); -485 } -486 -487 /** -488 * Remove permission from a group. -489 * Supports NULL value for World if the permission system registered supports global permissions. -490 * But May return odd values if the servers registered permission system does not have a global permission store. -491 * -492 * @param world World name +404 public boolean groupHas(World world, String group, String permission) { +405 if (world == null) { +406 return groupHas((String) null, group, permission); +407 } +408 return groupHas(world.getName(), group, permission); +409 } +410 +411 /** +412 * Add permission to a group. +413 * Supports NULL value for World if the permission system registered supports global permissions. +414 * But May return odd values if the servers registered permission system does not have a global permission store. +415 * +416 * @param world World name +417 * @param group Group name +418 * @param permission Permission node +419 * @return Success or Failure +420 */ +421 abstract public boolean groupAdd(String world, String group, String permission); +422 +423 /** +424 * Add permission to a group. +425 * Supports NULL value for World if the permission system registered supports global permissions. +426 * But May return odd values if the servers registered permission system does not have a global permission store. +427 * +428 * @param world World Object +429 * @param group Group name +430 * @param permission Permission node +431 * @return Success or Failure +432 */ +433 public boolean groupAdd(World world, String group, String permission) { +434 if (world == null) { +435 return groupAdd((String) null, group, permission); +436 } +437 return groupAdd(world.getName(), group, permission); +438 } +439 +440 /** +441 * Remove permission from a group. +442 * Supports NULL value for World if the permission system registered supports global permissions. +443 * But May return odd values if the servers registered permission system does not have a global permission store. +444 * +445 * @param world World name +446 * @param group Group name +447 * @param permission Permission node +448 * @return Success or Failure +449 */ +450 abstract public boolean groupRemove(String world, String group, String permission); +451 +452 /** +453 * Remove permission from a group. +454 * Supports NULL value for World if the permission system registered supports global permissions. +455 * But May return odd values if the servers registered permission system does not have a global permission store. +456 * +457 * @param world World Object +458 * @param group Group name +459 * @param permission Permission node +460 * @return Success or Failure +461 */ +462 public boolean groupRemove(World world, String group, String permission) { +463 if (world == null) { +464 return groupRemove((String) null, group, permission); +465 } +466 return groupRemove(world.getName(), group, permission); +467 } +468 +469 /** +470 * @deprecated As of VaultAPI 1.4 use {@link #playerInGroup(String, OfflinePlayer, String)} instead. +471 */ +472 @Deprecated +473 abstract public boolean playerInGroup(String world, String player, String group); +474 +475 /** +476 * @deprecated As of VaultAPI 1.4 use {@link #playerInGroup(String, OfflinePlayer, String)} instead. +477 */ +478 @Deprecated +479 public boolean playerInGroup(World world, String player, String group) { +480 if (world == null) { +481 return playerInGroup((String) null, player, group); +482 } +483 return playerInGroup(world.getName(), player, group); +484 } +485 +486 /** +487 * Check if player is member of a group. +488 * Supports NULL value for World if the permission system registered supports global permissions. +489 * But May return odd values if the servers registered permission system does not have a global permission store. +490 * +491 * @param world World Object +492 * @param player to check 493 * @param group Group name -494 * @param permission Permission node -495 * @return Success or Failure -496 */ -497 abstract public boolean groupRemove(String world, String group, String permission); -498 -499 /** -500 * Remove permission from a group. -501 * Supports NULL value for World if the permission system registered supports global permissions. -502 * But May return odd values if the servers registered permission system does not have a global permission store. -503 * -504 * @param world World Object -505 * @param group Group name -506 * @param permission Permission node -507 * @return Success or Failure -508 */ -509 public boolean groupRemove(World world, String group, String permission) { -510 if (world == null) { -511 return groupRemove((String) null, group, permission); -512 } -513 return groupRemove(world.getName(), group, permission); +494 * @return Success or Failure +495 */ +496 public boolean playerInGroup(String world, OfflinePlayer player, String group) { +497 if (world == null) { +498 return playerInGroup((String) null, player.getName(), group); +499 } +500 return playerInGroup(world, player.getName(), group); +501 } +502 +503 /** +504 * Check if player is member of a group. +505 * This method will ONLY check groups for which the player is in that are defined for the current world. +506 * This may result in odd return behaviour depending on what permission system has been registered. +507 * +508 * @param player Player Object +509 * @param group Group name +510 * @return Success or Failure +511 */ +512 public boolean playerInGroup(Player player, String group) { +513 return playerInGroup(player.getWorld().getName(), player, group); 514 } 515 516 /** -517 * @deprecated As of VaultAPI 1.4 use {@link #playerInGroup(String, OfflinePlayer, String)} instead. +517 * @deprecated As of VaultAPI 1.4 use {@link #playerAddGroup(String, OfflinePlayer, String)} instead. 518 */ 519 @Deprecated -520 abstract public boolean playerInGroup(String world, String player, String group); +520 abstract public boolean playerAddGroup(String world, String player, String group); 521 522 /** -523 * @deprecated As of VaultAPI 1.4 use {@link #playerInGroup(String, OfflinePlayer, String)} instead. +523 * @deprecated As of VaultAPI 1.4 use {@link #playerAddGroup(String, OfflinePlayer, String)} instead. 524 */ 525 @Deprecated -526 public boolean playerInGroup(World world, String player, String group) { +526 public boolean playerAddGroup(World world, String player, String group) { 527 if (world == null) { -528 return playerInGroup((String) null, player, group); +528 return playerAddGroup((String) null, player, group); 529 } -530 return playerInGroup(world.getName(), player, group); +530 return playerAddGroup(world.getName(), player, group); 531 } -532 +532 533 /** -534 * Check if player is member of a group. +534 * Add player to a group. 535 * Supports NULL value for World if the permission system registered supports global permissions. 536 * But May return odd values if the servers registered permission system does not have a global permission store. 537 * -538 * @param world World Object -539 * @param player to check +538 * @param world String world name +539 * @param player to add 540 * @param group Group name 541 * @return Success or Failure 542 */ -543 public boolean playerInGroup(String world, OfflinePlayer player, String group) { +543 public boolean playerAddGroup(String world, OfflinePlayer player, String group) { 544 if (world == null) { -545 return playerInGroup((String) null, player.getName(), group); +545 return playerAddGroup((String) null, player.getName(), group); 546 } -547 return playerInGroup(world, player.getName(), group); +547 return playerAddGroup(world, player.getName(), group); 548 } -549 +549 550 /** -551 * Check if player is member of a group. -552 * This method will ONLY check groups for which the player is in that are defined for the current world. -553 * This may result in odd return behaviour depending on what permission system has been registered. +551 * Add player to a group. +552 * This will add a player to the group on the current World. This may return odd results if the permission system +553 * being used on the server does not support world-specific groups, or if the group being added to is a global group. 554 * 555 * @param player Player Object 556 * @param group Group name 557 * @return Success or Failure 558 */ -559 public boolean playerInGroup(Player player, String group) { -560 return playerInGroup(player.getWorld().getName(), player, group); +559 public boolean playerAddGroup(Player player, String group) { +560 return playerAddGroup(player.getWorld().getName(), player, group); 561 } 562 563 /** -564 * @deprecated As of VaultAPI 1.4 use {@link #playerAddGroup(String, OfflinePlayer, String)} instead. +564 * @deprecated As of VaultAPI 1.4 use {@link #playerRemoveGroup(String, OfflinePlayer, String)} instead. 565 */ 566 @Deprecated -567 abstract public boolean playerAddGroup(String world, String player, String group); +567 abstract public boolean playerRemoveGroup(String world, String player, String group); 568 569 /** -570 * @deprecated As of VaultAPI 1.4 use {@link #playerAddGroup(String, OfflinePlayer, String)} instead. +570 * @deprecated As of VaultAPI 1.4 use {@link #playerRemoveGroup(String, OfflinePlayer, String)} instead. 571 */ 572 @Deprecated -573 public boolean playerAddGroup(World world, String player, String group) { +573 public boolean playerRemoveGroup(World world, String player, String group) { 574 if (world == null) { -575 return playerAddGroup((String) null, player, group); +575 return playerRemoveGroup((String) null, player, group); 576 } -577 return playerAddGroup(world.getName(), player, group); +577 return playerRemoveGroup(world.getName(), player, group); 578 } -579 +579 580 /** -581 * Add player to a group. +581 * Remove player from a group. 582 * Supports NULL value for World if the permission system registered supports global permissions. 583 * But May return odd values if the servers registered permission system does not have a global permission store. 584 * -585 * @param world String world name -586 * @param player to add +585 * @param world World Object +586 * @param player to remove 587 * @param group Group name 588 * @return Success or Failure 589 */ -590 public boolean playerAddGroup(String world, OfflinePlayer player, String group) { +590 public boolean playerRemoveGroup(String world, OfflinePlayer player, String group) { 591 if (world == null) { -592 return playerAddGroup((String) null, player.getName(), group); +592 return playerRemoveGroup((String) null, player.getName(), group); 593 } -594 return playerAddGroup(world, player.getName(), group); +594 return playerRemoveGroup(world, player.getName(), group); 595 } -596 +596 597 /** -598 * Add player to a group. +598 * Remove player from a group. 599 * This will add a player to the group on the current World. This may return odd results if the permission system 600 * being used on the server does not support world-specific groups, or if the group being added to is a global group. 601 * @@ -611,153 +611,106 @@ 603 * @param group Group name 604 * @return Success or Failure 605 */ -606 public boolean playerAddGroup(Player player, String group) { -607 return playerAddGroup(player.getWorld().getName(), player, group); +606 public boolean playerRemoveGroup(Player player, String group) { +607 return playerRemoveGroup(player.getWorld().getName(), player, group); 608 } 609 610 /** -611 * @deprecated As of VaultAPI 1.4 use {@link #playerRemoveGroup(String, OfflinePlayer, String)} instead. +611 * @deprecated As of VaultAPI 1.4 use {@link #getPlayerGroups(String, OfflinePlayer)} instead. 612 */ 613 @Deprecated -614 abstract public boolean playerRemoveGroup(String world, String player, String group); +614 abstract public String[] getPlayerGroups(String world, String player); 615 616 /** -617 * @deprecated As of VaultAPI 1.4 use {@link #playerRemoveGroup(String, OfflinePlayer, String)} instead. +617 * @deprecated As of VaultAPI 1.4 use {@link #getPlayerGroups(String, OfflinePlayer)} instead. 618 */ 619 @Deprecated -620 public boolean playerRemoveGroup(World world, String player, String group) { +620 public String[] getPlayerGroups(World world, String player) { 621 if (world == null) { -622 return playerRemoveGroup((String) null, player, group); +622 return getPlayerGroups((String) null, player); 623 } -624 return playerRemoveGroup(world.getName(), player, group); +624 return getPlayerGroups(world.getName(), player); 625 } 626 627 /** -628 * Remove player from a group. +628 * Gets the list of groups that this player has 629 * Supports NULL value for World if the permission system registered supports global permissions. 630 * But May return odd values if the servers registered permission system does not have a global permission store. 631 * -632 * @param world World Object -633 * @param player to remove -634 * @param group Group name -635 * @return Success or Failure -636 */ -637 public boolean playerRemoveGroup(String world, OfflinePlayer player, String group) { -638 if (world == null) { -639 return playerRemoveGroup((String) null, player.getName(), group); -640 } -641 return playerRemoveGroup(world, player.getName(), group); -642 } -643 -644 /** -645 * Remove player from a group. -646 * This will add a player to the group on the current World. This may return odd results if the permission system -647 * being used on the server does not support world-specific groups, or if the group being added to is a global group. -648 * -649 * @param player Player Object -650 * @param group Group name -651 * @return Success or Failure -652 */ -653 public boolean playerRemoveGroup(Player player, String group) { -654 return playerRemoveGroup(player.getWorld().getName(), player, group); -655 } -656 -657 /** -658 * @deprecated As of VaultAPI 1.4 use {@link #getPlayerGroups(String, OfflinePlayer)} instead. -659 */ -660 @Deprecated -661 abstract public String[] getPlayerGroups(String world, String player); -662 -663 /** -664 * @deprecated As of VaultAPI 1.4 use {@link #getPlayerGroups(String, OfflinePlayer)} instead. -665 */ -666 @Deprecated -667 public String[] getPlayerGroups(World world, String player) { -668 if (world == null) { -669 return getPlayerGroups((String) null, player); -670 } -671 return getPlayerGroups(world.getName(), player); -672 } -673 -674 /** -675 * Gets the list of groups that this player has -676 * Supports NULL value for World if the permission system registered supports global permissions. -677 * But May return odd values if the servers registered permission system does not have a global permission store. -678 * -679 * @param world String world name -680 * @param player OfflinePlayer -681 * @return Array of groups -682 */ -683 public String[] getPlayerGroups(String world, OfflinePlayer player) { -684 return getPlayerGroups(world, player.getName()); -685 } -686 -687 /** -688 * Returns a list of world-specific groups that this player is currently in. May return unexpected results if -689 * you are looking for global groups, or if the registered permission system does not support world-specific groups. -690 * See {@link #getPlayerGroups(String, OfflinePlayer)} for better control of World-specific or global groups. -691 * -692 * @param player Player Object -693 * @return Array of groups -694 */ -695 public String[] getPlayerGroups(Player player) { -696 return getPlayerGroups(player.getWorld().getName(), player); -697 } -698 -699 /** -700 * @deprecated As of VaultAPI 1.4 use {@link #getPrimaryGroup(String, OfflinePlayer)} instead. -701 */ -702 @Deprecated -703 abstract public String getPrimaryGroup(String world, String player); -704 -705 /** -706 * @deprecated As of VaultAPI 1.4 use {@link #getPrimaryGroup(String, OfflinePlayer)} instead. -707 */ -708 @Deprecated -709 public String getPrimaryGroup(World world, String player) { -710 if (world == null) { -711 return getPrimaryGroup((String) null, player); -712 } -713 return getPrimaryGroup(world.getName(), player); -714 } -715 -716 /** -717 * Gets players primary group -718 * Supports NULL value for World if the permission system registered supports global permissions. -719 * But May return odd values if the servers registered permission system does not have a global permission store. -720 * -721 * @param world String world name -722 * @param player to get from -723 * @return Players primary group -724 */ -725 public String getPrimaryGroup(String world, OfflinePlayer player) { -726 return getPrimaryGroup(world, player.getName()); -727 } -728 -729 /** -730 * Get players primary group. -731 * Defaults to the players current world, so may return only world-specific groups. -732 * In most cases {@link #getPrimaryGroup(String, OfflinePlayer)} is preferable. -733 * -734 * @param player Player Object -735 * @return Players primary group -736 */ -737 public String getPrimaryGroup(Player player) { -738 return getPrimaryGroup(player.getWorld().getName(), player); -739 } -740 -741 /** -742 * Returns a list of all known groups -743 * @return an Array of String of all groups -744 */ -745 abstract public String[] getGroups(); -746 -747 /** -748 * Returns true if the given implementation supports groups. -749 * @return true if the implementation supports groups -750 */ -751 abstract public boolean hasGroupSupport(); -752} +632 * @param world String world name +633 * @param player OfflinePlayer +634 * @return Array of groups +635 */ +636 public String[] getPlayerGroups(String world, OfflinePlayer player) { +637 return getPlayerGroups(world, player.getName()); +638 } +639 +640 /** +641 * Returns a list of world-specific groups that this player is currently in. May return unexpected results if +642 * you are looking for global groups, or if the registered permission system does not support world-specific groups. +643 * See {@link #getPlayerGroups(String, OfflinePlayer)} for better control of World-specific or global groups. +644 * +645 * @param player Player Object +646 * @return Array of groups +647 */ +648 public String[] getPlayerGroups(Player player) { +649 return getPlayerGroups(player.getWorld().getName(), player); +650 } +651 +652 /** +653 * @deprecated As of VaultAPI 1.4 use {@link #getPrimaryGroup(String, OfflinePlayer)} instead. +654 */ +655 @Deprecated +656 abstract public String getPrimaryGroup(String world, String player); +657 +658 /** +659 * @deprecated As of VaultAPI 1.4 use {@link #getPrimaryGroup(String, OfflinePlayer)} instead. +660 */ +661 @Deprecated +662 public String getPrimaryGroup(World world, String player) { +663 if (world == null) { +664 return getPrimaryGroup((String) null, player); +665 } +666 return getPrimaryGroup(world.getName(), player); +667 } +668 +669 /** +670 * Gets players primary group +671 * Supports NULL value for World if the permission system registered supports global permissions. +672 * But May return odd values if the servers registered permission system does not have a global permission store. +673 * +674 * @param world String world name +675 * @param player to get from +676 * @return Players primary group +677 */ +678 public String getPrimaryGroup(String world, OfflinePlayer player) { +679 return getPrimaryGroup(world, player.getName()); +680 } +681 +682 /** +683 * Get players primary group. +684 * Defaults to the players current world, so may return only world-specific groups. +685 * In most cases {@link #getPrimaryGroup(String, OfflinePlayer)} is preferable. +686 * +687 * @param player Player Object +688 * @return Players primary group +689 */ +690 public String getPrimaryGroup(Player player) { +691 return getPrimaryGroup(player.getWorld().getName(), player); +692 } +693 +694 /** +695 * Returns a list of all known groups +696 * @return an Array of String of all groups +697 */ +698 abstract public String[] getGroups(); +699 +700 /** +701 * Returns true if the given implementation supports groups. +702 * @return true if the implementation supports groups +703 */ +704 abstract public boolean hasGroupSupport(); +705} diff --git a/stylesheet.css b/stylesheet.css index 0aeaa97..98055b2 100644 --- a/stylesheet.css +++ b/stylesheet.css @@ -2,16 +2,19 @@ /* Overall document style */ + +@import url('resources/fonts/dejavu.css'); + body { background-color:#ffffff; color:#353833; - font-family:Arial, Helvetica, sans-serif; - font-size:76%; + font-family:'DejaVu Sans', Arial, Helvetica, sans-serif; + font-size:14px; margin:0; } a:link, a:visited { text-decoration:none; - color:#4c6b87; + color:#4A6782; } a:hover, a:focus { text-decoration:none; @@ -19,7 +22,7 @@ a:hover, a:focus { } a:active { text-decoration:none; - color:#4c6b87; + color:#4A6782; } a[name] { color:#353833; @@ -29,41 +32,51 @@ a[name]:hover { color:#353833; } pre { - font-size:1.3em; + font-family:'DejaVu Sans Mono', monospace; + font-size:14px; } h1 { - font-size:1.8em; + font-size:20px; } h2 { - font-size:1.5em; + font-size:18px; } h3 { - font-size:1.4em; + font-size:16px; + font-style:italic; } h4 { - font-size:1.3em; + font-size:13px; } h5 { - font-size:1.2em; + font-size:12px; } h6 { - font-size:1.1em; + font-size:11px; } ul { list-style-type:disc; } code, tt { - font-size:1.2em; + font-family:'DejaVu Sans Mono', monospace; + font-size:14px; + padding-top:4px; + margin-top:8px; + line-height:1.4em; } dt code { - font-size:1.2em; + font-family:'DejaVu Sans Mono', monospace; + font-size:14px; + padding-top:4px; } table tr td dt code { - font-size:1.2em; + font-family:'DejaVu Sans Mono', monospace; + font-size:14px; vertical-align:top; + padding-top:4px; } sup { - font-size:.6em; + font-size:8px; } /* Document title and Copyright styles @@ -76,9 +89,9 @@ Document title and Copyright styles .aboutLanguage { float:right; padding:0px 21px; - font-size:.8em; + font-size:11px; z-index:200; - margin-top:-7px; + margin-top:-9px; } .legalCopy { margin-left:.5em; @@ -92,9 +105,6 @@ Document title and Copyright styles } .tab { background-color:#0066FF; - background-image:url(resources/titlebar.gif); - background-position:left top; - background-repeat:no-repeat; color:#ffffff; padding:8px; width:5em; @@ -104,17 +114,15 @@ Document title and Copyright styles Navigation bar styles */ .bar { - background-image:url(resources/background.gif); - background-repeat:repeat-x; + background-color:#4D7A97; color:#FFFFFF; padding:.8em .5em .4em .8em; height:auto;/*height:1.8em;*/ - font-size:1em; + font-size:11px; margin:0; } .topNav { - background-image:url(resources/background.gif); - background-repeat:repeat-x; + background-color:#4D7A97; color:#FFFFFF; float:left; padding:0; @@ -123,11 +131,11 @@ Navigation bar styles height:2.8em; padding-top:10px; overflow:hidden; + font-size:12px; } .bottomNav { margin-top:10px; - background-image:url(resources/background.gif); - background-repeat:repeat-x; + background-color:#4D7A97; color:#FFFFFF; float:left; padding:0; @@ -136,18 +144,20 @@ Navigation bar styles height:2.8em; padding-top:10px; overflow:hidden; + font-size:12px; } .subNav { background-color:#dee3e9; - border-bottom:1px solid #9eadc0; float:left; width:100%; overflow:hidden; + font-size:12px; } .subNav div { clear:left; float:left; padding:0 0 5px 6px; + text-transform:uppercase; } ul.navList, ul.subNavList { float:left; @@ -157,27 +167,33 @@ ul.navList, ul.subNavList { ul.navList li{ list-style:none; float:left; - padding:3px 6px; + padding: 5px 6px; + text-transform:uppercase; } ul.subNavList li{ list-style:none; float:left; - font-size:90%; } .topNav a:link, .topNav a:active, .topNav a:visited, .bottomNav a:link, .bottomNav a:active, .bottomNav a:visited { color:#FFFFFF; text-decoration:none; + text-transform:uppercase; } .topNav a:hover, .bottomNav a:hover { text-decoration:none; color:#bb7a2a; + text-transform:uppercase; } .navBarCell1Rev { - background-image:url(resources/tab.gif); - background-color:#a88834; - color:#FFFFFF; + background-color:#F8981D; + color:#253441; margin: auto 5px; - border:1px solid #c9aa44; +} +.skipNav { + position:absolute; + top:auto; + left:-9999px; + overflow:hidden; } /* Page header and footer styles @@ -191,8 +207,11 @@ Page header and footer styles margin:10px; position:relative; } +.indexHeader span{ + margin-right:15px; +} .indexHeader h1 { - font-size:1.3em; + font-size:13px; } .title { color:#2c4557; @@ -202,7 +221,7 @@ Page header and footer styles margin:5px 0 0 0; } .header ul { - margin:0 0 25px 0; + margin:0 0 15px 0; padding:0; } .footer ul { @@ -210,24 +229,22 @@ Page header and footer styles } .header ul li, .footer ul li { list-style:none; - font-size:1.2em; + font-size:13px; } /* Heading styles */ div.details ul.blockList ul.blockList ul.blockList li.blockList h4, div.details ul.blockList ul.blockList ul.blockListLast li.blockList h4 { background-color:#dee3e9; - border-top:1px solid #9eadc0; - border-bottom:1px solid #9eadc0; + border:1px solid #d0d9e0; margin:0 0 6px -8px; - padding:2px 5px; + padding:7px 5px; } ul.blockList ul.blockList ul.blockList li.blockList h3 { background-color:#dee3e9; - border-top:1px solid #9eadc0; - border-bottom:1px solid #9eadc0; + border:1px solid #d0d9e0; margin:0 0 6px -8px; - padding:2px 5px; + padding:7px 5px; } ul.blockList ul.blockList li.blockList h3 { padding:0; @@ -247,10 +264,10 @@ Page layout container styles .indexContainer { margin:10px; position:relative; - font-size:1.0em; + font-size:12px; } .indexContainer h2 { - font-size:1.1em; + font-size:13px; padding:0 0 3px 0; } .indexContainer ul { @@ -259,15 +276,18 @@ Page layout container styles } .indexContainer ul li { list-style:none; + padding-top:2px; } .contentContainer .description dl dt, .contentContainer .details dl dt, .serializedFormContainer dl dt { - font-size:1.1em; + font-size:12px; font-weight:bold; margin:10px 0 0 0; color:#4E4E4E; } .contentContainer .description dl dd, .contentContainer .details dl dd, .serializedFormContainer dl dd { - margin:10px 0 10px 20px; + margin:5px 0 10px 0px; + font-size:14px; + font-family:'DejaVu Sans Mono',monospace; } .serializedFormContainer dl.nameValue dt { margin-left:1px; @@ -306,25 +326,24 @@ ul.blockList, ul.blockListLast { } ul.blockList li.blockList, ul.blockListLast li.blockList { list-style:none; - margin-bottom:25px; + margin-bottom:15px; + line-height:1.4; } ul.blockList ul.blockList li.blockList, ul.blockList ul.blockListLast li.blockList { padding:0px 20px 5px 10px; - border:1px solid #9eadc0; - background-color:#f9f9f9; + border:1px solid #ededed; + background-color:#f8f8f8; } ul.blockList ul.blockList ul.blockList li.blockList, ul.blockList ul.blockList ul.blockListLast li.blockList { padding:0 0 5px 8px; background-color:#ffffff; - border:1px solid #9eadc0; - border-top:none; + border:none; } ul.blockList ul.blockList ul.blockList ul.blockList li.blockList { margin-left:0; padding-left:0; padding-bottom:15px; border:none; - border-bottom:1px solid #9eadc0; } ul.blockList ul.blockList ul.blockList ul.blockList li.blockListLast { list-style:none; @@ -338,107 +357,155 @@ table tr td dl, table tr td dl dt, table tr td dl dd { /* Table styles */ -.contentContainer table, .classUseContainer table, .constantValuesContainer table { - border-bottom:1px solid #9eadc0; +.overviewSummary, .memberSummary, .typeSummary, .useSummary, .constantsSummary, .deprecatedSummary { width:100%; + border-left:1px solid #EEE; + border-right:1px solid #EEE; + border-bottom:1px solid #EEE; } -.contentContainer ul li table, .classUseContainer ul li table, .constantValuesContainer ul li table { - width:100%; +.overviewSummary, .memberSummary { + padding:0px; } -.contentContainer .description table, .contentContainer .details table { - border-bottom:none; -} -.contentContainer ul li table th.colOne, .contentContainer ul li table th.colFirst, .contentContainer ul li table th.colLast, .classUseContainer ul li table th, .constantValuesContainer ul li table th, .contentContainer ul li table td.colOne, .contentContainer ul li table td.colFirst, .contentContainer ul li table td.colLast, .classUseContainer ul li table td, .constantValuesContainer ul li table td{ - vertical-align:top; - padding-right:20px; -} -.contentContainer ul li table th.colLast, .classUseContainer ul li table th.colLast,.constantValuesContainer ul li table th.colLast, -.contentContainer ul li table td.colLast, .classUseContainer ul li table td.colLast,.constantValuesContainer ul li table td.colLast, -.contentContainer ul li table th.colOne, .classUseContainer ul li table th.colOne, -.contentContainer ul li table td.colOne, .classUseContainer ul li table td.colOne { - padding-right:3px; -} -.overviewSummary caption, .packageSummary caption, .contentContainer ul.blockList li.blockList caption, .summary caption, .classUseContainer caption, .constantValuesContainer caption { +.overviewSummary caption, .memberSummary caption, .typeSummary caption, +.useSummary caption, .constantsSummary caption, .deprecatedSummary caption { position:relative; text-align:left; background-repeat:no-repeat; - color:#FFFFFF; + color:#253441; font-weight:bold; clear:none; overflow:hidden; padding:0px; + padding-top:10px; + padding-left:1px; margin:0px; + white-space:pre; } -caption a:link, caption a:hover, caption a:active, caption a:visited { +.overviewSummary caption a:link, .memberSummary caption a:link, .typeSummary caption a:link, +.useSummary caption a:link, .constantsSummary caption a:link, .deprecatedSummary caption a:link, +.overviewSummary caption a:hover, .memberSummary caption a:hover, .typeSummary caption a:hover, +.useSummary caption a:hover, .constantsSummary caption a:hover, .deprecatedSummary caption a:hover, +.overviewSummary caption a:active, .memberSummary caption a:active, .typeSummary caption a:active, +.useSummary caption a:active, .constantsSummary caption a:active, .deprecatedSummary caption a:active, +.overviewSummary caption a:visited, .memberSummary caption a:visited, .typeSummary caption a:visited, +.useSummary caption a:visited, .constantsSummary caption a:visited, .deprecatedSummary caption a:visited { color:#FFFFFF; } -.overviewSummary caption span, .packageSummary caption span, .contentContainer ul.blockList li.blockList caption span, .summary caption span, .classUseContainer caption span, .constantValuesContainer caption span { +.overviewSummary caption span, .memberSummary caption span, .typeSummary caption span, +.useSummary caption span, .constantsSummary caption span, .deprecatedSummary caption span { white-space:nowrap; - padding-top:8px; - padding-left:8px; - display:block; + padding-top:5px; + padding-left:12px; + padding-right:12px; + padding-bottom:7px; + display:inline-block; float:left; - background-image:url(resources/titlebar.gif); - height:18px; + background-color:#F8981D; + border: none; + height:16px; } -.overviewSummary .tabEnd, .packageSummary .tabEnd, .contentContainer ul.blockList li.blockList .tabEnd, .summary .tabEnd, .classUseContainer .tabEnd, .constantValuesContainer .tabEnd { - width:10px; - background-image:url(resources/titlebar_end.gif); - background-repeat:no-repeat; - background-position:top right; +.memberSummary caption span.activeTableTab span { + white-space:nowrap; + padding-top:5px; + padding-left:12px; + padding-right:12px; + margin-right:3px; + display:inline-block; + float:left; + background-color:#F8981D; + height:16px; +} +.memberSummary caption span.tableTab span { + white-space:nowrap; + padding-top:5px; + padding-left:12px; + padding-right:12px; + margin-right:3px; + display:inline-block; + float:left; + background-color:#4D7A97; + height:16px; +} +.memberSummary caption span.tableTab, .memberSummary caption span.activeTableTab { + padding-top:0px; + padding-left:0px; + padding-right:0px; + background-image:none; + float:none; + display:inline; +} +.overviewSummary .tabEnd, .memberSummary .tabEnd, .typeSummary .tabEnd, +.useSummary .tabEnd, .constantsSummary .tabEnd, .deprecatedSummary .tabEnd { + display:none; + width:5px; position:relative; float:left; + background-color:#F8981D; } -ul.blockList ul.blockList li.blockList table { - margin:0 0 12px 0px; - width:100%; +.memberSummary .activeTableTab .tabEnd { + display:none; + width:5px; + margin-right:3px; + position:relative; + float:left; + background-color:#F8981D; } -.tableSubHeadingColor { - background-color: #EEEEFF; +.memberSummary .tableTab .tabEnd { + display:none; + width:5px; + margin-right:3px; + position:relative; + background-color:#4D7A97; + float:left; + } -.altColor { - background-color:#eeeeef; -} -.rowColor { - background-color:#ffffff; -} -.overviewSummary td, .packageSummary td, .contentContainer ul.blockList li.blockList td, .summary td, .classUseContainer td, .constantValuesContainer td { +.overviewSummary td, .memberSummary td, .typeSummary td, +.useSummary td, .constantsSummary td, .deprecatedSummary td { text-align:left; - padding:3px 3px 3px 7px; + padding:0px 0px 12px 10px; } -th.colFirst, th.colLast, th.colOne, .constantValuesContainer th { +th.colOne, th.colFirst, th.colLast, .useSummary th, .constantsSummary th, +td.colOne, td.colFirst, td.colLast, .useSummary td, .constantsSummary td{ + vertical-align:top; + padding-right:0px; + padding-top:8px; + padding-bottom:3px; +} +th.colFirst, th.colLast, th.colOne, .constantsSummary th { background:#dee3e9; - border-top:1px solid #9eadc0; - border-bottom:1px solid #9eadc0; text-align:left; - padding:3px 3px 3px 7px; + padding:8px 3px 3px 7px; +} +td.colFirst, th.colFirst { + white-space:nowrap; + font-size:13px; +} +td.colLast, th.colLast { + font-size:13px; +} +td.colOne, th.colOne { + font-size:13px; +} +.overviewSummary td.colFirst, .overviewSummary th.colFirst, +.useSummary td.colFirst, .useSummary th.colFirst, +.overviewSummary td.colOne, .overviewSummary th.colOne, +.memberSummary td.colFirst, .memberSummary th.colFirst, +.memberSummary td.colOne, .memberSummary th.colOne, +.typeSummary td.colFirst{ + width:25%; + vertical-align:top; } td.colOne a:link, td.colOne a:active, td.colOne a:visited, td.colOne a:hover, td.colFirst a:link, td.colFirst a:active, td.colFirst a:visited, td.colFirst a:hover, td.colLast a:link, td.colLast a:active, td.colLast a:visited, td.colLast a:hover, .constantValuesContainer td a:link, .constantValuesContainer td a:active, .constantValuesContainer td a:visited, .constantValuesContainer td a:hover { font-weight:bold; } -td.colFirst, th.colFirst { - border-left:1px solid #9eadc0; - white-space:nowrap; +.tableSubHeadingColor { + background-color:#EEEEFF; } -td.colLast, th.colLast { - border-right:1px solid #9eadc0; +.altColor { + background-color:#FFFFFF; } -td.colOne, th.colOne { - border-right:1px solid #9eadc0; - border-left:1px solid #9eadc0; -} -table.overviewSummary { - padding:0px; - margin-left:0px; -} -table.overviewSummary td.colFirst, table.overviewSummary th.colFirst, -table.overviewSummary td.colOne, table.overviewSummary th.colOne { - width:25%; - vertical-align:middle; -} -table.packageSummary td.colFirst, table.overviewSummary th.colFirst { - width:25%; - vertical-align:middle; +.rowColor { + background-color:#EEEEEF; } /* Content styles @@ -453,6 +520,24 @@ Content styles .docSummary { padding:0; } + +ul.blockList ul.blockList ul.blockList li.blockList h3 { + font-style:normal; +} + +div.block { + font-size:14px; + font-family:'DejaVu Serif', Georgia, "Times New Roman", Times, serif; +} + +td.colLast div { + padding-top:0px; +} + + +td.colLast a { + padding-bottom:3px; +} /* Formatting effect styles */ @@ -463,12 +548,27 @@ Formatting effect styles h1.hidden { visibility:hidden; overflow:hidden; - font-size:.9em; + font-size:10px; } .block { display:block; - margin:3px 0 0 0; + margin:3px 10px 2px 0px; + color:#474747; } -.strong { +.deprecatedLabel, .descfrmTypeLabel, .memberNameLabel, .memberNameLink, +.overrideSpecifyLabel, .packageHierarchyLabel, .paramLabel, .returnLabel, +.seeLabel, .simpleTagLabel, .throwsLabel, .typeNameLabel, .typeNameLink { font-weight:bold; } +.deprecationComment, .emphasizedPhrase, .interfaceName { + font-style:italic; +} + +div.block div.block span.deprecationComment, div.block div.block span.emphasizedPhrase, +div.block div.block span.interfaceName { + font-style:normal; +} + +div.contentContainer ul.blockList li.blockList h2{ + padding-bottom:0px; +}