From 9a8e6395bbbb251a43ed3eb0e518474744b2f5d4 Mon Sep 17 00:00:00 2001 From: carm Date: Tue, 21 Jun 2022 05:03:16 +0800 Subject: [PATCH] =?UTF-8?q?fix(text):=20=E4=BB=A4=20AbstractText#parse=20?= =?UTF-8?q?=E8=BF=94=E5=9B=9E=E5=80=BC=E4=B8=8D=E5=BE=97=E4=B8=BAnull?= =?UTF-8?q?=EF=BC=8C=E9=81=BF=E5=85=8D=E5=9C=A8List=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E5=BE=AA=E7=8E=AFparse=E6=97=B6=E5=87=BA=E7=8E=B0=E5=BC=82?= =?UTF-8?q?=E5=B8=B8=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- common/pom.xml | 2 +- .../mineconfiguration/common/data/AbstractText.java | 12 +++++------- .../common/value/ConfigMessageList.java | 4 ++-- platform/bukkit/base/pom.xml | 2 +- platform/bukkit/general/pom.xml | 2 +- platform/bukkit/pom.xml | 2 +- platform/bungee/pom.xml | 2 +- platform/spigot/pom.xml | 2 +- pom.xml | 2 +- 9 files changed, 14 insertions(+), 16 deletions(-) diff --git a/common/pom.xml b/common/pom.xml index 7a440ddc..102699fa 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -5,7 +5,7 @@ mineconfiguration-parent cc.carm.lib - 2.0.1 + 2.0.2 4.0.0 diff --git a/common/src/main/java/cc/carm/lib/mineconfiguration/common/data/AbstractText.java b/common/src/main/java/cc/carm/lib/mineconfiguration/common/data/AbstractText.java index 62a5208a..1f6d0633 100644 --- a/common/src/main/java/cc/carm/lib/mineconfiguration/common/data/AbstractText.java +++ b/common/src/main/java/cc/carm/lib/mineconfiguration/common/data/AbstractText.java @@ -28,16 +28,14 @@ public AbstractText(@NotNull Class receiverClazz, @NotNull String message) { return this.message; } - public @Nullable M parse(@NotNull BiFunction<@Nullable R, @NotNull String, @NotNull M> parser, - @Nullable R receiver, @Nullable String[] params, @Nullable Object[] values) { + public @NotNull M parse(@NotNull BiFunction<@Nullable R, @NotNull String, @NotNull M> parser, + @Nullable R receiver, @Nullable String[] params, @Nullable Object[] values) { return parse(parser, receiver, ParamsUtils.buildParams(params, values)); } - public @Nullable M parse(@NotNull BiFunction<@Nullable R, @NotNull String, @NotNull M> parser, - @Nullable R receiver, @NotNull Map placeholders) { - String message = getMessage(); - if (message.isEmpty()) return null; // No further processing - else return parser.apply(receiver, ParamsUtils.setPlaceholders(message, placeholders)); + public @NotNull M parse(@NotNull BiFunction<@Nullable R, @NotNull String, @NotNull M> parser, + @Nullable R receiver, @NotNull Map placeholders) { + return parser.apply(receiver, ParamsUtils.setPlaceholders(message, placeholders)); } diff --git a/common/src/main/java/cc/carm/lib/mineconfiguration/common/value/ConfigMessageList.java b/common/src/main/java/cc/carm/lib/mineconfiguration/common/value/ConfigMessageList.java index 099cb2cd..a9e59dac 100644 --- a/common/src/main/java/cc/carm/lib/mineconfiguration/common/value/ConfigMessageList.java +++ b/common/src/main/java/cc/carm/lib/mineconfiguration/common/value/ConfigMessageList.java @@ -1,10 +1,10 @@ package cc.carm.lib.mineconfiguration.common.value; -import cc.carm.lib.mineconfiguration.common.utils.ParamsUtils; -import cc.carm.lib.mineconfiguration.common.data.AbstractText; import cc.carm.lib.configuration.core.function.ConfigDataFunction; import cc.carm.lib.configuration.core.source.ConfigurationProvider; import cc.carm.lib.configuration.core.value.type.ConfiguredList; +import cc.carm.lib.mineconfiguration.common.data.AbstractText; +import cc.carm.lib.mineconfiguration.common.utils.ParamsUtils; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/platform/bukkit/base/pom.xml b/platform/bukkit/base/pom.xml index cf7e7e85..d0c9191c 100644 --- a/platform/bukkit/base/pom.xml +++ b/platform/bukkit/base/pom.xml @@ -5,7 +5,7 @@ mineconfiguration-bukkit-parent cc.carm.lib - 2.0.1 + 2.0.2 4.0.0 diff --git a/platform/bukkit/general/pom.xml b/platform/bukkit/general/pom.xml index d513db23..a6fcc638 100644 --- a/platform/bukkit/general/pom.xml +++ b/platform/bukkit/general/pom.xml @@ -5,7 +5,7 @@ mineconfiguration-bukkit-parent cc.carm.lib - 2.0.1 + 2.0.2 4.0.0 diff --git a/platform/bukkit/pom.xml b/platform/bukkit/pom.xml index 9ca2b111..45a8f508 100644 --- a/platform/bukkit/pom.xml +++ b/platform/bukkit/pom.xml @@ -5,7 +5,7 @@ mineconfiguration-parent cc.carm.lib - 2.0.1 + 2.0.2 ../../pom.xml 4.0.0 diff --git a/platform/bungee/pom.xml b/platform/bungee/pom.xml index 9962b20d..5dd740b1 100644 --- a/platform/bungee/pom.xml +++ b/platform/bungee/pom.xml @@ -5,7 +5,7 @@ mineconfiguration-parent cc.carm.lib - 2.0.1 + 2.0.2 ../../pom.xml 4.0.0 diff --git a/platform/spigot/pom.xml b/platform/spigot/pom.xml index adad109c..ee7cda34 100644 --- a/platform/spigot/pom.xml +++ b/platform/spigot/pom.xml @@ -5,7 +5,7 @@ cc.carm.lib mineconfiguration-parent - 2.0.1 + 2.0.2 ../../pom.xml 4.0.0 diff --git a/pom.xml b/pom.xml index 6880d6af..5e266194 100644 --- a/pom.xml +++ b/pom.xml @@ -14,7 +14,7 @@ cc.carm.lib mineconfiguration-parent - 2.0.1 + 2.0.2 pom common