feat(deps): Update with EasyConfiguration

CarmJos · Mar 3, 2025 · e859722 · e859722
1 parent adf26ba
commit e859722
Show file tree

Hide file tree

Showing 7 changed files with 43 additions and 13 deletions.
diff --git a/common/pom.xml b/common/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>mineconfiguration-parent</artifactId>
         <groupId>cc.carm.lib</groupId>
-        <version>3.0.2</version>
+        <version>3.0.3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <properties>

diff --git a/platform/bukkit/pom.xml b/platform/bukkit/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>mineconfiguration-parent</artifactId>
         <groupId>cc.carm.lib</groupId>
-        <version>3.0.2</version>
+        <version>3.0.3</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/platform/bukkit/src/main/java/cc/carm/lib/mineconfiguration/bukkit/source/BukkitSection.java b/platform/bukkit/src/main/java/cc/carm/lib/mineconfiguration/bukkit/source/BukkitSection.java
@@ -6,9 +6,7 @@
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.annotations.UnmodifiableView;
 
-import java.util.Collections;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
 
 public class BukkitSection implements ConfigureSection {
 
@@ -62,6 +60,38 @@ public BukkitSection(@NotNull BukkitSource source, @Nullable BukkitSection paren
         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

diff --git a/.../bukkit/src/main/java/cc/carm/lib/mineconfiguration/bukkit/value/item/ConfiguredItem.java b/.../bukkit/src/main/java/cc/carm/lib/mineconfiguration/bukkit/value/item/ConfiguredItem.java
@@ -4,12 +4,12 @@
 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 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;
@@ -32,8 +32,8 @@ public static Builder create() {
     public static final ValueAdapter<ItemStack> ITEM_ADAPTER = new ValueAdapter<>(ITEM_TYPE,
             (holder, type, value) -> XItemStack.serialize(value),
             (holder, type, value) -> {
-                ConfigurationSection section = (ConfigurationSection) value;
-                return XItemStack.deserialize(section);
+                ConfigureSection section = (ConfigureSection) value;
+                return XItemStack.deserialize(section.asMap());
             }
     );
 

diff --git a/platform/bungee/pom.xml b/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.0.3</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/platform/velocity/pom.xml b/platform/velocity/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>mineconfiguration-parent</artifactId>
         <groupId>cc.carm.lib</groupId>
-        <version>3.0.2</version>
+        <version>3.0.3</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/pom.xml b/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>4.0.7</deps.easyconfifuration.version>
-        <deps.yamlcommentwriter.version>1.2.0</deps.yamlcommentwriter.version>
+        <deps.easyconfifuration.version>4.0.9</deps.easyconfifuration.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.0.2</version>
+    <version>3.0.3</version>
     <packaging>pom</packaging>
     <modules>
         <module>common</module>