Skip to content

Commit 22a6a66

Browse files
zefir-gitzefir-git
committed
deserialise MiniMessage messages
1 parent c6e2138 commit 22a6a66

File tree

2 files changed

+34
-30
lines changed

2 files changed

+34
-30
lines changed

‎src/main/java/pro/cloudnode/smp/bankaccounts/commands/BankCommand.java‎

Lines changed: 22 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
package pro.cloudnode.smp.bankaccounts.commands;
22

3+
import net.kyori.adventure.text.Component;
4+
import net.kyori.adventure.text.minimessage.MiniMessage;
35
import net.kyori.adventure.text.minimessage.tag.resolver.Placeholder;
46
import org.bukkit.Material;
57
import org.bukkit.OfflinePlayer;
@@ -242,43 +244,43 @@ else if (args.length == 3 && sender.hasPermission(Permissions.INSTRUMENT_CREATE_
242244
* Plugin help
243245
*/
244246
public static @NotNull Message help(final @NotNull CommandSender sender) {
245-
sender.sendMessage("<dark_gray>---</dark_gray>");
246-
sender.sendMessage("<green>Available commands:");
247-
sender.sendMessage("");
247+
sender.sendMessage(MiniMessage.miniMessage().deserialize("<dark_gray>---</dark_gray>"));
248+
sender.sendMessage(MiniMessage.miniMessage().deserialize("<green>Available commands:"));
249+
sender.sendMessage(Component.empty());
248250
if (sender.hasPermission(Permissions.BALANCE_SELF))
249-
sender.sendMessage("<click:suggest_command:/bank balance ><green>/bank balance <gray>[account]</gray></green> <white>- Check your accounts</click>");
251+
sender.sendMessage(MiniMessage.miniMessage().deserialize("<click:suggest_command:/bank balance ><green>/bank balance <gray>[account]</gray></green> <white>- Check your accounts</click>"));
250252
if (sender.hasPermission(Permissions.BALANCE_OTHER))
251-
sender.sendMessage("<click:suggest_command:/bank balance --player ><green>/bank balance <gray>--player <player></gray></green> <white>- List another player's accounts</click>");
253+
sender.sendMessage(MiniMessage.miniMessage().deserialize("<click:suggest_command:/bank balance --player ><green>/bank balance <gray>--player <player></gray></green> <white>- List another player's accounts</click>"));
252254
if (sender.hasPermission(Permissions.TRANSFER_SELF) || sender.hasPermission(Permissions.TRANSFER_OTHER))
253-
sender.sendMessage("<click:suggest_command:/bank transfer ><green>/bank transfer <gray><from> <to> <amount> [description]</gray></green> <white>- Transfer money to another account</click>");
255+
sender.sendMessage(MiniMessage.miniMessage().deserialize("<click:suggest_command:/bank transfer ><green>/bank transfer <gray><from> <to> <amount> [description]</gray></green> <white>- Transfer money to another account</click>"));
254256
if (sender.hasPermission(Permissions.HISTORY))
255-
sender.sendMessage("<click:suggest_command:/bank transactions ><green>/bank transactions <gray><account> [page=1]</gray></green> <white>- List transactions</click>");
257+
sender.sendMessage(MiniMessage.miniMessage().deserialize("<click:suggest_command:/bank transactions ><green>/bank transactions <gray><account> [page=1]</gray></green> <white>- List transactions</click>"));
256258
if (sender.hasPermission(Permissions.ACCOUNT_CREATE))
257-
sender.sendMessage("<click:suggest_command:/bank create ><green>/bank create <gray><PERSONAL|BUSINESS" + (sender.hasPermission(Permissions.ACCOUNT_CREATE_VAULT) ? "|VAULT" : "") + "></gray></green> <white>- Create a new account</click>");
259+
sender.sendMessage(MiniMessage.miniMessage().deserialize("<click:suggest_command:/bank create ><green>/bank create <gray><PERSONAL|BUSINESS" + (sender.hasPermission(Permissions.ACCOUNT_CREATE_VAULT) ? "|VAULT" : "") + "></gray></green> <white>- Create a new account</click>"));
258260
if (sender.hasPermission(Permissions.ACCOUNT_CREATE_OTHER))
259-
sender.sendMessage("<click:suggest_command:/bank create ><green>/bank create <gray><PERSONAL|BUSINESS" + (sender.hasPermission(Permissions.ACCOUNT_CREATE_VAULT) ? "|VAULT" : "") + "> --player <player></gray></green> <white>- Create an account for another player</click>");
261+
sender.sendMessage(MiniMessage.miniMessage().deserialize("<click:suggest_command:/bank create ><green>/bank create <gray><PERSONAL|BUSINESS" + (sender.hasPermission(Permissions.ACCOUNT_CREATE_VAULT) ? "|VAULT" : "") + "> --player <player></gray></green> <white>- Create an account for another player</click>"));
260262
if (sender.hasPermission(Permissions.FREEZE)) {
261-
sender.sendMessage("<click:suggest_command:/bank freeze ><green>/bank freeze <gray><account></gray></green> <white>- Freeze an account</click>");
262-
sender.sendMessage("<click:suggest_command:/bank unfreeze ><green>/bank unfreeze <gray><account></gray></green> <white>- Unfreeze an account</click>");
263+
sender.sendMessage(MiniMessage.miniMessage().deserialize("<click:suggest_command:/bank freeze ><green>/bank freeze <gray><account></gray></green> <white>- Freeze an account</click>"));
264+
sender.sendMessage(MiniMessage.miniMessage().deserialize("<click:suggest_command:/bank unfreeze ><green>/bank unfreeze <gray><account></gray></green> <white>- Unfreeze an account</click>"));
263265
}
264266
if (sender.hasPermission(Permissions.DELETE))
265-
sender.sendMessage("<click:suggest_command:/bank delete ><green>/bank delete <gray><account></gray></green> <white>- Delete an account</click>");
267+
sender.sendMessage(MiniMessage.miniMessage().deserialize("<click:suggest_command:/bank delete ><green>/bank delete <gray><account></gray></green> <white>- Delete an account</click>"));
266268
if (sender.hasPermission(Permissions.INSTRUMENT_CREATE))
267-
sender.sendMessage("<click:suggest_command:/bank instrument ><green>/bank instrument <gray><account>" + (sender.hasPermission(Permissions.INSTRUMENT_CREATE_OTHER) ? " [player]" : "") + "</gray></green> <white>- Create a new instrument</click>");
269+
sender.sendMessage(MiniMessage.miniMessage().deserialize("<click:suggest_command:/bank instrument ><green>/bank instrument <gray><account>" + (sender.hasPermission(Permissions.INSTRUMENT_CREATE_OTHER) ? " [player]" : "") + "</gray></green> <white>- Create a new instrument</click>"));
268270
if (sender.hasPermission(Permissions.WHOIS))
269-
sender.sendMessage("<click:suggest_command:/bank whois ><green>/bank whois <gray><account></gray></green> <white>- Get information about an account</click>");
271+
sender.sendMessage(MiniMessage.miniMessage().deserialize("<click:suggest_command:/bank whois ><green>/bank whois <gray><account></gray></green> <white>- Get information about an account</click>"));
270272
if (sender.hasPermission(Permissions.BALTOP))
271-
sender.sendMessage("<click:suggest_command:/baltop ><green>/baltop <gray>[personal|business|player] [page=1]</gray></green> <white>- Top balance leaderboard</click>");
273+
sender.sendMessage(MiniMessage.miniMessage().deserialize("<click:suggest_command:/baltop ><green>/baltop <gray>[personal|business|player] [page=1]</gray></green> <white>- Top balance leaderboard</click>"));
272274
if (sender.hasPermission(Permissions.POS_CREATE))
273-
sender.sendMessage("<click:suggest_command:/pos ><green>/pos <gray><account> <price> [description]</gray></green> <white>- Create a new point of sale</click>");
275+
sender.sendMessage(MiniMessage.miniMessage().deserialize("<click:suggest_command:/pos ><green>/pos <gray><account> <price> [description]</gray></green> <white>- Create a new point of sale</click>"));
274276
if (sender.hasPermission(Permissions.SET_BALANCE))
275-
sender.sendMessage("<click:suggest_command:/bank setbalance ><green>/bank setbalance <gray><account> <balance|Infinity></gray></green> <white>- Set an account's balance</click>");
277+
sender.sendMessage(MiniMessage.miniMessage().deserialize("<click:suggest_command:/bank setbalance ><green>/bank setbalance <gray><account> <balance|Infinity></gray></green> <white>- Set an account's balance</click>"));
276278
if (sender.hasPermission(Permissions.SET_NAME))
277-
sender.sendMessage("<click:suggest_command:/bank setname ><green>/bank setname <gray><account> [name]</gray></green> <white>- Set an account's name</click>");
279+
sender.sendMessage(MiniMessage.miniMessage().deserialize("<click:suggest_command:/bank setname ><green>/bank setname <gray><account> [name]</gray></green> <white>- Set an account's name</click>"));
278280
if (sender.hasPermission(Permissions.RELOAD))
279-
sender.sendMessage("<click:suggest_command:/bank reload><green>/bank reload</green> <white>- Reload plugin configuration</click>");
281+
sender.sendMessage(MiniMessage.miniMessage().deserialize("<click:suggest_command:/bank reload><green>/bank reload</green> <white>- Reload plugin configuration</click>"));
280282
if (Stream.of(Permissions.INVOICE_CREATE, Permissions.INVOICE_VIEW, Permissions.INVOICE_SEND, Permissions.TRANSFER_SELF, Permissions.TRANSFER_OTHER).anyMatch(sender::hasPermission))
281-
sender.sendMessage("<click:suggest_command:/invoice help><green>/invoice help</green> <white>- See invoicing commands</click>");
283+
sender.sendMessage(MiniMessage.miniMessage().deserialize("<click:suggest_command:/invoice help><green>/invoice help</green> <white>- See invoicing commands</click>"));
282284
return new Message(sender, "<dark_gray>---</dark_gray>");
283285
}
284286

‎src/main/java/pro/cloudnode/smp/bankaccounts/commands/InvoiceCommand.java‎

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
package pro.cloudnode.smp.bankaccounts.commands;
22

3+
import net.kyori.adventure.text.Component;
4+
import net.kyori.adventure.text.minimessage.MiniMessage;
35
import org.bukkit.OfflinePlayer;
46
import org.bukkit.command.CommandSender;
57
import org.bukkit.entity.Player;
@@ -123,23 +125,23 @@ else if (args.length == 3) {
123125
* <p>{@code /invoice help}</p>
124126
*/
125127
public static @NotNull CommandResult help(final @NotNull CommandSender sender, final @NotNull String label) {
126-
sender.sendMessage("<dark_gray>---</dark_gray>");
127-
sender.sendMessage("<green>Available commands:");
128-
sender.sendMessage("");
128+
sender.sendMessage(MiniMessage.miniMessage().deserialize("<dark_gray>---</dark_gray>"));
129+
sender.sendMessage(MiniMessage.miniMessage().deserialize("<green>Available commands:"));
130+
sender.sendMessage(Component.empty());
129131
if (sender.hasPermission(Permissions.INVOICE_CREATE)) {
130-
sender.sendMessage("<click:suggest_command:/" + label + " create ><green>/" + label + " create <gray><account> <amount> [description]</gray></green> <white>- Create an invoice</white></click>");
131-
sender.sendMessage("<click:suggest_command:/" + label + " create ><green>/" + label + " create <gray><account> <amount> [description] --player <player></gray></green> <white>- Create and send invoice to player</white></click>");
132+
sender.sendMessage(MiniMessage.miniMessage().deserialize("<click:suggest_command:/" + label + " create ><green>/" + label + " create <gray><account> <amount> [description]</gray></green> <white>- Create an invoice</white></click>"));
133+
sender.sendMessage(MiniMessage.miniMessage().deserialize("<click:suggest_command:/" + label + " create ><green>/" + label + " create <gray><account> <amount> [description] --player <player></gray></green> <white>- Create and send invoice to player</white></click>"));
132134
}
133135
if (sender.hasPermission(Permissions.INVOICE_VIEW))
134-
sender.sendMessage("<click:suggest_command:/" + label + " view ><green>/" + label + " view <gray><invoice></gray></green> <white>- View invoice details</white></click>");
136+
sender.sendMessage(MiniMessage.miniMessage().deserialize("<click:suggest_command:/" + label + " view ><green>/" + label + " view <gray><invoice></gray></green> <white>- View invoice details</white></click>"));
135137
if (sender.hasPermission(Permissions.TRANSFER_SELF) || sender.hasPermission(Permissions.TRANSFER_OTHER))
136-
sender.sendMessage("<click:suggest_command:/" + label + " pay ><green>/" + label + " pay <gray><invoice> <account></gray></green> <white>- Pay an invoice</white></click>");
138+
sender.sendMessage(MiniMessage.miniMessage().deserialize("<click:suggest_command:/" + label + " pay ><green>/" + label + " pay <gray><invoice> <account></gray></green> <white>- Pay an invoice</white></click>"));
137139
if (sender.hasPermission(Permissions.INVOICE_SEND))
138-
sender.sendMessage("<click:suggest_command:/" + label + " send ><green>/" + label + " send <gray><invoice> <player></gray></green> <white>- Send an invoice to a player</white></click>");
140+
sender.sendMessage(MiniMessage.miniMessage().deserialize("<click:suggest_command:/" + label + " send ><green>/" + label + " send <gray><invoice> <player></gray></green> <white>- Send an invoice to a player</white></click>"));
139141
if (sender.hasPermission(Permissions.INVOICE_VIEW)) {
140-
sender.sendMessage("<click:suggest_command:/" + label + " list ><green>/" + label + " list <gray>[all|sent|received] [page]</gray></green> <white>- List invoices</white></click>");
142+
sender.sendMessage(MiniMessage.miniMessage().deserialize("<click:suggest_command:/" + label + " list ><green>/" + label + " list <gray>[all|sent|received] [page]</gray></green> <white>- List invoices</white></click>"));
141143
if (sender.hasPermission(Permissions.INVOICE_VIEW_OTHER))
142-
sender.sendMessage("<click:suggest_command:/" + label + " list ><green>/" + label + " list <gray>[all|sent|received] [page] --player <player></gray></green> <white>- List invoices of player</white></click>");
144+
sender.sendMessage(MiniMessage.miniMessage().deserialize("<click:suggest_command:/" + label + " list ><green>/" + label + " list <gray>[all|sent|received] [page] --player <player></gray></green> <white>- List invoices of player</white></click>"));
143145
}
144146
return new Message(sender, "<dark_gray>---</dark_gray>");
145147
}

0 commit comments

Comments
 (0)