From ce91150f54852c22bd58d77fb76bde28de96b914 Mon Sep 17 00:00:00 2001 From: XiaoMoMi Date: Wed, 30 Oct 2024 19:57:45 +0800 Subject: [PATCH] bypass other names --- .../common/locale/MiniMessageTranslationRegistryImpl.java | 8 ++++++-- gradle.properties | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/common/src/main/java/net/momirealms/customfishing/common/locale/MiniMessageTranslationRegistryImpl.java b/common/src/main/java/net/momirealms/customfishing/common/locale/MiniMessageTranslationRegistryImpl.java index f17a203f..efcd86ea 100644 --- a/common/src/main/java/net/momirealms/customfishing/common/locale/MiniMessageTranslationRegistryImpl.java +++ b/common/src/main/java/net/momirealms/customfishing/common/locale/MiniMessageTranslationRegistryImpl.java @@ -154,7 +154,7 @@ public class MiniMessageTranslationRegistryImpl implements Examinable, MiniMessa } public static class ArgumentTag implements TagResolver { - private static final String NAME = "argument"; + private static final String NAME_0 = "argument"; private static final String NAME_1 = "arg"; private final List argumentComponents; @@ -165,6 +165,10 @@ public class MiniMessageTranslationRegistryImpl implements Examinable, MiniMessa @Override public @Nullable Tag resolve(final @NotNull String name, final @NotNull ArgumentQueue arguments, final @NotNull Context ctx) throws ParsingException { + if (!has(name)) { + return null; + } + final int index = arguments.popOr("No argument number provided").asInt().orElseThrow(() -> ctx.newException("Invalid argument number", arguments)); if (index < 0 || index >= argumentComponents.size()) { @@ -176,7 +180,7 @@ public class MiniMessageTranslationRegistryImpl implements Examinable, MiniMessa @Override public boolean has(final @NotNull String name) { - return name.equals(NAME) || name.equals(NAME_1); + return name.equals(NAME_0) || name.equals(NAME_1); } } diff --git a/gradle.properties b/gradle.properties index 5a310982..97af8b0c 100644 --- a/gradle.properties +++ b/gradle.properties @@ -37,7 +37,7 @@ commons_pool_version=2.12.0 bstats_version=3.0.2 geantyref_version=1.3.16 caffeine_version=3.1.8 -rtag_version=1.5.7 +rtag_version=1.5.8 jedis_version=5.1.5 exp4j_version=0.4.8 placeholder_api_version=2.11.6