From 3d1639362b4562dd801628c7481b805f869afd26 Mon Sep 17 00:00:00 2001 From: carm Date: Wed, 15 Mar 2023 22:51:06 +0800 Subject: [PATCH] =?UTF-8?q?feat(value):=20=E9=80=82=E9=85=8DManifest?= =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- common/pom.xml | 2 +- .../builder/message/MessageListBuilder.java | 11 +++++++- .../builder/message/MessageValueBuilder.java | 10 ++++++- .../common/value/BaseMessage.java | 12 ++++----- .../common/value/ConfigMessage.java | 15 +++++------ .../common/value/ConfigMessageList.java | 27 ++++++++++++++----- platform/bukkit/pom.xml | 2 +- .../bukkit/CraftConfigValue.java | 7 +++-- .../builder/item/ItemConfigBuilder.java | 9 +++++-- .../builder/message/CraftMessageBuilder.java | 2 ++ .../message/CraftMessageListBuilder.java | 4 +-- .../message/CraftMessageValueBuilder.java | 4 +-- .../serializable/SerializableBuilder.java | 2 +- .../builder/sound/SoundConfigBuilder.java | 2 +- .../builder/title/TitleConfigBuilder.java | 3 +-- .../bukkit/value/ConfiguredItem.java | 9 +++---- .../bukkit/value/ConfiguredMessage.java | 8 +++--- .../bukkit/value/ConfiguredMessageList.java | 8 +++--- .../bukkit/value/ConfiguredSerializable.java | 9 +++---- .../bukkit/value/ConfiguredSound.java | 10 +++---- .../bukkit/value/ConfiguredTitle.java | 22 ++++++++++----- platform/bungee/pom.xml | 2 +- .../bungee/BungeeConfigValue.java | 14 ++++------ .../builder/message/BungeeMessageBuilder.java | 6 ++--- .../message/BungeeMessageListBuilder.java | 10 +++---- .../message/BungeeMessageValueBuilder.java | 10 +++---- .../{MessageText.java => TextConfig.java} | 14 +++++----- .../bungee/value/ConfiguredMessage.java | 12 ++++----- .../bungee/value/ConfiguredMessageList.java | 13 ++++----- pom.xml | 4 +-- 30 files changed, 139 insertions(+), 124 deletions(-) rename platform/bungee/src/main/java/cc/carm/lib/mineconfiguration/bungee/data/{MessageText.java => TextConfig.java} (58%) diff --git a/common/pom.xml b/common/pom.xml index 7994297f..254765ea 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -5,7 +5,7 @@ mineconfiguration-parent cc.carm.lib - 2.4.0 + 2.5.0 4.0.0 diff --git a/common/src/main/java/cc/carm/lib/mineconfiguration/common/builder/message/MessageListBuilder.java b/common/src/main/java/cc/carm/lib/mineconfiguration/common/builder/message/MessageListBuilder.java index 37ad922b..47193c20 100644 --- a/common/src/main/java/cc/carm/lib/mineconfiguration/common/builder/message/MessageListBuilder.java +++ b/common/src/main/java/cc/carm/lib/mineconfiguration/common/builder/message/MessageListBuilder.java @@ -1,16 +1,18 @@ package cc.carm.lib.mineconfiguration.common.builder.message; +import cc.carm.lib.configuration.core.builder.CommonConfigBuilder; +import cc.carm.lib.configuration.core.value.ValueManifest; import cc.carm.lib.mineconfiguration.common.data.AbstractText; import cc.carm.lib.mineconfiguration.common.utils.ParamsUtils; import cc.carm.lib.mineconfiguration.common.value.ConfigMessageList; -import cc.carm.lib.configuration.core.builder.CommonConfigBuilder; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import java.util.ArrayList; import java.util.Arrays; import java.util.List; +import java.util.Optional; import java.util.function.BiConsumer; import java.util.function.BiFunction; import java.util.function.Function; @@ -67,4 +69,11 @@ public B whenSend(@NotNull BiConsumer<@NotNull R, @NotNull List> sendFunction @Override public abstract @NotNull ConfigMessageList build(); + protected @NotNull ValueManifest> buildManifest(@NotNull List emptyValue) { + return new ValueManifest<>( + this.provider, this.path, this.headerComments, this.inlineComment, + Optional.ofNullable(this.defaultValue).orElse(emptyValue) + ); + } + } diff --git a/common/src/main/java/cc/carm/lib/mineconfiguration/common/builder/message/MessageValueBuilder.java b/common/src/main/java/cc/carm/lib/mineconfiguration/common/builder/message/MessageValueBuilder.java index 4d10f27f..87f50323 100644 --- a/common/src/main/java/cc/carm/lib/mineconfiguration/common/builder/message/MessageValueBuilder.java +++ b/common/src/main/java/cc/carm/lib/mineconfiguration/common/builder/message/MessageValueBuilder.java @@ -1,13 +1,15 @@ package cc.carm.lib.mineconfiguration.common.builder.message; +import cc.carm.lib.configuration.core.builder.CommonConfigBuilder; +import cc.carm.lib.configuration.core.value.ValueManifest; import cc.carm.lib.mineconfiguration.common.data.AbstractText; import cc.carm.lib.mineconfiguration.common.utils.ParamsUtils; import cc.carm.lib.mineconfiguration.common.value.ConfigMessage; -import cc.carm.lib.configuration.core.builder.CommonConfigBuilder; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import java.util.List; +import java.util.Optional; import java.util.function.BiConsumer; import java.util.function.BiFunction; import java.util.function.Function; @@ -64,4 +66,10 @@ public B whenSend(@NotNull BiConsumer<@NotNull R, @NotNull M> sendFunction) { @Override public abstract @NotNull ConfigMessage build(); + protected @NotNull ValueManifest buildManifest(@NotNull T emptyValue) { + return new ValueManifest<>( + this.provider, this.path, this.headerComments, this.inlineComment, + Optional.ofNullable(this.defaultValue).orElse(emptyValue) + ); + } } diff --git a/common/src/main/java/cc/carm/lib/mineconfiguration/common/value/BaseMessage.java b/common/src/main/java/cc/carm/lib/mineconfiguration/common/value/BaseMessage.java index 990a4a3e..b55ff489 100644 --- a/common/src/main/java/cc/carm/lib/mineconfiguration/common/value/BaseMessage.java +++ b/common/src/main/java/cc/carm/lib/mineconfiguration/common/value/BaseMessage.java @@ -41,21 +41,21 @@ public interface BaseMessage { /** * 为某位接收者解析此消息。 * - * @param sender 接收者 + * @param receiver 接收者 * @param placeholders 消息中的变量与对应参数 * @return 解析变量后的消息内容 */ - @Nullable M parse(@Nullable R sender, @NotNull Map placeholders); + @Nullable M parse(@Nullable R receiver, @NotNull Map placeholders); /** * 为某位接收者解析此消息。 * - * @param sender 接收者 - * @param values 已定变量的对应参数 + * @param receiver 接收者 + * @param values 已定变量的对应参数 * @return 解析变量后的消息内容 */ - default @Nullable M parse(@Nullable R sender, @Nullable Object... values) { - return parse(sender, ParamsUtils.buildParams(getParams(), values)); + default @Nullable M parse(@Nullable R receiver, @Nullable Object... values) { + return parse(receiver, ParamsUtils.buildParams(getParams(), values)); } /** diff --git a/common/src/main/java/cc/carm/lib/mineconfiguration/common/value/ConfigMessage.java b/common/src/main/java/cc/carm/lib/mineconfiguration/common/value/ConfigMessage.java index 9c07ce7a..669d4d77 100644 --- a/common/src/main/java/cc/carm/lib/mineconfiguration/common/value/ConfigMessage.java +++ b/common/src/main/java/cc/carm/lib/mineconfiguration/common/value/ConfigMessage.java @@ -1,13 +1,12 @@ package cc.carm.lib.mineconfiguration.common.value; import cc.carm.lib.configuration.core.function.ConfigValueParser; -import cc.carm.lib.configuration.core.source.ConfigurationProvider; +import cc.carm.lib.configuration.core.value.ValueManifest; import cc.carm.lib.configuration.core.value.type.ConfiguredValue; import cc.carm.lib.mineconfiguration.common.data.AbstractText; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import java.util.List; import java.util.Map; import java.util.function.BiConsumer; import java.util.function.BiFunction; @@ -22,15 +21,15 @@ public abstract class ConfigMessage, R> protected final @NotNull Function textBuilder; - public ConfigMessage(@Nullable ConfigurationProvider provider, @Nullable String sectionPath, - @Nullable List headerComments, @Nullable String inlineComments, - @NotNull Class textClazz, @NotNull T defaultMessage, @NotNull String[] params, + public ConfigMessage(@NotNull ValueManifest manifest, + @NotNull Class textClazz, @NotNull String[] params, @NotNull BiFunction<@Nullable R, @NotNull String, @Nullable M> messageParser, @NotNull BiConsumer<@NotNull R, @NotNull M> sendFunction, @NotNull Function textBuilder) { super( - provider, sectionPath, headerComments, inlineComments, textClazz, defaultMessage, - ConfigValueParser.castToString().andThen((s, d) -> textBuilder.apply(s)), AbstractText::getMessage + manifest, textClazz, + ConfigValueParser.castToString().andThen((s, d) -> textBuilder.apply(s)), + AbstractText::getMessage ); this.params = params; this.messageParser = messageParser; @@ -62,5 +61,5 @@ public void set(@Nullable String value) { protected T buildText(String value) { return textBuilder.apply(value); } - + } 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 c56a910b..e2602bed 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,7 +1,7 @@ package cc.carm.lib.mineconfiguration.common.value; import cc.carm.lib.configuration.core.function.ConfigDataFunction; -import cc.carm.lib.configuration.core.source.ConfigurationProvider; +import cc.carm.lib.configuration.core.value.ValueManifest; import cc.carm.lib.configuration.core.value.type.ConfiguredList; import cc.carm.lib.mineconfiguration.common.data.AbstractText; import org.jetbrains.annotations.NotNull; @@ -24,15 +24,15 @@ public abstract class ConfigMessageList, R> protected final @NotNull Function textBuilder; - public ConfigMessageList(@Nullable ConfigurationProvider provider, @Nullable String sectionPath, - @Nullable List headerComments, @Nullable String inlineComments, - @NotNull Class textClazz, @NotNull List messages, @NotNull String[] params, + public ConfigMessageList(@NotNull ValueManifest> manifest, + @NotNull Class textClazz, @NotNull String[] params, @NotNull BiFunction<@Nullable R, @NotNull String, @Nullable M> messageParser, @NotNull BiConsumer<@NotNull R, @NotNull List> sendFunction, @NotNull Function textBuilder) { super( - provider, sectionPath, headerComments, inlineComments, textClazz, messages, - ConfigDataFunction.castToString().andThen(textBuilder::apply), AbstractText::getMessage + manifest, textClazz, + ConfigDataFunction.castToString().andThen(textBuilder::apply), + AbstractText::getMessage ); this.params = params; this.messageParser = messageParser; @@ -68,12 +68,25 @@ public void apply(@NotNull R receiver, @NotNull List message) { .collect(Collectors.toList()); } + public @Nullable M parseToLine(@Nullable R receiver, @NotNull Map placeholders) { + List list = get(); + if (list.isEmpty()) return null; + + List messages = list.stream().map(T::getMessage).collect(Collectors.toList()); + if (String.join("", messages).isEmpty()) return null; + + String combined = String.join("\n", messages); + T text = textBuilder.apply(combined); + + return text.parse(this.messageParser, receiver, placeholders); + } + public void setMessages(@NotNull String... values) { setMessages(values.length == 0 ? null : Arrays.asList(values)); } public void setMessages(@Nullable List values) { - if (values == null || values.isEmpty()) { + if (values == null) { set(null); } else { set(buildText(values)); diff --git a/platform/bukkit/pom.xml b/platform/bukkit/pom.xml index 96018bea..5f7b7841 100644 --- a/platform/bukkit/pom.xml +++ b/platform/bukkit/pom.xml @@ -5,7 +5,7 @@ mineconfiguration-parent cc.carm.lib - 2.4.0 + 2.5.0 ../../pom.xml 4.0.0 diff --git a/platform/bukkit/src/main/java/cc/carm/lib/mineconfiguration/bukkit/CraftConfigValue.java b/platform/bukkit/src/main/java/cc/carm/lib/mineconfiguration/bukkit/CraftConfigValue.java index edec1ef3..79ef07f9 100644 --- a/platform/bukkit/src/main/java/cc/carm/lib/mineconfiguration/bukkit/CraftConfigValue.java +++ b/platform/bukkit/src/main/java/cc/carm/lib/mineconfiguration/bukkit/CraftConfigValue.java @@ -1,6 +1,7 @@ package cc.carm.lib.mineconfiguration.bukkit; import cc.carm.lib.configuration.core.source.ConfigurationProvider; +import cc.carm.lib.configuration.core.value.ValueManifest; import cc.carm.lib.configuration.core.value.impl.CachedConfigValue; import cc.carm.lib.mineconfiguration.bukkit.builder.CraftConfigBuilder; import cc.carm.lib.mineconfiguration.bukkit.source.CraftConfigProvider; @@ -16,10 +17,8 @@ public abstract class CraftConfigValue extends CachedConfigValue { return new CraftConfigBuilder(); } - public CraftConfigValue(@Nullable CraftConfigProvider provider, @Nullable String sectionPath, - @Nullable List headerComments, @Nullable String inlineComments, - @Nullable T defaultValue) { - super(provider, sectionPath, headerComments, inlineComments, defaultValue); + public CraftConfigValue(@NotNull ValueManifest manifest) { + super(manifest); } public CraftConfigProvider getBukkitProvider() { diff --git a/platform/bukkit/src/main/java/cc/carm/lib/mineconfiguration/bukkit/builder/item/ItemConfigBuilder.java b/platform/bukkit/src/main/java/cc/carm/lib/mineconfiguration/bukkit/builder/item/ItemConfigBuilder.java index dc6dc3d5..6c5a468b 100644 --- a/platform/bukkit/src/main/java/cc/carm/lib/mineconfiguration/bukkit/builder/item/ItemConfigBuilder.java +++ b/platform/bukkit/src/main/java/cc/carm/lib/mineconfiguration/bukkit/builder/item/ItemConfigBuilder.java @@ -1,5 +1,6 @@ package cc.carm.lib.mineconfiguration.bukkit.builder.item; +import cc.carm.lib.configuration.core.value.ValueManifest; import cc.carm.lib.mineconfiguration.bukkit.builder.AbstractCraftBuilder; import cc.carm.lib.mineconfiguration.bukkit.data.ItemConfig; import cc.carm.lib.mineconfiguration.bukkit.value.ConfiguredItem; @@ -110,8 +111,12 @@ public ItemConfigBuilder params(@NotNull List params) { @Override public @NotNull ConfiguredItem build() { - ItemConfig defaultItem = Optional.ofNullable(this.defaultValue).orElse(buildDefault()); - return new ConfiguredItem(this.provider, this.path, this.headerComments, this.inlineComment, defaultItem, buildParams()); + return new ConfiguredItem( + new ValueManifest<>( + this.provider, this.path, this.headerComments, this.inlineComment, + Optional.ofNullable(this.defaultValue).orElse(buildDefault()) + ), buildParams() + ); } protected final String[] buildParams() { diff --git a/platform/bukkit/src/main/java/cc/carm/lib/mineconfiguration/bukkit/builder/message/CraftMessageBuilder.java b/platform/bukkit/src/main/java/cc/carm/lib/mineconfiguration/bukkit/builder/message/CraftMessageBuilder.java index 3e7ccc21..965a7b56 100644 --- a/platform/bukkit/src/main/java/cc/carm/lib/mineconfiguration/bukkit/builder/message/CraftMessageBuilder.java +++ b/platform/bukkit/src/main/java/cc/carm/lib/mineconfiguration/bukkit/builder/message/CraftMessageBuilder.java @@ -1,5 +1,6 @@ package cc.carm.lib.mineconfiguration.bukkit.builder.message; +import cc.carm.lib.configuration.core.value.ValueManifest; import cc.carm.lib.mineconfiguration.bukkit.data.TextConfig; import cc.carm.lib.mineconfiguration.bukkit.utils.TextParser; import cc.carm.lib.mineconfiguration.common.builder.message.MessageConfigBuilder; @@ -8,6 +9,7 @@ import org.jetbrains.annotations.Nullable; import java.util.HashMap; +import java.util.Optional; import java.util.function.BiFunction; public class CraftMessageBuilder extends MessageConfigBuilder { diff --git a/platform/bukkit/src/main/java/cc/carm/lib/mineconfiguration/bukkit/builder/message/CraftMessageListBuilder.java b/platform/bukkit/src/main/java/cc/carm/lib/mineconfiguration/bukkit/builder/message/CraftMessageListBuilder.java index 5f39609f..6306c4c2 100644 --- a/platform/bukkit/src/main/java/cc/carm/lib/mineconfiguration/bukkit/builder/message/CraftMessageListBuilder.java +++ b/platform/bukkit/src/main/java/cc/carm/lib/mineconfiguration/bukkit/builder/message/CraftMessageListBuilder.java @@ -9,7 +9,6 @@ import org.jetbrains.annotations.Nullable; import java.util.ArrayList; -import java.util.Optional; import java.util.function.BiFunction; public class CraftMessageListBuilder @@ -27,8 +26,7 @@ public CraftMessageListBuilder(@NotNull BiFunction<@Nullable CommandSender, @Not @Override public @NotNull ConfiguredMessageList build() { return new ConfiguredMessageList<>( - this.provider, this.path, this.headerComments, this.inlineComment, - Optional.ofNullable(this.defaultValue).orElse(TextConfig.of(new ArrayList<>())), + buildManifest(TextConfig.of(new ArrayList<>())), ParamsUtils.formatParams(this.paramFormatter, this.params), this.messageParser, this.sendFunction ); diff --git a/platform/bukkit/src/main/java/cc/carm/lib/mineconfiguration/bukkit/builder/message/CraftMessageValueBuilder.java b/platform/bukkit/src/main/java/cc/carm/lib/mineconfiguration/bukkit/builder/message/CraftMessageValueBuilder.java index 9b928391..a93bb170 100644 --- a/platform/bukkit/src/main/java/cc/carm/lib/mineconfiguration/bukkit/builder/message/CraftMessageValueBuilder.java +++ b/platform/bukkit/src/main/java/cc/carm/lib/mineconfiguration/bukkit/builder/message/CraftMessageValueBuilder.java @@ -8,7 +8,6 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import java.util.Optional; import java.util.function.BiFunction; public class CraftMessageValueBuilder @@ -26,8 +25,7 @@ public CraftMessageValueBuilder(@NotNull BiFunction<@Nullable CommandSender, @No @Override public @NotNull ConfiguredMessage build() { return new ConfiguredMessage<>( - this.provider, this.path, this.headerComments, this.inlineComment, - Optional.ofNullable(this.defaultValue).orElse(TextConfig.of("")), + buildManifest(TextConfig.of("")), ParamsUtils.formatParams(this.paramFormatter, this.params), this.messageParser, this.sendHandler ); diff --git a/platform/bukkit/src/main/java/cc/carm/lib/mineconfiguration/bukkit/builder/serializable/SerializableBuilder.java b/platform/bukkit/src/main/java/cc/carm/lib/mineconfiguration/bukkit/builder/serializable/SerializableBuilder.java index eedff346..5f5d3a48 100644 --- a/platform/bukkit/src/main/java/cc/carm/lib/mineconfiguration/bukkit/builder/serializable/SerializableBuilder.java +++ b/platform/bukkit/src/main/java/cc/carm/lib/mineconfiguration/bukkit/builder/serializable/SerializableBuilder.java @@ -21,7 +21,7 @@ public SerializableBuilder(@NotNull Class valueClass) { @Override public @NotNull ConfiguredSerializable build() { - return new ConfiguredSerializable<>(this.provider, this.path, this.headerComments, this.inlineComment, this.valueClass, this.defaultValue); + return new ConfiguredSerializable<>(buildManifest(), valueClass); } } diff --git a/platform/bukkit/src/main/java/cc/carm/lib/mineconfiguration/bukkit/builder/sound/SoundConfigBuilder.java b/platform/bukkit/src/main/java/cc/carm/lib/mineconfiguration/bukkit/builder/sound/SoundConfigBuilder.java index 26dcad53..8cfed5c4 100644 --- a/platform/bukkit/src/main/java/cc/carm/lib/mineconfiguration/bukkit/builder/sound/SoundConfigBuilder.java +++ b/platform/bukkit/src/main/java/cc/carm/lib/mineconfiguration/bukkit/builder/sound/SoundConfigBuilder.java @@ -40,7 +40,7 @@ public class SoundConfigBuilder extends AbstractCraftBuilder paramFormatter) { @Override public @NotNull ConfiguredTitle build() { return new ConfiguredTitle( - this.provider, this.path, this.headerComments, this.inlineComment, - this.defaultValue, ParamsUtils.formatParams(this.paramFormatter, this.params), + buildManifest(), ParamsUtils.formatParams(this.paramFormatter, this.params), this.sendConsumer, this.fadeIn, this.stay, this.fadeOut ); } diff --git a/platform/bukkit/src/main/java/cc/carm/lib/mineconfiguration/bukkit/value/ConfiguredItem.java b/platform/bukkit/src/main/java/cc/carm/lib/mineconfiguration/bukkit/value/ConfiguredItem.java index e56fded4..e2972799 100644 --- a/platform/bukkit/src/main/java/cc/carm/lib/mineconfiguration/bukkit/value/ConfiguredItem.java +++ b/platform/bukkit/src/main/java/cc/carm/lib/mineconfiguration/bukkit/value/ConfiguredItem.java @@ -2,11 +2,11 @@ import cc.carm.lib.configuration.core.function.ConfigValueParser; import cc.carm.lib.configuration.core.source.ConfigurationWrapper; +import cc.carm.lib.configuration.core.value.ValueManifest; import cc.carm.lib.configuration.core.value.type.ConfiguredSection; import cc.carm.lib.mineconfiguration.bukkit.CraftConfigValue; import cc.carm.lib.mineconfiguration.bukkit.builder.item.ItemConfigBuilder; import cc.carm.lib.mineconfiguration.bukkit.data.ItemConfig; -import cc.carm.lib.mineconfiguration.bukkit.source.CraftConfigProvider; import cc.carm.lib.mineconfiguration.common.utils.ParamsUtils; import org.bukkit.entity.Player; import org.bukkit.inventory.ItemStack; @@ -14,7 +14,6 @@ import org.jetbrains.annotations.Nullable; import java.util.HashMap; -import java.util.List; import java.util.Map; public class ConfiguredItem extends ConfiguredSection { @@ -33,11 +32,9 @@ public static ConfiguredItem of(@Nullable ItemConfig defaultItem) { protected final @NotNull String[] params; - public ConfiguredItem(@Nullable CraftConfigProvider provider, @Nullable String sectionPath, - @Nullable List headerComments, @Nullable String inlineComments, - @Nullable ItemConfig defaultValue, @NotNull String[] params) { + public ConfiguredItem(@NotNull ValueManifest manifest, @NotNull String[] params) { super( - provider, sectionPath, headerComments, inlineComments, ItemConfig.class, defaultValue, + manifest, ItemConfig.class, getItemParser(), ItemConfig::serialize ); this.params = params; diff --git a/platform/bukkit/src/main/java/cc/carm/lib/mineconfiguration/bukkit/value/ConfiguredMessage.java b/platform/bukkit/src/main/java/cc/carm/lib/mineconfiguration/bukkit/value/ConfiguredMessage.java index 787c0716..6a97e5b8 100644 --- a/platform/bukkit/src/main/java/cc/carm/lib/mineconfiguration/bukkit/value/ConfiguredMessage.java +++ b/platform/bukkit/src/main/java/cc/carm/lib/mineconfiguration/bukkit/value/ConfiguredMessage.java @@ -1,6 +1,6 @@ package cc.carm.lib.mineconfiguration.bukkit.value; -import cc.carm.lib.configuration.core.source.ConfigurationProvider; +import cc.carm.lib.configuration.core.value.ValueManifest; import cc.carm.lib.mineconfiguration.bukkit.CraftConfigValue; import cc.carm.lib.mineconfiguration.bukkit.builder.message.CraftMessageValueBuilder; import cc.carm.lib.mineconfiguration.bukkit.data.TextConfig; @@ -35,12 +35,10 @@ public static ConfiguredMessage ofString(@NotNull String defaultMessage) return asString().defaults(defaultMessage).build(); } - public ConfiguredMessage(@Nullable ConfigurationProvider provider, @Nullable String sectionPath, - @Nullable List headerComments, @Nullable String inlineComments, - @NotNull TextConfig defaultMessage, @NotNull String[] params, + public ConfiguredMessage(@NotNull ValueManifest manifest, @NotNull String[] params, @NotNull BiFunction<@Nullable CommandSender, @NotNull String, @Nullable M> messageParser, @NotNull BiConsumer<@NotNull CommandSender, @NotNull M> sendFunction) { - super(provider, sectionPath, headerComments, inlineComments, TextConfig.class, defaultMessage, params, messageParser, sendFunction, TextConfig::of); + super(manifest, TextConfig.class, params, messageParser, sendFunction, TextConfig::of); } @Override diff --git a/platform/bukkit/src/main/java/cc/carm/lib/mineconfiguration/bukkit/value/ConfiguredMessageList.java b/platform/bukkit/src/main/java/cc/carm/lib/mineconfiguration/bukkit/value/ConfiguredMessageList.java index d915cd00..cc176601 100644 --- a/platform/bukkit/src/main/java/cc/carm/lib/mineconfiguration/bukkit/value/ConfiguredMessageList.java +++ b/platform/bukkit/src/main/java/cc/carm/lib/mineconfiguration/bukkit/value/ConfiguredMessageList.java @@ -1,6 +1,6 @@ package cc.carm.lib.mineconfiguration.bukkit.value; -import cc.carm.lib.configuration.core.source.ConfigurationProvider; +import cc.carm.lib.configuration.core.value.ValueManifest; import cc.carm.lib.mineconfiguration.bukkit.CraftConfigValue; import cc.carm.lib.mineconfiguration.bukkit.builder.message.CraftMessageListBuilder; import cc.carm.lib.mineconfiguration.bukkit.data.TextConfig; @@ -31,12 +31,10 @@ public static ConfiguredMessageList ofStrings(@NotNull String... default return asStrings().defaults(defaultMessages).build(); } - public ConfiguredMessageList(@Nullable ConfigurationProvider provider, @Nullable String sectionPath, - @Nullable List headerComments, @Nullable String inlineComments, - @NotNull List messages, @NotNull String[] params, + public ConfiguredMessageList(@NotNull ValueManifest> manifest, @NotNull String[] params, @NotNull BiFunction<@Nullable CommandSender, @NotNull String, @Nullable M> messageParser, @NotNull BiConsumer<@NotNull CommandSender, @NotNull List> sendFunction) { - super(provider, sectionPath, headerComments, inlineComments, TextConfig.class, messages, params, messageParser, sendFunction, TextConfig::of); + super(manifest, TextConfig.class, params, messageParser, sendFunction, TextConfig::of); } @Override diff --git a/platform/bukkit/src/main/java/cc/carm/lib/mineconfiguration/bukkit/value/ConfiguredSerializable.java b/platform/bukkit/src/main/java/cc/carm/lib/mineconfiguration/bukkit/value/ConfiguredSerializable.java index edbb8af5..c70f51ba 100644 --- a/platform/bukkit/src/main/java/cc/carm/lib/mineconfiguration/bukkit/value/ConfiguredSerializable.java +++ b/platform/bukkit/src/main/java/cc/carm/lib/mineconfiguration/bukkit/value/ConfiguredSerializable.java @@ -1,12 +1,11 @@ package cc.carm.lib.mineconfiguration.bukkit.value; +import cc.carm.lib.configuration.core.value.ValueManifest; import cc.carm.lib.mineconfiguration.bukkit.CraftConfigValue; -import cc.carm.lib.mineconfiguration.bukkit.source.CraftConfigProvider; import org.bukkit.configuration.serialization.ConfigurationSerializable; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import java.util.List; import java.util.Optional; public class ConfiguredSerializable extends CraftConfigValue { @@ -22,10 +21,8 @@ public static ConfiguredSerializable of protected final @NotNull Class valueClass; - public ConfiguredSerializable(@Nullable CraftConfigProvider provider, @Nullable String sectionPath, - @Nullable List headerComments, @Nullable String inlineComments, - @NotNull Class valueClass, @Nullable T defaultValue) { - super(provider, sectionPath, headerComments, inlineComments, defaultValue); + public ConfiguredSerializable(@NotNull ValueManifest manifest, @NotNull Class valueClass) { + super(manifest); this.valueClass = valueClass; } diff --git a/platform/bukkit/src/main/java/cc/carm/lib/mineconfiguration/bukkit/value/ConfiguredSound.java b/platform/bukkit/src/main/java/cc/carm/lib/mineconfiguration/bukkit/value/ConfiguredSound.java index 1f9812a2..59650571 100644 --- a/platform/bukkit/src/main/java/cc/carm/lib/mineconfiguration/bukkit/value/ConfiguredSound.java +++ b/platform/bukkit/src/main/java/cc/carm/lib/mineconfiguration/bukkit/value/ConfiguredSound.java @@ -1,7 +1,7 @@ package cc.carm.lib.mineconfiguration.bukkit.value; import cc.carm.lib.configuration.core.function.ConfigValueParser; -import cc.carm.lib.configuration.core.source.ConfigurationProvider; +import cc.carm.lib.configuration.core.value.ValueManifest; import cc.carm.lib.configuration.core.value.type.ConfiguredValue; import cc.carm.lib.mineconfiguration.bukkit.CraftConfigValue; import cc.carm.lib.mineconfiguration.bukkit.builder.sound.SoundConfigBuilder; @@ -9,9 +9,7 @@ import org.bukkit.Sound; import org.bukkit.entity.Player; import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; -import java.util.List; import java.util.Optional; public class ConfiguredSound extends ConfiguredValue { @@ -44,10 +42,8 @@ public class ConfiguredSound extends ConfiguredValue { return CraftConfigValue.builder().createSound().defaults(soundName, volume, pitch).build(); } - public ConfiguredSound(@Nullable ConfigurationProvider provider, @Nullable String sectionPath, - @Nullable List headerComments, @Nullable String inlineComments, - @Nullable SoundConfig defaultValue) { - super(provider, sectionPath, headerComments, inlineComments, SoundConfig.class, defaultValue, getSoundParser(), SoundConfig::serialize); + public ConfiguredSound(@NotNull ValueManifest manifest) { + super(manifest, SoundConfig.class, getSoundParser(), SoundConfig::serialize); } public void setSound(@NotNull Sound sound) { diff --git a/platform/bukkit/src/main/java/cc/carm/lib/mineconfiguration/bukkit/value/ConfiguredTitle.java b/platform/bukkit/src/main/java/cc/carm/lib/mineconfiguration/bukkit/value/ConfiguredTitle.java index 14d87a18..71016462 100644 --- a/platform/bukkit/src/main/java/cc/carm/lib/mineconfiguration/bukkit/value/ConfiguredTitle.java +++ b/platform/bukkit/src/main/java/cc/carm/lib/mineconfiguration/bukkit/value/ConfiguredTitle.java @@ -1,8 +1,8 @@ package cc.carm.lib.mineconfiguration.bukkit.value; import cc.carm.lib.configuration.core.function.ConfigValueParser; -import cc.carm.lib.configuration.core.source.ConfigurationProvider; import cc.carm.lib.configuration.core.source.ConfigurationWrapper; +import cc.carm.lib.configuration.core.value.ValueManifest; import cc.carm.lib.configuration.core.value.type.ConfiguredSection; import cc.carm.lib.mineconfiguration.bukkit.CraftConfigValue; import cc.carm.lib.mineconfiguration.bukkit.builder.title.TitleConfigBuilder; @@ -15,8 +15,10 @@ import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Range; -import java.util.List; import java.util.Map; +import java.util.Optional; +import java.util.function.Function; +import java.util.function.Predicate; public class ConfiguredTitle extends ConfiguredSection { @@ -40,12 +42,10 @@ public static ConfiguredTitle of(@Nullable String line1, @Nullable String line2, protected final int stay; protected final int fadeOut; - public ConfiguredTitle(@Nullable ConfigurationProvider provider, @Nullable String sectionPath, - @Nullable List headerComments, @Nullable String inlineComments, - @Nullable TitleConfig defaultValue, @NotNull String[] params, + public ConfiguredTitle(@NotNull ValueManifest manifest, @NotNull String[] params, @NotNull TitleSendConsumer sendConsumer, int fadeIn, int stay, int fadeOut) { - super(provider, sectionPath, headerComments, inlineComments, TitleConfig.class, defaultValue, getTitleParser(), TitleConfig::serialize); + super(manifest, TitleConfig.class, getTitleParser(), TitleConfig::serialize); this.sendConsumer = sendConsumer; this.params = params; this.fadeIn = fadeIn; @@ -102,6 +102,16 @@ public void sendToAll(@NotNull Map placeholders) { Bukkit.getOnlinePlayers().forEach(onlinePlayer -> send(onlinePlayer, placeholders)); } + public void sendToEach(@NotNull Function<@NotNull Player, Object[]> eachValues) { + sendToEach(null, eachValues); + } + + public void sendToEach(@Nullable Predicate limiter, + @NotNull Function<@NotNull Player, Object[]> eachValues) { + Predicate predicate = Optional.ofNullable(limiter).orElse(r -> true); + Bukkit.getOnlinePlayers().stream().filter(predicate) + .forEach(r -> send(r, ParamsUtils.buildParams(params, eachValues.apply(r)))); + } public static ConfigValueParser, TitleConfig> getTitleParser() { return (s, d) -> TitleConfig.deserialize(s); diff --git a/platform/bungee/pom.xml b/platform/bungee/pom.xml index 476e498c..56e3212a 100644 --- a/platform/bungee/pom.xml +++ b/platform/bungee/pom.xml @@ -5,7 +5,7 @@ mineconfiguration-parent cc.carm.lib - 2.4.0 + 2.5.0 ../../pom.xml 4.0.0 diff --git a/platform/bungee/src/main/java/cc/carm/lib/mineconfiguration/bungee/BungeeConfigValue.java b/platform/bungee/src/main/java/cc/carm/lib/mineconfiguration/bungee/BungeeConfigValue.java index eda3c4dc..b0353b7d 100644 --- a/platform/bungee/src/main/java/cc/carm/lib/mineconfiguration/bungee/BungeeConfigValue.java +++ b/platform/bungee/src/main/java/cc/carm/lib/mineconfiguration/bungee/BungeeConfigValue.java @@ -1,14 +1,12 @@ package cc.carm.lib.mineconfiguration.bungee; +import cc.carm.lib.configuration.core.source.ConfigurationProvider; +import cc.carm.lib.configuration.core.value.ValueManifest; +import cc.carm.lib.configuration.core.value.impl.CachedConfigValue; import cc.carm.lib.mineconfiguration.bungee.builder.BungeeConfigBuilder; import cc.carm.lib.mineconfiguration.bungee.source.BungeeConfigProvider; import cc.carm.lib.mineconfiguration.bungee.source.BungeeSectionWrapper; -import cc.carm.lib.configuration.core.source.ConfigurationProvider; -import cc.carm.lib.configuration.core.value.impl.CachedConfigValue; import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; - -import java.util.List; public abstract class BungeeConfigValue extends CachedConfigValue { @@ -16,10 +14,8 @@ public abstract class BungeeConfigValue extends CachedConfigValue { return new BungeeConfigBuilder(); } - public BungeeConfigValue(@Nullable BungeeConfigProvider provider, @Nullable String configPath, - @Nullable List headerComments, @Nullable String inlineComments, - @Nullable T defaultValue) { - super(provider, configPath, headerComments, inlineComments, defaultValue); + public BungeeConfigValue(@NotNull ValueManifest manifest) { + super(manifest); } public BungeeConfigProvider getBukkitProvider() { diff --git a/platform/bungee/src/main/java/cc/carm/lib/mineconfiguration/bungee/builder/message/BungeeMessageBuilder.java b/platform/bungee/src/main/java/cc/carm/lib/mineconfiguration/bungee/builder/message/BungeeMessageBuilder.java index 0e2739ad..5f0c789b 100644 --- a/platform/bungee/src/main/java/cc/carm/lib/mineconfiguration/bungee/builder/message/BungeeMessageBuilder.java +++ b/platform/bungee/src/main/java/cc/carm/lib/mineconfiguration/bungee/builder/message/BungeeMessageBuilder.java @@ -1,7 +1,7 @@ package cc.carm.lib.mineconfiguration.bungee.builder.message; import cc.carm.lib.easyplugin.utils.ColorParser; -import cc.carm.lib.mineconfiguration.bungee.data.MessageText; +import cc.carm.lib.mineconfiguration.bungee.data.TextConfig; import cc.carm.lib.mineconfiguration.common.builder.message.MessageConfigBuilder; import net.md_5.bungee.api.CommandSender; import org.jetbrains.annotations.NotNull; @@ -10,11 +10,11 @@ import java.util.function.BiFunction; @SuppressWarnings("deprecation") -public class BungeeMessageBuilder extends MessageConfigBuilder { +public class BungeeMessageBuilder extends MessageConfigBuilder { public BungeeMessageBuilder() { - super(CommandSender.class, MessageText.class); + super(CommandSender.class, TextConfig.class); } @Override diff --git a/platform/bungee/src/main/java/cc/carm/lib/mineconfiguration/bungee/builder/message/BungeeMessageListBuilder.java b/platform/bungee/src/main/java/cc/carm/lib/mineconfiguration/bungee/builder/message/BungeeMessageListBuilder.java index 6fce265f..df87bc4f 100644 --- a/platform/bungee/src/main/java/cc/carm/lib/mineconfiguration/bungee/builder/message/BungeeMessageListBuilder.java +++ b/platform/bungee/src/main/java/cc/carm/lib/mineconfiguration/bungee/builder/message/BungeeMessageListBuilder.java @@ -1,6 +1,7 @@ package cc.carm.lib.mineconfiguration.bungee.builder.message; -import cc.carm.lib.mineconfiguration.bungee.data.MessageText; +import cc.carm.lib.configuration.core.value.ValueManifest; +import cc.carm.lib.mineconfiguration.bungee.data.TextConfig; import cc.carm.lib.mineconfiguration.bungee.value.ConfiguredMessageList; import cc.carm.lib.mineconfiguration.common.builder.message.MessageListBuilder; import cc.carm.lib.mineconfiguration.common.utils.ParamsUtils; @@ -13,10 +14,10 @@ import java.util.function.BiFunction; public class BungeeMessageListBuilder - extends MessageListBuilder> { + extends MessageListBuilder> { public BungeeMessageListBuilder(@NotNull BiFunction<@Nullable CommandSender, @NotNull String, @Nullable M> parser) { - super(CommandSender.class, MessageText::of, parser); + super(CommandSender.class, TextConfig::of, parser); } @Override @@ -27,8 +28,7 @@ public BungeeMessageListBuilder(@NotNull BiFunction<@Nullable CommandSender, @No @Override public @NotNull ConfiguredMessageList build() { return new ConfiguredMessageList<>( - this.provider, this.path, this.headerComments, this.inlineComment, - Optional.ofNullable(this.defaultValue).orElse(MessageText.of(new ArrayList<>())), + buildManifest(TextConfig.of(new ArrayList<>())), ParamsUtils.formatParams(this.paramFormatter, this.params), this.messageParser, this.sendFunction ); diff --git a/platform/bungee/src/main/java/cc/carm/lib/mineconfiguration/bungee/builder/message/BungeeMessageValueBuilder.java b/platform/bungee/src/main/java/cc/carm/lib/mineconfiguration/bungee/builder/message/BungeeMessageValueBuilder.java index 8227fa78..6a907282 100644 --- a/platform/bungee/src/main/java/cc/carm/lib/mineconfiguration/bungee/builder/message/BungeeMessageValueBuilder.java +++ b/platform/bungee/src/main/java/cc/carm/lib/mineconfiguration/bungee/builder/message/BungeeMessageValueBuilder.java @@ -1,6 +1,6 @@ package cc.carm.lib.mineconfiguration.bungee.builder.message; -import cc.carm.lib.mineconfiguration.bungee.data.MessageText; +import cc.carm.lib.mineconfiguration.bungee.data.TextConfig; import cc.carm.lib.mineconfiguration.bungee.value.ConfiguredMessage; import cc.carm.lib.mineconfiguration.common.builder.message.MessageValueBuilder; import cc.carm.lib.mineconfiguration.common.utils.ParamsUtils; @@ -8,14 +8,13 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import java.util.Optional; import java.util.function.BiFunction; public class BungeeMessageValueBuilder - extends MessageValueBuilder> { + extends MessageValueBuilder> { public BungeeMessageValueBuilder(@NotNull BiFunction<@Nullable CommandSender, @NotNull String, @Nullable M> parser) { - super(CommandSender.class, MessageText::new, parser); + super(CommandSender.class, TextConfig::new, parser); } @Override @@ -26,8 +25,7 @@ public BungeeMessageValueBuilder(@NotNull BiFunction<@Nullable CommandSender, @N @Override public @NotNull ConfiguredMessage build() { return new ConfiguredMessage<>( - this.provider, this.path, this.headerComments, this.inlineComment, - Optional.ofNullable(this.defaultValue).orElse(MessageText.of("")), + buildManifest(TextConfig.of("")), ParamsUtils.formatParams(this.paramFormatter, this.params), this.messageParser, this.sendHandler ); diff --git a/platform/bungee/src/main/java/cc/carm/lib/mineconfiguration/bungee/data/MessageText.java b/platform/bungee/src/main/java/cc/carm/lib/mineconfiguration/bungee/data/TextConfig.java similarity index 58% rename from platform/bungee/src/main/java/cc/carm/lib/mineconfiguration/bungee/data/MessageText.java rename to platform/bungee/src/main/java/cc/carm/lib/mineconfiguration/bungee/data/TextConfig.java index 291f91bf..586a12b0 100644 --- a/platform/bungee/src/main/java/cc/carm/lib/mineconfiguration/bungee/data/MessageText.java +++ b/platform/bungee/src/main/java/cc/carm/lib/mineconfiguration/bungee/data/TextConfig.java @@ -11,24 +11,24 @@ import java.util.List; import java.util.stream.Collectors; -public class MessageText extends AbstractText { +public class TextConfig extends AbstractText { - public MessageText(@NotNull String message) { + public TextConfig(@NotNull String message) { super(CommandSender.class, message); } @Contract("!null,-> !null") - public static @Nullable MessageText of(@Nullable String message) { + public static @Nullable TextConfig of(@Nullable String message) { if (message == null) return null; - else return new MessageText(message); + else return new TextConfig(message); } - public static @NotNull List of(@Nullable List messages) { + public static @NotNull List of(@Nullable List messages) { if (messages == null || messages.isEmpty()) return new ArrayList<>(); - else return messages.stream().map(MessageText::of).collect(Collectors.toList()); + else return messages.stream().map(TextConfig::of).collect(Collectors.toList()); } - public static @NotNull List of(@NotNull String... messages) { + public static @NotNull List of(@NotNull String... messages) { return of(Arrays.asList(messages)); } diff --git a/platform/bungee/src/main/java/cc/carm/lib/mineconfiguration/bungee/value/ConfiguredMessage.java b/platform/bungee/src/main/java/cc/carm/lib/mineconfiguration/bungee/value/ConfiguredMessage.java index 7407ceb4..3ad4f69c 100644 --- a/platform/bungee/src/main/java/cc/carm/lib/mineconfiguration/bungee/value/ConfiguredMessage.java +++ b/platform/bungee/src/main/java/cc/carm/lib/mineconfiguration/bungee/value/ConfiguredMessage.java @@ -1,9 +1,9 @@ package cc.carm.lib.mineconfiguration.bungee.value; -import cc.carm.lib.configuration.core.source.ConfigurationProvider; +import cc.carm.lib.configuration.core.value.ValueManifest; import cc.carm.lib.mineconfiguration.bungee.BungeeConfigValue; import cc.carm.lib.mineconfiguration.bungee.builder.message.BungeeMessageValueBuilder; -import cc.carm.lib.mineconfiguration.bungee.data.MessageText; +import cc.carm.lib.mineconfiguration.bungee.data.TextConfig; import cc.carm.lib.mineconfiguration.common.value.ConfigMessage; import net.md_5.bungee.api.CommandSender; import net.md_5.bungee.api.ProxyServer; @@ -16,7 +16,7 @@ import java.util.function.BiConsumer; import java.util.function.BiFunction; -public class ConfiguredMessage extends ConfigMessage { +public class ConfiguredMessage extends ConfigMessage { @NotNull public static BungeeMessageValueBuilder<@Nullable M> create(@NotNull BiFunction<@Nullable CommandSender, @NotNull String, @Nullable M> messageParser) { @@ -35,12 +35,10 @@ public static ConfiguredMessage ofString(@NotNull String defaultMessage) return asString().defaults(defaultMessage).build(); } - public ConfiguredMessage(@Nullable ConfigurationProvider provider, @Nullable String sectionPath, - @Nullable List headerComments, @Nullable String inlineComments, - @NotNull MessageText defaultMessage, @NotNull String[] params, + public ConfiguredMessage(@NotNull ValueManifest manifest, @NotNull String[] params, @NotNull BiFunction<@Nullable CommandSender, @NotNull String, @Nullable M> messageParser, @NotNull BiConsumer<@NotNull CommandSender, @NotNull M> sendFunction) { - super(provider, sectionPath, headerComments, inlineComments, MessageText.class, defaultMessage, params, messageParser, sendFunction, MessageText::of); + super(manifest, TextConfig.class, params, messageParser, sendFunction, TextConfig::of); } @Override diff --git a/platform/bungee/src/main/java/cc/carm/lib/mineconfiguration/bungee/value/ConfiguredMessageList.java b/platform/bungee/src/main/java/cc/carm/lib/mineconfiguration/bungee/value/ConfiguredMessageList.java index a30cd173..76bf60ba 100644 --- a/platform/bungee/src/main/java/cc/carm/lib/mineconfiguration/bungee/value/ConfiguredMessageList.java +++ b/platform/bungee/src/main/java/cc/carm/lib/mineconfiguration/bungee/value/ConfiguredMessageList.java @@ -1,10 +1,10 @@ package cc.carm.lib.mineconfiguration.bungee.value; +import cc.carm.lib.configuration.core.value.ValueManifest; import cc.carm.lib.mineconfiguration.bungee.BungeeConfigValue; import cc.carm.lib.mineconfiguration.bungee.builder.message.BungeeMessageListBuilder; -import cc.carm.lib.mineconfiguration.bungee.data.MessageText; +import cc.carm.lib.mineconfiguration.bungee.data.TextConfig; import cc.carm.lib.mineconfiguration.common.value.ConfigMessageList; -import cc.carm.lib.configuration.core.source.ConfigurationProvider; import net.md_5.bungee.api.CommandSender; import net.md_5.bungee.api.ProxyServer; import org.jetbrains.annotations.NotNull; @@ -13,11 +13,10 @@ import java.util.ArrayList; import java.util.Collection; import java.util.List; -import java.util.Map; import java.util.function.BiConsumer; import java.util.function.BiFunction; -public class ConfiguredMessageList extends ConfigMessageList { +public class ConfiguredMessageList extends ConfigMessageList { @NotNull public static BungeeMessageListBuilder create(@NotNull BiFunction<@Nullable CommandSender, @NotNull String, @Nullable M> messageParser) { @@ -32,12 +31,10 @@ public static ConfiguredMessageList ofStrings(@NotNull String... default return asStrings().defaults(defaultMessages).build(); } - public ConfiguredMessageList(@Nullable ConfigurationProvider provider, @Nullable String sectionPath, - @Nullable List headerComments, @Nullable String inlineComments, - @NotNull List messages, @NotNull String[] params, + public ConfiguredMessageList(@NotNull ValueManifest> manifest, @NotNull String[] params, @NotNull BiFunction<@Nullable CommandSender, @NotNull String, @Nullable M> messageParser, @NotNull BiConsumer<@NotNull CommandSender, @NotNull List> sendFunction) { - super(provider, sectionPath, headerComments, inlineComments, MessageText.class, messages, params, messageParser, sendFunction, MessageText::of); + super(manifest, TextConfig.class, params, messageParser, sendFunction, TextConfig::of); } @Override diff --git a/pom.xml b/pom.xml index e009287c..11d1bf7b 100644 --- a/pom.xml +++ b/pom.xml @@ -10,13 +10,13 @@ UTF-8 UTF-8 - 3.4.0 + 3.5.0 1.5.4 cc.carm.lib mineconfiguration-parent - 2.4.0 + 2.5.0 pom common