diff --git a/src/main/java/pro/cloudnode/smp/bankaccounts/BankConfig.java b/src/main/java/pro/cloudnode/smp/bankaccounts/BankConfig.java index be4a3ba..ec51a4c 100644 --- a/src/main/java/pro/cloudnode/smp/bankaccounts/BankConfig.java +++ b/src/main/java/pro/cloudnode/smp/bankaccounts/BankConfig.java @@ -624,8 +624,8 @@ public int interestInterval(final @NotNull Account.Type type) { // messages.errors.disallowed-characters public @NotNull Component messagesErrorsDisallowedCharacters(final @NotNull String characters) { return MiniMessage.miniMessage().deserialize( - Objects.requireNonNull(config.getString("messages.errors.disallowed-characters")) - .replace("", characters) + Objects.requireNonNull(config.getString("messages.errors.disallowed-characters")), + Placeholder.unparsed("characters", characters) ); } @@ -799,10 +799,12 @@ public int interestInterval(final @NotNull Account.Type type) { .replace("", BankAccounts.formatCurrencyShort(from.balance)) .replace("", amount.toPlainString()) .replace("", BankAccounts.formatCurrency(amount)) - .replace("", BankAccounts.formatCurrencyShort(amount)) - .replace("", description == null ? "no description" : description) - .replace("", "/bank transfer --confirm " + from.id + " " + to.id + " " + amount.toPlainString() + (description == null ? "" : " " + description)) - ); + .replace("", BankAccounts.formatCurrencyShort(amount)), + Placeholder.component("description", description == null ? MiniMessage.miniMessage().deserialize("no description") : Component.text(description)) + ).replaceText(configurer -> { + configurer.matchLiteral(""); + configurer.replacement(Component.text("/bank transfer --confirm " + from.id + " " + to.id + " " + amount.toPlainString() + (description == null ? "" : " " + description))); + }); } // messages.transfer-sent @@ -826,9 +828,9 @@ public int interestInterval(final @NotNull Account.Type type) { .replace("", transaction.amount.toPlainString()) .replace("", BankAccounts.formatCurrency(transaction.amount)) .replace("", BankAccounts.formatCurrencyShort(transaction.amount)) - .replace("", transaction.description == null ? "no description" : transaction.description) .replace("", String.valueOf(transaction.getId())) - .replace("", transaction.instrument == null ? "direct transfer" : transaction.instrument) + .replace("", transaction.instrument == null ? "direct transfer" : transaction.instrument), + Placeholder.component("description", transaction.description == null ? MiniMessage.miniMessage().deserialize("no description") : Component.text(transaction.description)) ); } @@ -853,9 +855,9 @@ public int interestInterval(final @NotNull Account.Type type) { .replace("", transaction.amount.toPlainString()) .replace("", BankAccounts.formatCurrency(transaction.amount)) .replace("", BankAccounts.formatCurrencyShort(transaction.amount)) - .replace("", transaction.description == null ? "no description" : transaction.description) .replace("", String.valueOf(transaction.getId())) - .replace("", transaction.instrument == null ? "direct transfer" : transaction.instrument) + .replace("", transaction.instrument == null ? "direct transfer" : transaction.instrument), + Placeholder.component("description", transaction.description == null ? MiniMessage.miniMessage().deserialize("no description") : Component.text(transaction.description)) ); } @@ -903,12 +905,12 @@ public int interestInterval(final @NotNull Account.Type type) { .replace("", amount.toPlainString()) .replace("", BankAccounts.formatCurrency(amount)) .replace("", BankAccounts.formatCurrencyShort(amount)) - .replace("", transaction.description == null ? "no description" : transaction.description) .replace("", String.valueOf(transaction.getId())) .replace("", transaction.instrument == null ? "direct transfer" : transaction.instrument) .replace("", sdf.format(transaction.time) + " UTC") .replace("", sdf.format(transaction.time) + " UTC"), - Formatter.date("date", transaction.time.toInstant().atZone(ZoneOffset.UTC).toLocalDateTime()) + Formatter.date("date", transaction.time.toInstant().atZone(ZoneOffset.UTC).toLocalDateTime()), + Placeholder.component("description", transaction.description == null ? MiniMessage.miniMessage().deserialize("no description") : Component.text(transaction.description)) ); } @@ -954,12 +956,12 @@ public int interestInterval(final @NotNull Account.Type type) { .replace("", pos.price.toPlainString()) .replace("", BankAccounts.formatCurrency(pos.price)) .replace("", BankAccounts.formatCurrencyShort(pos.price)) - .replace("", pos.description == null ? "no description" : pos.description) .replace("", String.valueOf(pos.x)) .replace("", String.valueOf(pos.y)) .replace("", String.valueOf(pos.z)) .replace("", "X: " + pos.x + " Y: " + pos.y + " Z: " + pos.z + " in " + pos.world.getName()) - .replace("", pos.world.getName()) + .replace("", pos.world.getName()), + Placeholder.component("description", pos.description == null ? MiniMessage.miniMessage().deserialize("no description") : Component.text(pos.description)) ); } @@ -989,11 +991,11 @@ public int interestInterval(final @NotNull Account.Type type) { .replace("", transaction.amount.toPlainString()) .replace("", BankAccounts.formatCurrency(transaction.amount)) .replace("", BankAccounts.formatCurrencyShort(transaction.amount)) - .replace("", transaction.description == null ? "no description" : transaction.description) .replace("", String.valueOf(transaction.getId())) .replace("", transaction.instrument == null ? "direct transfer" : transaction.instrument) .replace("", String.valueOf(items.length)) - .replace("", items.length == 1 ? "1 item" : items.length + " items") + .replace("", items.length == 1 ? "1 item" : items.length + " items"), + Placeholder.component("description", transaction.description == null ? MiniMessage.miniMessage().deserialize("no description") : Component.text(transaction.description)) ); } @@ -1018,11 +1020,11 @@ public int interestInterval(final @NotNull Account.Type type) { .replace("", transaction.amount.toPlainString()) .replace("", BankAccounts.formatCurrency(transaction.amount)) .replace("", BankAccounts.formatCurrencyShort(transaction.amount)) - .replace("", transaction.description == null ? "no description" : transaction.description) .replace("", String.valueOf(transaction.getId())) .replace("", transaction.instrument == null ? "direct transfer" : transaction.instrument) .replace("", String.valueOf(items.length)) - .replace("", items.length == 1 ? "1 item" : items.length + " items") + .replace("", items.length == 1 ? "1 item" : items.length + " items"), + Placeholder.component("description", transaction.description == null ? MiniMessage.miniMessage().deserialize("no description") : Component.text(transaction.description)) ); } @@ -1046,9 +1048,13 @@ public int interestInterval(final @NotNull Account.Type type) { Objects.requireNonNull(config.getString("messages.baltop.header")) .replace("", category) .replace("", String.valueOf(page)) - .replace("", cmdPrev) - .replace("", cmdNext) - ); + ).replaceText(configurer -> { + configurer.matchLiteral(""); + configurer.replacement(cmdPrev); + }).replaceText(configurer -> { + configurer.matchLiteral(""); + configurer.replacement(cmdNext); + }); } // messages.baltop.entry