Small API Changes. Add better formatting.

fernferret · Aug 16, 2011 · c8c6a20 · c8c6a20
1 parent 44e62ec
commit c8c6a20
Show file tree

Hide file tree

Showing 10 changed files with 241 additions and 193 deletions.
diff --git a/src/com/fernferret/allpay/AllPay.java b/src/com/fernferret/allpay/AllPay.java
@@ -16,7 +16,7 @@
  * @author Eric Stokes
  */
 public class AllPay {
-    private static final String version = "1.0.1";
+    private static final String version = "1.0.2";
     protected static final String logPrefix = "[AllPay] - Version " + version;
 
     protected static final Logger log = Logger.getLogger("Minecraft");
@@ -81,9 +81,10 @@ private void loadRealShopEconomy() {
 
     private void loadBOSEconomy() {
         if (this.bank == null && !(this.bank instanceof EssentialsBank)) {
-            BOSEconomy boseconPlugin = (BOSEconomy) this.plugin.getServer().getPluginManager().getPlugin("BOSEconomy");
+            Plugin boseconPlugin = this.plugin.getServer().getPluginManager().getPlugin("BOSEconomy");
             if (boseconPlugin != null) {
-                this.bank = new BOSEconomyBank(boseconPlugin);
+
+                this.bank = new BOSEconomyBank((BOSEconomy) boseconPlugin);
                 log.info(logPrefix + " - hooked into BOSEconomy " + this.plugin.getDescription().getFullName());
             }
         }

diff --git a/src/com/fernferret/allpay/BOSEconomyBank.java b/src/com/fernferret/allpay/BOSEconomyBank.java
@@ -12,11 +12,8 @@ public BOSEconomyBank(BOSEconomy plugin) {
 	}
 
 	@Override
-	public String getFormattedMoneyAmount(double amount) {
-		if (amount == 1) {
-			return amount + " " + this.plugin.getMoneyName();
-		}
-		return amount + " " + this.plugin.getMoneyNamePlural();
+	public String getFormattedMoneyAmount(Player player, double amount) {
+		return this.formatCurrency(amount, this.plugin.getMoneyName(), this.plugin.getMoneyNamePlural());
 	}
 
 	@Override

diff --git a/src/com/fernferret/allpay/EssentialsBank.java b/src/com/fernferret/allpay/EssentialsBank.java
@@ -19,7 +19,7 @@ public String getEconUsed() {
 	}
 
 	@Override
-	public String getFormattedMoneyAmount(double amount) {
+	public String getFormattedMoneyAmount(Player player, double amount) {
 		return Economy.format(amount);
 	}