From 8af9ae3e5616eefdc84d9f1669631a06bc1af0d8 Mon Sep 17 00:00:00 2001 From: Andrzej Pomirski Date: Wed, 30 Jan 2013 17:57:48 +0100 Subject: [PATCH 1/6] Fix JavaDocs --- src/net/milkbowl/vault/economy/Economy.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/net/milkbowl/vault/economy/Economy.java b/src/net/milkbowl/vault/economy/Economy.java index be115d7..20d6d95 100644 --- a/src/net/milkbowl/vault/economy/Economy.java +++ b/src/net/milkbowl/vault/economy/Economy.java @@ -31,8 +31,8 @@ public interface Economy { public boolean isEnabled(); /** - * Gets name of permission method - * @return Name of Permission Method + * Gets name of economy method + * @return Name of Ecoomy Method */ public String getName(); @@ -196,4 +196,4 @@ public interface Economy { * @return if the account creation was successful */ public boolean createPlayerAccount(String playerName); -} \ No newline at end of file +} From 79bbee126d2959834fb6be7cb266adb8198ce0f6 Mon Sep 17 00:00:00 2001 From: William Lebel Date: Tue, 5 Feb 2013 14:22:40 -0500 Subject: [PATCH 2/6] Updated Craftconomy hook to latest API changes. Made the pom.xml downloads from the repository. --- pom.xml | 12 +++++++----- .../economy/plugins/Economy_Craftconomy3.java | 18 +++++++++--------- 2 files changed, 16 insertions(+), 14 deletions(-) diff --git a/pom.xml b/pom.xml index 3cfe60c..7f4866b 100644 --- a/pom.xml +++ b/pom.xml @@ -231,11 +231,9 @@ ${project.basedir}/lib/Craftconomy.jar - me.greatmancode + com.greatmancode craftconomy3 - 3.0.0 - system - ${project.basedir}/lib/craftconomy3.jar + 3.1.0-SNAPSHOT net.crystalyx.bukkit.simplyperms @@ -371,9 +369,13 @@ iConomy 4,5,6 BOSEconomy 6/7, EssentialsEcon, 3Co, MultiConomy, MineConomy, Econ bukkit-repo http://repo.bukkit.org/content/groups/public/ - + sdfeconomy-repo http://omwah.sdf.org/maven/repo/snapshots/ + + greatman-repo + http://repo.greatmancode.com/content/groups/public/ + diff --git a/src/net/milkbowl/vault/economy/plugins/Economy_Craftconomy3.java b/src/net/milkbowl/vault/economy/plugins/Economy_Craftconomy3.java index 439659e..6565e1e 100644 --- a/src/net/milkbowl/vault/economy/plugins/Economy_Craftconomy3.java +++ b/src/net/milkbowl/vault/economy/plugins/Economy_Craftconomy3.java @@ -105,22 +105,22 @@ public class Economy_Craftconomy3 implements Economy { @Override public String format(double amount) { - return Common.getInstance().format(null, Common.getInstance().getCurrencyManager().getCurrency(CurrencyManager.defaultCurrencyID), amount); + return Common.getInstance().format(null, Common.getInstance().getCurrencyManager().getDefaultCurrency(), amount); } @Override public String currencyNameSingular() { - return Common.getInstance().getCurrencyManager().getCurrency(CurrencyManager.defaultCurrencyID).getName(); + return Common.getInstance().getCurrencyManager().getDefaultCurrency().getName(); } @Override public String currencyNamePlural() { - return Common.getInstance().getCurrencyManager().getCurrency(CurrencyManager.defaultCurrencyID).getPlural(); + return Common.getInstance().getCurrencyManager().getDefaultCurrency().getPlural(); } @Override public double getBalance(String playerName) { - return Common.getInstance().getAccountManager().getAccount(playerName).getBalance(Common.getInstance().getServerCaller().getDefaultWorld(), Common.getInstance().getCurrencyManager().getCurrency(CurrencyManager.defaultCurrencyID).getName()); + return Common.getInstance().getAccountManager().getAccount(playerName).getBalance(Common.getInstance().getServerCaller().getDefaultWorld(), Common.getInstance().getCurrencyManager().getDefaultCurrency().getName()); } @Override @@ -131,8 +131,8 @@ public class Economy_Craftconomy3 implements Economy { double balance; Account account = Common.getInstance().getAccountManager().getAccount(playerName); - if (account.hasEnough(amount, Common.getInstance().getServerCaller().getDefaultWorld(), Common.getInstance().getCurrencyManager().getCurrency(CurrencyManager.defaultCurrencyID).getName())) { - balance = account.withdraw(amount, Common.getInstance().getServerCaller().getDefaultWorld(), Common.getInstance().getCurrencyManager().getCurrency(CurrencyManager.defaultCurrencyID).getName()); + if (account.hasEnough(amount, Common.getInstance().getServerCaller().getDefaultWorld(), Common.getInstance().getCurrencyManager().getDefaultCurrency().getName())) { + balance = account.withdraw(amount, Common.getInstance().getServerCaller().getDefaultWorld(), Common.getInstance().getCurrencyManager().getDefaultCurrency().getName()); return new EconomyResponse(amount, balance, ResponseType.SUCCESS, ""); } else { return new EconomyResponse(0, getBalance(playerName), ResponseType.FAILURE, "Insufficient funds"); @@ -147,7 +147,7 @@ public class Economy_Craftconomy3 implements Economy { Account account = Common.getInstance().getAccountManager().getAccount(playerName); - double balance = account.deposit(amount, Common.getInstance().getServerCaller().getDefaultWorld(), Common.getInstance().getCurrencyManager().getCurrency(CurrencyManager.defaultCurrencyID).getName()); + double balance = account.deposit(amount, Common.getInstance().getServerCaller().getDefaultWorld(), Common.getInstance().getCurrencyManager().getDefaultCurrency().getName()); return new EconomyResponse(amount, balance, ResponseType.SUCCESS, null); } @@ -185,7 +185,7 @@ public class Economy_Craftconomy3 implements Economy { if (Common.getInstance().getAccountManager().exist(Account.BANK_PREFIX + name)) { Account account = Common.getInstance().getAccountManager().getAccount(Account.BANK_PREFIX + name); - if (account.hasEnough(amount, Common.getInstance().getServerCaller().getDefaultWorld(), Common.getInstance().getCurrencyManager().getCurrency(CurrencyManager.defaultCurrencyID).getName())) { + if (account.hasEnough(amount, Common.getInstance().getServerCaller().getDefaultWorld(), Common.getInstance().getCurrencyManager().getDefaultCurrency().getName())) { return new EconomyResponse(0, bankBalance(Account.BANK_PREFIX + name).balance, ResponseType.SUCCESS, ""); } else { return new EconomyResponse(0, bankBalance(Account.BANK_PREFIX + name).balance, ResponseType.FAILURE, "The bank does not have enough money!"); @@ -267,7 +267,7 @@ public class Economy_Craftconomy3 implements Economy { ArrayList list = new ArrayList(); Iterator iterator = accountList.iterator(); while (iterator.hasNext()) { - list.add(iterator.next().name.replaceFirst(Account.BANK_PREFIX, "")); + list.add(iterator.next().getName().replaceFirst(Account.BANK_PREFIX, "")); } return list; From 785d2f5b4bdd58b3dfde7729d065d45993ecd873 Mon Sep 17 00:00:00 2001 From: Nick Minkler Date: Wed, 6 Feb 2013 16:25:43 -0800 Subject: [PATCH 3/6] don't check plugin enabled status when hooking a plugin in PluginEnableEvent --- plugin.yml | 3 +- .../plugins/Permission_GroupManager.java | 16 ++- .../plugins/Permission_PermissionsEx.java | 100 +++++++++--------- .../plugins/Permission_Privileges.java | 6 +- .../plugins/Permission_SimplyPerms.java | 6 +- 5 files changed, 60 insertions(+), 71 deletions(-) diff --git a/plugin.yml b/plugin.yml index 72212ab..3c4507a 100644 --- a/plugin.yml +++ b/plugin.yml @@ -4,8 +4,7 @@ version: 1.2.23-b${BUILD_NUMBER} authors: [cereal, Sleaker, mung3r] website: http://dev.bukkit.org/server-mods/vault load: startup -description: > - Abstraction Library for Bukkit Plugins +description: Abstraction Library for Bukkit Plugins commands: vault-info: description: Displays information about Vault diff --git a/src/net/milkbowl/vault/permission/plugins/Permission_GroupManager.java b/src/net/milkbowl/vault/permission/plugins/Permission_GroupManager.java index 6e5cc4c..5c2eb98 100644 --- a/src/net/milkbowl/vault/permission/plugins/Permission_GroupManager.java +++ b/src/net/milkbowl/vault/permission/plugins/Permission_GroupManager.java @@ -50,11 +50,9 @@ public class Permission_GroupManager extends Permission { // Load Plugin in case it was loaded before if (groupManager == null) { Plugin perms = plugin.getServer().getPluginManager().getPlugin("GroupManager"); - if (perms != null) { - if (perms.isEnabled()) { - groupManager = (GroupManager) perms; - log.info(String.format("[%s][Permission] %s hooked.", plugin.getDescription().getName(), name)); - } + if (perms != null && perms.isEnabled()) { + groupManager = (GroupManager) perms; + log.info(String.format("[%s][Permission] %s hooked.", plugin.getDescription().getName(), name)); } } } @@ -70,12 +68,10 @@ public class Permission_GroupManager extends Permission { public void onPluginEnable(PluginEnableEvent event) { if (permission.groupManager == null) { Plugin perms = plugin.getServer().getPluginManager().getPlugin("GroupManager"); - if (perms != null) { - if (perms.isEnabled()) { - permission.groupManager = (GroupManager) perms; - log.info(String.format("[%s][Permission] %s hooked.", plugin.getDescription().getName(), permission.name)); - } + permission.groupManager = (GroupManager) perms; + log.info(String.format("[%s][Permission] %s hooked.", plugin.getDescription().getName(), permission.name)); + } } } diff --git a/src/net/milkbowl/vault/permission/plugins/Permission_PermissionsEx.java b/src/net/milkbowl/vault/permission/plugins/Permission_PermissionsEx.java index 1e74413..b189f4f 100644 --- a/src/net/milkbowl/vault/permission/plugins/Permission_PermissionsEx.java +++ b/src/net/milkbowl/vault/permission/plugins/Permission_PermissionsEx.java @@ -69,7 +69,7 @@ public class Permission_PermissionsEx extends Permission { @Override public boolean playerInGroup(String worldName, String playerName, String groupName) { - return PermissionsEx.getPermissionManager().getUser(playerName).inGroup(groupName); + return PermissionsEx.getPermissionManager().getUser(playerName).inGroup(groupName); } public class PermissionServerListener implements Listener { @@ -85,18 +85,16 @@ public class Permission_PermissionsEx extends Permission { Plugin perms = plugin.getServer().getPluginManager().getPlugin("PermissionsEx"); if (perms != null) { - if (perms.isEnabled()) { - try { - if (Double.valueOf(perms.getDescription().getVersion()) < 1.16) { - log.info(String.format("[%s][Permission] %s below 1.16 is not compatible with Vault! Falling back to SuperPerms only mode. PLEASE UPDATE!", plugin.getDescription().getName(), name)); - return; - } - } catch (NumberFormatException e) { - // Do nothing + try { + if (Double.valueOf(perms.getDescription().getVersion()) < 1.16) { + log.info(String.format("[%s][Permission] %s below 1.16 is not compatible with Vault! Falling back to SuperPerms only mode. PLEASE UPDATE!", plugin.getDescription().getName(), name)); + return; } - permission.permission = (PermissionsEx) perms; - log.info(String.format("[%s][Permission] %s hooked.", plugin.getDescription().getName(), permission.name)); + } catch (NumberFormatException e) { + // Do nothing } + permission.permission = (PermissionsEx) perms; + log.info(String.format("[%s][Permission] %s hooked.", plugin.getDescription().getName(), permission.name)); } } } @@ -131,8 +129,8 @@ public class Permission_PermissionsEx extends Permission { @Override public boolean playerRemoveGroup(String worldName, String playerName, String groupName) { - PermissionsEx.getPermissionManager().getUser(playerName).removeGroup(groupName); - return true; + PermissionsEx.getPermissionManager().getUser(playerName).removeGroup(groupName); + return true; } @Override @@ -215,7 +213,7 @@ public class Permission_PermissionsEx extends Permission { return false; } } - + @Override public boolean playerAddTransient(String worldName, String player, String permission) { PermissionUser pPlayer = PermissionsEx.getPermissionManager().getUser(player); @@ -226,62 +224,62 @@ public class Permission_PermissionsEx extends Permission { return false; } } - + @Override public boolean playerAddTransient(String worldName, Player player, String permission) { - return playerAddTransient(worldName, player.getName(), permission); + return playerAddTransient(worldName, player.getName(), permission); } - + @Override public boolean playerAddTransient(String player, String permission) { - return playerAddTransient(null, player, permission); + return playerAddTransient(null, player, permission); } - + @Override public boolean playerAddTransient(Player player, String permission) { - return playerAddTransient(null, player.getName(), permission); + return playerAddTransient(null, player.getName(), permission); } @Override public boolean playerRemoveTransient(String worldName, String player, String permission) { - PermissionUser pPlayer = PermissionsEx.getPermissionManager().getUser(player); - if (pPlayer != null) { - pPlayer.removeTimedPermission(permission, worldName); - return true; - } else { - return false; - } + PermissionUser pPlayer = PermissionsEx.getPermissionManager().getUser(player); + if (pPlayer != null) { + pPlayer.removeTimedPermission(permission, worldName); + return true; + } else { + return false; + } } - + @Override public boolean playerRemoveTransient(Player player, String permission) { - return playerRemoveTransient(null, player.getName(), permission); + return playerRemoveTransient(null, player.getName(), permission); } - + @Override public boolean playerRemoveTransient(String worldName, Player player, String permission) { - return playerRemoveTransient(worldName, player.getName(), permission); + return playerRemoveTransient(worldName, player.getName(), permission); } - - @Override - public boolean playerRemoveTransient(String player, String permission) { - return playerRemoveTransient(null, player, permission); - } - @Override - public String[] getGroups() { - PermissionGroup[] groups = PermissionsEx.getPermissionManager().getGroups(); - if (groups == null || groups.length == 0) - return null; - String[] groupNames = new String[groups.length]; - for (int i = 0; i < groups.length; i++) { - groupNames[i] = groups[i].getName(); - } - return groupNames; - } + @Override + public boolean playerRemoveTransient(String player, String permission) { + return playerRemoveTransient(null, player, permission); + } - @Override - public boolean hasSuperPermsCompat() { - return true; - } + @Override + public String[] getGroups() { + PermissionGroup[] groups = PermissionsEx.getPermissionManager().getGroups(); + if (groups == null || groups.length == 0) + return null; + String[] groupNames = new String[groups.length]; + for (int i = 0; i < groups.length; i++) { + groupNames[i] = groups[i].getName(); + } + return groupNames; + } + + @Override + public boolean hasSuperPermsCompat() { + return true; + } } diff --git a/src/net/milkbowl/vault/permission/plugins/Permission_Privileges.java b/src/net/milkbowl/vault/permission/plugins/Permission_Privileges.java index 65611d9..17b53ab 100644 --- a/src/net/milkbowl/vault/permission/plugins/Permission_Privileges.java +++ b/src/net/milkbowl/vault/permission/plugins/Permission_Privileges.java @@ -47,10 +47,8 @@ public class Permission_Privileges extends Permission { Plugin perms = plugin.getServer().getPluginManager().getPlugin("Privileges"); if (perms != null) { - if (perms.isEnabled()) { - permission.privs = (Privileges) perms; - log.info(String.format("[%s][Permission] %s hooked.", plugin.getDescription().getName(), permission.name)); - } + permission.privs = (Privileges) perms; + log.info(String.format("[%s][Permission] %s hooked.", plugin.getDescription().getName(), permission.name)); } } } diff --git a/src/net/milkbowl/vault/permission/plugins/Permission_SimplyPerms.java b/src/net/milkbowl/vault/permission/plugins/Permission_SimplyPerms.java index 6464583..14720f5 100644 --- a/src/net/milkbowl/vault/permission/plugins/Permission_SimplyPerms.java +++ b/src/net/milkbowl/vault/permission/plugins/Permission_SimplyPerms.java @@ -63,10 +63,8 @@ public class Permission_SimplyPerms extends Permission{ Plugin perms = plugin.getServer().getPluginManager().getPlugin("SimplyPerms"); if (perms != null) { - if (perms.isEnabled()) { - permission.perms = ((SimplyPlugin) perms).getAPI(); - log.info(String.format("[%s][Permission] %s hooked.", plugin.getDescription().getName(), permission.name)); - } + permission.perms = ((SimplyPlugin) perms).getAPI(); + log.info(String.format("[%s][Permission] %s hooked.", plugin.getDescription().getName(), permission.name)); } } } From a514f066c8e9226860d7430ec04ebc9bf766aeb8 Mon Sep 17 00:00:00 2001 From: Nick Minkler Date: Wed, 6 Feb 2013 16:32:39 -0800 Subject: [PATCH 4/6] don't check if economy is enabled in PluginEnableEvent assume it is being enabled and add the hook. --- .../vault/economy/plugins/Economy_3co.java | 2 +- .../vault/economy/plugins/Economy_AEco.java | 2 +- .../vault/economy/plugins/Economy_BOSE6.java | 2 +- .../vault/economy/plugins/Economy_BOSE7.java | 2 +- .../economy/plugins/Economy_CommandsEX.java | 2 +- .../economy/plugins/Economy_Craftconomy.java | 2 +- .../economy/plugins/Economy_Craftconomy3.java | 2 +- .../vault/economy/plugins/Economy_Dosh.java | 234 +++++++++--------- .../vault/economy/plugins/Economy_EconXP.java | 2 +- .../economy/plugins/Economy_Essentials.java | 2 +- .../economy/plugins/Economy_GoldIsMoney.java | 2 +- .../economy/plugins/Economy_GoldIsMoney2.java | 2 +- .../economy/plugins/Economy_Gringotts.java | 2 +- .../economy/plugins/Economy_McMoney.java | 2 +- .../economy/plugins/Economy_MineConomy.java | 2 +- .../plugins/Economy_MultiCurrency.java | 2 +- .../vault/economy/plugins/Economy_XPBank.java | 2 +- .../economy/plugins/Economy_eWallet.java | 2 +- .../economy/plugins/Economy_iConomy4.java | 2 +- .../economy/plugins/Economy_iConomy5.java | 2 +- .../economy/plugins/Economy_iConomy6.java | 2 +- 21 files changed, 135 insertions(+), 139 deletions(-) diff --git a/src/net/milkbowl/vault/economy/plugins/Economy_3co.java b/src/net/milkbowl/vault/economy/plugins/Economy_3co.java index ce3bc71..ad1e8ea 100644 --- a/src/net/milkbowl/vault/economy/plugins/Economy_3co.java +++ b/src/net/milkbowl/vault/economy/plugins/Economy_3co.java @@ -158,7 +158,7 @@ public class Economy_3co implements Economy { if (economy.economy == null) { Plugin eco = plugin.getServer().getPluginManager().getPlugin("3co"); - if (eco != null && eco.isEnabled()) { + if (eco != null) { economy.economy = (ECO) eco; log.info(String.format("[%s][Economy] %s hooked.", plugin.getDescription().getName(), economy.name)); } diff --git a/src/net/milkbowl/vault/economy/plugins/Economy_AEco.java b/src/net/milkbowl/vault/economy/plugins/Economy_AEco.java index c0c8577..a4aaa88 100644 --- a/src/net/milkbowl/vault/economy/plugins/Economy_AEco.java +++ b/src/net/milkbowl/vault/economy/plugins/Economy_AEco.java @@ -126,7 +126,7 @@ public class Economy_AEco implements Economy { if (economy.economy == null) { Plugin eco = plugin.getServer().getPluginManager().getPlugin("AEco"); - if (eco != null && eco.isEnabled()) { + if (eco != null) { economy.economy = AEco.ECONOMY; try { createWallet = economy.getClass().getMethod("createWallet", String.class); diff --git a/src/net/milkbowl/vault/economy/plugins/Economy_BOSE6.java b/src/net/milkbowl/vault/economy/plugins/Economy_BOSE6.java index 29d7f9e..a08e53e 100644 --- a/src/net/milkbowl/vault/economy/plugins/Economy_BOSE6.java +++ b/src/net/milkbowl/vault/economy/plugins/Economy_BOSE6.java @@ -171,7 +171,7 @@ public class Economy_BOSE6 implements Economy { if (economy.economy == null) { Plugin bose = plugin.getServer().getPluginManager().getPlugin("BOSEconomy"); - if (bose != null && bose.isEnabled() && bose.getDescription().getVersion().startsWith("0.6")) { + if (bose != null && bose.getDescription().getVersion().startsWith("0.6")) { economy.economy = (BOSEconomy) bose; log.info(String.format("[%s][Economy] %s hooked.", plugin.getDescription().getName(), economy.name)); } diff --git a/src/net/milkbowl/vault/economy/plugins/Economy_BOSE7.java b/src/net/milkbowl/vault/economy/plugins/Economy_BOSE7.java index 312e76a..6353617 100644 --- a/src/net/milkbowl/vault/economy/plugins/Economy_BOSE7.java +++ b/src/net/milkbowl/vault/economy/plugins/Economy_BOSE7.java @@ -132,7 +132,7 @@ public class Economy_BOSE7 implements Economy { if (economy.economy == null) { Plugin bose = plugin.getServer().getPluginManager().getPlugin("BOSEconomy"); - if (bose != null && bose.isEnabled() && bose.getDescription().getVersion().startsWith("0.7")) { + if (bose != null && bose.getDescription().getVersion().startsWith("0.7")) { economy.economy = (BOSEconomy) bose; log.info(String.format("[%s][Economy] %s hooked.", plugin.getDescription().getName(), economy.name)); } diff --git a/src/net/milkbowl/vault/economy/plugins/Economy_CommandsEX.java b/src/net/milkbowl/vault/economy/plugins/Economy_CommandsEX.java index 09b29ae..78a621b 100644 --- a/src/net/milkbowl/vault/economy/plugins/Economy_CommandsEX.java +++ b/src/net/milkbowl/vault/economy/plugins/Economy_CommandsEX.java @@ -51,7 +51,7 @@ public class Economy_CommandsEX implements net.milkbowl.vault.economy.Economy { if (economy.economy == null) { Plugin cex = plugin.getServer().getPluginManager().getPlugin("CommandsEX"); - if (cex != null && cex.isEnabled()) { + if (cex != null) { economy.economy = (CommandsEX) cex; log.info(String.format("[%s][Economy] %s hooked.", plugin.getDescription().getName(), economy.name)); } diff --git a/src/net/milkbowl/vault/economy/plugins/Economy_Craftconomy.java b/src/net/milkbowl/vault/economy/plugins/Economy_Craftconomy.java index 686dca6..0165661 100644 --- a/src/net/milkbowl/vault/economy/plugins/Economy_Craftconomy.java +++ b/src/net/milkbowl/vault/economy/plugins/Economy_Craftconomy.java @@ -52,7 +52,7 @@ public class Economy_Craftconomy implements Economy { // Load Plugin in case it was loaded before if (economy == null) { Plugin ec = plugin.getServer().getPluginManager().getPlugin("Craftconomy"); - if (ec != null && ec.isEnabled() && ec.getClass().getName().equals("me.greatman.Craftconomy.Craftconomy")) { + if (ec != null && ec.getClass().getName().equals("me.greatman.Craftconomy.Craftconomy")) { economy = (Craftconomy) ec; log.info(String.format("[%s][Economy] %s hooked.", plugin.getDescription().getName(), name)); } diff --git a/src/net/milkbowl/vault/economy/plugins/Economy_Craftconomy3.java b/src/net/milkbowl/vault/economy/plugins/Economy_Craftconomy3.java index 6565e1e..a147261 100644 --- a/src/net/milkbowl/vault/economy/plugins/Economy_Craftconomy3.java +++ b/src/net/milkbowl/vault/economy/plugins/Economy_Craftconomy3.java @@ -71,7 +71,7 @@ public class Economy_Craftconomy3 implements Economy { if (economy.economy == null) { Plugin ec = plugin.getServer().getPluginManager().getPlugin("Craftconomy3"); - if (ec != null && ec.isEnabled() && ec.getClass().getName().equals("com.greatmancode.craftconomy3.BukkitLoader")) { + if (ec != null && ec.getClass().getName().equals("com.greatmancode.craftconomy3.BukkitLoader")) { economy.economy = (BukkitLoader) ec; log.info(String.format("[%s][Economy] %s hooked.", plugin.getDescription().getName(), economy.name)); } diff --git a/src/net/milkbowl/vault/economy/plugins/Economy_Dosh.java b/src/net/milkbowl/vault/economy/plugins/Economy_Dosh.java index 53da751..60baf68 100644 --- a/src/net/milkbowl/vault/economy/plugins/Economy_Dosh.java +++ b/src/net/milkbowl/vault/economy/plugins/Economy_Dosh.java @@ -27,144 +27,140 @@ import net.milkbowl.vault.economy.EconomyResponse; public class Economy_Dosh implements Economy { - - - Plugin plugin; - Dosh doshPlugin; - boolean isEnabled = false; - DoshAPIHandler apiHandle; - - public Economy_Dosh(Plugin _plugin) { - - plugin = _plugin; - - if (plugin.getServer().getPluginManager().isPluginEnabled("Dosh")) { - doshPlugin = (Dosh) plugin.getServer().getPluginManager().getPlugin("Dosh"); - apiHandle = new DoshAPIHandler(); - isEnabled = true; - } else { - return; - } - - } - - @Override - public boolean isEnabled() { - return isEnabled; - } - @Override - public String getName() { - return "Dosh"; - } - @Override - public boolean hasBankSupport() { - return false; - } + Plugin plugin; + Dosh doshPlugin; + DoshAPIHandler apiHandle; - @Override - public int fractionalDigits() { - return 0; - } + public Economy_Dosh(Plugin _plugin) { + plugin = _plugin; - @Override - public String format(double amount) { - return null; - } + if (plugin.getServer().getPluginManager().isPluginEnabled("Dosh")) { + doshPlugin = (Dosh) plugin.getServer().getPluginManager().getPlugin("Dosh"); + apiHandle = new DoshAPIHandler(); + } else { + return; + } + } - @Override - public String currencyNamePlural() { - return Dosh.getSettings().moneyName + "s"; - } + @Override + public boolean isEnabled() { + return apiHandle != null; + } - @Override - public String currencyNameSingular() { - return Dosh.getSettings().moneyName; - } + @Override + public String getName() { + return "Dosh"; + } - @Override - public boolean hasAccount(String playerName) { - return true; - } + @Override + public boolean hasBankSupport() { + return false; + } - @Override - public double getBalance(String playerName) { - return DoshAPIHandler.getUserBal(playerName); - } + @Override + public int fractionalDigits() { + return 0; + } - @Override - public boolean has(String playerName, double amount) { - return (getBalance(playerName) - amount) > 0; - } + @Override + public String format(double amount) { + return null; + } - @Override - public EconomyResponse withdrawPlayer(String playerName, double amount) { - - if (DoshAPIHandler.subtractMoney(playerName, amount)) { - return new EconomyResponse(amount, getBalance(playerName), EconomyResponse.ResponseType.SUCCESS, "Worked!"); - } - - return new EconomyResponse(amount, getBalance(playerName), EconomyResponse.ResponseType.FAILURE, "Didnt work!"); - - } + @Override + public String currencyNamePlural() { + return Dosh.getSettings().moneyName + "s"; + } - @Override - public EconomyResponse depositPlayer(String playerName, double amount) { - DoshAPIHandler.addUserBal(playerName, amount); - return new EconomyResponse(amount, getBalance(playerName), EconomyResponse.ResponseType.SUCCESS, "It worked!"); - } + @Override + public String currencyNameSingular() { + return Dosh.getSettings().moneyName; + } - @Override - public EconomyResponse createBank(String name, String player) { - return new EconomyResponse(0D, 0D, EconomyResponse.ResponseType.NOT_IMPLEMENTED, "We do not use banks!"); - } + @Override + public boolean hasAccount(String playerName) { + return true; + } - @Override - public EconomyResponse deleteBank(String name) { - return new EconomyResponse(0D, 0D, EconomyResponse.ResponseType.NOT_IMPLEMENTED, "We do not use banks!"); - } + @Override + public double getBalance(String playerName) { + return DoshAPIHandler.getUserBal(playerName); + } - @Override - public EconomyResponse bankBalance(String name) { - return new EconomyResponse(0D, 0D, EconomyResponse.ResponseType.NOT_IMPLEMENTED, "We do not use banks!"); - } + @Override + public boolean has(String playerName, double amount) { + return (getBalance(playerName) - amount) > 0; + } - @Override - public EconomyResponse bankHas(String name, double amount) { - return new EconomyResponse(0D, 0D, EconomyResponse.ResponseType.NOT_IMPLEMENTED, "We do not use banks!"); - } + @Override + public EconomyResponse withdrawPlayer(String playerName, double amount) { - @Override - public EconomyResponse bankWithdraw(String name, double amount) { - return new EconomyResponse(0D, 0D, EconomyResponse.ResponseType.NOT_IMPLEMENTED, "We do not use banks!"); - } + if (DoshAPIHandler.subtractMoney(playerName, amount)) { + return new EconomyResponse(amount, getBalance(playerName), EconomyResponse.ResponseType.SUCCESS, "Worked!"); + } - @Override - public EconomyResponse bankDeposit(String name, double amount) { - return new EconomyResponse(0D, 0D, EconomyResponse.ResponseType.NOT_IMPLEMENTED, "We do not use banks!"); - } + return new EconomyResponse(amount, getBalance(playerName), EconomyResponse.ResponseType.FAILURE, "Didnt work!"); - @Override - public EconomyResponse isBankOwner(String name, String playerName) { - return null; - } + } - @Override - public EconomyResponse isBankMember(String name, String playerName) { - return null; - } + @Override + public EconomyResponse depositPlayer(String playerName, double amount) { + DoshAPIHandler.addUserBal(playerName, amount); + return new EconomyResponse(amount, getBalance(playerName), EconomyResponse.ResponseType.SUCCESS, "It worked!"); + } - @Override - public List getBanks() { - return null; - } + @Override + public EconomyResponse createBank(String name, String player) { + return new EconomyResponse(0D, 0D, EconomyResponse.ResponseType.NOT_IMPLEMENTED, "We do not use banks!"); + } + + @Override + public EconomyResponse deleteBank(String name) { + return new EconomyResponse(0D, 0D, EconomyResponse.ResponseType.NOT_IMPLEMENTED, "We do not use banks!"); + } + + @Override + public EconomyResponse bankBalance(String name) { + return new EconomyResponse(0D, 0D, EconomyResponse.ResponseType.NOT_IMPLEMENTED, "We do not use banks!"); + } + + @Override + public EconomyResponse bankHas(String name, double amount) { + return new EconomyResponse(0D, 0D, EconomyResponse.ResponseType.NOT_IMPLEMENTED, "We do not use banks!"); + } + + @Override + public EconomyResponse bankWithdraw(String name, double amount) { + return new EconomyResponse(0D, 0D, EconomyResponse.ResponseType.NOT_IMPLEMENTED, "We do not use banks!"); + } + + @Override + public EconomyResponse bankDeposit(String name, double amount) { + return new EconomyResponse(0D, 0D, EconomyResponse.ResponseType.NOT_IMPLEMENTED, "We do not use banks!"); + } + + @Override + public EconomyResponse isBankOwner(String name, String playerName) { + return null; + } + + @Override + public EconomyResponse isBankMember(String name, String playerName) { + return null; + } + + @Override + public List getBanks() { + return null; + } + + @Override + public boolean createPlayerAccount(String playerName) { + return false; + } + + public class DoshAPIHandler extends MoneyUtils {} - @Override - public boolean createPlayerAccount(String playerName) { - return false; - } - - public class DoshAPIHandler extends MoneyUtils {} - } diff --git a/src/net/milkbowl/vault/economy/plugins/Economy_EconXP.java b/src/net/milkbowl/vault/economy/plugins/Economy_EconXP.java index f251c85..308d340 100644 --- a/src/net/milkbowl/vault/economy/plugins/Economy_EconXP.java +++ b/src/net/milkbowl/vault/economy/plugins/Economy_EconXP.java @@ -68,7 +68,7 @@ public class Economy_EconXP implements Economy { if (economy.econ == null) { Plugin eco = plugin.getServer().getPluginManager().getPlugin("EconXP"); - if (eco != null && eco.isEnabled()) { + if (eco != null) { economy.econ = (EconXP) eco; log.info(String.format("[%s][Economy] %s hooked.", plugin.getDescription().getName(), economy.name)); } diff --git a/src/net/milkbowl/vault/economy/plugins/Economy_Essentials.java b/src/net/milkbowl/vault/economy/plugins/Economy_Essentials.java index ec6f636..96520e0 100644 --- a/src/net/milkbowl/vault/economy/plugins/Economy_Essentials.java +++ b/src/net/milkbowl/vault/economy/plugins/Economy_Essentials.java @@ -184,7 +184,7 @@ public class Economy_Essentials implements Economy { if (economy.ess == null) { Plugin essentials = plugin.getServer().getPluginManager().getPlugin("Essentials"); - if (essentials != null && essentials.isEnabled()) { + if (essentials != null) { economy.ess = (Essentials) essentials; log.info(String.format("[%s][Economy] %s hooked.", plugin.getDescription().getName(), economy.name)); } diff --git a/src/net/milkbowl/vault/economy/plugins/Economy_GoldIsMoney.java b/src/net/milkbowl/vault/economy/plugins/Economy_GoldIsMoney.java index ca9da53..2003e4d 100644 --- a/src/net/milkbowl/vault/economy/plugins/Economy_GoldIsMoney.java +++ b/src/net/milkbowl/vault/economy/plugins/Economy_GoldIsMoney.java @@ -112,7 +112,7 @@ public class Economy_GoldIsMoney implements Economy { if (economy.economy == null) { Plugin ec = plugin.getServer().getPluginManager().getPlugin("GoldIsMoney"); - if (ec != null && ec.isEnabled() && ec.getClass().getName().equals("com.flobi.GoldIsMoney.GoldIsMoney")) { + if (ec != null && ec.getClass().getName().equals("com.flobi.GoldIsMoney.GoldIsMoney")) { economy.economy = (GoldIsMoney) ec; log.info(String.format("[%s][Economy] %s hooked.", plugin.getDescription().getName(), economy.name)); } diff --git a/src/net/milkbowl/vault/economy/plugins/Economy_GoldIsMoney2.java b/src/net/milkbowl/vault/economy/plugins/Economy_GoldIsMoney2.java index 58fd9b2..2368cef 100644 --- a/src/net/milkbowl/vault/economy/plugins/Economy_GoldIsMoney2.java +++ b/src/net/milkbowl/vault/economy/plugins/Economy_GoldIsMoney2.java @@ -266,7 +266,7 @@ public class Economy_GoldIsMoney2 implements Economy { if (economy.economy == null) { Plugin ec = plugin.getServer().getPluginManager().getPlugin("GoldIsMoney"); - if (ec != null && ec.isEnabled() && ec.getClass().getName().equals("com.flobi.GoldIsMoney2.GoldIsMoney")) { + if (ec != null && ec.getClass().getName().equals("com.flobi.GoldIsMoney2.GoldIsMoney")) { economy.economy = (GoldIsMoney) ec; log.info(String.format("[%s][Economy] %s hooked.", plugin.getDescription().getName(), economy.name)); } diff --git a/src/net/milkbowl/vault/economy/plugins/Economy_Gringotts.java b/src/net/milkbowl/vault/economy/plugins/Economy_Gringotts.java index 0b063e2..a044586 100644 --- a/src/net/milkbowl/vault/economy/plugins/Economy_Gringotts.java +++ b/src/net/milkbowl/vault/economy/plugins/Economy_Gringotts.java @@ -67,7 +67,7 @@ public class Economy_Gringotts implements Economy { if (economy.gringotts == null) { Plugin grngts = plugin.getServer().getPluginManager().getPlugin("Gringotts"); - if (grngts != null && grngts.isEnabled()) { + if (grngts != null) { economy.gringotts = (Gringotts) grngts; log.info(String.format("[%s][Economy] %s hooked.", plugin.getDescription().getName(), economy.name)); } diff --git a/src/net/milkbowl/vault/economy/plugins/Economy_McMoney.java b/src/net/milkbowl/vault/economy/plugins/Economy_McMoney.java index 1064a46..3df4fbe 100644 --- a/src/net/milkbowl/vault/economy/plugins/Economy_McMoney.java +++ b/src/net/milkbowl/vault/economy/plugins/Economy_McMoney.java @@ -113,7 +113,7 @@ public class Economy_McMoney implements Economy { if (economy.economy == null) { Plugin eco = plugin.getServer().getPluginManager().getPlugin("McMoney"); - if (eco != null && eco.isEnabled()) { + if (eco != null) { economy.economy = McMoneyAPI.getInstance(); log.info(String.format("[%s][Economy] %s hooked.", plugin.getDescription().getName(), economy.name)); } diff --git a/src/net/milkbowl/vault/economy/plugins/Economy_MineConomy.java b/src/net/milkbowl/vault/economy/plugins/Economy_MineConomy.java index 7528687..af80f06 100644 --- a/src/net/milkbowl/vault/economy/plugins/Economy_MineConomy.java +++ b/src/net/milkbowl/vault/economy/plugins/Economy_MineConomy.java @@ -69,7 +69,7 @@ public class Economy_MineConomy implements Economy { if (economy.econ == null) { Plugin eco = plugin.getServer().getPluginManager().getPlugin("MineConomy"); - if (eco != null && eco.isEnabled()) { + if (eco != null) { economy.econ = (MineConomy) eco; log.info(String.format("[%s][Economy] %s hooked.", plugin.getDescription().getName(), economy.name)); } diff --git a/src/net/milkbowl/vault/economy/plugins/Economy_MultiCurrency.java b/src/net/milkbowl/vault/economy/plugins/Economy_MultiCurrency.java index 86b64d3..25f3d35 100644 --- a/src/net/milkbowl/vault/economy/plugins/Economy_MultiCurrency.java +++ b/src/net/milkbowl/vault/economy/plugins/Economy_MultiCurrency.java @@ -159,7 +159,7 @@ public class Economy_MultiCurrency implements Economy { if (economy.economy == null) { Plugin mcur = plugin.getServer().getPluginManager().getPlugin("MultiCurrency"); - if (mcur != null && mcur.isEnabled()) { + if (mcur != null) { economy.economy = (Currency) mcur; log.info(String.format("[%s][Economy] %s hooked.", plugin.getDescription().getName(), economy.name)); } diff --git a/src/net/milkbowl/vault/economy/plugins/Economy_XPBank.java b/src/net/milkbowl/vault/economy/plugins/Economy_XPBank.java index dd72748..dcf0467 100644 --- a/src/net/milkbowl/vault/economy/plugins/Economy_XPBank.java +++ b/src/net/milkbowl/vault/economy/plugins/Economy_XPBank.java @@ -73,7 +73,7 @@ public class Economy_XPBank implements Economy { if (economy.XPB == null) { Plugin eco = plugin.getServer().getPluginManager().getPlugin("XPBank"); - if (eco != null && eco.isEnabled()) { + if (eco != null) { economy.XPB = (XPBank) eco; api = XPB.getAPI(); log.info(String.format("[%s][Economy] %s hooked.", plugin.getDescription().getName(), economy.name)); diff --git a/src/net/milkbowl/vault/economy/plugins/Economy_eWallet.java b/src/net/milkbowl/vault/economy/plugins/Economy_eWallet.java index 1ef83d7..8ad9d0a 100644 --- a/src/net/milkbowl/vault/economy/plugins/Economy_eWallet.java +++ b/src/net/milkbowl/vault/economy/plugins/Economy_eWallet.java @@ -65,7 +65,7 @@ public class Economy_eWallet implements Economy { if (economy.econ == null) { Plugin eco = plugin.getServer().getPluginManager().getPlugin("eWallet"); - if (eco != null && eco.isEnabled()) { + if (eco != null) { economy.econ = (ECO) eco; log.info(String.format("[%s][Economy] %s hooked.", plugin.getDescription().getName(), economy.name)); } diff --git a/src/net/milkbowl/vault/economy/plugins/Economy_iConomy4.java b/src/net/milkbowl/vault/economy/plugins/Economy_iConomy4.java index 5df59d3..d2c3003 100644 --- a/src/net/milkbowl/vault/economy/plugins/Economy_iConomy4.java +++ b/src/net/milkbowl/vault/economy/plugins/Economy_iConomy4.java @@ -174,7 +174,7 @@ public class Economy_iConomy4 implements Economy { if (economy.economy == null) { Plugin iConomy = plugin.getServer().getPluginManager().getPlugin("iConomy"); - if (iConomy != null && iConomy.isEnabled() && iConomy.getClass().getName().equals("com.nijiko.coelho.iConomy.iConomy")) { + if (iConomy != null && iConomy.getClass().getName().equals("com.nijiko.coelho.iConomy.iConomy")) { economy.economy = (iConomy) iConomy; log.info(String.format("[%s][Economy] %s hooked.", plugin.getDescription().getName(), economy.name)); } diff --git a/src/net/milkbowl/vault/economy/plugins/Economy_iConomy5.java b/src/net/milkbowl/vault/economy/plugins/Economy_iConomy5.java index 4b1494a..6759527 100644 --- a/src/net/milkbowl/vault/economy/plugins/Economy_iConomy5.java +++ b/src/net/milkbowl/vault/economy/plugins/Economy_iConomy5.java @@ -116,7 +116,7 @@ public class Economy_iConomy5 implements Economy { if (economy.economy == null) { Plugin ec = plugin.getServer().getPluginManager().getPlugin("iConomy"); - if (ec != null && ec.isEnabled() && ec.getClass().getName().equals("com.iConomy.iConomy")) { + if (ec != null && ec.getClass().getName().equals("com.iConomy.iConomy")) { economy.economy = (iConomy) ec; log.info(String.format("[%s][Economy] %s hooked.", plugin.getDescription().getName(), economy.name)); } diff --git a/src/net/milkbowl/vault/economy/plugins/Economy_iConomy6.java b/src/net/milkbowl/vault/economy/plugins/Economy_iConomy6.java index 42a7bda..5cec08f 100644 --- a/src/net/milkbowl/vault/economy/plugins/Economy_iConomy6.java +++ b/src/net/milkbowl/vault/economy/plugins/Economy_iConomy6.java @@ -73,7 +73,7 @@ public class Economy_iConomy6 implements Economy { public void onPluginEnable(PluginEnableEvent event) { if (economy.economy == null) { Plugin ec = plugin.getServer().getPluginManager().getPlugin("iConomy"); - if (ec != null && ec.isEnabled() && ec.getClass().getName().equals("com.iCo6.iConomy")) { + if (ec != null && ec.getClass().getName().equals("com.iCo6.iConomy")) { String version = ec.getDescription().getVersion().split("\\.")[0]; name += version; economy.economy = (iConomy) ec; From f2e3e2b3e4004621af4f3d6c23e12cee49a1a1ff Mon Sep 17 00:00:00 2001 From: Nick Minkler Date: Wed, 6 Feb 2013 16:41:55 -0800 Subject: [PATCH 5/6] compile against Priveleges repository version. --- pom.xml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 7f4866b..e3ea0dc 100644 --- a/pom.xml +++ b/pom.xml @@ -21,11 +21,10 @@ ${project.basedir}/lib/DroxPerms-0.4.0-SNAPSHOT.jar - net.krinsoft.privileges + net.krinsoft Privileges - 1.7b127 + 1.7.4 system - ${project.basedir}/lib/Privileges.jar org.tyrannyofheaven.bukkit @@ -377,5 +376,9 @@ iConomy 4,5,6 BOSEconomy 6/7, EssentialsEcon, 3Co, MultiConomy, MineConomy, Econ greatman-repo http://repo.greatmancode.com/content/groups/public/ + + krinsoft + http://files.krinsoft.net:8085/nexus/content/groups/public + From bc9ec51fad4ae6bb76c32682026b48f21aee1ea1 Mon Sep 17 00:00:00 2001 From: Nick Minkler Date: Wed, 6 Feb 2013 16:43:09 -0800 Subject: [PATCH 6/6] wrong scope --- pom.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/pom.xml b/pom.xml index e3ea0dc..db0ea5b 100644 --- a/pom.xml +++ b/pom.xml @@ -24,7 +24,6 @@ net.krinsoft Privileges 1.7.4 - system org.tyrannyofheaven.bukkit