Skip to content

Commit 32b583a

Browse files
PotatoPresidentPotatoPresident
authored
Change chat results to not use feedback (#351)
1 parent 4bee3b1 commit 32b583a

File tree

2 files changed

+82
-108
lines changed

2 files changed

+82
-108
lines changed

‎src/main/kotlin/com/github/quiltservertools/ledger/commands/subcommands/StatusCommand.kt‎

Lines changed: 45 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -29,76 +29,58 @@ object StatusCommand : BuildableCommand {
2929
private fun status(context: Context): Int {
3030
Ledger.launch {
3131
val source = context.source
32-
source.sendFeedback(
33-
{
34-
Text.translatable("text.ledger.header.status")
35-
.setStyle(TextColorPallet.primary)
36-
},
37-
false
32+
source.sendMessage(
33+
Text.translatable("text.ledger.header.status")
34+
.setStyle(TextColorPallet.primary)
3835
)
39-
source.sendFeedback(
40-
{
41-
Text.translatable(
42-
"text.ledger.status.queue",
43-
ActionQueueService.size.toString().literal()
44-
.setStyle(TextColorPallet.secondaryVariant)
45-
).setStyle(TextColorPallet.secondary)
46-
},
47-
false
36+
source.sendMessage(
37+
Text.translatable(
38+
"text.ledger.status.queue",
39+
ActionQueueService.size.toString().literal()
40+
.setStyle(TextColorPallet.secondaryVariant)
41+
).setStyle(TextColorPallet.secondary)
4842
)
49-
source.sendFeedback(
50-
{
51-
Text.translatable(
52-
"text.ledger.status.version",
53-
getVersion().friendlyString.literal()
54-
.setStyle(TextColorPallet.secondaryVariant)
55-
).setStyle(TextColorPallet.secondary)
56-
},
57-
false
43+
source.sendMessage(
44+
Text.translatable(
45+
"text.ledger.status.version",
46+
getVersion().friendlyString.literal()
47+
.setStyle(TextColorPallet.secondaryVariant)
48+
).setStyle(TextColorPallet.secondary)
5849
)
59-
source.sendFeedback(
60-
{
61-
Text.translatable(
62-
"text.ledger.status.db_type",
63-
DatabaseManager.databaseType.literal()
64-
.setStyle(TextColorPallet.secondaryVariant)
65-
).setStyle(TextColorPallet.secondary)
66-
},
67-
false
50+
source.sendMessage(
51+
Text.translatable(
52+
"text.ledger.status.db_type",
53+
DatabaseManager.databaseType.literal()
54+
.setStyle(TextColorPallet.secondaryVariant)
55+
).setStyle(TextColorPallet.secondary)
6856
)
69-
source.sendFeedback(
70-
{
71-
Text.translatable(
72-
"text.ledger.status.discord",
73-
"text.ledger.status.discord.join".translate()
74-
.setStyle(TextColorPallet.secondaryVariant)
75-
.styled {
76-
it.withClickEvent(
77-
ClickEvent.OpenUrl(
78-
URI("https://discord.gg/FpRNYrQaGP")
79-
)
57+
source.sendMessage(
58+
Text.translatable(
59+
"text.ledger.status.discord",
60+
"text.ledger.status.discord.join".translate()
61+
.setStyle(TextColorPallet.secondaryVariant)
62+
.styled {
63+
it.withClickEvent(
64+
ClickEvent.OpenUrl(
65+
URI("https://discord.gg/FpRNYrQaGP")
8066
)
81-
}
82-
).setStyle(TextColorPallet.secondary)
83-
},
84-
false
67+
)
68+
}
69+
).setStyle(TextColorPallet.secondary)
8570
)
86-
source.sendFeedback(
87-
{
88-
Text.translatable(
89-
"text.ledger.status.wiki",
90-
"text.ledger.status.wiki.view".translate()
91-
.setStyle(TextColorPallet.secondaryVariant)
92-
.styled {
93-
it.withClickEvent(
94-
ClickEvent.OpenUrl(
95-
URI("https://quiltservertools.github.io/Ledger/latest/")
96-
)
71+
source.sendMessage(
72+
Text.translatable(
73+
"text.ledger.status.wiki",
74+
"text.ledger.status.wiki.view".translate()
75+
.setStyle(TextColorPallet.secondaryVariant)
76+
.styled {
77+
it.withClickEvent(
78+
ClickEvent.OpenUrl(
79+
URI("https://www.quiltservertools.net/Ledger/${getVersion().friendlyString}/")
9780
)
98-
}
99-
).setStyle(TextColorPallet.secondary)
100-
},
101-
false
81+
)
82+
}
83+
).setStyle(TextColorPallet.secondary)
10284
)
10385
}
10486

‎src/main/kotlin/com/github/quiltservertools/ledger/utility/MessageUtils.kt‎

Lines changed: 37 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -34,63 +34,55 @@ object MessageUtils {
3434
return
3535
}
3636

37-
source.sendFeedback({ header }, false)
37+
source.sendMessage(header)
3838

3939
results.actions.forEach { actionType ->
40-
source.sendFeedback({ actionType.getMessage(source) }, false)
40+
source.sendMessage(actionType.getMessage(source))
4141
}
4242

43-
source.sendFeedback(
44-
{
45-
Text.translatable(
46-
"text.ledger.footer.search",
47-
Text.translatable("text.ledger.footer.page_backward").setStyle(TextColorPallet.primaryVariant)
48-
.styled {
49-
if (results.page > 1) {
50-
it.withHoverEvent(
51-
HoverEvent.ShowText(
52-
Text.translatable("text.ledger.footer.page_backward.hover")
53-
)
54-
).withClickEvent(
55-
ClickEvent.RunCommand("/lg pg ${results.page - 1}")
56-
)
57-
} else {
58-
Style.EMPTY
59-
}
60-
},
61-
results.page.toString().literal().setStyle(TextColorPallet.primaryVariant),
62-
results.pages.toString().literal().setStyle(TextColorPallet.primaryVariant),
63-
Text.translatable("text.ledger.footer.page_forward").setStyle(TextColorPallet.primaryVariant)
64-
.styled {
65-
if (results.page < results.pages) {
66-
it.withHoverEvent(
67-
HoverEvent.ShowText(
68-
Text.translatable("text.ledger.footer.page_forward.hover")
69-
)
70-
).withClickEvent(
71-
ClickEvent.RunCommand("/lg pg ${results.page + 1}")
72-
)
73-
} else {
74-
Style.EMPTY
75-
}
76-
}
77-
).setStyle(TextColorPallet.primary)
78-
},
79-
false
43+
source.sendMessage(
44+
Text.translatable(
45+
"text.ledger.footer.search",
46+
Text.translatable("text.ledger.footer.page_backward").setStyle(TextColorPallet.primaryVariant).styled {
47+
if (results.page > 1) {
48+
it.withHoverEvent(
49+
HoverEvent.ShowText(
50+
Text.translatable("text.ledger.footer.page_backward.hover")
51+
)
52+
).withClickEvent(
53+
ClickEvent.RunCommand("/lg pg ${results.page - 1}")
54+
)
55+
} else {
56+
Style.EMPTY
57+
}
58+
},
59+
results.page.toString().literal().setStyle(TextColorPallet.primaryVariant),
60+
results.pages.toString().literal().setStyle(TextColorPallet.primaryVariant),
61+
Text.translatable("text.ledger.footer.page_forward").setStyle(TextColorPallet.primaryVariant).styled {
62+
if (results.page < results.pages) {
63+
it.withHoverEvent(
64+
HoverEvent.ShowText(
65+
Text.translatable("text.ledger.footer.page_forward.hover")
66+
)
67+
).withClickEvent(
68+
ClickEvent.RunCommand("/lg pg ${results.page + 1}")
69+
)
70+
} else {
71+
Style.EMPTY
72+
}
73+
}
74+
).setStyle(TextColorPallet.primary)
8075
)
8176
}
8277

8378
fun sendPlayerMessage(source: ServerCommandSource, results: List<PlayerResult>) {
8479
if (results.isEmpty()) {
85-
source.sendFeedback(
86-
{ "error.ledger.command.no_results".translate().setStyle(TextColorPallet.primary) },
87-
false
88-
)
80+
source.sendMessage("error.ledger.command.no_results".translate().setStyle(TextColorPallet.primary))
8981
return
9082
}
91-
source.sendFeedback({ "text.ledger.header.search".translate().setStyle(TextColorPallet.secondary) }, false)
83+
source.sendMessage("text.ledger.header.search".translate().setStyle(TextColorPallet.secondary))
9284
results.forEach {
93-
source.sendFeedback({ it.toText() }, false)
85+
source.sendMessage(it.toText())
9486
}
9587
}
9688

0 commit comments

Comments
 (0)