From c7000846cd3100d79434e893da49f2d2bb326155 Mon Sep 17 00:00:00 2001
From: games647 <games647@users.noreply.github.com>
Date: Wed, 21 Mar 2018 11:16:16 +0100
Subject: [PATCH] Replace Reflection with setter implementation

---
 .../src/com/earth2me/essentials/Settings.java  | 18 ++----------------
 .../earth2me/essentials/utils/NumberUtil.java  |  7 ++++++-
 2 files changed, 8 insertions(+), 17 deletions(-)

diff --git a/Essentials/src/com/earth2me/essentials/Settings.java b/Essentials/src/com/earth2me/essentials/Settings.java
index fbca35f22..1bdb39641 100644
--- a/Essentials/src/com/earth2me/essentials/Settings.java
+++ b/Essentials/src/com/earth2me/essentials/Settings.java
@@ -16,8 +16,6 @@ import org.bukkit.event.EventPriority;
 import org.bukkit.inventory.ItemStack;
 
 import java.io.File;
-import java.lang.reflect.Field;
-import java.lang.reflect.Modifier;
 import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.text.DecimalFormat;
@@ -1333,20 +1331,8 @@ public class Settings implements net.ess3.api.ISettings {
         DecimalFormat currencyFormat = new DecimalFormat(currencyFormatString, decimalFormatSymbols);
         currencyFormat.setRoundingMode(RoundingMode.FLOOR);
 
-        // Updates NumberUtil#PRETTY_FORMAT field so that all of Essentials
-        // can follow a single format.
-        try {
-            Field field = NumberUtil.class.getDeclaredField("PRETTY_FORMAT");
-            field.setAccessible(true);
-            field.set(null, currencyFormat);
-            field.setAccessible(false);
-        } catch (NoSuchFieldException | IllegalAccessException e) {
-            ess.getLogger().severe("Failed to apply custom currency format: " + e.getMessage());
-            if (isDebug()) {
-                e.printStackTrace();
-            }
-        }
-
+        // Updates NumberUtil#PRETTY_FORMAT field so that all of Essentials can follow a single format.
+        NumberUtil.internalSetPrettyFormat(currencyFormat);
         return currencyFormat;
     }
 
diff --git a/Essentials/src/com/earth2me/essentials/utils/NumberUtil.java b/Essentials/src/com/earth2me/essentials/utils/NumberUtil.java
index 3d2a5cef5..f554ed6b3 100644
--- a/Essentials/src/com/earth2me/essentials/utils/NumberUtil.java
+++ b/Essentials/src/com/earth2me/essentials/utils/NumberUtil.java
@@ -11,8 +11,8 @@ import java.util.Locale;
 
 import static com.earth2me.essentials.I18n.tl;
 
-
 public class NumberUtil {
+
     private static DecimalFormat twoDPlaces = new DecimalFormat("#,###.##");
     private static DecimalFormat currencyFormat = new DecimalFormat("#0.00", DecimalFormatSymbols.getInstance(Locale.US));
     
@@ -30,6 +30,11 @@ public class NumberUtil {
         PRETTY_FORMAT.setMaximumFractionDigits(2);
     }
 
+    // this method should only be called by Essentials
+    public static void internalSetPrettyFormat(NumberFormat prettyFormat) {
+        PRETTY_FORMAT = prettyFormat;
+    }
+
     public static String shortCurrency(final BigDecimal value, final IEssentials ess) {
         return ess.getSettings().getCurrencySymbol() + formatAsCurrency(value);
     }