From 2b4553e5e3ef52ad26860e96f71d721fb3a7e7f6 Mon Sep 17 00:00:00 2001
From: Rsl1122 <djrapitops@hotmail.com>
Date: Sun, 8 Oct 2017 11:26:51 +0300
Subject: [PATCH] Added a config setting for #345 (0s time amount format)

---
 Plan/src/main/java/com/djrapitops/plan/Settings.java            | 1 +
 .../systems/webserver/webapi/bukkit/ConfigurationWebAPI.java    | 2 +-
 .../main/java/com/djrapitops/plan/utilities/FormatUtils.java    | 2 +-
 Plan/src/main/resources/bungeeconfig.yml                        | 1 +
 Plan/src/main/resources/config.yml                              | 1 +
 5 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/Plan/src/main/java/com/djrapitops/plan/Settings.java b/Plan/src/main/java/com/djrapitops/plan/Settings.java
index 6c556c43b..85ba6e4d1 100644
--- a/Plan/src/main/java/com/djrapitops/plan/Settings.java
+++ b/Plan/src/main/java/com/djrapitops/plan/Settings.java
@@ -60,6 +60,7 @@ public enum Settings {
     FORMAT_HOURS("Customization.Formatting.TimeAmount.Hours"),
     FORMAT_MINUTES("Customization.Formatting.TimeAmount.Minutes"),
     FORMAT_SECONDS("Customization.Formatting.TimeAmount.Seconds"),
+    FORMAT_ZERO_SECONDS("Customization.Formatting.TimeAmount.Zero"),
     FORMAT_DECIMALS("Customization.Formatting.DecimalPoints"),
     //
     COLOR_MAIN("Commands.Colors.Main"),
diff --git a/Plan/src/main/java/com/djrapitops/plan/systems/webserver/webapi/bukkit/ConfigurationWebAPI.java b/Plan/src/main/java/com/djrapitops/plan/systems/webserver/webapi/bukkit/ConfigurationWebAPI.java
index 80e71a2b0..fa1451d6b 100644
--- a/Plan/src/main/java/com/djrapitops/plan/systems/webserver/webapi/bukkit/ConfigurationWebAPI.java
+++ b/Plan/src/main/java/com/djrapitops/plan/systems/webserver/webapi/bukkit/ConfigurationWebAPI.java
@@ -79,7 +79,7 @@ public class ConfigurationWebAPI extends WebAPI {
                 Settings.DB_DATABASE, Settings.FORMAT_DECIMALS, Settings.FORMAT_SECONDS,
                 Settings.FORMAT_DAY, Settings.FORMAT_DAYS, Settings.FORMAT_HOURS,
                 Settings.FORMAT_MINUTES, Settings.FORMAT_MONTHS, Settings.FORMAT_MONTH,
-                Settings.FORMAT_YEAR, Settings.FORMAT_YEARS,
+                Settings.FORMAT_YEAR, Settings.FORMAT_YEARS, Settings.FORMAT_ZERO_SECONDS
         };
         for (Settings setting : sameStrings) {
             addConfigValue(configValues, setting, setting.toString());
diff --git a/Plan/src/main/java/com/djrapitops/plan/utilities/FormatUtils.java b/Plan/src/main/java/com/djrapitops/plan/utilities/FormatUtils.java
index cf2d55dac..ee7e361fb 100644
--- a/Plan/src/main/java/com/djrapitops/plan/utilities/FormatUtils.java
+++ b/Plan/src/main/java/com/djrapitops/plan/utilities/FormatUtils.java
@@ -133,7 +133,7 @@ public class FormatUtils {
         }
         String formattedTime = StringUtils.remove(builder.toString(), "%zero%");
         if (formattedTime.isEmpty()) {
-            return Settings.FORMAT_SECONDS.toString().replace("%seconds%", "0").replace("%zero%", "0");
+            return Settings.FORMAT_ZERO_SECONDS.toString();
         }
         return formattedTime;
     }
diff --git a/Plan/src/main/resources/bungeeconfig.yml b/Plan/src/main/resources/bungeeconfig.yml
index 0ae298032..a6d94bf90 100644
--- a/Plan/src/main/resources/bungeeconfig.yml
+++ b/Plan/src/main/resources/bungeeconfig.yml
@@ -59,6 +59,7 @@ Customization:
       Hours: '%hours%h '
       Minutes: '%minutes%m '
       Seconds: '%seconds%s'
+      Zero: '0s'
 
 Theme:
   Base: Default
diff --git a/Plan/src/main/resources/config.yml b/Plan/src/main/resources/config.yml
index e2afd88b7..3d54a53ba 100644
--- a/Plan/src/main/resources/config.yml
+++ b/Plan/src/main/resources/config.yml
@@ -64,6 +64,7 @@ Customization:
       Hours: '%hours%h '
       Minutes: '%minutes%m '
       Seconds: '%seconds%s'
+      Zero: '0s'
 
 Theme:
   Base: Default