GH-357 Add configurable duration formatter with plural support #358
+330
−136
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -8,7 +8,6 @@ public class CrystalPvpSettings extends OkaeriConfig { | |
| @Comment({"# Should player be tagged when damaged from crystal explosion set by other player"}) | ||
| public boolean tagFromCrystals = true; | ||
|
|
||
| @Comment({"# Should player be tagged when damaged from respawn anchor explosion set by other player"}) | ||
| public boolean tagFromRespawnAnchor = true; | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||||
|---|---|---|---|---|---|---|---|---|
| @@ -0,0 +1,37 @@ | ||||||||
| package com.eternalcode.combat.config.implementation; | ||||||||
|
|
||||||||
| import eu.okaeri.configs.OkaeriConfig; | ||||||||
| import eu.okaeri.configs.annotation.Comment; | ||||||||
|
|
||||||||
| public class DurationFormatSettings extends OkaeriConfig { | ||||||||
|
|
||||||||
| @Comment({ | ||||||||
| "# Pattern used to format durations.", | ||||||||
|
Member
There was a problem hiding this comment.
Suggested change
|
||||||||
| "# Placeholders:", | ||||||||
| "# %d{singular|plural} - days", | ||||||||
| "# %h{singular|plural} - hours", | ||||||||
| "# %m{singular|plural} - minutes", | ||||||||
| "# %s{singular|plural} - seconds", | ||||||||
| "# %ms{singular|plural} - milliseconds", | ||||||||
| "# Example:", | ||||||||
| "# %d{day|days} %h{hour|hours} %m{minute|minutes} %s{second|seconds} %ms{millisecond|milliseconds}" | ||||||||
| }) | ||||||||
| public String pattern = "%d {day|days} %h {hour|hours} %m {minute|minutes} %s {second|seconds} %ms {millisecond|milliseconds}"; | ||||||||
|
Member
There was a problem hiding this comment. nie możemy tego rozłożyć może na filedy typu: days: "{x} day|{x} days" w ogóle w językach typu Polski jest problem z
Contributor
Author
There was a problem hiding this comment. moim zdaniem w takiej formie jest to zrobione lepiej i zostawiłbym to. Jest prosto, jest czytelnie. Wiem o co Ci chodzi, coś w stylu config per unit, ale zmiana = wieksza struktura configu, wiecej "edge case" no i zmiana parseru. Do dyskusji to jest generalnie
Member
There was a problem hiding this comment. W sumie configurowałem przed chwilą dla testu i przyjemnie się tego używa -> potem i tak jest parsowane do wiadmości przez placeholder. Dzięki separatorom jest spoko.
Member
There was a problem hiding this comment. Configuration with formatting tags does not work - text is not formatted. 
|
||||||||
|
|
||||||||
| @Comment({ | ||||||||
| "# Separator used between duration parts.", | ||||||||
| "# Example result:", | ||||||||
| "# 1 hour, 2 minutes, 5 seconds" | ||||||||
| }) | ||||||||
| public String separator = ", "; | ||||||||
|
|
||||||||
| @Comment({ | ||||||||
| "# Separator used before the last duration part.", | ||||||||
| "# Example result:", | ||||||||
| "# 1 hour, 2 minutes and 5 seconds" | ||||||||
| }) | ||||||||
| public String lastSeparator = " and "; | ||||||||
|
|
||||||||
| @Comment({"# Text displayed when duration is zero or negative."}) | ||||||||
| public String zero = "<1 second"; | ||||||||
| } | ||||||||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -23,11 +23,6 @@ public class MessagesSettings extends OkaeriConfig { | |
| .actionBar("Combat ends in: <red>{TIME}</red>") | ||
| .build(); | ||
|
|
||
| @Comment({ | ||
| "# Message displayed when a player lacks permission to execute a command.", | ||
| "# The {PERMISSION} placeholder is replaced with the required permission." | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -5,10 +5,10 @@ | |
|
|
||
| public class PlaceholderSettings extends OkaeriConfig { | ||
|
|
||
| @Comment("# Text returned by %eternalcombat_isInCombat_formatted% placeholder when the player is in combat") | ||
| public String isInCombatFormattedTrue = "In Combat"; | ||
|
|
||
| @Comment("# Text returned by %eternalcombat_isInCombat_formatted% placeholder when the player is out of combat") | ||
| public String isInCombatFormattedFalse = "Not In Combat"; | ||
|
|
||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -8,6 +8,7 @@ | |
| import com.eternalcode.combat.fight.pearl.FightPearlSettings; | ||
| import eu.okaeri.configs.OkaeriConfig; | ||
| import eu.okaeri.configs.annotation.Comment; | ||
|
|
||
| import java.time.Duration; | ||
| import java.util.List; | ||
|
|
||
|
|
@@ -29,6 +30,13 @@ public class PluginConfig extends OkaeriConfig { | |
| }) | ||
| public Settings settings = new Settings(); | ||
|
|
||
| @Comment({ | ||
| " ", | ||
| "# Duration formatting settings.", | ||
| "# Controls how time values (e.g. cooldowns, timers) are displayed." | ||
| }) | ||
| public DurationFormatSettings durationFormat = new DurationFormatSettings(); | ||
|
|
||
| @Comment({ | ||
| " ", | ||
| "# Settings related to Ender Pearls.", | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -3,7 +3,7 @@ | |
| import com.eternalcode.combat.config.implementation.PluginConfig; | ||
| import com.eternalcode.combat.fight.event.CauseOfUnTag; | ||
| import com.eternalcode.combat.notification.NoticeService; | ||
| import com.eternalcode.combat.time.DurationFormatter; | ||
| import org.bukkit.Server; | ||
| import org.bukkit.entity.Player; | ||
|
|
||
|
|
@@ -17,7 +17,7 @@ public class FightTask implements Runnable { | |
| private final FightManager fightManager; | ||
| private final NoticeService noticeService; | ||
|
|
||
| public FightTask(Server server, PluginConfig config, FightManager fightManager, NoticeService noticeService) { | ||
| this.server = server; | ||
| this.config = config; | ||
| this.fightManager = fightManager; | ||
|
|
@@ -45,7 +45,7 @@ public void run() { | |
| this.noticeService.create() | ||
| .player(player.getUniqueId()) | ||
| .notice(this.config.messagesSettings.combatNotification) | ||
| .placeholder("{TIME}", DurationFormatter.of(config.durationFormat).format(remaining)) | ||
| .send(); | ||
|
|
||
| } | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.