From 16e297269d6771671bb08f89b2be3c60162a3c8a Mon Sep 17 00:00:00 2001 From: Josh Roy <10731363+JRoy@users.noreply.github.com> Date: Sat, 3 Feb 2024 22:35:37 -0500 Subject: [PATCH] Fix several regressions from adventure PR (#5637) * Fixes /list * Fixes /baltop * Fixes Social Spy * Fixes Essentials Signs --- .../java/com/earth2me/essentials/PlayerList.java | 6 +++--- .../essentials/commands/Commandbalancetop.java | 4 ++-- .../earth2me/essentials/commands/Commandlist.java | 7 ++++--- .../messaging/SimpleMessageRecipient.java | 5 ++--- .../earth2me/essentials/signs/EssentialsSign.java | 13 +++++++------ .../com/earth2me/essentials/signs/SignEnchant.java | 8 ++++---- .../com/earth2me/essentials/signs/SignFree.java | 2 +- .../com/earth2me/essentials/signs/SignInfo.java | 2 +- .../java/com/earth2me/essentials/signs/SignKit.java | 4 ++-- .../com/earth2me/essentials/signs/SignRepair.java | 2 +- .../com/earth2me/essentials/signs/SignSpawnmob.java | 2 +- .../com/earth2me/essentials/signs/SignWarp.java | 2 +- 12 files changed, 29 insertions(+), 28 deletions(-) diff --git a/Essentials/src/main/java/com/earth2me/essentials/PlayerList.java b/Essentials/src/main/java/com/earth2me/essentials/PlayerList.java index fac0f701f6d..0570fe2a384 100644 --- a/Essentials/src/main/java/com/earth2me/essentials/PlayerList.java +++ b/Essentials/src/main/java/com/earth2me/essentials/PlayerList.java @@ -1,9 +1,9 @@ package com.earth2me.essentials; +import com.earth2me.essentials.utils.AdventureUtil; import com.earth2me.essentials.utils.FormatUtil; import com.earth2me.essentials.utils.NumberUtil; import net.ess3.api.TranslatableException; -import org.bukkit.ChatColor; import org.bukkit.Server; import java.util.ArrayList; @@ -39,13 +39,13 @@ public static String listUsers(final IEssentials ess, final List users, fi groupString.append(tlLiteral("listHiddenTag")); } user.setDisplayNick(); - groupString.append(user.getDisplayName()); + groupString.append(AdventureUtil.legacyToMini(user.getDisplayName())); final String strippedNick = FormatUtil.stripFormat(user.getNickname()); if (ess.getSettings().realNamesOnList() && strippedNick != null && !strippedNick.equals(user.getName())) { groupString.append(" ").append(tlLiteral("listRealName",user.getName())); } - groupString.append(ChatColor.WHITE); + groupString.append(""); } return groupString.toString(); } diff --git a/Essentials/src/main/java/com/earth2me/essentials/commands/Commandbalancetop.java b/Essentials/src/main/java/com/earth2me/essentials/commands/Commandbalancetop.java index 805e09f3e55..79599a98f18 100644 --- a/Essentials/src/main/java/com/earth2me/essentials/commands/Commandbalancetop.java +++ b/Essentials/src/main/java/com/earth2me/essentials/commands/Commandbalancetop.java @@ -110,11 +110,11 @@ public void run() { future.thenRun(() -> { if (fresh) { final SimpleTextInput newCache = new SimpleTextInput(); - newCache.getLines().add(tlLiteral("serverTotal", NumberUtil.displayCurrency(ess.getBalanceTop().getBalanceTopTotal(), ess))); + newCache.getLines().add(AdventureUtil.miniToLegacy(tlLiteral("serverTotal", NumberUtil.displayCurrency(ess.getBalanceTop().getBalanceTopTotal(), ess)))); int pos = 1; for (final Map.Entry entry : ess.getBalanceTop().getBalanceTopCache().entrySet()) { if (ess.getSettings().showZeroBaltop() || entry.getValue().getBalance().compareTo(BigDecimal.ZERO) > 0) { - newCache.getLines().add(tlLiteral("balanceTopLine", pos, AdventureUtil.parsed(AdventureUtil.legacyToMini(entry.getValue().getDisplayName())), NumberUtil.displayCurrency(entry.getValue().getBalance(), ess))); + newCache.getLines().add(AdventureUtil.miniToLegacy(tlLiteral("balanceTopLine", pos, entry.getValue().getDisplayName(), NumberUtil.displayCurrency(entry.getValue().getBalance(), ess)))); } pos++; } diff --git a/Essentials/src/main/java/com/earth2me/essentials/commands/Commandlist.java b/Essentials/src/main/java/com/earth2me/essentials/commands/Commandlist.java index 38ca776f88e..254f48ec240 100644 --- a/Essentials/src/main/java/com/earth2me/essentials/commands/Commandlist.java +++ b/Essentials/src/main/java/com/earth2me/essentials/commands/Commandlist.java @@ -3,6 +3,7 @@ import com.earth2me.essentials.CommandSource; import com.earth2me.essentials.PlayerList; import com.earth2me.essentials.User; +import com.earth2me.essentials.utils.AdventureUtil; import org.bukkit.Server; import java.util.ArrayList; @@ -23,11 +24,11 @@ public void run(final Server server, final CommandSource sender, final String co user = ess.getUser(sender.getPlayer()); showHidden = user.isAuthorized("essentials.list.hidden") || user.canInteractVanished(); } - sender.sendMessage(PlayerList.listSummary(ess, user, showHidden)); + sender.sendComponent(AdventureUtil.miniMessage().deserialize(PlayerList.listSummary(ess, user, showHidden))); final Map> playerList = PlayerList.getPlayerLists(ess, user, showHidden); if (args.length > 0) { - sender.sendMessage(PlayerList.listGroupUsers(ess, playerList, args[0].toLowerCase())); + sender.sendComponent(AdventureUtil.miniMessage().deserialize(PlayerList.listGroupUsers(ess, playerList, args[0].toLowerCase()))); } else { sendGroupedList(sender, commandLabel, playerList); } @@ -36,7 +37,7 @@ public void run(final Server server, final CommandSource sender, final String co // Output the standard /list output, when no group is specified private void sendGroupedList(final CommandSource sender, final String commandLabel, final Map> playerList) { for (final String str : PlayerList.prepareGroupedList(ess, sender, commandLabel, playerList)) { - sender.sendMessage(str); + sender.sendComponent(AdventureUtil.miniMessage().deserialize(str)); } } diff --git a/Essentials/src/main/java/com/earth2me/essentials/messaging/SimpleMessageRecipient.java b/Essentials/src/main/java/com/earth2me/essentials/messaging/SimpleMessageRecipient.java index 6372ccdf30d..d52eeb294af 100644 --- a/Essentials/src/main/java/com/earth2me/essentials/messaging/SimpleMessageRecipient.java +++ b/Essentials/src/main/java/com/earth2me/essentials/messaging/SimpleMessageRecipient.java @@ -4,7 +4,6 @@ import com.earth2me.essentials.IUser; import com.earth2me.essentials.User; import com.earth2me.essentials.utils.AdventureUtil; -import com.earth2me.essentials.utils.CommonPlaceholders; import net.ess3.api.events.PrivateMessagePreSendEvent; import net.ess3.api.events.PrivateMessageSentEvent; import org.bukkit.entity.Player; @@ -128,9 +127,9 @@ public MessageResponse sendMessage(final IMessageRecipient recipient, String mes && !onlineUser.equals(senderUser) && !onlineUser.equals(recipient)) { if (senderUser.isMuted() && ess.getSettings().getSocialSpyListenMutedPlayers()) { - onlineUser.sendMessage(tlSender("socialSpyMutedPrefix") + tlLiteral("socialSpyMsgFormat", CommonPlaceholders.displayNameRecipient(this), CommonPlaceholders.displayNameRecipient(recipient), message)); + onlineUser.sendComponent(AdventureUtil.miniMessage().deserialize(tlSender("socialSpyMutedPrefix") + tlLiteral("socialSpyMsgFormat", getDisplayName(), recipient.getDisplayName(), message))); } else { - onlineUser.sendMessage(tlLiteral("socialSpyPrefix") + tlLiteral("socialSpyMsgFormat", CommonPlaceholders.displayNameRecipient(this), CommonPlaceholders.displayNameRecipient(recipient), message)); + onlineUser.sendComponent(AdventureUtil.miniMessage().deserialize(tlLiteral("socialSpyPrefix") + tlLiteral("socialSpyMsgFormat", getDisplayName(), recipient.getDisplayName(), message))); } } } diff --git a/Essentials/src/main/java/com/earth2me/essentials/signs/EssentialsSign.java b/Essentials/src/main/java/com/earth2me/essentials/signs/EssentialsSign.java index a146e67ef79..39921ee3f4f 100644 --- a/Essentials/src/main/java/com/earth2me/essentials/signs/EssentialsSign.java +++ b/Essentials/src/main/java/com/earth2me/essentials/signs/EssentialsSign.java @@ -5,6 +5,7 @@ import com.earth2me.essentials.MetaItemStack; import com.earth2me.essentials.Trade; import com.earth2me.essentials.User; +import com.earth2me.essentials.utils.AdventureUtil; import com.earth2me.essentials.utils.FormatUtil; import com.earth2me.essentials.utils.MaterialUtil; import com.earth2me.essentials.utils.NumberUtil; @@ -103,7 +104,7 @@ protected final boolean onSignCreate(final SignChangeEvent event, final IEssenti // they won't change it to §1[Signname] return true; } - sign.setLine(0, tlLiteral("signFormatFail", this.signName)); + sign.setLine(0, AdventureUtil.miniToLegacy(tlLiteral("signFormatFail", this.signName))); final SignCreateEvent signEvent = new SignCreateEvent(sign, this, user); ess.getServer().getPluginManager().callEvent(signEvent); @@ -137,7 +138,7 @@ public String getSuccessName(final IEssentials ess) { } public String getSuccessName() { - String successName = tlLiteral("signFormatSuccess", this.signName); + String successName = AdventureUtil.miniToLegacy(tlLiteral("signFormatSuccess", this.signName)); if (successName.isEmpty() || !successName.contains(this.signName)) { // Set to null to cause an error in place of no functionality. This makes an error obvious as opposed to leaving users baffled by lack of // functionality. @@ -147,7 +148,7 @@ public String getSuccessName() { } public String getTemplateName() { - return tlLiteral("signFormatTemplate", this.signName); + return AdventureUtil.miniToLegacy(tlLiteral("signFormatTemplate", this.signName)); } public String getName() { @@ -407,7 +408,7 @@ protected final ItemStack getItemStack(final String itemName, final int quantity item.setAmount(quantity); return item; } catch (final Exception ex) { - throw new SignException(ex, ex.getMessage()); + throw new SignException(ex, "errorWithMessage", ex.getMessage()); } } @@ -425,7 +426,7 @@ protected final ItemStack getItemMeta(final CommandSource source, final ItemStac stack = metaStack.getItemStack(); } } catch (final Exception ex) { - throw new SignException(ex, ex.getMessage()); + throw new SignException(ex, "errorWithMessage", ex.getMessage()); } return stack; } @@ -447,7 +448,7 @@ protected final BigDecimal getBigDecimal(final String line, final IEssentials es try { return new BigDecimal(NumberUtil.sanitizeCurrencyString(line, ess)); } catch (final ArithmeticException | NumberFormatException ex) { - throw new SignException(ex, ex.getMessage()); + throw new SignException(ex, "errorWithMessage", ex.getMessage()); } } diff --git a/Essentials/src/main/java/com/earth2me/essentials/signs/SignEnchant.java b/Essentials/src/main/java/com/earth2me/essentials/signs/SignEnchant.java index f767c97b86c..47f29285a86 100644 --- a/Essentials/src/main/java/com/earth2me/essentials/signs/SignEnchant.java +++ b/Essentials/src/main/java/com/earth2me/essentials/signs/SignEnchant.java @@ -40,7 +40,7 @@ protected boolean onSignCreate(final ISign sign, final User player, final String level = Integer.parseInt(enchantLevel[1]); } catch (final NumberFormatException ex) { sign.setLine(2, "§c"); - throw new SignException(ex, ex.getMessage()); + throw new SignException(ex, "errorWithMessage", ex.getMessage()); } } final boolean allowUnsafe = ess.getSettings().allowUnsafeEnchantments() && player.isAuthorized("essentials.enchantments.allowunsafe") && player.isAuthorized("essentials.signs.enchant.allowunsafe"); @@ -57,7 +57,7 @@ protected boolean onSignCreate(final ISign sign, final User player, final String } } } catch (final Throwable ex) { - throw new SignException(ex, ex.getMessage()); + throw new SignException(ex, "errorWithMessage", ex.getMessage()); } getTrade(sign, 3, ess); return true; @@ -81,7 +81,7 @@ protected boolean onSignInteract(final ISign sign, final User player, final Stri try { level = Integer.parseInt(enchantLevel[1]); } catch (final NumberFormatException ex) { - throw new SignException(ex, ex.getMessage()); + throw new SignException(ex, "errorWithMessage", ex.getMessage()); } } @@ -103,7 +103,7 @@ protected boolean onSignInteract(final ISign sign, final User player, final Stri } } } catch (final Exception ex) { - throw new SignException(ex, ex.getMessage()); + throw new SignException(ex, "errorWithMessage", ex.getMessage()); } final String enchantmentName = enchantment.getName().toLowerCase(Locale.ENGLISH); diff --git a/Essentials/src/main/java/com/earth2me/essentials/signs/SignFree.java b/Essentials/src/main/java/com/earth2me/essentials/signs/SignFree.java index b42d3afdf54..8cbcaf3e2ab 100644 --- a/Essentials/src/main/java/com/earth2me/essentials/signs/SignFree.java +++ b/Essentials/src/main/java/com/earth2me/essentials/signs/SignFree.java @@ -21,7 +21,7 @@ protected boolean onSignCreate(final ISign sign, final User player, final String item = getItemMeta(item, sign.getLine(3), ess); } catch (final SignException ex) { sign.setLine(1, "§c"); - throw new SignException(ex, ex.getMessage()); + throw new SignException(ex, "errorWithMessage", ex.getMessage()); } return true; } diff --git a/Essentials/src/main/java/com/earth2me/essentials/signs/SignInfo.java b/Essentials/src/main/java/com/earth2me/essentials/signs/SignInfo.java index 91878c831d8..b1c2f491096 100644 --- a/Essentials/src/main/java/com/earth2me/essentials/signs/SignInfo.java +++ b/Essentials/src/main/java/com/earth2me/essentials/signs/SignInfo.java @@ -39,7 +39,7 @@ protected boolean onSignInteract(final ISign sign, final User player, final Stri pager.showPage(chapter, page, null, player.getSource()); } catch (final IOException ex) { - throw new SignException(ex, ex.getMessage()); + throw new SignException(ex, "errorWithMessage", ex.getMessage()); } charge.charge(player); diff --git a/Essentials/src/main/java/com/earth2me/essentials/signs/SignKit.java b/Essentials/src/main/java/com/earth2me/essentials/signs/SignKit.java index bcf63c1d72f..d8060326c52 100644 --- a/Essentials/src/main/java/com/earth2me/essentials/signs/SignKit.java +++ b/Essentials/src/main/java/com/earth2me/essentials/signs/SignKit.java @@ -27,7 +27,7 @@ protected boolean onSignCreate(final ISign sign, final User player, final String try { ess.getKits().getKit(kitName); } catch (final Exception ex) { - throw new SignException(ex, ex.getMessage()); + throw new SignException(ex, "errorWithMessage", ex.getMessage()); } final String group = sign.getLine(2); if ("Everyone".equalsIgnoreCase(group) || "Everybody".equalsIgnoreCase(group)) { @@ -55,7 +55,7 @@ protected boolean onSignInteract(final ISign sign, final User player, final Stri } catch (final NoChargeException ex) { return false; } catch (final Exception ex) { - throw new SignException(ex, ex.getMessage()); + throw new SignException(ex, "errorWithMessage", ex.getMessage()); } return true; } else { diff --git a/Essentials/src/main/java/com/earth2me/essentials/signs/SignRepair.java b/Essentials/src/main/java/com/earth2me/essentials/signs/SignRepair.java index 8ebcfc02df0..7c448d25ba4 100644 --- a/Essentials/src/main/java/com/earth2me/essentials/signs/SignRepair.java +++ b/Essentials/src/main/java/com/earth2me/essentials/signs/SignRepair.java @@ -43,7 +43,7 @@ protected boolean onSignInteract(final ISign sign, final User player, final Stri } } catch (final Exception ex) { - throw new SignException(ex, ex.getMessage()); + throw new SignException(ex, "errorWithMessage", ex.getMessage()); } charge.charge(player); diff --git a/Essentials/src/main/java/com/earth2me/essentials/signs/SignSpawnmob.java b/Essentials/src/main/java/com/earth2me/essentials/signs/SignSpawnmob.java index 47d69d3e495..cf3a34403fc 100644 --- a/Essentials/src/main/java/com/earth2me/essentials/signs/SignSpawnmob.java +++ b/Essentials/src/main/java/com/earth2me/essentials/signs/SignSpawnmob.java @@ -30,7 +30,7 @@ protected boolean onSignInteract(final ISign sign, final User player, final Stri final List mobData = SpawnMob.mobData(sign.getLine(2)); SpawnMob.spawnmob(ess, ess.getServer(), player.getSource(), player, mobParts, mobData, Integer.parseInt(sign.getLine(1))); } catch (final Exception ex) { - throw new SignException(ex, ex.getMessage()); + throw new SignException(ex, "errorWithMessage", ex.getMessage()); } charge.charge(player); diff --git a/Essentials/src/main/java/com/earth2me/essentials/signs/SignWarp.java b/Essentials/src/main/java/com/earth2me/essentials/signs/SignWarp.java index 8fb4f9182fb..edb64f66e33 100644 --- a/Essentials/src/main/java/com/earth2me/essentials/signs/SignWarp.java +++ b/Essentials/src/main/java/com/earth2me/essentials/signs/SignWarp.java @@ -25,7 +25,7 @@ protected boolean onSignCreate(final ISign sign, final User player, final String try { ess.getWarps().getWarp(warpName); } catch (final Exception ex) { - throw new SignException(ex, ex.getMessage()); + throw new SignException(ex, "errorWithMessage", ex.getMessage()); } final String group = sign.getLine(2); if ("Everyone".equalsIgnoreCase(group) || "Everybody".equalsIgnoreCase(group)) {