diff --git a/build-number.txt b/build-number.txt index f733f7b3..c2a7108a 100644 --- a/build-number.txt +++ b/build-number.txt @@ -1 +1 @@ -1511 \ No newline at end of file +1514 \ No newline at end of file diff --git a/src/main/java/me/chayapak1/chomens_bot/commands/InfoCommand.java b/src/main/java/me/chayapak1/chomens_bot/commands/InfoCommand.java index df2bfe18..1d6c4cb5 100644 --- a/src/main/java/me/chayapak1/chomens_bot/commands/InfoCommand.java +++ b/src/main/java/me/chayapak1/chomens_bot/commands/InfoCommand.java @@ -6,6 +6,7 @@ import me.chayapak1.chomens_bot.command.CommandContext; import me.chayapak1.chomens_bot.command.CommandException; import me.chayapak1.chomens_bot.command.TrustLevel; import me.chayapak1.chomens_bot.util.ColorUtilities; +import me.chayapak1.chomens_bot.util.StringUtilities; import net.kyori.adventure.text.Component; import net.kyori.adventure.text.event.ClickEvent; import net.kyori.adventure.text.event.HoverEvent; @@ -236,11 +237,15 @@ public class InfoCommand extends Command { return Component.translatable( "The bots uptime is: %s", Component.translatable( - "%s days, %s hours, %s minutes, %s seconds", + "%s %s, %s %s, %s %s, %s %s", Component.text(days), + Component.text(StringUtilities.addPluralS(days, "day")), Component.text(hours), + Component.text(StringUtilities.addPluralS(hours, "hour")), Component.text(minutes), - Component.text(seconds) + Component.text(StringUtilities.addPluralS(minutes, "minute")), + Component.text(seconds), + Component.text(StringUtilities.addPluralS(seconds, "second")) ).color(NamedTextColor.GREEN) ).color(ColorUtilities.getColorByString(bot.config.colorPalette.defaultColor)); } diff --git a/src/main/java/me/chayapak1/chomens_bot/util/StringUtilities.java b/src/main/java/me/chayapak1/chomens_bot/util/StringUtilities.java index 51430e53..26eaf240 100644 --- a/src/main/java/me/chayapak1/chomens_bot/util/StringUtilities.java +++ b/src/main/java/me/chayapak1/chomens_bot/util/StringUtilities.java @@ -56,6 +56,10 @@ public class StringUtilities { return false; } + public static String addPluralS (long amount, String unit) { + return amount > 1 ? unit + "s" : unit; + } + public static boolean isNotNullAndNotBlank (String text) { return text != null && !text.isBlank(); }