chore(deps): bump com.github.cryptomorin:XSeries from 13.6.0 to 13.7.0

Bumps [com.github.cryptomorin:XSeries](https://github.com/CryptoMorin/XSeries) from 13.6.0 to 13.7.0.
- [Release notes](https://github.com/CryptoMorin/XSeries/releases)
- [Commits](https://github.com/CryptoMorin/XSeries/compare/v13.6.0...v13.7.0)

---
updated-dependencies:
- dependency-name: com.github.cryptomorin:XSeries
  dependency-version: 13.7.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

.github/workflows/codacy-analysis.yml

@@ -29,11 +29,11 @@ jobs:
     steps:
       # Checkout the repository to the GitHub Actions runner
       - name: Checkout code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
       # Execute Codacy Analysis CLI and generate a SARIF output with the security issues identified during the analysis
       - name: Run Codacy Analysis CLI
-        uses: codacy/codacy-analysis-cli-action@09916000460adeeedc96b9704f86deba53e2ad5d
+        uses: codacy/codacy-analysis-cli-action@30783d03e758713bb5ed7b79292cfb14b9dd9a4a
         with:
           # Check https://github.com/codacy/codacy-analysis-cli#project-token to get your project token from your Codacy repository
           # You can also omit the token and run the tools that support default configurations
@@ -49,6 +49,6 @@ jobs:
 
       # Upload the SARIF file generated in the previous step
       - name: Upload SARIF results file
-        uses: github/codeql-action/upload-sarif@v3
+        uses: github/codeql-action/upload-sarif@v4
         with:
           sarif_file: results.sarif

.github/workflows/codeql-analysis.yml

@@ -38,11 +38,11 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@v3
+        uses: github/codeql-action/init@v4
         with:
           languages: ${{ matrix.language }}
           # If you wish to specify custom queries, you can do so here or in a config file.
@@ -53,7 +53,7 @@ jobs:
       # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
       # If this step fails, then you should remove it and run the build manually (see below)
       - name: Autobuild
-        uses: github/codeql-action/autobuild@v3
+        uses: github/codeql-action/autobuild@v4
 
       # ℹ️ Command-line programs to run using the OS shell.
       # 📚 https://git.io/JvXDl
@@ -67,4 +67,4 @@ jobs:
       #   make release
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@v3
+        uses: github/codeql-action/analyze@v4

.github/workflows/deploy.yml

@@ -16,9 +16,9 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
       - name: "Set up JDK"
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
         with:
           java-version: '17'
           distribution: 'adopt'
@@ -41,9 +41,9 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
       - name: "Set up JDK"
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
         with:
           java-version: '17'
           distribution: 'adopt'

.github/workflows/maven.yml

@@ -15,18 +15,26 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
       - name: "Set up JDK"
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
         with:
           java-version: '17'
           distribution: 'adopt'
+          cache: maven
+          server-id: github
+          server-username: MAVEN_USERNAME
+          server-password: MAVEN_TOKEN
       - name: "Package"
         run: mvn -B package --file pom.xml -Dgpg.skip
+        env:
+          MAVEN_USERNAME: ${{ github.repository_owner }}
+          MAVEN_TOKEN: ${{secrets.GITHUB_TOKEN}}
+          MAVEN_GPG_PASSPHRASE: ${{ secrets.MAVEN_GPG_PASSPHRASE }}
       - name: "Target Stage"
         run: mkdir staging && cp */target/*.jar staging
       - name: "Upload artifact"
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7
         with:
           name: Artifact
           path: staging

README.md

@@ -12,7 +12,6 @@
 [![License](https://img.shields.io/github/license/CarmJos/MineConfiguration)](https://opensource.org/licenses/MIT)
 [![workflow](https://github.com/CarmJos/MineConfiguration/actions/workflows/maven.yml/badge.svg?branch=master)](https://github.com/CarmJos/MineConfiguration/actions/workflows/maven.yml)
 ![CodeSize](https://img.shields.io/github/languages/code-size/CarmJos/MineConfiguration)
-![](https://visitor-badge.glitch.me/badge?page_id=MineConfiguration.readme)
 
 EasyConfiguration for MineCraft!
 

common/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>mineconfiguration-parent</artifactId>
         <groupId>cc.carm.lib</groupId>
-        <version>3.0.2</version>
+        <version>3.1.4</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <properties>
@@ -23,29 +23,29 @@
 
         <dependency>
             <groupId>cc.carm.lib</groupId>
-            <artifactId>easyconfiguration-core</artifactId>
+            <artifactId>configured-core</artifactId>
-            <version>${deps.easyconfifuration.version}</version>
+            <version>${deps.configured.version}</version>
             <scope>compile</scope>
         </dependency>
 
         <dependency>
             <groupId>cc.carm.lib</groupId>
-            <artifactId>easyconfiguration-feature-commentable</artifactId>
+            <artifactId>configured-feature-commentable</artifactId>
-            <version>${deps.easyconfifuration.version}</version>
+            <version>${deps.configured.version}</version>
             <scope>compile</scope>
         </dependency>
 
         <dependency>
             <groupId>cc.carm.lib</groupId>
-            <artifactId>easyconfiguration-feature-file</artifactId>
+            <artifactId>configured-feature-file</artifactId>
-            <version>${deps.easyconfifuration.version}</version>
+            <version>${deps.configured.version}</version>
             <scope>compile</scope>
         </dependency>
 
         <dependency>
             <groupId>cc.carm.lib</groupId>
-            <artifactId>easyconfiguration-feature-text</artifactId>
+            <artifactId>configured-feature-text</artifactId>
-            <version>${deps.easyconfifuration.version}</version>
+            <version>${deps.configured.version}</version>
             <scope>compile</scope>
         </dependency>
 
@@ -60,7 +60,7 @@
         <dependency>
             <groupId>net.md-5</groupId>
             <artifactId>bungeecord-chat</artifactId>
-            <version>1.20-R0.2-deprecated+build.19</version>
+            <version>1.21-R0.4</version>
             <scope>provided</scope>
         </dependency>
 

platform/adventure/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>mineconfiguration-parent</artifactId>
         <groupId>cc.carm.lib</groupId>
-        <version>3.0.2</version>
+        <version>3.1.4</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
@@ -14,12 +14,14 @@
         <maven.compiler.target>17</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <maven.compiler.encoding>UTF-8</maven.compiler.encoding>
+
+        <deps.adventure.version>4.26.1</deps.adventure.version>
     </properties>
     <artifactId>mineconfiguration-velocity</artifactId>
     <packaging>jar</packaging>
 
-    <name>MineConfiguration-Velocity</name>
+    <name>MineConfiguration-Adventure</name>
-    <description>轻松(做)配置，适用于Velocity的版本，可用JSON与YAML格式。</description>
+    <description>轻松(做)配置，适用于基于Adventure的平台(如Velocity、Paper)，可用JSON与YAML格式。</description>
 
     <dependencies>
 
@@ -32,18 +34,35 @@
 
         <dependency>
             <groupId>cc.carm.lib</groupId>
-            <artifactId>easyconfiguration-yaml</artifactId>
+            <artifactId>configured-yaml</artifactId>
-            <version>${deps.easyconfifuration.version}</version>
+            <version>${deps.configured.version}</version>
             <scope>compile</scope>
         </dependency>
 
         <dependency>
-            <groupId>com.velocitypowered</groupId>
+            <groupId>net.kyori</groupId>
-            <artifactId>velocity-api</artifactId>
+            <artifactId>adventure-api</artifactId>
-            <version>3.4.0-SNAPSHOT</version>
+            <version>${deps.adventure.version}</version>
-            <scope>provided</scope>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>net.kyori</groupId>
+            <artifactId>adventure-text-serializer-legacy</artifactId>
+            <version>${deps.adventure.version}</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>net.kyori</groupId>
+            <artifactId>adventure-text-serializer-plain</artifactId>
+            <version>${deps.adventure.version}</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>net.kyori</groupId>
+            <artifactId>adventure-text-minimessage</artifactId>
+            <version>${deps.adventure.version}</version>
+            <scope>compile</scope>
         </dependency>
-
     </dependencies>
 
     <build>

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

@@ -1,4 +1,4 @@
-package cc.carm.lib.mineconfiguration.velocity;
+package cc.carm.lib.mineconfiguration.adventure;
 
 import cc.carm.lib.configuration.Configuration;
 import cc.carm.lib.configuration.source.ConfigurationHolder;
@@ -13,8 +13,8 @@ public class MineConfiguration extends AbstractConfiguration<ConfigurationHolder
 
     public MineConfiguration(@NotNull File pluginDataFolder) {
         super(
-                YAMLConfigFactory.from(pluginDataFolder, "config.yml").resourcePath("config.yml").build(),
+                YAMLConfigFactory.from(pluginDataFolder, "config.yml").build(),
-                YAMLConfigFactory.from(pluginDataFolder, "messages.yml").resourcePath("messages.yml").build()
+                YAMLConfigFactory.from(pluginDataFolder, "messages.yml").build()
         );
     }
 

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

@@ -1,4 +1,4 @@
-package cc.carm.lib.mineconfiguration.velocity.value;
+package cc.carm.lib.mineconfiguration.adventure.value;
 
 import cc.carm.lib.configuration.value.ValueManifest;
 import cc.carm.lib.configuration.value.text.ConfiguredText;
@@ -6,15 +6,23 @@ import cc.carm.lib.configuration.value.text.data.TextContents;
 import cc.carm.lib.easyplugin.utils.ColorParser;
 import net.kyori.adventure.audience.Audience;
 import net.kyori.adventure.text.Component;
+import net.kyori.adventure.text.serializer.ComponentSerializer;
+import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.List;
+import java.util.concurrent.atomic.AtomicReference;
 import java.util.function.BiConsumer;
 import java.util.function.BiFunction;
 
 public class ConfiguredMessage extends ConfiguredText<Component, Audience> {
 
+    public static final LegacyComponentSerializer LEGACY_SERIALIZER = LegacyComponentSerializer.legacySection();
+
+    public static AtomicReference<ComponentSerializer<?, ?, String>> SERIALIZER = new AtomicReference<>(LEGACY_SERIALIZER);
+
     @NotNull
+
     public static ConfiguredMessage.Builder create() {
         return new Builder();
     }
@@ -23,7 +31,7 @@ public class ConfiguredMessage extends ConfiguredText<Component, Audience> {
         return create().defaults(messages).build();
     }
 
-    public ConfiguredMessage(@NotNull ValueManifest<TextContents> manifest,
+    public ConfiguredMessage(@NotNull ValueManifest<TextContents, TextContents> manifest,
                              @NotNull BiFunction<Audience, String, String> parser,
                              @NotNull BiFunction<Audience, String, Component> compiler,
                              @NotNull BiConsumer<Audience, List<Component>> dispatcher,
@@ -41,7 +49,7 @@ public class ConfiguredMessage extends ConfiguredText<Component, Audience> {
         public Builder() {
             super();
             this.parser = (receiver, message) -> ColorParser.parse(message);
-            this.compiler = (receiver, message) -> Component.text(message);
+            this.compiler = (receiver, message) -> SERIALIZER.get().deserialize(message);
             this.dispatcher = (receiver, message) -> message.forEach(receiver::sendMessage);
         }
 

platform/bukkit/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>mineconfiguration-parent</artifactId>
         <groupId>cc.carm.lib</groupId>
-        <version>3.0.2</version>
+        <version>3.1.4</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
@@ -40,7 +40,7 @@
         <dependency>
             <groupId>com.github.cryptomorin</groupId>
             <artifactId>XSeries</artifactId>
-            <version>13.0.0</version>
+            <version>13.7.0</version>
             <scope>compile</scope>
         </dependency>
 
@@ -52,6 +52,13 @@
             <scope>provided</scope>
         </dependency>
 
+        <dependency>
+            <groupId>net.md-5</groupId>
+            <artifactId>bungeecord-chat</artifactId>
+            <version>1.21-R0.4</version>
+            <scope>provided</scope>
+        </dependency>
+
         <!--PlaceholderAPI for general placeholder's support-->
         <dependency>
             <groupId>me.clip</groupId>

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

@@ -8,17 +8,25 @@ import cc.carm.lib.mineconfiguration.common.AbstractConfiguration;
 import org.bukkit.plugin.Plugin;
 import org.bukkit.plugin.java.JavaPlugin;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 import java.io.File;
 
 public class MineConfiguration extends AbstractConfiguration<ConfigurationHolder<BukkitSource>> {
 
-    public static ConfigurationHolder<BukkitSource> from(File file, String source) {
+    public static ConfigurationHolder<BukkitSource> from(@NotNull File file,
+                                                         @Nullable String source) {
         return BukkitConfigFactory.from(file).resourcePath(source).build();
     }
 
-    public static ConfigurationHolder<BukkitSource> from(Plugin plugin, String fileName) {
+    public static ConfigurationHolder<BukkitSource> from(@NotNull Plugin plugin,
-        return from(new File(plugin.getDataFolder(), fileName), fileName);
+                                                         @NotNull String fileName) {
+        return from(plugin, fileName, null);
+    }
+
+    public static ConfigurationHolder<BukkitSource> from(@NotNull Plugin plugin,
+                                                         @NotNull String fileName, @Nullable String resource) {
+        return from(new File(plugin.getDataFolder(), fileName), resource);
     }
 
     public MineConfiguration(@NotNull JavaPlugin plugin) {

platform/bukkit/src/main/java/cc/carm/lib/mineconfiguration/bukkit/source/BukkitSection.java

@@ -6,9 +6,7 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.annotations.UnmodifiableView;
 
-import java.util.Collections;
+import java.util.*;
-import java.util.Map;
-import java.util.Set;
 
 public class BukkitSection implements ConfigureSection {
 
@@ -62,6 +60,38 @@ public class BukkitSection implements ConfigureSection {
         return Collections.unmodifiableMap(original);
     }
 
+    public Map<String, Object> toMap(ConfigurationSection section) {
+        Map<String, Object> map = new LinkedHashMap<>();
+        for (String key : section.getKeys(false)) {
+            Object value = section.get(key);
+            if (value instanceof ConfigurationSection) {
+                map.put(key, toMap((ConfigurationSection) value));
+            } else if (value instanceof BukkitSection) {
+                map.put(key, toMap(((BukkitSection) value).data()));
+            } else if (value instanceof List<?>) {
+                List<Object> list = new ArrayList<>();
+                for (Object o : (List<?>) value) {
+                    if (o instanceof ConfigurationSection) {
+                        list.add(toMap((ConfigurationSection) o));
+                    } else if (o instanceof BukkitSection) {
+                        list.add(toMap(((BukkitSection) o).data()));
+                    } else {
+                        list.add(o);
+                    }
+                }
+                map.put(key, list);
+            } else {
+                map.put(key, value);
+            }
+        }
+        return map;
+    }
+
+    @Override
+    public @NotNull @UnmodifiableView Map<String, Object> asMap() {
+        return toMap(data());
+    }
+
     @Override
     public void set(@NotNull String path, @Nullable Object value) {
         if (value instanceof BukkitSection) { // unwrap

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

@@ -38,7 +38,7 @@ public class ConfiguredMessage<M> extends ConfiguredText<M, CommandSender> {
         return asString().defaults(messages).build();
     }
 
-    public ConfiguredMessage(@NotNull ValueManifest<TextContents> manifest,
+    public ConfiguredMessage(@NotNull ValueManifest<TextContents, TextContents> manifest,
                              @NotNull BiFunction<CommandSender, String, String> parser,
                              @NotNull BiFunction<CommandSender, String, M> compiler,
                              @NotNull BiConsumer<CommandSender, List<M>> dispatcher,
@@ -46,8 +46,8 @@ public class ConfiguredMessage<M> extends ConfiguredText<M, CommandSender> {
         super(manifest, parser, compiler, dispatcher, params);
     }
 
-    public void sendActionBar(Player player, Object... values) {
+    public void sendActionBar(@NotNull Player player, Object... values) {
-        ActionBar.sendActionBar(player, prepare(values).parseLine(player, (sender, message) -> message));
+        ActionBar.sendActionBar(player, (String) prepare(values).parseLine(player, (sender, message) -> message));
     }
 
     public void print(Object... values) {

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

@@ -55,7 +55,7 @@ public class ConfiguredSound extends ConfiguredValue<SoundConfig> {
             }
     );
 
-    public ConfiguredSound(@NotNull ValueManifest<SoundConfig> manifest, @NotNull ValueAdapter<SoundConfig> adapter) {
+    public ConfiguredSound(@NotNull ValueManifest<SoundConfig, SoundConfig> manifest, @NotNull ValueAdapter<SoundConfig> adapter) {
         super(manifest, adapter);
     }
 
@@ -83,7 +83,7 @@ public class ConfiguredSound extends ConfiguredValue<SoundConfig> {
         Optional.ofNullable(get()).ifPresent(s -> s.playAt(location));
     }
 
-    public static class Builder extends AbstractConfigBuilder<SoundConfig, ConfiguredSound, ConfigurationHolder<?>, Builder> {
+    public static class Builder extends AbstractConfigBuilder<SoundConfig, SoundConfig, ConfiguredSound, ConfigurationHolder<?>, Builder> {
 
         protected @NotNull ValueAdapter<SoundConfig> adapter = SOUND_ADAPTER;
 

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

@@ -55,7 +55,7 @@ public class ConfiguredTitle extends ConfiguredValue<TitleConfig> {
     protected final @NotNull UnaryOperator<String> paramBuilder;
     protected final @NotNull String[] params;
 
-    public ConfiguredTitle(@NotNull ValueManifest<TitleConfig> manifest, ValueAdapter<TitleConfig> adapter,
+    public ConfiguredTitle(@NotNull ValueManifest<TitleConfig, TitleConfig> manifest, ValueAdapter<TitleConfig> adapter,
                            @NotNull UnaryOperator<String> paramBuilder, @NotNull String[] params,
                            @NotNull ConfiguredTitle.TitleConsumer sendConsumer) {
         super(manifest, adapter);
@@ -150,7 +150,7 @@ public class ConfiguredTitle extends ConfiguredValue<TitleConfig> {
 
     }
 
-    public static class Builder extends AbstractConfigBuilder<TitleConfig, ConfiguredTitle, ConfigurationHolder<?>, Builder> {
+    public static class Builder extends AbstractConfigBuilder<TitleConfig, TitleConfig, ConfiguredTitle, ConfigurationHolder<?>, Builder> {
 
         protected @NotNull ValueAdapter<TitleConfig> adapter = TITLE_ADAPTER;
         protected @NotNull TitleConfig title = TitleConfig.of(null, null);

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

@@ -4,12 +4,12 @@ import cc.carm.lib.configuration.adapter.ValueAdapter;
 import cc.carm.lib.configuration.adapter.ValueType;
 import cc.carm.lib.configuration.builder.AbstractConfigBuilder;
 import cc.carm.lib.configuration.source.ConfigurationHolder;
+import cc.carm.lib.configuration.source.section.ConfigureSection;
 import cc.carm.lib.configuration.value.ValueManifest;
 import cc.carm.lib.configuration.value.standard.ConfiguredValue;
-import cc.carm.lib.configuration.value.text.function.ContentHandler;
+import cc.carm.lib.easyplugin.utils.ColorParser;
 import com.cryptomorin.xseries.XItemStack;
 import org.bukkit.Material;
-import org.bukkit.configuration.ConfigurationSection;
 import org.bukkit.enchantments.Enchantment;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemFlag;
@@ -19,8 +19,8 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.*;
+import java.util.function.BiFunction;
 import java.util.function.Consumer;
-import java.util.function.UnaryOperator;
 
 public class ConfiguredItem extends ConfiguredValue<ItemStack> {
 
@@ -32,18 +32,18 @@ public class ConfiguredItem extends ConfiguredValue<ItemStack> {
     public static final ValueAdapter<ItemStack> ITEM_ADAPTER = new ValueAdapter<>(ITEM_TYPE,
             (holder, type, value) -> XItemStack.serialize(value),
             (holder, type, value) -> {
-                ConfigurationSection section = (ConfigurationSection) value;
+                ConfigureSection section = (ConfigureSection) value;
-                return XItemStack.deserialize(section);
+                return XItemStack.deserialize(section.asMap());
             }
     );
 
-    protected final @NotNull UnaryOperator<String> paramBuilder;
+    protected final @NotNull BiFunction<Player, String, String> parser;
     protected final @NotNull String[] params;
 
-    public ConfiguredItem(@NotNull ValueManifest<ItemStack> manifest, ValueAdapter<ItemStack> adapter,
+    public ConfiguredItem(@NotNull ValueManifest<ItemStack, ItemStack> manifest, ValueAdapter<ItemStack> adapter,
-                          @NotNull UnaryOperator<String> paramBuilder, @NotNull String[] params) {
+                          @NotNull BiFunction<Player, String, String> parser, @NotNull String[] params) {
         super(manifest, adapter);
-        this.paramBuilder = paramBuilder;
+        this.parser = parser;
         this.params = params;
     }
 
@@ -82,7 +82,7 @@ public class ConfiguredItem extends ConfiguredValue<ItemStack> {
     }
 
     public @NotNull PreparedItem prepare(@NotNull Object... values) {
-        return PreparedItem.of(player -> get()).params(params).placeholders(values);
+        return PreparedItem.of(player -> get()).parser(parser).params(params).placeholders(values);
     }
 
     public void modifyItem(Consumer<ItemStack> modifier) {
@@ -114,11 +114,11 @@ public class ConfiguredItem extends ConfiguredValue<ItemStack> {
     }
 
 
-    public static class Builder extends AbstractConfigBuilder<ItemStack, ConfiguredItem, ConfigurationHolder<?>, Builder> {
+    public static class Builder extends AbstractConfigBuilder<ItemStack, ItemStack, ConfiguredItem, ConfigurationHolder<?>, Builder> {
 
         protected @Nullable ItemStack item = null;
         protected @NotNull String[] params = new String[0];
-        protected @NotNull UnaryOperator<String> paramFormatter = ContentHandler.DEFAULT_PARAM_BUILDER;
+        protected @NotNull BiFunction<Player, String, String> parser = (player, message) -> ColorParser.parse(message);
 
         public Builder() {
             super(ConfigurationHolder.class, ITEM_TYPE);
@@ -186,8 +186,8 @@ public class ConfiguredItem extends ConfiguredValue<ItemStack> {
             return defaultFlags(new LinkedHashSet<>(Arrays.asList(flags)));
         }
 
-        public Builder formatParam(@NotNull UnaryOperator<String> paramFormatter) {
+        public Builder parser(@NotNull BiFunction<Player, String, String> parser) {
-            this.paramFormatter = paramFormatter;
+            this.parser = parser;
             return self();
         }
 
@@ -208,7 +208,7 @@ public class ConfiguredItem extends ConfiguredValue<ItemStack> {
 
         @Override
         public @NotNull ConfiguredItem build() {
-            return new ConfiguredItem(buildManifest(), ITEM_ADAPTER, paramFormatter, params);
+            return new ConfiguredItem(buildManifest(), ITEM_ADAPTER, parser, params);
         }
     }
 

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

@@ -20,13 +20,10 @@ import java.util.List;
 import java.util.UUID;
 import java.util.function.BiConsumer;
 import java.util.function.Function;
-import java.util.regex.Pattern;
 
 public abstract class ItemModifier<S extends ItemModifier<S, R>, R>
         extends ContentHandler<Player, S> {
     
-    public static final @NotNull Pattern LORE_INSERT_PATTERN = Pattern.compile("^(?:\\{(.*)})?#(.*)#(?:\\{(-?\\d+)(?:,(-?\\d+))?})?$");
-
     protected final @NotNull Function<@NotNull Player, @Nullable ItemStack> itemProvider;
 
     protected @NotNull BiConsumer<ItemStack, Player> itemConsumer;

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

@@ -22,7 +22,7 @@ public class PreparedItem extends ItemModifier<PreparedItem, ItemStack> {
         super(itemProvider);
     }
 
-    public @Nullable ItemStack get(Player player) {
+    public @Nullable ItemStack get(@Nullable Player player) {
         @Nullable ItemStack item = itemProvider.apply(player);
         if (item == null) return null;
 

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

@@ -40,7 +40,7 @@ public class ConfiguredNotify extends ConfiguredList<NotifyConfig> {
     protected final @NotNull UnaryOperator<String> paramBuilder;
     protected final @NotNull String[] params;
 
-    public ConfiguredNotify(@NotNull ValueManifest<List<NotifyConfig>> manifest,
+    public ConfiguredNotify(@NotNull ValueManifest<List<NotifyConfig>, NotifyConfig> manifest,
                             @NotNull ValueAdapter<NotifyConfig> adapter,
                             @NotNull UnaryOperator<String> paramBuilder, @NotNull String[] params) {
         super(manifest, ArrayList::new, adapter);
@@ -65,7 +65,7 @@ public class ConfiguredNotify extends ConfiguredList<NotifyConfig> {
     }
 
 
-    public static class NotifyBuilder extends AbstractConfigBuilder<List<NotifyConfig>, ConfiguredNotify, ConfigurationHolder<?>, NotifyBuilder> {
+    public static class NotifyBuilder extends AbstractConfigBuilder<List<NotifyConfig>, NotifyConfig, ConfiguredNotify, ConfigurationHolder<?>, NotifyBuilder> {
 
         protected final @NotNull List<NotifyConfig> notifications = new ArrayList<>();
 

platform/bungee/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>mineconfiguration-parent</artifactId>
         <groupId>cc.carm.lib</groupId>
-        <version>3.0.2</version>
+        <version>3.1.4</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
@@ -32,8 +32,8 @@
 
         <dependency>
             <groupId>cc.carm.lib</groupId>
-            <artifactId>easyconfiguration-yaml</artifactId>
+            <artifactId>configured-yaml</artifactId>
-            <version>${deps.easyconfifuration.version}</version>
+            <version>${deps.configured.version}</version>
             <scope>compile</scope>
         </dependency>
 
@@ -41,7 +41,7 @@
         <dependency>
             <groupId>net.md-5</groupId>
             <artifactId>bungeecord-api</artifactId>
-            <version>1.20-R0.2</version>
+            <version>1.21-R0.4</version>
             <type>jar</type>
             <scope>provided</scope>
         </dependency>

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

@@ -30,8 +30,8 @@ public class MineConfiguration extends AbstractConfiguration<ConfigurationHolder
 
     public MineConfiguration(@NotNull File pluginDataFolder) {
         super(
-                YAMLConfigFactory.from(pluginDataFolder, "config.yml").resourcePath("config.yml").build(),
+                YAMLConfigFactory.from(pluginDataFolder, "config.yml").build(),
-                YAMLConfigFactory.from(pluginDataFolder, "messages.yml").resourcePath("messages.yml").build()
+                YAMLConfigFactory.from(pluginDataFolder, "messages.yml").build()
         );
     }
 

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

@@ -25,7 +25,7 @@ public class ConfiguredMessage extends ConfiguredText<BaseComponent[], CommandSe
         return create().defaults(messages).build();
     }
 
-    public ConfiguredMessage(@NotNull ValueManifest<TextContents> manifest,
+    public ConfiguredMessage(@NotNull ValueManifest<TextContents, TextContents> manifest,
                              @NotNull BiFunction<CommandSender, String, String> parser,
                              @NotNull BiFunction<CommandSender, String, BaseComponent[]> compiler,
                              @NotNull BiConsumer<CommandSender, List<BaseComponent[]>> dispatcher,

pom.xml

@@ -10,20 +10,20 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <maven.compiler.encoding>UTF-8</maven.compiler.encoding>
 
-        <deps.easyconfifuration.version>4.0.7</deps.easyconfifuration.version>
+        <deps.configured.version>4.2.0</deps.configured.version>
-        <deps.yamlcommentwriter.version>1.2.0</deps.yamlcommentwriter.version>
+        <deps.yamlcommentwriter.version>1.2.1</deps.yamlcommentwriter.version>
-        <deps.easyplugin.version>1.5.12</deps.easyplugin.version>
+        <deps.easyplugin.version>1.5.13</deps.easyplugin.version>
     </properties>
 
     <groupId>cc.carm.lib</groupId>
     <artifactId>mineconfiguration-parent</artifactId>
-    <version>3.0.2</version>
+    <version>3.1.4</version>
     <packaging>pom</packaging>
     <modules>
         <module>common</module>
         <module>platform/bukkit</module>
         <module>platform/bungee</module>
-        <module>platform/velocity</module>
+        <module>platform/adventure</module>
     </modules>
 
     <name>MineConfiguration</name>
@@ -91,12 +91,6 @@
             <url>https://mvn.lumine.io/repository/maven-public/</url>
         </repository>
 
-        <repository>
-            <id>carm-repo</id>
-            <name>Carm's Repo</name>
-            <url>https://repo.carm.cc/repository/maven-public/</url>
-        </repository>
-
     </repositories>
 
     <distributionManagement>
@@ -115,7 +109,7 @@
         <dependency>
             <groupId>org.jetbrains</groupId>
             <artifactId>annotations</artifactId>
-            <version>26.0.2</version>
+            <version>26.1.0</version>
             <scope>provided</scope>
         </dependency>
 
@@ -128,7 +122,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
-                <version>3.5.2</version>
+                <version>3.5.5</version>
                 <configuration>
                     <useSystemClassLoader>false</useSystemClassLoader>
                 </configuration>
@@ -136,7 +130,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-gpg-plugin</artifactId>
-                <version>3.2.7</version>
+                <version>3.2.8</version>
                 <executions>
                     <execution>
                         <id>sign-artifacts</id>
@@ -156,7 +150,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-release-plugin</artifactId>
-                <version>3.1.1</version>
+                <version>3.3.1</version>
                 <configuration>
                     <autoVersionSubmodules>true</autoVersionSubmodules>
                     <useReleaseProfile>false</useReleaseProfile>
@@ -167,7 +161,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.14.0</version>
+                <version>3.15.0</version>
                 <configuration>
                     <source>${project.jdk.version}</source>
                     <target>${project.jdk.version}</target>
@@ -179,12 +173,12 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
-                <version>3.4.2</version>
+                <version>3.5.0</version>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-source-plugin</artifactId>
-                <version>3.3.1</version>
+                <version>3.4.0</version>
                 <executions>
                     <execution>
                         <phase>package</phase>
@@ -202,7 +196,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-javadoc-plugin</artifactId>
-                    <version>3.11.2</version>
+                    <version>3.12.0</version>
                     <configuration>
                         <classifier>javadoc</classifier>
                         <detectJavaApiLink>false</detectJavaApiLink>
@@ -231,7 +225,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-shade-plugin</artifactId>
-                    <version>3.6.0</version>
+                    <version>3.6.2</version>
                     <executions>
                         <execution>
                             <phase>package</phase>
@@ -278,7 +272,7 @@
                     <plugin>
                         <groupId>org.sonatype.central</groupId>
                         <artifactId>central-publishing-maven-plugin</artifactId>
-                        <version>0.7.0</version>
+                        <version>0.10.0</version>
                         <extensions>true</extensions>
                         <configuration>
                             <publishingServerId>central</publishingServerId>