From 051049eee2d64f4389d649cbe659fa5bc8654cf9 Mon Sep 17 00:00:00 2001
From: carm <carm@carm.cc>
Date: Fri, 21 Mar 2025 02:39:46 +0800
Subject: [PATCH] feat(deps): Update with EasyConfiguration

---
 .../bukkit/value/item/ConfiguredItem.java         | 15 +++++++++++++--
 .../bukkit/value/item/PreparedItem.java           |  2 +-
 pom.xml                                           |  2 +-
 3 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/platform/bukkit/src/main/java/cc/carm/lib/mineconfiguration/bukkit/value/item/ConfiguredItem.java b/platform/bukkit/src/main/java/cc/carm/lib/mineconfiguration/bukkit/value/item/ConfiguredItem.java
index 74f00d3..9553d00 100644
--- a/platform/bukkit/src/main/java/cc/carm/lib/mineconfiguration/bukkit/value/item/ConfiguredItem.java
+++ b/platform/bukkit/src/main/java/cc/carm/lib/mineconfiguration/bukkit/value/item/ConfiguredItem.java
@@ -8,6 +8,7 @@ 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,6 +20,7 @@ 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;
 
@@ -37,12 +39,15 @@ public class ConfiguredItem extends ConfiguredValue<ItemStack> {
             }
     );
 
+    protected final @NotNull BiFunction<Player, String, String> parser;
     protected final @NotNull UnaryOperator<String> paramBuilder;
     protected final @NotNull String[] params;
 
     public ConfiguredItem(@NotNull ValueManifest<ItemStack, ItemStack> manifest, ValueAdapter<ItemStack> adapter,
+                          @NotNull BiFunction<Player, String, String> parser,
                           @NotNull UnaryOperator<String> paramBuilder, @NotNull String[] params) {
         super(manifest, adapter);
+        this.parser = parser;
         this.paramBuilder = paramBuilder;
         this.params = params;
     }
@@ -82,7 +87,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,6 +123,7 @@ public class ConfiguredItem extends ConfiguredValue<ItemStack> {
 
         protected @Nullable ItemStack item = null;
         protected @NotNull String[] params = new String[0];
+        protected @NotNull BiFunction<Player, String, String> parser = (player, message) -> ColorParser.parse(message);
         protected @NotNull UnaryOperator<String> paramFormatter = ContentHandler.DEFAULT_PARAM_BUILDER;
 
         public Builder() {
@@ -186,6 +192,11 @@ public class ConfiguredItem extends ConfiguredValue<ItemStack> {
             return defaultFlags(new LinkedHashSet<>(Arrays.asList(flags)));
         }
 
+        public Builder parser(@NotNull BiFunction<Player, String, String> parser) {
+            this.parser = parser;
+            return self();
+        }
+
         public Builder formatParam(@NotNull UnaryOperator<String> paramFormatter) {
             this.paramFormatter = paramFormatter;
             return self();
@@ -208,7 +219,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, paramFormatter, params);
         }
     }
 
diff --git a/platform/bukkit/src/main/java/cc/carm/lib/mineconfiguration/bukkit/value/item/PreparedItem.java b/platform/bukkit/src/main/java/cc/carm/lib/mineconfiguration/bukkit/value/item/PreparedItem.java
index f527b47..268445f 100644
--- a/platform/bukkit/src/main/java/cc/carm/lib/mineconfiguration/bukkit/value/item/PreparedItem.java
+++ b/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;
 
diff --git a/pom.xml b/pom.xml
index 35b1a4b..308a5cf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
         <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.2</deps.configured.version>
         <deps.yamlcommentwriter.version>1.2.1</deps.yamlcommentwriter.version>
         <deps.easyplugin.version>1.5.12</deps.easyplugin.version>
     </properties>