diff --git a/src/main/kotlin/com/github/quiltservertools/ledger/commands/subcommands/StatusCommand.kt b/src/main/kotlin/com/github/quiltservertools/ledger/commands/subcommands/StatusCommand.kt index 52ad116d..50a9942c 100644 --- a/src/main/kotlin/com/github/quiltservertools/ledger/commands/subcommands/StatusCommand.kt +++ b/src/main/kotlin/com/github/quiltservertools/ledger/commands/subcommands/StatusCommand.kt @@ -29,76 +29,58 @@ object StatusCommand : BuildableCommand { private fun status(context: Context): Int { Ledger.launch { val source = context.source - source.sendFeedback( - { - Text.translatable("text.ledger.header.status") - .setStyle(TextColorPallet.primary) - }, - false + source.sendMessage( + Text.translatable("text.ledger.header.status") + .setStyle(TextColorPallet.primary) ) - source.sendFeedback( - { - Text.translatable( - "text.ledger.status.queue", - ActionQueueService.size.toString().literal() - .setStyle(TextColorPallet.secondaryVariant) - ).setStyle(TextColorPallet.secondary) - }, - false + source.sendMessage( + Text.translatable( + "text.ledger.status.queue", + ActionQueueService.size.toString().literal() + .setStyle(TextColorPallet.secondaryVariant) + ).setStyle(TextColorPallet.secondary) ) - source.sendFeedback( - { - Text.translatable( - "text.ledger.status.version", - getVersion().friendlyString.literal() - .setStyle(TextColorPallet.secondaryVariant) - ).setStyle(TextColorPallet.secondary) - }, - false + source.sendMessage( + Text.translatable( + "text.ledger.status.version", + getVersion().friendlyString.literal() + .setStyle(TextColorPallet.secondaryVariant) + ).setStyle(TextColorPallet.secondary) ) - source.sendFeedback( - { - Text.translatable( - "text.ledger.status.db_type", - DatabaseManager.databaseType.literal() - .setStyle(TextColorPallet.secondaryVariant) - ).setStyle(TextColorPallet.secondary) - }, - false + source.sendMessage( + Text.translatable( + "text.ledger.status.db_type", + DatabaseManager.databaseType.literal() + .setStyle(TextColorPallet.secondaryVariant) + ).setStyle(TextColorPallet.secondary) ) - source.sendFeedback( - { - Text.translatable( - "text.ledger.status.discord", - "text.ledger.status.discord.join".translate() - .setStyle(TextColorPallet.secondaryVariant) - .styled { - it.withClickEvent( - ClickEvent.OpenUrl( - URI("https://discord.gg/FpRNYrQaGP") - ) + source.sendMessage( + Text.translatable( + "text.ledger.status.discord", + "text.ledger.status.discord.join".translate() + .setStyle(TextColorPallet.secondaryVariant) + .styled { + it.withClickEvent( + ClickEvent.OpenUrl( + URI("https://discord.gg/FpRNYrQaGP") ) - } - ).setStyle(TextColorPallet.secondary) - }, - false + ) + } + ).setStyle(TextColorPallet.secondary) ) - source.sendFeedback( - { - Text.translatable( - "text.ledger.status.wiki", - "text.ledger.status.wiki.view".translate() - .setStyle(TextColorPallet.secondaryVariant) - .styled { - it.withClickEvent( - ClickEvent.OpenUrl( - URI("https://quiltservertools.github.io/Ledger/latest/") - ) + source.sendMessage( + Text.translatable( + "text.ledger.status.wiki", + "text.ledger.status.wiki.view".translate() + .setStyle(TextColorPallet.secondaryVariant) + .styled { + it.withClickEvent( + ClickEvent.OpenUrl( + URI("https://www.quiltservertools.net/Ledger/${getVersion().friendlyString}/") ) - } - ).setStyle(TextColorPallet.secondary) - }, - false + ) + } + ).setStyle(TextColorPallet.secondary) ) } diff --git a/src/main/kotlin/com/github/quiltservertools/ledger/utility/MessageUtils.kt b/src/main/kotlin/com/github/quiltservertools/ledger/utility/MessageUtils.kt index 6e76c8c7..9d5c5f89 100644 --- a/src/main/kotlin/com/github/quiltservertools/ledger/utility/MessageUtils.kt +++ b/src/main/kotlin/com/github/quiltservertools/ledger/utility/MessageUtils.kt @@ -34,63 +34,55 @@ object MessageUtils { return } - source.sendFeedback({ header }, false) + source.sendMessage(header) results.actions.forEach { actionType -> - source.sendFeedback({ actionType.getMessage(source) }, false) + source.sendMessage(actionType.getMessage(source)) } - source.sendFeedback( - { - Text.translatable( - "text.ledger.footer.search", - Text.translatable("text.ledger.footer.page_backward").setStyle(TextColorPallet.primaryVariant) - .styled { - if (results.page > 1) { - it.withHoverEvent( - HoverEvent.ShowText( - Text.translatable("text.ledger.footer.page_backward.hover") - ) - ).withClickEvent( - ClickEvent.RunCommand("/lg pg ${results.page - 1}") - ) - } else { - Style.EMPTY - } - }, - results.page.toString().literal().setStyle(TextColorPallet.primaryVariant), - results.pages.toString().literal().setStyle(TextColorPallet.primaryVariant), - Text.translatable("text.ledger.footer.page_forward").setStyle(TextColorPallet.primaryVariant) - .styled { - if (results.page < results.pages) { - it.withHoverEvent( - HoverEvent.ShowText( - Text.translatable("text.ledger.footer.page_forward.hover") - ) - ).withClickEvent( - ClickEvent.RunCommand("/lg pg ${results.page + 1}") - ) - } else { - Style.EMPTY - } - } - ).setStyle(TextColorPallet.primary) - }, - false + source.sendMessage( + Text.translatable( + "text.ledger.footer.search", + Text.translatable("text.ledger.footer.page_backward").setStyle(TextColorPallet.primaryVariant).styled { + if (results.page > 1) { + it.withHoverEvent( + HoverEvent.ShowText( + Text.translatable("text.ledger.footer.page_backward.hover") + ) + ).withClickEvent( + ClickEvent.RunCommand("/lg pg ${results.page - 1}") + ) + } else { + Style.EMPTY + } + }, + results.page.toString().literal().setStyle(TextColorPallet.primaryVariant), + results.pages.toString().literal().setStyle(TextColorPallet.primaryVariant), + Text.translatable("text.ledger.footer.page_forward").setStyle(TextColorPallet.primaryVariant).styled { + if (results.page < results.pages) { + it.withHoverEvent( + HoverEvent.ShowText( + Text.translatable("text.ledger.footer.page_forward.hover") + ) + ).withClickEvent( + ClickEvent.RunCommand("/lg pg ${results.page + 1}") + ) + } else { + Style.EMPTY + } + } + ).setStyle(TextColorPallet.primary) ) } fun sendPlayerMessage(source: ServerCommandSource, results: List) { if (results.isEmpty()) { - source.sendFeedback( - { "error.ledger.command.no_results".translate().setStyle(TextColorPallet.primary) }, - false - ) + source.sendMessage("error.ledger.command.no_results".translate().setStyle(TextColorPallet.primary)) return } - source.sendFeedback({ "text.ledger.header.search".translate().setStyle(TextColorPallet.secondary) }, false) + source.sendMessage("text.ledger.header.search".translate().setStyle(TextColorPallet.secondary)) results.forEach { - source.sendFeedback({ it.toText() }, false) + source.sendMessage(it.toText()) } }