diff --git a/common/pom.xml b/common/pom.xml index 7a440dd..102699f 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 62a5208..1f6d063 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 abstract class AbstractText { 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 099cb2c..a9e59da 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 cf7e7e8..d0c9191 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 d513db2..a6fcc63 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 9ca2b11..45a8f50 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 9962b20..5dd740b 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 adad109..ee7cda3 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 6880d6a..5e26619 100644 --- a/pom.xml +++ b/pom.xml @@ -14,7 +14,7 @@ cc.carm.lib mineconfiguration-parent - 2.0.1 + 2.0.2 pom common