From d32d5bd3e3626c49471aa206de2df0d20bd03abb Mon Sep 17 00:00:00 2001
From: LMBishop <13875753+LMBishop@users.noreply.github.com>
Date: Thu, 24 Jun 2021 00:55:42 +0100
Subject: Fix broken time formatting

- Closes #186
---
 .../quests/bukkit/hook/papi/QuestsPlaceholders.java |  2 +-
 .../bukkit/menu/element/QuestMenuElement.java       |  2 +-
 .../questcontroller/NormalQuestController.java      |  2 +-
 .../leonardobishop/quests/bukkit/util/Format.java   | 20 ++++++++++++++++++++
 .../leonardobishop/quests/common/util/Format.java   | 21 ---------------------
 5 files changed, 23 insertions(+), 24 deletions(-)
 create mode 100644 bukkit/src/main/java/com/leonardobishop/quests/bukkit/util/Format.java
 delete mode 100644 common/src/main/java/com/leonardobishop/quests/common/util/Format.java

diff --git a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/hook/papi/QuestsPlaceholders.java b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/hook/papi/QuestsPlaceholders.java
index 6047b6f2..ad015dc5 100644
--- a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/hook/papi/QuestsPlaceholders.java
+++ b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/hook/papi/QuestsPlaceholders.java
@@ -8,7 +8,7 @@ import com.leonardobishop.quests.common.player.QPlayer;
 import com.leonardobishop.quests.common.player.questprogressfile.QuestProgressFile;
 import com.leonardobishop.quests.common.quest.Category;
 import com.leonardobishop.quests.common.quest.Quest;
-import com.leonardobishop.quests.common.util.Format;
+import com.leonardobishop.quests.bukkit.util.Format;
 import me.clip.placeholderapi.expansion.Cacheable;
 import me.clip.placeholderapi.expansion.PlaceholderExpansion;
 import org.bukkit.Bukkit;
diff --git a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/menu/element/QuestMenuElement.java b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/menu/element/QuestMenuElement.java
index 215a93a1..96f20560 100644
--- a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/menu/element/QuestMenuElement.java
+++ b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/menu/element/QuestMenuElement.java
@@ -8,7 +8,7 @@ import com.leonardobishop.quests.common.enums.QuestStartResult;
 import com.leonardobishop.quests.common.player.QPlayer;
 import com.leonardobishop.quests.common.player.questprogressfile.QuestProgress;
 import com.leonardobishop.quests.common.quest.Quest;
-import com.leonardobishop.quests.common.util.Format;
+import com.leonardobishop.quests.bukkit.util.Format;
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
diff --git a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/questcontroller/NormalQuestController.java b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/questcontroller/NormalQuestController.java
index e385ba9f..c9c95eb7 100644
--- a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/questcontroller/NormalQuestController.java
+++ b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/questcontroller/NormalQuestController.java
@@ -18,7 +18,7 @@ import com.leonardobishop.quests.common.player.questprogressfile.TaskProgress;
 import com.leonardobishop.quests.common.quest.Quest;
 import com.leonardobishop.quests.common.quest.Task;
 import com.leonardobishop.quests.common.questcontroller.QuestController;
-import com.leonardobishop.quests.common.util.Format;
+import com.leonardobishop.quests.bukkit.util.Format;
 import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
 import org.bukkit.entity.Player;
diff --git a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/util/Format.java b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/util/Format.java
new file mode 100644
index 00000000..5a58c28d
--- /dev/null
+++ b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/util/Format.java
@@ -0,0 +1,20 @@
+package com.leonardobishop.quests.bukkit.util;
+
+public class Format {
+    
+    public static String formatTime(long sec) {
+        long hours = sec / 3600;
+        long minutes = (sec % 3600) / 60;
+        long seconds = ((sec % 3600) % 60) % 60;
+
+        return Messages.TIME_FORMAT.getMessage()
+                .replace("{hours}", String.format("%02d", hours))
+                .replace("{minutes}", String.format("%02d", minutes))
+                .replace("{seconds}", String.format("%02d", seconds));
+//        return "{hours}h {minutes}m {seconds}s"
+//                .replace("{hours}", String.format("%02d", hours))
+//                .replace("{minutes}", String.format("%02d", minutes))
+//                .replace("{seconds}", String.format("%02d", seconds));
+    }
+
+}
diff --git a/common/src/main/java/com/leonardobishop/quests/common/util/Format.java b/common/src/main/java/com/leonardobishop/quests/common/util/Format.java
deleted file mode 100644
index 410462ee..00000000
--- a/common/src/main/java/com/leonardobishop/quests/common/util/Format.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.leonardobishop.quests.common.util;
-
-public class Format {
-
-    //TODO reimplement customisation
-    public static String formatTime(long sec) {
-        long hours = sec / 3600;
-        long minutes = (sec % 3600) / 60;
-        long seconds = ((sec % 3600) % 60) % 60;
-
-//        return Messages.TIME_FORMAT.getMessage()
-//                .replace("{hours}", String.format("%02d", hours))
-//                .replace("{minutes}", String.format("%02d", minutes))
-//                .replace("{seconds}", String.format("%02d", seconds));
-        return "{houes}h {minutes}m {seconds}s"
-                .replace("{hours}", String.format("%02d", hours))
-                .replace("{minutes}", String.format("%02d", minutes))
-                .replace("{seconds}", String.format("%02d", seconds));
-    }
-
-}
-- 
cgit v1.2.3-70-g09d2