feat(send): 提供新消息发送方法，分离玩家参数和消息参数

Bumps [cc.carm.lib:easyplugin-color](https://github.com/CarmJos/EasyPlugin) from 1.5.6 to 1.5.7.
- [Release notes](https://github.com/CarmJos/EasyPlugin/releases)
- [Commits](https://github.com/CarmJos/EasyPlugin/compare/1.5.6...1.5.7)

---
updated-dependencies:
- dependency-name: cc.carm.lib:easyplugin-color
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

common/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>mineconfiguration-parent</artifactId>
         <groupId>cc.carm.lib</groupId>
-        <version>2.5.1</version>
+        <version>2.8.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <properties>
@@ -39,7 +39,7 @@
         <dependency>
             <groupId>net.md-5</groupId>
             <artifactId>bungeecord-chat</artifactId>
-            <version>1.16-R0.4</version>
+            <version>1.20-R0.1</version>
             <scope>provided</scope>
         </dependency>
 

common/src/main/java/cc/carm/lib/mineconfiguration/common/AbstractConfiguration.java

@@ -0,0 +1,51 @@
+package cc.carm.lib.mineconfiguration.common;
+
+import cc.carm.lib.configuration.core.ConfigurationRoot;
+import cc.carm.lib.configuration.core.source.ConfigurationProvider;
+import org.jetbrains.annotations.NotNull;
+
+public abstract class AbstractConfiguration<P extends ConfigurationProvider<?>> {
+
+    private final P configProvider;
+    private final P messageProvider;
+
+    protected AbstractConfiguration(@NotNull P configProvider, @NotNull P messageProvider) {
+        this.configProvider = configProvider;
+        this.messageProvider = messageProvider;
+    }
+
+    public void initializeConfig(@NotNull ConfigurationRoot configRoot) {
+        this.configProvider.initialize(configRoot);
+    }
+
+    public void initializeMessage(@NotNull ConfigurationRoot messageRoot) {
+        this.messageProvider.initialize(messageRoot);
+    }
+
+    public void initializeConfig(@NotNull Class<? extends ConfigurationRoot> configRoot) {
+        this.configProvider.initialize(configRoot);
+    }
+
+    public void initializeMessage(@NotNull Class<? extends ConfigurationRoot> messageRoot) {
+        this.messageProvider.initialize(messageRoot);
+    }
+
+    public P getConfigProvider() {
+        return configProvider;
+    }
+
+    public P getMessageProvider() {
+        return messageProvider;
+    }
+
+    public void reload() throws Exception {
+        getConfigProvider().reload();
+        getMessageProvider().reload();
+    }
+
+    public void save() throws Exception {
+        getConfigProvider().save();
+        getMessageProvider().save();
+    }
+
+}

common/src/main/java/cc/carm/lib/mineconfiguration/common/value/BaseMessage.java

@@ -38,6 +38,16 @@ public interface BaseMessage<R, M> {
     @ApiStatus.OverrideOnly
     void apply(@NotNull R receiver, @NotNull M message);
 
+    /**
+     * 填入变量值，返回一个准备好待发送的消息。
+     *
+     * @param values 变量值
+     * @return 准备好待发送的消息
+     */
+    default @NotNull PreparedMessage<R, M> prepare(@NotNull Object... values) {
+        return new PreparedMessage<>(this, values);
+    }
+
     /**
      * 为某位接收者解析此消息。
      *

common/src/main/java/cc/carm/lib/mineconfiguration/common/value/ConfigMessage.java

@@ -7,6 +7,7 @@ import cc.carm.lib.mineconfiguration.common.data.AbstractText;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
+import java.util.Collection;
 import java.util.Map;
 import java.util.function.BiConsumer;
 import java.util.function.BiFunction;
@@ -47,11 +48,20 @@ public abstract class ConfigMessage<M, T extends AbstractText<R>, R>
         sendFunction.accept(receiver, message);
     }
 
-    @Override
-    public @Nullable M parse(@Nullable R sender, @NotNull Map<String, Object> placeholders) {
+    protected <N> @Nullable N parseTo(@Nullable R sender, @NotNull Map<String, Object> placeholders,
+                                      @NotNull BiFunction<@Nullable R, @NotNull String, @Nullable N> parser) {
         T value = get();
         if (value == null || value.getMessage().isEmpty()) return null;
-        else return value.parse(this.messageParser, sender, placeholders);
+        else return value.parse(parser, sender, placeholders);
+    }
+
+    public @Nullable String parseString(@Nullable R sender, @NotNull Map<String, Object> placeholders) {
+        return parseTo(sender, placeholders, (r, s) -> s);
+    }
+
+    @Override
+    public @Nullable M parse(@Nullable R sender, @NotNull Map<String, Object> placeholders) {
+        return parseTo(sender, placeholders, this.messageParser);
     }
 
     public void set(@Nullable String value) {
@@ -62,4 +72,28 @@ public abstract class ConfigMessage<M, T extends AbstractText<R>, R>
         return textBuilder.apply(value);
     }
 
+    public abstract class PreparedMessage<P, N> {
+
+        protected final @NotNull Object[] values;
+
+        protected PreparedMessage(@NotNull Object[] values) {
+            this.values = values;
+        }
+
+        public Object[] getValues() {
+            return values;
+        }
+
+        public abstract void to(P receiver);
+
+        public void to(Collection<P> receivers) {
+            receivers.forEach(this::to);
+        }
+
+        public N get(P receiver) {
+            return null;
+        }
+
+    }
+
 }

common/src/main/java/cc/carm/lib/mineconfiguration/common/value/ConfigMessageList.java

@@ -4,6 +4,7 @@ import cc.carm.lib.configuration.core.function.ConfigDataFunction;
 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 cc.carm.lib.mineconfiguration.common.utils.ParamsUtils;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -68,14 +69,22 @@ public abstract class ConfigMessageList<M, T extends AbstractText<R>, R>
                 .collect(Collectors.toList());
     }
 
+    public @Nullable M parseToLine(@Nullable R receiver, @NotNull Object... values) {
+        return parseToLine(receiver, "\n", ParamsUtils.buildParams(this.params, values));
+    }
+
     public @Nullable M parseToLine(@Nullable R receiver, @NotNull Map<String, Object> placeholders) {
+        return parseToLine(receiver, "\n", placeholders);
+    }
+
+    public @Nullable M parseToLine(@Nullable R receiver, @NotNull String delimiter, @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);
+        String combined = String.join(delimiter, messages);
         T text = textBuilder.apply(combined);
 
         return text.parse(this.messageParser, receiver, placeholders);

common/src/main/java/cc/carm/lib/mineconfiguration/common/value/PreparedMessage.java

@@ -0,0 +1,48 @@
+package cc.carm.lib.mineconfiguration.common.value;
+
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+public class PreparedMessage<R, M> {
+
+    protected final @NotNull BaseMessage<R, M> message;
+    protected final @NotNull Object[] values;
+
+    protected PreparedMessage(@NotNull BaseMessage<R, M> message, @NotNull Object[] values) {
+        this.message = message;
+        this.values = values;
+    }
+
+    /**
+     * 为某位接收者解析此消息。
+     *
+     * @param receiver 接收者
+     * @return 解析变量后的消息内容
+     */
+    public @Nullable M parse(@Nullable R receiver) {
+        return message.parse(receiver, values);
+    }
+
+    /**
+     * 向某位接收者发送消息
+     *
+     * @param receiver 消息的接收者
+     */
+    public void to(@Nullable R receiver) {
+        message.send(receiver, values);
+    }
+
+    /**
+     * 向某位接收者发送消息
+     *
+     * @param receivers 消息的接收者们
+     */
+    public void to(@NotNull Iterable<R> receivers) {
+        receivers.forEach(this::to);
+    }
+
+    public void toAll() {
+        to(message.getAllReceivers());
+    }
+
+}

platform/bukkit/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>mineconfiguration-parent</artifactId>
         <groupId>cc.carm.lib</groupId>
-        <version>2.5.1</version>
+        <version>2.8.1</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
@@ -37,11 +37,18 @@
             <scope>compile</scope>
         </dependency>
 
+        <dependency>
+            <groupId>com.github.cryptomorin</groupId>
+            <artifactId>XSeries</artifactId>
+            <version>9.5.0</version>
+            <scope>compile</scope>
+        </dependency>
+
         <!--suppress VulnerableLibrariesLocal -->
         <dependency>
             <groupId>org.bukkit</groupId>
             <artifactId>bukkit</artifactId>
-            <version>1.8.8-R0.1-SNAPSHOT</version>
+            <version>1.13.2-R0.1-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
 
@@ -49,15 +56,7 @@
         <dependency>
             <groupId>me.clip</groupId>
             <artifactId>placeholderapi</artifactId>
-            <version>2.11.2</version>
-            <scope>provided</scope>
-        </dependency>
-
-        <!--ProtocolLib for general packet's function support-->
-        <dependency>
-            <groupId>com.comphenix.protocol</groupId>
-            <artifactId>ProtocolLib</artifactId>
-            <version>4.8.0</version>
+            <version>2.11.3</version>
             <scope>provided</scope>
         </dependency>
 

platform/bukkit/src/main/java/cc/carm/lib/mineconfiguration/bukkit/CraftConfigValue.java

@@ -7,9 +7,6 @@ import cc.carm.lib.mineconfiguration.bukkit.builder.CraftConfigBuilder;
 import cc.carm.lib.mineconfiguration.bukkit.source.CraftConfigProvider;
 import cc.carm.lib.mineconfiguration.bukkit.source.CraftSectionWrapper;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-import java.util.List;
 
 public abstract class CraftConfigValue<T> extends CachedConfigValue<T> {
 
@@ -17,7 +14,7 @@ public abstract class CraftConfigValue<T> extends CachedConfigValue<T> {
         return new CraftConfigBuilder();
     }
 
-    public CraftConfigValue(@NotNull ValueManifest<T> manifest) {
+    protected CraftConfigValue(@NotNull ValueManifest<T> manifest) {
         super(manifest);
     }
 

platform/bukkit/src/main/java/cc/carm/lib/mineconfiguration/bukkit/MineConfiguration.java

@@ -1,12 +1,16 @@
 package cc.carm.lib.mineconfiguration.bukkit;
 
+import cc.carm.lib.configuration.core.ConfigurationRoot;
 import cc.carm.lib.mineconfiguration.bukkit.source.BukkitConfigProvider;
+import cc.carm.lib.mineconfiguration.common.AbstractConfiguration;
 import org.bukkit.plugin.Plugin;
+import org.bukkit.plugin.java.JavaPlugin;
+import org.jetbrains.annotations.NotNull;
 
 import java.io.File;
 import java.io.IOException;
 
-public class MineConfiguration {
+public class MineConfiguration extends AbstractConfiguration<BukkitConfigProvider> {
 
     public static BukkitConfigProvider from(File file, String source) {
         BukkitConfigProvider provider = new BukkitConfigProvider(file);
@@ -39,4 +43,24 @@ public class MineConfiguration {
         return from(new File(plugin.getDataFolder(), fileName), source);
     }
 
+    public MineConfiguration(@NotNull JavaPlugin plugin) {
+        super(from(plugin, "config.yml"), from(plugin, "messages.yml"));
+    }
+
+    public MineConfiguration(@NotNull JavaPlugin plugin,
+                             @NotNull ConfigurationRoot configRoot,
+                             @NotNull ConfigurationRoot messageRoot) {
+        this(plugin);
+        initializeConfig(configRoot);
+        initializeMessage(messageRoot);
+    }
+
+    public MineConfiguration(@NotNull JavaPlugin plugin,
+                             @NotNull Class<? extends ConfigurationRoot> configRoot,
+                             @NotNull Class<? extends ConfigurationRoot> messageRoot) {
+        this(plugin);
+        initializeConfig(configRoot);
+        initializeMessage(messageRoot);
+    }
+
 }

platform/bukkit/src/main/java/cc/carm/lib/mineconfiguration/bukkit/builder/CraftConfigBuilder.java

@@ -6,11 +6,8 @@ import cc.carm.lib.mineconfiguration.bukkit.builder.message.CraftMessageBuilder;
 import cc.carm.lib.mineconfiguration.bukkit.builder.serializable.SerializableBuilder;
 import cc.carm.lib.mineconfiguration.bukkit.builder.sound.SoundConfigBuilder;
 import cc.carm.lib.mineconfiguration.bukkit.builder.title.TitleConfigBuilder;
-import cc.carm.lib.mineconfiguration.bukkit.data.ItemConfig;
-import cc.carm.lib.mineconfiguration.bukkit.value.ConfiguredItem;
 import org.bukkit.configuration.serialization.ConfigurationSerializable;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
 
 public class CraftConfigBuilder extends ConfigBuilder {
 
@@ -34,12 +31,4 @@ public class CraftConfigBuilder extends ConfigBuilder {
         return new SerializableBuilder<>(valueClass);
     }
 
-    public @NotNull ConfiguredItem ofItem() {
-        return createItem().build();
-    }
-
-    public @NotNull ConfiguredItem ofItem(@Nullable ItemConfig defaultItem) {
-        return createItem().defaults(defaultItem).build();
-    }
-
 }

platform/bukkit/src/main/java/cc/carm/lib/mineconfiguration/bukkit/builder/item/ItemConfigBuilder.java

@@ -2,19 +2,21 @@ 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;
 import cc.carm.lib.mineconfiguration.common.utils.ParamsUtils;
 import org.bukkit.Material;
 import org.bukkit.enchantments.Enchantment;
 import org.bukkit.inventory.ItemFlag;
+import org.bukkit.inventory.ItemStack;
+import org.bukkit.inventory.meta.ItemMeta;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.*;
 import java.util.function.Function;
+import java.util.function.UnaryOperator;
 
-public class ItemConfigBuilder extends AbstractCraftBuilder<ItemConfig, ItemConfigBuilder> {
+public class ItemConfigBuilder extends AbstractCraftBuilder<ItemStack, ItemConfigBuilder> {
 
     protected Material type;
     protected short data = 0;
@@ -84,7 +86,7 @@ public class ItemConfigBuilder extends AbstractCraftBuilder<ItemConfig, ItemConf
         return defaultFlags(new LinkedHashSet<>(Arrays.asList(flags)));
     }
 
-    public ItemConfigBuilder formatParam(@NotNull Function<@NotNull String, @NotNull String> paramFormatter) {
+    public ItemConfigBuilder formatParam(@NotNull UnaryOperator<String> paramFormatter) {
         this.paramFormatter = paramFormatter;
         return getThis();
     }
@@ -104,9 +106,20 @@ public class ItemConfigBuilder extends AbstractCraftBuilder<ItemConfig, ItemConf
         return this;
     }
 
-    protected @Nullable ItemConfig buildDefault() {
+    protected @Nullable ItemStack buildDefault() {
         if (this.type == null) return null;
-        else return new ItemConfig(type, data, name, lore, enchants, flags);
+
+        ItemStack item = new ItemStack(type, 1, data);
+        ItemMeta meta = item.getItemMeta();
+        if (meta == null) return item;
+
+        Optional.ofNullable(this.name).ifPresent(meta::setDisplayName);
+        Optional.ofNullable(this.lore).ifPresent(meta::setLore);
+        enchants.forEach((enchant, level) -> meta.addEnchant(enchant, level, true));
+        flags.forEach(meta::addItemFlags);
+        item.setItemMeta(meta);
+
+        return item;
     }
 
     @Override

platform/bukkit/src/main/java/cc/carm/lib/mineconfiguration/bukkit/builder/message/CraftMessageBuilder.java

@@ -1,6 +1,5 @@
 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;
@@ -9,7 +8,6 @@ import org.jetbrains.annotations.NotNull;
 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> {

platform/bukkit/src/main/java/cc/carm/lib/mineconfiguration/bukkit/builder/title/TitleConfigBuilder.java

@@ -2,43 +2,29 @@ package cc.carm.lib.mineconfiguration.bukkit.builder.title;
 
 import cc.carm.lib.mineconfiguration.bukkit.builder.AbstractCraftBuilder;
 import cc.carm.lib.mineconfiguration.bukkit.data.TitleConfig;
-import cc.carm.lib.mineconfiguration.bukkit.function.TitleSendConsumer;
-import cc.carm.lib.mineconfiguration.bukkit.utils.ProtocolLibHelper;
 import cc.carm.lib.mineconfiguration.bukkit.value.ConfiguredTitle;
 import cc.carm.lib.mineconfiguration.common.utils.ParamsUtils;
-import org.bukkit.Bukkit;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.annotations.Range;
 
 import java.util.List;
 import java.util.function.Function;
+import java.util.function.UnaryOperator;
 
 public class TitleConfigBuilder extends AbstractCraftBuilder<TitleConfig, TitleConfigBuilder> {
 
-    @SuppressWarnings("deprecation")
-    protected static @NotNull TitleSendConsumer DEFAULT_TITLE_CONSUMER = (player, fadeIn, stay, fadeOut, line1, line2) -> {
-        if (Bukkit.getPluginManager().isPluginEnabled("ProtocolLib")) {
-            try {
-                ProtocolLibHelper.sendTitle(player, fadeIn, stay, fadeOut, line1, line2);
-            } catch (Exception ignored) {
-            }
-        } else {
-            player.sendTitle(line1, line2);
-        }
-    };
-
     protected @NotNull String[] params = new String[0];
 
     protected @Range(from = 0L, to = Integer.MAX_VALUE) int fadeIn = 10;
     protected @Range(from = 0L, to = Integer.MAX_VALUE) int stay = 60;
     protected @Range(from = 0L, to = Integer.MAX_VALUE) int fadeOut = 10;
 
-    protected @NotNull TitleSendConsumer sendConsumer;
+    protected @NotNull ConfiguredTitle.TitleConsumer sendConsumer;
     protected @NotNull Function<@NotNull String, @NotNull String> paramFormatter;
 
     public TitleConfigBuilder() {
-        this.sendConsumer = TitleConfigBuilder.DEFAULT_TITLE_CONSUMER;
+        this.sendConsumer = ConfiguredTitle.DEFAULT_TITLE_CONSUMER;
         this.paramFormatter = ParamsUtils.DEFAULT_PARAM_FORMATTER;
     }
 
@@ -47,7 +33,7 @@ public class TitleConfigBuilder extends AbstractCraftBuilder<TitleConfig, TitleC
         return defaults(TitleConfig.of(line1, line2));
     }
 
-    public @NotNull TitleConfigBuilder whenSend(@NotNull TitleSendConsumer consumer) {
+    public @NotNull TitleConfigBuilder whenSend(@NotNull ConfiguredTitle.TitleConsumer consumer) {
         this.sendConsumer = consumer;
         return this;
     }
@@ -76,7 +62,7 @@ public class TitleConfigBuilder extends AbstractCraftBuilder<TitleConfig, TitleC
         return this;
     }
 
-    public TitleConfigBuilder formatParam(Function<String, String> paramFormatter) {
+    public TitleConfigBuilder formatParam(UnaryOperator<String> paramFormatter) {
         this.paramFormatter = paramFormatter;
         return this;
     }

platform/bukkit/src/main/java/cc/carm/lib/mineconfiguration/bukkit/data/ItemConfig.java

@@ -26,6 +26,8 @@ public class ItemConfig {
     protected @NotNull Map<Enchantment, Integer> enchants;
     protected @NotNull Set<ItemFlag> flags;
 
+    protected int customModelData = 0;
+
     public ItemConfig(@NotNull Material type, @Nullable String name) {
         this(type, name, Collections.emptyList());
     }
@@ -131,7 +133,7 @@ public class ItemConfig {
     public static @NotNull ItemConfig deserialize(@NotNull ConfigurationSection section) throws Exception {
         return deserialize(CraftSectionWrapper.of(section));
     }
-    
+
     public static @NotNull ItemConfig deserialize(@NotNull ConfigurationWrapper<?> section) throws Exception {
         String typeName = section.getString("type");
         if (typeName == null) throw new NullPointerException("Item type name is null");

platform/bukkit/src/main/java/cc/carm/lib/mineconfiguration/bukkit/data/TitleConfig.java

@@ -1,8 +1,8 @@
 package cc.carm.lib.mineconfiguration.bukkit.data;
 
 import cc.carm.lib.configuration.core.source.ConfigurationWrapper;
-import cc.carm.lib.mineconfiguration.bukkit.function.TitleSendConsumer;
 import cc.carm.lib.mineconfiguration.bukkit.utils.TextParser;
+import cc.carm.lib.mineconfiguration.bukkit.value.ConfiguredTitle;
 import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -25,20 +25,58 @@ public class TitleConfig {
         return new TitleConfig(line1, line2);
     }
 
+    public static @NotNull TitleConfig of(@Nullable String line1, @Nullable String line2,
+                                          int fadeIn, int stay, int fadeOut) {
+        return of(
+                Optional.ofNullable(line1).map(TextConfig::of).orElse(null),
+                Optional.ofNullable(line2).map(TextConfig::of).orElse(null),
+                fadeIn, stay, fadeOut
+        );
+    }
+
+    public static @NotNull TitleConfig of(@Nullable TextConfig line1, @Nullable TextConfig line2,
+                                          int fadeIn, int stay, int fadeOut) {
+        return new TitleConfig(line1, line2, fadeIn, stay, fadeOut);
+    }
+
     protected @Nullable TextConfig line1;
     protected @Nullable TextConfig line2;
 
+    protected final int fadeIn;
+    protected final int stay;
+    protected final int fadeOut;
+
     protected TitleConfig(@Nullable TextConfig line1, @Nullable TextConfig line2) {
+        this(line1, line2, -1, -1, -1);
+    }
+
+    protected TitleConfig(@Nullable TextConfig line1, @Nullable TextConfig line2, int fadeIn, int stay, int fadeOut) {
         this.line1 = line1;
         this.line2 = line2;
+        this.fadeIn = fadeIn;
+        this.stay = stay;
+        this.fadeOut = fadeOut;
     }
 
     public void send(@NotNull Player player,
-                     @Range(from = 0L, to = Long.MAX_VALUE) int fadeIn,
-                     @Range(from = 0L, to = Long.MAX_VALUE) int stay,
-                     @Range(from = 0L, to = Long.MAX_VALUE) int fadeOut,
                      @NotNull Map<String, Object> placeholders,
-                     @Nullable TitleSendConsumer sendConsumer) {
+                     @Nullable ConfiguredTitle.TitleConsumer sendConsumer) {
+        send(
+                player,
+                this.fadeIn < 0 ? 10 : this.fadeIn,
+                this.stay < 0 ? 60 : this.stay,
+                this.fadeOut < 0 ? 10 : this.fadeOut,
+                placeholders,
+                sendConsumer
+        );
+    }
+
+    public void send(@NotNull Player player,
+                     @Range(from = 0L, to = Integer.MAX_VALUE) int fadeIn,
+                     @Range(from = 0L, to = Integer.MAX_VALUE) int stay,
+                     @Range(from = 0L, to = Integer.MAX_VALUE) int fadeOut,
+                     @NotNull Map<String, Object> placeholders,
+                     @Nullable ConfiguredTitle.TitleConsumer sendConsumer) {
         if (this.line1 == null && this.line2 == null) return;
         if (sendConsumer == null) return;
         sendConsumer.send(
@@ -58,11 +96,23 @@ public class TitleConfig {
         Map<String, Object> map = new LinkedHashMap<>();
         if (this.line1 != null) map.put("line1", this.line1.getMessage());
         if (this.line2 != null) map.put("line2", this.line2.getMessage());
+        if (this.fadeIn > 0) map.put("fadeIn", this.fadeIn);
+        if (this.stay > 0) map.put("stay", this.stay);
+        if (this.fadeOut > 0) map.put("fadeOut", this.fadeOut);
         return map;
     }
 
-    public static @NotNull TitleConfig deserialize(@NotNull ConfigurationWrapper<?> section) {
-        return of(section.getString("line1"), section.getString("line2"));
+    public static @Nullable TitleConfig deserialize(@NotNull ConfigurationWrapper<?> section) {
+        String line1 = section.getString("line1");
+        String line2 = section.getString("line2");
+        if (line1 == null && line2 == null) return null;
+
+        return of(
+                line1, line2,
+                section.getInt("fadeIn", -1),
+                section.getInt("stay", -1),
+                section.getInt("fadeOut", -1)
+        );
     }
 
 }

platform/bukkit/src/main/java/cc/carm/lib/mineconfiguration/bukkit/function/TitleSendConsumer.java

@@ -1,26 +0,0 @@
-package cc.carm.lib.mineconfiguration.bukkit.function;
-
-import org.bukkit.entity.Player;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Range;
-
-@FunctionalInterface
-public interface TitleSendConsumer {
-
-    /**
-     * 向目标玩家发送标题文字
-     *
-     * @param player  目标玩家
-     * @param fadeIn  淡入时间 (ticks)
-     * @param stay    保留时间 (ticks)
-     * @param fadeOut 淡出时间 (ticks)
-     * @param line1   第一行文字
-     * @param line2   第二行文字
-     */
-    void send(@NotNull Player player,
-              @Range(from = 0L, to = Integer.MAX_VALUE) int fadeIn,
-              @Range(from = 0L, to = Integer.MAX_VALUE) int stay,
-              @Range(from = 0L, to = Integer.MAX_VALUE) int fadeOut,
-              @NotNull String line1, @NotNull String line2);
-
-}

platform/bukkit/src/main/java/cc/carm/lib/mineconfiguration/bukkit/utils/ProtocolLibHelper.java

@@ -1,41 +0,0 @@
-package cc.carm.lib.mineconfiguration.bukkit.utils;
-
-import com.comphenix.protocol.PacketType;
-import com.comphenix.protocol.ProtocolLibrary;
-import com.comphenix.protocol.ProtocolManager;
-import com.comphenix.protocol.events.PacketContainer;
-import com.comphenix.protocol.wrappers.EnumWrappers;
-import com.comphenix.protocol.wrappers.WrappedChatComponent;
-import org.bukkit.entity.Player;
-import org.jetbrains.annotations.NotNull;
-
-public class ProtocolLibHelper {
-
-    @SuppressWarnings("deprecation")
-    public static void sendTitle(@NotNull Player player, long fadeIn, long stay, long fadeOut, String line1, String line2) throws Exception {
-        ProtocolManager pm = ProtocolLibrary.getProtocolManager();
-
-        if (line1 != null) {
-            PacketContainer packet = pm.createPacket(PacketType.Play.Server.TITLE);
-            packet.getTitleActions().write(0, EnumWrappers.TitleAction.TITLE);
-            packet.getChatComponents().write(0, WrappedChatComponent.fromText(line1));
-            pm.sendServerPacket(player, packet, false);
-        }
-
-        if (line2 != null) {
-            PacketContainer packet = pm.createPacket(PacketType.Play.Server.TITLE);
-            packet.getTitleActions().write(0, EnumWrappers.TitleAction.SUBTITLE);
-            packet.getChatComponents().write(0, WrappedChatComponent.fromText(line2));
-            pm.sendServerPacket(player, packet, false);
-        }
-
-        PacketContainer timePacket = pm.createPacket(PacketType.Play.Server.TITLE);
-        timePacket.getTitleActions().write(0, EnumWrappers.TitleAction.TIMES);
-        timePacket.getIntegers()
-                .write(0, Math.toIntExact(fadeIn))
-                .write(1, Math.toIntExact(stay))
-                .write(2, Math.toIntExact(fadeOut));
-        pm.sendServerPacket(player, timePacket, false);
-    }
-
-}

platform/bukkit/src/main/java/cc/carm/lib/mineconfiguration/bukkit/value/ConfiguredItem.java

@@ -1,71 +1,111 @@
 package cc.carm.lib.mineconfiguration.bukkit.value;
 
-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.utils.TextParser;
 import cc.carm.lib.mineconfiguration.common.utils.ParamsUtils;
+import com.cryptomorin.xseries.XItemStack;
+import org.bukkit.configuration.ConfigurationSection;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
+import org.bukkit.inventory.meta.ItemMeta;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-import java.util.HashMap;
-import java.util.Map;
+import java.util.*;
+import java.util.function.Consumer;
 
-public class ConfiguredItem extends ConfiguredSection<ItemConfig> {
+public class ConfiguredItem extends ConfiguredSection<ItemStack> {
 
     public static ItemConfigBuilder create() {
-        return CraftConfigValue.builder().createItem();
-    }
-
-    public static ConfiguredItem of() {
-        return CraftConfigValue.builder().ofItem();
-    }
-
-    public static ConfiguredItem of(@Nullable ItemConfig defaultItem) {
-        return CraftConfigValue.builder().ofItem(defaultItem);
+        return new ItemConfigBuilder();
     }
 
     protected final @NotNull String[] params;
 
-    public ConfiguredItem(@NotNull ValueManifest<ItemConfig> manifest, @NotNull String[] params) {
+    public ConfiguredItem(@NotNull ValueManifest<ItemStack> manifest, @NotNull String[] params) {
         super(
-                manifest, ItemConfig.class,
-                getItemParser(), ItemConfig::serialize
+                manifest, ItemStack.class,
+                (data, v) -> XItemStack.deserialize((ConfigurationSection) data.getSource()),
+                XItemStack::serialize
         );
         this.params = params;
     }
 
-    public static ConfigValueParser<ConfigurationWrapper<?>, ItemConfig> getItemParser() {
-        return (s, d) -> ItemConfig.deserialize(s);
-    }
-
     public @NotNull String[] getParams() {
         return params;
     }
 
-    public @Nullable ItemStack getItem(@Nullable Player player) {
-        return getItem(player, 1);
+    @Override
+    public @Nullable ItemStack get() {
+        return Optional.ofNullable(super.get()).map(ItemStack::clone).orElse(null);
     }
 
-    public @Nullable ItemStack getItem(@Nullable Player player, int amount) {
-        return getItem(player, amount, new HashMap<>());
+    public void modifyItem(Consumer<ItemStack> modifier) {
+        ItemStack item = get();
+        if (item == null) return;
+        modifier.accept(item);
+        set(item);
     }
 
-    public @Nullable ItemStack getItem(@Nullable Player player, int amount, @NotNull Object... values) {
-        return getItem(player, amount, ParamsUtils.buildParams(params, values));
+    public void modifyMeta(Consumer<ItemMeta> modifier) {
+        modifyItem(item -> {
+            ItemMeta meta = item.getItemMeta();
+            modifier.accept(meta);
+            item.setItemMeta(meta);
+        });
     }
 
-    public @Nullable ItemStack getItem(@Nullable Player player, int amount, @NotNull String[] params, @NotNull Object[] values) {
-        return getItem(player, amount, ParamsUtils.buildParams(params, values));
+    public void setName(@Nullable String name) {
+        modifyMeta(meta -> meta.setDisplayName(name));
     }
 
-    public @Nullable ItemStack getItem(@Nullable Player player, int amount, @NotNull Map<String, Object> placeholders) {
-        return getOptional().map(item -> item.getItemStack(player, amount, placeholders)).orElse(null);
+    public void setLore(@Nullable List<String> lore) {
+        modifyMeta(meta -> meta.setLore(lore));
+    }
+
+    public void setLore(String... lore) {
+        if (lore.length == 0) setLore((List<String>) null);
+        else setLore(Arrays.asList(lore));
+    }
+
+    public @Nullable ItemStack get(@Nullable Player player) {
+        return get(player, new HashMap<>());
+    }
+
+    public @Nullable ItemStack get(@Nullable Player player, @NotNull Object... values) {
+        return get(player, ParamsUtils.buildParams(params, values));
+    }
+
+    public @Nullable ItemStack get(@Nullable Player player, @NotNull String[] params, @NotNull Object[] values) {
+        return get(player, ParamsUtils.buildParams(params, values));
+    }
+
+    public @Nullable ItemStack get(@Nullable Player player, @NotNull Map<String, Object> placeholders) {
+        return get(item -> {
+            ItemMeta meta = item.getItemMeta();
+            if (meta == null) return;
+
+            List<String> lore = meta.getLore();
+            if (lore != null && !lore.isEmpty()) {
+                meta.setLore(TextParser.parseList(player, lore, placeholders));
+            }
+
+            String name = meta.getDisplayName();
+            if (!name.isEmpty()) {
+                meta.setDisplayName(TextParser.parseText(player, name, placeholders));
+            }
+
+            item.setItemMeta(meta);
+        });
+    }
+
+    public @Nullable ItemStack get(Consumer<ItemStack> modifier) {
+        return getOptional().map(item -> {
+            modifier.accept(item);
+            return item;
+        }).orElse(null);
     }
 
 }

platform/bukkit/src/main/java/cc/carm/lib/mineconfiguration/bukkit/value/ConfiguredMessage.java

@@ -4,15 +4,19 @@ 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;
+import cc.carm.lib.mineconfiguration.common.utils.ParamsUtils;
 import cc.carm.lib.mineconfiguration.common.value.ConfigMessage;
+import com.cryptomorin.xseries.messages.ActionBar;
 import org.bukkit.Bukkit;
 import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 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;
 
@@ -41,6 +45,14 @@ public class ConfiguredMessage<M> extends ConfigMessage<M, TextConfig, CommandSe
         super(manifest, TextConfig.class, params, messageParser, sendFunction, TextConfig::of);
     }
 
+    public void sendActionBar(Player player, String... values) {
+        sendActionBar(player, ParamsUtils.buildParams(this.params, values));
+    }
+
+    public void sendActionBar(Player player, Map<String, Object> placeholders) {
+        ActionBar.sendActionBar(player, parseString(player, placeholders));
+    }
+
     @Override
     public @NotNull Collection<CommandSender> getAllReceivers() {
         List<CommandSender> senders = new ArrayList<>();

platform/bukkit/src/main/java/cc/carm/lib/mineconfiguration/bukkit/value/ConfiguredSerializable.java

@@ -35,7 +35,7 @@ public class ConfiguredSerializable<T extends ConfigurationSerializable> extends
             } catch (Exception e) {
                 // 出现了解析错误，提示并返回默认值。
                 e.printStackTrace();
-                return useDefault();
+                return getDefaultValue();
             }
         } else return Optional.ofNullable(getCachedValue()).orElse(defaultValue);
     }

platform/bukkit/src/main/java/cc/carm/lib/mineconfiguration/bukkit/value/ConfiguredTitle.java

@@ -7,8 +7,8 @@ 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;
 import cc.carm.lib.mineconfiguration.bukkit.data.TitleConfig;
-import cc.carm.lib.mineconfiguration.bukkit.function.TitleSendConsumer;
 import cc.carm.lib.mineconfiguration.common.utils.ParamsUtils;
+import com.cryptomorin.xseries.messages.Titles;
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
@@ -22,6 +22,8 @@ import java.util.function.Predicate;
 
 public class ConfiguredTitle extends ConfiguredSection<TitleConfig> {
 
+    public static final @NotNull ConfiguredTitle.TitleConsumer DEFAULT_TITLE_CONSUMER = Titles::sendTitle;
+
     public static TitleConfigBuilder create() {
         return CraftConfigValue.builder().createTitle();
     }
@@ -35,7 +37,7 @@ public class ConfiguredTitle extends ConfiguredSection<TitleConfig> {
         return create().defaults(line1, line2).fadeIn(fadeIn).stay(stay).fadeOut(fadeOut).build();
     }
 
-    protected final @NotNull TitleSendConsumer sendConsumer;
+    protected final @NotNull ConfiguredTitle.TitleConsumer sendConsumer;
     protected final @NotNull String[] params;
 
     protected final int fadeIn;
@@ -43,7 +45,7 @@ public class ConfiguredTitle extends ConfiguredSection<TitleConfig> {
     protected final int fadeOut;
 
     public ConfiguredTitle(@NotNull ValueManifest<TitleConfig> manifest, @NotNull String[] params,
-                           @NotNull TitleSendConsumer sendConsumer,
+                           @NotNull ConfiguredTitle.TitleConsumer sendConsumer,
                            int fadeIn, int stay, int fadeOut) {
         super(manifest, TitleConfig.class, getTitleParser(), TitleConfig::serialize);
         this.sendConsumer = sendConsumer;
@@ -68,7 +70,7 @@ public class ConfiguredTitle extends ConfiguredSection<TitleConfig> {
         return fadeOut;
     }
 
-    public @NotNull TitleSendConsumer getSendConsumer() {
+    public @NotNull ConfiguredTitle.TitleConsumer getSendConsumer() {
         return sendConsumer;
     }
 
@@ -116,4 +118,26 @@ public class ConfiguredTitle extends ConfiguredSection<TitleConfig> {
     public static ConfigValueParser<ConfigurationWrapper<?>, TitleConfig> getTitleParser() {
         return (s, d) -> TitleConfig.deserialize(s);
     }
+
+    @FunctionalInterface
+    public interface TitleConsumer {
+
+        /**
+         * 向目标玩家发送标题文字
+         *
+         * @param player  目标玩家
+         * @param fadeIn  淡入时间 (ticks)
+         * @param stay    保留时间 (ticks)
+         * @param fadeOut 淡出时间 (ticks)
+         * @param line1   第一行文字
+         * @param line2   第二行文字
+         */
+        void send(@NotNull Player player,
+                  @Range(from = 0L, to = Integer.MAX_VALUE) int fadeIn,
+                  @Range(from = 0L, to = Integer.MAX_VALUE) int stay,
+                  @Range(from = 0L, to = Integer.MAX_VALUE) int fadeOut,
+                  @NotNull String line1, @NotNull String line2);
+
+    }
+
 }

platform/bungee/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>mineconfiguration-parent</artifactId>
         <groupId>cc.carm.lib</groupId>
-        <version>2.5.1</version>
+        <version>2.8.1</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

platform/bungee/src/main/java/cc/carm/lib/mineconfiguration/bungee/MineConfiguration.java

@@ -1,15 +1,18 @@
 package cc.carm.lib.mineconfiguration.bungee;
 
+import cc.carm.lib.configuration.core.ConfigurationRoot;
 import cc.carm.lib.mineconfiguration.bungee.source.BungeeConfigProvider;
+import cc.carm.lib.mineconfiguration.common.AbstractConfiguration;
 import net.md_5.bungee.api.plugin.Plugin;
 import net.md_5.bungee.config.ConfigurationProvider;
 import net.md_5.bungee.config.JsonConfiguration;
 import net.md_5.bungee.config.YamlConfiguration;
+import org.jetbrains.annotations.NotNull;
 
 import java.io.File;
 import java.io.IOException;
 
-public class MineConfiguration {
+public class MineConfiguration extends AbstractConfiguration<BungeeConfigProvider> {
 
     protected static BungeeConfigProvider create(File file, String source, ConfigurationProvider loader) {
         BungeeConfigProvider provider = new BungeeConfigProvider(file, loader);
@@ -94,4 +97,26 @@ public class MineConfiguration {
         return fromJSON(new File(plugin.getDataFolder(), fileName), source);
     }
 
+
+    public MineConfiguration(@NotNull Plugin plugin) {
+        super(from(plugin, "config.yml"), from(plugin, "messages.yml"));
+    }
+
+    public MineConfiguration(@NotNull Plugin plugin,
+                             @NotNull ConfigurationRoot configRoot,
+                             @NotNull ConfigurationRoot messageRoot) {
+        this(plugin);
+        initializeConfig(configRoot);
+        initializeMessage(messageRoot);
+    }
+
+    public MineConfiguration(@NotNull Plugin plugin,
+                             @NotNull Class<? extends ConfigurationRoot> configRoot,
+                             @NotNull Class<? extends ConfigurationRoot> messageRoot) {
+        this(plugin);
+        initializeConfig(configRoot);
+        initializeMessage(messageRoot);
+    }
+
+
 }

platform/bungee/src/test/java/ConfigTest.java

@@ -52,7 +52,7 @@ public class ConfigTest {
 
             @HeaderComment("执行的指令列表")
             @InlineComment("建议以\"\"包裹")
-            public static final ConfigValue<List<String>> COMMANDS = ConfiguredList.builder(String.class)
+            public static final ConfigValue<List<String>> COMMANDS = ConfiguredList.builderOf(String.class)
                     .fromString().defaults("alert Commands here!").build();
         }
 

pom.xml

@@ -10,14 +10,14 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <maven.compiler.encoding>UTF-8</maven.compiler.encoding>
 
-        <deps.easyconfifuration.version>3.5.1</deps.easyconfifuration.version>
-        <deps.easyplugin.version>1.5.4</deps.easyplugin.version>
+        <deps.easyconfifuration.version>3.8.0</deps.easyconfifuration.version>
+        <deps.easyplugin.version>1.5.7</deps.easyplugin.version>
         <deps.yamlcommentwriter.version>1.0.1</deps.yamlcommentwriter.version>
     </properties>
 
     <groupId>cc.carm.lib</groupId>
     <artifactId>mineconfiguration-parent</artifactId>
-    <version>2.5.1</version>
+    <version>2.8.1</version>
     <packaging>pom</packaging>
     <modules>
         <module>common</module>
@@ -122,7 +122,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
-                <version>3.0.0</version>
+                <version>3.1.2</version>
                 <configuration>
                     <useSystemClassLoader>false</useSystemClassLoader>
                 </configuration>
@@ -130,7 +130,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-gpg-plugin</artifactId>
-                <version>3.0.1</version>
+                <version>3.1.0</version>
                 <executions>
                     <execution>
                         <id>sign-artifacts</id>
@@ -150,7 +150,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-release-plugin</artifactId>
-                <version>2.5.3</version>
+                <version>3.0.1</version>
                 <configuration>
                     <autoVersionSubmodules>true</autoVersionSubmodules>
                     <useReleaseProfile>false</useReleaseProfile>
@@ -178,7 +178,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-source-plugin</artifactId>
-                <version>3.2.1</version>
+                <version>3.3.0</version>
                 <executions>
                     <execution>
                         <phase>package</phase>
@@ -225,7 +225,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-shade-plugin</artifactId>
-                    <version>3.4.1</version>
+                    <version>3.5.0</version>
                     <executions>
                         <execution>
                             <phase>package</phase>