From 6015eb7947f207c4a5db0ab40f62952553b3de54 Mon Sep 17 00:00:00 2001
From: Carter <mega_narwhal@yahoo.com>
Date: Thu, 8 Jun 2017 18:33:49 -0400
Subject: [PATCH] Use MessageUtils instead of String.format for currency
 formatting

---
 .../org/appledash/saneeconomy/economy/Currency.java    | 10 ++++++----
 SaneEconomyCore/src/main/resources/config.yml          |  2 +-
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/SaneEconomyCore/src/main/java/org/appledash/saneeconomy/economy/Currency.java b/SaneEconomyCore/src/main/java/org/appledash/saneeconomy/economy/Currency.java
index b7a201f..725954a 100644
--- a/SaneEconomyCore/src/main/java/org/appledash/saneeconomy/economy/Currency.java
+++ b/SaneEconomyCore/src/main/java/org/appledash/saneeconomy/economy/Currency.java
@@ -1,6 +1,7 @@
 package org.appledash.saneeconomy.economy;
 
 import com.google.common.base.Strings;
+import org.appledash.saneeconomy.utils.MessageUtils;
 import org.bukkit.configuration.ConfigurationSection;
 
 import java.text.DecimalFormat;
@@ -22,7 +23,7 @@ public class Currency {
         this.nameSingular = nameSingular;
         this.namePlural = namePlural;
         this.format = format;
-        this.formatBalance = "%s %s";
+        this.formatBalance = "{1} {2}";
     }
 
     public Currency(String nameSingular,String namePlural,DecimalFormat format,String formatBalance){
@@ -69,10 +70,11 @@ public class Currency {
      */
     public String formatAmount(double amount) {
         if (amount == 1) {
-            return String.format(formatBalance, format.format(amount), nameSingular);
+            return MessageUtils.indexedFormat(formatBalance, format.format(amount), nameSingular);
+//            return String.format(formatBalance, format.format(amount), nameSingular);
         }
-
-        return String.format(formatBalance, format.format(amount), namePlural);
+		return MessageUtils.indexedFormat(formatBalance, format.format(amount), namePlural);
+//		return String.format(formatBalance, format.format(amount), namePlural);
     }
 
     /**
diff --git a/SaneEconomyCore/src/main/resources/config.yml b/SaneEconomyCore/src/main/resources/config.yml
index a985b96..d0cf37c 100644
--- a/SaneEconomyCore/src/main/resources/config.yml
+++ b/SaneEconomyCore/src/main/resources/config.yml
@@ -5,7 +5,7 @@ currency:
   name:
     singular: dollar
     plural: dollars
-  balance-format: '%s %s'
+  balance-format: '{1} {2}'
   format: '0.00'
   grouping: 3
   grouping-separator: ','