From bc44e76a8e90f9319c242d46a93744cf63f1ab51 Mon Sep 17 00:00:00 2001 From: JRoy <10731363+JRoy@users.noreply.github.com> Date: Sun, 27 Apr 2025 14:54:06 -0400 Subject: [PATCH 1/2] Use legacy text for TranslatableException#getMessage --- .../src/main/java/net/ess3/api/TranslatableException.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Essentials/src/main/java/net/ess3/api/TranslatableException.java b/Essentials/src/main/java/net/ess3/api/TranslatableException.java index 34fdacb8dd0..87ac813a3f5 100644 --- a/Essentials/src/main/java/net/ess3/api/TranslatableException.java +++ b/Essentials/src/main/java/net/ess3/api/TranslatableException.java @@ -1,5 +1,7 @@ package net.ess3.api; +import com.earth2me.essentials.utils.AdventureUtil; + import static com.earth2me.essentials.I18n.tlLiteral; /** @@ -39,6 +41,7 @@ public Object[] getArgs() { @Override public String getMessage() { - return tlLiteral(tlKey, args); + final String literal = tlLiteral(tlKey, args); + return AdventureUtil.miniToLegacy(literal); } } From e582d5b0f639c3e5d06bc7ed1b3f4591603bff19 Mon Sep 17 00:00:00 2001 From: JRoy <10731363+JRoy@users.noreply.github.com> Date: Sun, 27 Apr 2025 15:08:35 -0400 Subject: [PATCH 2/2] fix tests --- .../src/test/java/com/earth2me/essentials/EconomyTest.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Essentials/src/test/java/com/earth2me/essentials/EconomyTest.java b/Essentials/src/test/java/com/earth2me/essentials/EconomyTest.java index 7429756795d..eaa37156863 100644 --- a/Essentials/src/test/java/com/earth2me/essentials/EconomyTest.java +++ b/Essentials/src/test/java/com/earth2me/essentials/EconomyTest.java @@ -4,6 +4,7 @@ import com.earth2me.essentials.api.UserDoesNotExistException; import com.earth2me.essentials.commands.IEssentialsCommand; import com.earth2me.essentials.commands.NoChargeException; +import com.earth2me.essentials.utils.AdventureUtil; import net.ess3.api.Economy; import net.ess3.api.MaxMoneyException; import org.bukkit.command.CommandSender; @@ -138,7 +139,7 @@ public void testNegativePayCommand() { try { runCommand("pay", user1, PLAYERNAME2 + " -123"); } catch (final Exception e) { - Assert.assertEquals(I18n.tlLiteral("payMustBePositive"), e.getMessage()); + Assert.assertEquals(AdventureUtil.miniToLegacy(I18n.tlLiteral("payMustBePositive")), e.getMessage()); } } }