feat(deps): Update with EasyConfiguration

common/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>mineconfiguration-parent</artifactId>
         <groupId>cc.carm.lib</groupId>
-        <version>3.1.0</version>
+        <version>3.1.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <properties>

platform/bukkit/pom.xml

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

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

@@ -46,7 +46,7 @@ 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));
     }
 

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

@@ -7,7 +7,7 @@ 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.enchantments.Enchantment;
@@ -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> {
 
@@ -37,13 +37,13 @@ public class ConfiguredItem extends ConfiguredValue<ItemStack> {
             }
     );
 
-    protected final @NotNull UnaryOperator<String> paramBuilder;
+    protected final @NotNull BiFunction<Player, String, String> parser;
     protected final @NotNull String[] params;
 
     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) {
@@ -118,7 +118,7 @@ public class ConfiguredItem extends ConfiguredValue<ItemStack> {
 
         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) {
-            this.paramFormatter = paramFormatter;
+        public Builder parser(@NotNull BiFunction<Player, String, String> parser) {
+            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/bungee/pom.xml

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

platform/velocity/pom.xml

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

pom.xml

@@ -10,14 +10,14 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <maven.compiler.encoding>UTF-8</maven.compiler.encoding>
 
-        <deps.configured.version>4.1.1</deps.configured.version>
+        <deps.configured.version>4.1.3</deps.configured.version>
         <deps.yamlcommentwriter.version>1.2.1</deps.yamlcommentwriter.version>
         <deps.easyplugin.version>1.5.12</deps.easyplugin.version>
     </properties>
 
     <groupId>cc.carm.lib</groupId>
     <artifactId>mineconfiguration-parent</artifactId>
-    <version>3.1.0</version>
+    <version>3.1.1</version>
     <packaging>pom</packaging>
     <modules>
         <module>common</module>