diff --git a/plugin.yml b/plugin.yml index a3becb2..25d3474 100644 --- a/plugin.yml +++ b/plugin.yml @@ -1,6 +1,6 @@ name: Vault main: net.milkbowl.vault.Vault -version: 1.0.0dev1 +version: 1.0.0dev2 author: Cereal description: > Abstraction Library for Bukkit Plugins diff --git a/src/net/milkbowl/vault/economy/Economy.java b/src/net/milkbowl/vault/economy/Economy.java index 744aa1a..c47b3be 100644 --- a/src/net/milkbowl/vault/economy/Economy.java +++ b/src/net/milkbowl/vault/economy/Economy.java @@ -23,7 +23,7 @@ public interface Economy { public boolean isEnabled(); public String getName(); public String format(double amount); - public EconomyResponse getBalance(String playerName); + public double getBalance(String playerName); public EconomyResponse withdrawPlayer(String playerName, double amount); public EconomyResponse depositPlayer(String playerName, double amount); } \ No newline at end of file diff --git a/src/net/milkbowl/vault/economy/plugins/Economy_3co.java b/src/net/milkbowl/vault/economy/plugins/Economy_3co.java index 10100fa..a727fa2 100644 --- a/src/net/milkbowl/vault/economy/plugins/Economy_3co.java +++ b/src/net/milkbowl/vault/economy/plugins/Economy_3co.java @@ -76,15 +76,13 @@ public class Economy_3co implements Economy { } @Override - public EconomyResponse getBalance(String playerName) { - double balance; - EconomyResponse.ResponseType type; - String errorMessage = null; + public double getBalance(String playerName) { + final double balance; balance = (double) economy.getMoney(plugin.getServer().getPlayer(playerName)); - type = EconomyResponse.ResponseType.SUCCESS; - return new EconomyResponse(balance, balance, type, errorMessage); + final double fBalance = balance; + return fBalance; } @Override diff --git a/src/net/milkbowl/vault/economy/plugins/Economy_BOSE.java b/src/net/milkbowl/vault/economy/plugins/Economy_BOSE.java index f8a7c3f..fe3695c 100644 --- a/src/net/milkbowl/vault/economy/plugins/Economy_BOSE.java +++ b/src/net/milkbowl/vault/economy/plugins/Economy_BOSE.java @@ -78,15 +78,13 @@ public class Economy_BOSE implements Economy { } @Override - public EconomyResponse getBalance(String playerName) { - double balance; - EconomyResponse.ResponseType type; - String errorMessage = null; + public double getBalance(String playerName) { + final double balance; balance = (double) economy.getPlayerMoney(playerName); - type = EconomyResponse.ResponseType.SUCCESS; - return new EconomyResponse(balance, balance, type, errorMessage); + final double fBalance = balance; + return fBalance; } @Override diff --git a/src/net/milkbowl/vault/economy/plugins/Economy_Essentials.java b/src/net/milkbowl/vault/economy/plugins/Economy_Essentials.java index e48f31a..63a178b 100644 --- a/src/net/milkbowl/vault/economy/plugins/Economy_Essentials.java +++ b/src/net/milkbowl/vault/economy/plugins/Economy_Essentials.java @@ -79,26 +79,18 @@ public class Economy_Essentials implements Economy { } @Override - public EconomyResponse getBalance(String playerName) { + public double getBalance(String playerName) { double balance; - EconomyResponse.ResponseType type; - String errorMessage = null; - + try { balance = com.earth2me.essentials.api.Economy.getMoney(playerName); - type = EconomyResponse.ResponseType.SUCCESS; } catch (UserDoesNotExistException e) { - if(createPlayerAccount(playerName)) { - balance = 0; - type = EconomyResponse.ResponseType.SUCCESS; - } else { - balance = 0; - type = EconomyResponse.ResponseType.FAILURE; - errorMessage = "User does not exist"; - } + createPlayerAccount(playerName); + balance = 0; } - return new EconomyResponse(balance, balance, type, errorMessage); + final double fBalance = balance; + return fBalance; } private boolean createPlayerAccount(String playerName) { diff --git a/src/net/milkbowl/vault/economy/plugins/Economy_iConomy4.java b/src/net/milkbowl/vault/economy/plugins/Economy_iConomy4.java index 8f58d92..1f86da2 100644 --- a/src/net/milkbowl/vault/economy/plugins/Economy_iConomy4.java +++ b/src/net/milkbowl/vault/economy/plugins/Economy_iConomy4.java @@ -91,15 +91,13 @@ public class Economy_iConomy4 implements Economy { } @Override - public EconomyResponse getBalance(String playerName) { - double balance; - EconomyResponse.ResponseType type; - String errorMessage = null; + public double getBalance(String playerName) { + final double balance; balance = getAccountBalance(playerName); - type = EconomyResponse.ResponseType.SUCCESS; - return new EconomyResponse(balance, balance, type, errorMessage); + final double fBalance = balance; + return fBalance; } private double getAccountBalance(String playerName) { diff --git a/src/net/milkbowl/vault/economy/plugins/Economy_iConomy5.java b/src/net/milkbowl/vault/economy/plugins/Economy_iConomy5.java index e88ed80..0c44358 100644 --- a/src/net/milkbowl/vault/economy/plugins/Economy_iConomy5.java +++ b/src/net/milkbowl/vault/economy/plugins/Economy_iConomy5.java @@ -84,15 +84,13 @@ public class Economy_iConomy5 implements Economy { } @Override - public EconomyResponse getBalance(String playerName) { - double balance; - EconomyResponse.ResponseType type; - String errorMessage = null; + public double getBalance(String playerName) { + final double balance; balance = getAccountBalance(playerName); - type = EconomyResponse.ResponseType.SUCCESS; - return new EconomyResponse(balance, balance, type, errorMessage); + final double fBalance = balance; + return fBalance; } @Override