diff options
| author | nicuch <nicuch100@gmail.com> | 2020-01-12 16:32:37 +0200 |
|---|---|---|
| committer | nicuch <nicuch100@gmail.com> | 2020-01-12 16:32:37 +0200 |
| commit | 8600578d9aa4e20dab6c9d588e218f33f5dc82b1 (patch) | |
| tree | 65a9cddb97975a541f8754c5d5908f2fadcbf05c /src/main | |
| parent | 5a263e026a5d876c3150a4452274aeb8bae883d2 (diff) | |
Added time-format
Diffstat (limited to 'src/main')
4 files changed, 7 insertions, 7 deletions
diff --git a/src/main/java/com/leonardobishop/quests/Quests.java b/src/main/java/com/leonardobishop/quests/Quests.java index 71f42917..d99b2a87 100644 --- a/src/main/java/com/leonardobishop/quests/Quests.java +++ b/src/main/java/com/leonardobishop/quests/Quests.java @@ -84,9 +84,9 @@ public class Quests extends JavaPlugin { } public String convertToFormat(long m) { //seconds please - long hours = m / 60; - long minutes = (m % 60) / 60; - long seconds = ((m % 60) % 60) % 60; + long hours = m / 3600; + long minutes = (m % 3600) / 60; + long seconds = ((m % 3600) % 60) % 60; return Messages.TIME_FORMAT.getMessage() .replace("{hours}", String.format("%02d", hours)) diff --git a/src/main/java/com/leonardobishop/quests/obj/misc/QMenuQuest.java b/src/main/java/com/leonardobishop/quests/obj/misc/QMenuQuest.java index 38914c4b..622e4558 100644 --- a/src/main/java/com/leonardobishop/quests/obj/misc/QMenuQuest.java +++ b/src/main/java/com/leonardobishop/quests/obj/misc/QMenuQuest.java @@ -128,7 +128,7 @@ public class QMenuQuest implements QMenu { inventory.setItem(invSlot, is); } else if (cooldown > 0) { Map<String, String> placeholders = new HashMap<>(); - placeholders.put("{time}", Quests.get().convertToFormat(TimeUnit.MINUTES.convert(cooldown, TimeUnit.SECONDS))); + placeholders.put("{time}", Quests.get().convertToFormat(TimeUnit.SECONDS.convert(cooldown, TimeUnit.MILLISECONDS))); placeholders.put("{quest}", quest.getDisplayNameStripped()); ItemStack is = replaceItemStack(Items.QUEST_COOLDOWN.getItem(), placeholders); inventory.setItem(invSlot, is); diff --git a/src/main/java/com/leonardobishop/quests/player/questprogressfile/QuestProgressFile.java b/src/main/java/com/leonardobishop/quests/player/questprogressfile/QuestProgressFile.java index a8d8dd94..743a3dbc 100644 --- a/src/main/java/com/leonardobishop/quests/player/questprogressfile/QuestProgressFile.java +++ b/src/main/java/com/leonardobishop/quests/player/questprogressfile/QuestProgressFile.java @@ -146,8 +146,8 @@ public class QuestProgressFile { break; case QUEST_COOLDOWN: long cooldown = getCooldownFor(quest); - questResultMessage = Messages.QUEST_START_COOLDOWN.getMessage().replace("{time}", String.valueOf(plugin.convertToFormat(TimeUnit.MINUTES.convert - (cooldown, TimeUnit.SECONDS)))); + questResultMessage = Messages.QUEST_START_COOLDOWN.getMessage().replace("{time}", String.valueOf(plugin.convertToFormat(TimeUnit.SECONDS.convert + (cooldown, TimeUnit.MINUTES)))); break; case QUEST_LOCKED: questResultMessage = Messages.QUEST_START_LOCKED.getMessage(); diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml index bdf6e0e2..0193f33d 100644 --- a/src/main/resources/config.yml +++ b/src/main/resources/config.yml @@ -168,7 +168,7 @@ titles: # Configure messages messages: - time-format: "{hours}h {minutes}m {seconds}s" + time-format: "{hours}h {minutes}m" quest-start: "&7Quest &c{quest} &7started!" quest-complete: "&7Quest &c{quest} &7completed!" quest-cancel: "&7Quest &c{quest} &7cancelled!" |