feat(value): 适配Manifest更新

CarmJos · Mar 15, 2023 · 3d16393 · 3d16393
1 parent ce205e1
commit 3d16393
Show file tree

Hide file tree

Showing 30 changed files with 139 additions and 124 deletions.
diff --git a/common/pom.xml b/common/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>mineconfiguration-parent</artifactId>
         <groupId>cc.carm.lib</groupId>
-        <version>2.4.0</version>
+        <version>2.5.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <properties>

diff --git a/...rc/main/java/cc/carm/lib/mineconfiguration/common/builder/message/MessageListBuilder.java b/...rc/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<M>> sendFunction
     @Override
     public abstract @NotNull ConfigMessageList<M, T, R> build();
 
+    protected @NotNull ValueManifest<List<T>> buildManifest(@NotNull List<T> emptyValue) {
+        return new ValueManifest<>(
+                this.provider, this.path, this.headerComments, this.inlineComment,
+                Optional.ofNullable(this.defaultValue).orElse(emptyValue)
+        );
+    }
+
 }
diff --git a/...c/main/java/cc/carm/lib/mineconfiguration/common/builder/message/MessageValueBuilder.java b/...c/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<M, T, R> build();
 
+    protected @NotNull ValueManifest<T> 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
@@ -41,21 +41,21 @@ public interface BaseMessage<R, M> {
     /**
      * 为某位接收者解析此消息。
      *
-     * @param sender       接收者
+     * @param receiver     接收者
      * @param placeholders 消息中的变量与对应参数
      * @return 解析变量后的消息内容
      */
-    @Nullable M parse(@Nullable R sender, @NotNull Map<String, Object> placeholders);
+    @Nullable M parse(@Nullable R receiver, @NotNull Map<String, Object> 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
@@ -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<M, T extends AbstractText<R>, R>
 
     protected final @NotNull Function<String, T> textBuilder;
 
-    public ConfigMessage(@Nullable ConfigurationProvider<?> provider, @Nullable String sectionPath,
-                         @Nullable List<String> headerComments, @Nullable String inlineComments,
-                         @NotNull Class<T> textClazz, @NotNull T defaultMessage, @NotNull String[] params,
+    public ConfigMessage(@NotNull ValueManifest<T> manifest,
+                         @NotNull Class<T> textClazz, @NotNull String[] params,
                          @NotNull BiFunction<@Nullable R, @NotNull String, @Nullable M> messageParser,
                          @NotNull BiConsumer<@NotNull R, @NotNull M> sendFunction,
                          @NotNull Function<String, T> 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
@@ -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<M, T extends AbstractText<R>, R>
 
     protected final @NotNull Function<String, T> textBuilder;
 
-    public ConfigMessageList(@Nullable ConfigurationProvider<?> provider, @Nullable String sectionPath,
-                             @Nullable List<String> headerComments, @Nullable String inlineComments,
-                             @NotNull Class<T> textClazz, @NotNull List<T> messages, @NotNull String[] params,
+    public ConfigMessageList(@NotNull ValueManifest<List<T>> manifest,
+                             @NotNull Class<T> textClazz, @NotNull String[] params,
                              @NotNull BiFunction<@Nullable R, @NotNull String, @Nullable M> messageParser,
                              @NotNull BiConsumer<@NotNull R, @NotNull List<M>> sendFunction,
                              @NotNull Function<String, @NotNull T> 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<M> message) {
                 .collect(Collectors.toList());
     }
 
+    public @Nullable M parseToLine(@Nullable R receiver, @NotNull Map<String, Object> placeholders) {
+        List<T> list = get();
+        if (list.isEmpty()) return null;
+
+        List<String> 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<String> 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
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>mineconfiguration-parent</artifactId>
         <groupId>cc.carm.lib</groupId>
-        <version>2.4.0</version>
+        <version>2.5.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

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
@@ -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<T> extends CachedConfigValue<T> {
         return new CraftConfigBuilder();
     }
 
-    public CraftConfigValue(@Nullable CraftConfigProvider provider, @Nullable String sectionPath,
-                            @Nullable List<String> headerComments, @Nullable String inlineComments,
-                            @Nullable T defaultValue) {
-        super(provider, sectionPath, headerComments, inlineComments, defaultValue);
+    public CraftConfigValue(@NotNull ValueManifest<T> manifest) {
+        super(manifest);
     }
 
     public CraftConfigProvider getBukkitProvider() {

diff --git a/...it/src/main/java/cc/carm/lib/mineconfiguration/bukkit/builder/item/ItemConfigBuilder.java b/...it/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<String> 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/...c/main/java/cc/carm/lib/mineconfiguration/bukkit/builder/message/CraftMessageBuilder.java b/...c/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<CommandSender, TextConfig> {

diff --git a/...in/java/cc/carm/lib/mineconfiguration/bukkit/builder/message/CraftMessageListBuilder.java b/...in/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<M>
@@ -27,8 +26,7 @@ public CraftMessageListBuilder(@NotNull BiFunction<@Nullable CommandSender, @Not
     @Override
     public @NotNull ConfiguredMessageList<M> 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/...n/java/cc/carm/lib/mineconfiguration/bukkit/builder/message/CraftMessageValueBuilder.java b/...n/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<M>
@@ -26,8 +25,7 @@ public CraftMessageValueBuilder(@NotNull BiFunction<@Nullable CommandSender, @No
     @Override
     public @NotNull ConfiguredMessage<M> 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/...n/java/cc/carm/lib/mineconfiguration/bukkit/builder/serializable/SerializableBuilder.java b/...n/java/cc/carm/lib/mineconfiguration/bukkit/builder/serializable/SerializableBuilder.java
@@ -21,7 +21,7 @@ public SerializableBuilder(@NotNull Class<T> valueClass) {
 
     @Override
     public @NotNull ConfiguredSerializable<T> build() {
-        return new ConfiguredSerializable<>(this.provider, this.path, this.headerComments, this.inlineComment,  this.valueClass, this.defaultValue);
+        return new ConfiguredSerializable<>(buildManifest(), valueClass);
     }
 
 }

diff --git a/.../src/main/java/cc/carm/lib/mineconfiguration/bukkit/builder/sound/SoundConfigBuilder.java b/.../src/main/java/cc/carm/lib/mineconfiguration/bukkit/builder/sound/SoundConfigBuilder.java
@@ -40,7 +40,7 @@ public class SoundConfigBuilder extends AbstractCraftBuilder<SoundConfig, SoundC
 
     @Override
     public @NotNull ConfiguredSound build() {
-        return new ConfiguredSound(this.provider, this.path, this.headerComments, this.inlineComment, this.defaultValue);
+        return new ConfiguredSound(buildManifest());
     }
 
 }
diff --git a/.../src/main/java/cc/carm/lib/mineconfiguration/bukkit/builder/title/TitleConfigBuilder.java b/.../src/main/java/cc/carm/lib/mineconfiguration/bukkit/builder/title/TitleConfigBuilder.java
@@ -89,8 +89,7 @@ public TitleConfigBuilder formatParam(Function<String, String> 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
@@ -2,19 +2,18 @@
 
 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;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
 
 public class ConfiguredItem extends ConfiguredSection<ItemConfig> {
@@ -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<String> headerComments, @Nullable String inlineComments,
-                          @Nullable ItemConfig defaultValue, @NotNull String[] params) {
+    public ConfiguredItem(@NotNull ValueManifest<ItemConfig> manifest, @NotNull String[] params) {
         super(
-                provider, sectionPath, headerComments, inlineComments, ItemConfig.class, defaultValue,
+                manifest, ItemConfig.class,
                 getItemParser(), ItemConfig::serialize
         );
         this.params = params;

diff --git a/...rm/bukkit/src/main/java/cc/carm/lib/mineconfiguration/bukkit/value/ConfiguredMessage.java b/...rm/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<String> ofString(@NotNull String defaultMessage)
         return asString().defaults(defaultMessage).build();
     }
 
-    public ConfiguredMessage(@Nullable ConfigurationProvider<?> provider, @Nullable String sectionPath,
-                             @Nullable List<String> headerComments, @Nullable String inlineComments,
-                             @NotNull TextConfig defaultMessage, @NotNull String[] params,
+    public ConfiguredMessage(@NotNull ValueManifest<TextConfig> 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