Merge branch 'master' into vault

Author: zefir-git

src/main/java/pro/cloudnode/smp/bankaccounts/BankAccounts.java

@@ -373,11 +373,11 @@ public static String formatCurrencyShort(final @Nullable BigDecimal amount) {
      * Create server account, if enabled in config
      */
     private static void createServerAccount() {
-        final @NotNull Account[] accounts = Account.get(getConsoleOfflinePlayer());
+        final @NotNull Account @NotNull [] accounts = Account.get(getConsoleOfflinePlayer());
         if (accounts.length > 0) return;
         final @Nullable String name = getInstance().config().serverAccountName();
         final @NotNull Account.Type type = getInstance().config().serverAccountType();
-        final @Nullable BigDecimal balance = getInstance().config().serverAccountStartingBalance().map(BigDecimal::valueOf).orElse(null);
+        final @Nullable BigDecimal balance = getInstance().config().serverAccountStartingBalance();
         new Account(getConsoleOfflinePlayer(), type, name, balance, false).insert();
     }
 

src/main/java/pro/cloudnode/smp/bankaccounts/BankConfig.java

@@ -146,10 +146,10 @@ public boolean integrationsVaultEnabled() {
     }
 
     // server-account.starting-balance
-    public @NotNull Optional<@NotNull Double> serverAccountStartingBalance() {
+    public @Nullable BigDecimal serverAccountStartingBalance() {
         if (Objects.requireNonNull(config.getString("server-account.starting-balance")).equalsIgnoreCase("infinity"))
-            return Optional.empty();
-        else return Optional.of(config.getDouble("server-account.starting-balance"));
+            return null;
+        else return new BigDecimal(Objects.requireNonNull(config.getString("server-account.starting-balance")));
     }
 
     // account-limits.
@@ -168,8 +168,8 @@ public boolean transferConfirmationEnabled() {
     }
 
     // transfer-confirmation.min-amount
-    public double transferConfirmationMinAmount() {
-        return config.getDouble("transfer-confirmation.min-amount");
+    public @NotNull BigDecimal transferConfirmationMinAmount() {
+        return new BigDecimal(Objects.requireNonNull(config.getString("transfer-confirmation.min-amount")));
     }
 
     // transfer-confirmation.bypass-own-accounts

src/main/java/pro/cloudnode/smp/bankaccounts/commands/BankCommand.java

@@ -351,7 +351,7 @@ public static boolean setBalance(final @NotNull CommandSender sender, final @Not
         else {
             final @Nullable BigDecimal balance;
             try {
-                balance = args[1].equalsIgnoreCase("Infinity") ? null : BigDecimal.valueOf(Double.parseDouble(args[1]));
+                balance = args[1].equalsIgnoreCase("Infinity") ? null : new BigDecimal(args[1]);
             }
             catch (NumberFormatException e) {
                 return sendMessage(sender, BankAccounts.getInstance().config().messagesErrorsInvalidNumber(args[1]));
@@ -485,7 +485,7 @@ public static boolean transfer(final @NotNull CommandSender sender, final @NotNu
 
         final @NotNull BigDecimal amount;
         try {
-            amount = BigDecimal.valueOf(Double.parseDouble(argsCopy[2])).setScale(2, RoundingMode.HALF_UP);
+            amount = new BigDecimal(argsCopy[2]).setScale(2, RoundingMode.HALF_UP);
         }
         catch (NumberFormatException e) {
             return sendMessage(sender, BankAccounts.getInstance().config().messagesErrorsInvalidNumber(argsCopy[2]));
@@ -505,7 +505,7 @@ public static boolean transfer(final @NotNull CommandSender sender, final @NotNu
             return sendMessage(sender, BankAccounts.getInstance().config().messagesErrorsDisallowedCharacters("<>"));
 
         if (!confirm && BankAccounts.getInstance().config().transferConfirmationEnabled()) {
-            final @NotNull BigDecimal minAmount = BigDecimal.valueOf(BankAccounts.getInstance().config().transferConfirmationMinAmount());
+            final @NotNull BigDecimal minAmount = BankAccounts.getInstance().config().transferConfirmationMinAmount();
             boolean bypassOwnAccounts = BankAccounts.getInstance().config().transferConfirmationBypassOwnAccounts();
             if (amount.compareTo(minAmount) >= 0 && (!bypassOwnAccounts || !from.get().owner.getUniqueId()
                     .equals(to.get().owner.getUniqueId()))) {

src/main/java/pro/cloudnode/smp/bankaccounts/commands/InvoiceCommand.java

@@ -153,7 +153,7 @@ public static boolean create(final @NotNull CommandSender sender, @NotNull Strin
 
         final @NotNull BigDecimal amount;
         try {
-            amount = BigDecimal.valueOf(Double.parseDouble(argsCopy[1])).setScale(2, RoundingMode.HALF_UP);
+            amount = new BigDecimal(argsCopy[1]).setScale(2, RoundingMode.HALF_UP);
         }
         catch (final @NotNull NumberFormatException e) {
             return sendMessage(sender, BankAccounts.getInstance().config().messagesErrorsInvalidNumber(argsCopy[1]));

src/main/java/pro/cloudnode/smp/bankaccounts/commands/POSCommand.java

@@ -53,7 +53,7 @@ public boolean execute(final @NotNull CommandSender sender, final @NotNull Strin
 
         final @NotNull BigDecimal price;
         try {
-            price = BigDecimal.valueOf(Double.parseDouble(args[1])).setScale(2, RoundingMode.HALF_UP);
+            price = new BigDecimal(args[1]).setScale(2, RoundingMode.HALF_UP);
         }
         catch (final @NotNull NumberFormatException e) {
             return sendMessage(sender, BankAccounts.getInstance().config().messagesErrorsInvalidNumber(args[1]));