Code refactoring

Author: devkeni

build.gradle

@@ -5,28 +5,20 @@ plugins {
 }
 
 group = 'com.devkeni'
-version = '1.0-SNAPSHOT'
+version = '1.1-SNAPSHOT'
 
 repositories {
     mavenCentral()
     maven { url 'https://jitpack.io' }
-    maven {
-        name = 'spigotmc-repo'
-        url = 'https://hub.spigotmc.org/nexus/content/repositories/snapshots/'
-    }
-    maven {
-        name = 'sonatype'
-        url = 'https://oss.sonatype.org/content/groups/public/'
-    }
-    maven {
-        url = 'https://repo.extendedclip.com/content/repositories/placeholderapi/'
-    }
+    maven { url 'https://oss.sonatype.org/content/groups/public/' }
+    maven { url 'https://hub.spigotmc.org/nexus/content/repositories/snapshots/'}
+    maven { url 'https://repo.extendedclip.com/content/repositories/placeholderapi/' }
 }
 
 dependencies {
-    compileOnly 'org.spigotmc:spigot-api:1.8.8-R0.1-SNAPSHOT'
-    compileOnly "com.github.MilkBowl:VaultAPI:1.7"
     compileOnly 'me.clip:placeholderapi:2.10.9'
+    compileOnly "com.github.MilkBowl:VaultAPI:1.7"
+    compileOnly 'org.spigotmc:spigot-api:1.8.8-R0.1-SNAPSHOT'
 
     compileOnly 'org.projectlombok:lombok:1.18.20'
     annotationProcessor 'org.projectlombok:lombok:1.18.20'

src/main/java/com/devkeni/balanceformatter/BalanceFormatter.java

@@ -1,24 +1,21 @@
 package com.devkeni.balanceformatter;
 
 import com.devkeni.balanceformatter.placeholder.PlaceholderHook;
-import com.devkeni.balanceformatter.util.NumberUtils;
 import net.milkbowl.vault.economy.Economy;
 import org.bukkit.plugin.java.JavaPlugin;
 
 public final class BalanceFormatter extends JavaPlugin {
 
-    Economy economy;
-    NumberUtils numberUtils;
-    PlaceholderHook placeholder;
+    private PlaceholderHook placeholder;
 
     @Override
     public void onEnable() {
 
-        //Configuration
+        // Configuration
         saveDefaultConfig();
 
-        //Economy
-        economy = getServer().getServicesManager().getRegistration(Economy.class).getProvider();
+        // Economy
+        Economy economy = getServer().getServicesManager().getRegistration(Economy.class).getProvider();
 
         if (economy == null) {
             getLogger().severe("A error ocurred when loading vault service.");
@@ -27,11 +24,8 @@ public void onEnable() {
             return;
         }
 
-        //Utils
-        numberUtils = new NumberUtils(this, economy);
-
-        //Placeholder
-        placeholder = new PlaceholderHook(this, numberUtils);
+        // Placeholder
+        placeholder = new PlaceholderHook(this, economy);
         placeholder.register();
     }
 
@@ -40,4 +34,8 @@ public void onDisable() {
         placeholder.unregister();
     }
 
+    public static BalanceFormatter getInstance() {
+        return getPlugin(BalanceFormatter.class);
+    }
+
 }

src/main/java/com/devkeni/balanceformatter/placeholder/PlaceholderHook.java

@@ -3,6 +3,7 @@
 import com.devkeni.balanceformatter.util.NumberUtils;
 import lombok.RequiredArgsConstructor;
 import me.clip.placeholderapi.expansion.PlaceholderExpansion;
+import net.milkbowl.vault.economy.Economy;
 import org.bukkit.entity.Player;
 import org.bukkit.plugin.Plugin;
 import org.jetbrains.annotations.NotNull;
@@ -11,11 +12,11 @@
 public class PlaceholderHook extends PlaceholderExpansion {
 
     private final Plugin plugin;
-    private final NumberUtils numberUtils;
+    private final Economy economy;
 
     @Override
     public @NotNull String getAuthor() {
-        return "SigmaNetwork";
+        return "DevKeni";
     }
 
     @Override
@@ -29,11 +30,8 @@ public class PlaceholderHook extends PlaceholderExpansion {
     }
 
     @Override
-    public String onPlaceholderRequest(Player player, String params) {
-        if (params.equalsIgnoreCase("formated")) {
-            return numberUtils.getMoneyFormatted(player);
-        }
-        return params;
+    public String onPlaceholderRequest(Player player, @NotNull String params) {
+        return NumberUtils.format(economy.getBalance(player));
     }
 
 }

src/main/java/com/devkeni/balanceformatter/util/NumberUtils.java

@@ -1,40 +1,25 @@
 package com.devkeni.balanceformatter.util;
 
-import lombok.RequiredArgsConstructor;
-import net.milkbowl.vault.economy.Economy;
-import org.bukkit.entity.Player;
-import org.bukkit.plugin.Plugin;
+import com.devkeni.balanceformatter.BalanceFormatter;
 
 import java.text.DecimalFormat;
 
-@RequiredArgsConstructor
 public class NumberUtils {
 
-    private final Plugin plugin;
-    private final Economy economy;
+    private static final DecimalFormat DECIMAL_FORMAT = new DecimalFormat("###.#");
 
-    private final DecimalFormat DECIMAL_FORMAT = new DecimalFormat("###,###.##");
-
-    public String getMoneyFormatted(Player player) {
-        return format(economy.getBalance(player));
-    }
-
-    private String formatLarge(double n, int iteration) {
+    private static String formatLarge(double n, int iteration) {
         double f = n / 1000.0D;
         return f < 1000 || iteration >= getNumberFormat().length - 1 ?
-                formatShort(f) + getNumberFormat()[iteration] : formatLarge(f, iteration + 1);
-    }
-
-    private String formatShort(double value) {
-        return DECIMAL_FORMAT.format(value);
+                DECIMAL_FORMAT.format(f) + getNumberFormat()[iteration] : formatLarge(f, iteration + 1);
     }
 
-    private String format(double value) {
-        return value < 1000 ?  formatShort(value) : formatLarge(value, 0);
+    public static String format(double value) {
+        return value < 1000 ? DECIMAL_FORMAT.format(value) : formatLarge(value, 0);
     }
 
-    private String[] getNumberFormat() {
-        return plugin.getConfig().getString("money-format").split(";");
+    private static String[] getNumberFormat() {
+        return BalanceFormatter.getInstance().getConfig().getString("money-format").split(";");
     }
 
 }

src/main/resources/plugin.yml

@@ -2,4 +2,4 @@ name: BalanceFormatter
 version: @version@
 main: com.devkeni.balanceformatter.BalanceFormatter
 depend: [ Vault, PlaceholderAPI ]
-authors: [ DevKeni, DevTuca ]
+author: DevKeni