From 1f49dc3498ea69dab55b4b7f30e1577b7a5d3d0d Mon Sep 17 00:00:00 2001
From: XiaoMoMi <littlemomi@qq.com>
Date: Sat, 15 Mar 2025 16:04:42 +0800
Subject: [PATCH] Update config.yml

---
 bukkit-loader/src/main/resources/config.yml              | 9 +++++----
 .../craftengine/core/pack/AbstractPackManager.java       | 9 +++++++++
 .../conflict/resolution/MergePackMcMetaResolution.java   | 5 +++--
 3 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/bukkit-loader/src/main/resources/config.yml b/bukkit-loader/src/main/resources/config.yml
index 52854a150..90fe3e854 100644
--- a/bukkit-loader/src/main/resources/config.yml
+++ b/bukkit-loader/src/main/resources/config.yml
@@ -53,6 +53,9 @@ resource-pack:
     max: LATEST
   merge-external-folders:
     - ModelEngine/resource pack
+    - CustomNameplates/ResourcePack
+    - BetterModel/build
+    - BetterHud/build
   send:
     send-on-join: true
     send-on-reload: true
@@ -93,10 +96,8 @@ resource-pack:
         type: exact
         path: "pack.mcmeta"
       resolution:
-        type: retain_matching
-        term:
-          type: contains
-          path: "resources/default/resourcepack/"
+        type: merge_pack_mcmeta
+        description: "<gray>CraftEngine ResourcePack"
     - term:
         type: exact
         path: "pack.png"
diff --git a/core/src/main/java/net/momirealms/craftengine/core/pack/AbstractPackManager.java b/core/src/main/java/net/momirealms/craftengine/core/pack/AbstractPackManager.java
index 4f8674360..518b15e3b 100644
--- a/core/src/main/java/net/momirealms/craftengine/core/pack/AbstractPackManager.java
+++ b/core/src/main/java/net/momirealms/craftengine/core/pack/AbstractPackManager.java
@@ -61,6 +61,15 @@ public abstract class AbstractPackManager implements PackManager {
         this.plugin = plugin;
         this.eventDispatcher = eventDispatcher;
         this.zipGenerator = (p1, p2) -> {};
+        Path resourcesFolder = this.plugin.dataFolderPath().resolve("resources");
+        try {
+            if (Files.notExists(resourcesFolder)) {
+                Files.createDirectories(resourcesFolder);
+                this.saveDefaultConfigs();
+            }
+        } catch (IOException e) {
+            this.plugin.logger().warn("Failed to create default configs folder", e);
+        }
     }
 
     @Override
diff --git a/core/src/main/java/net/momirealms/craftengine/core/pack/conflict/resolution/MergePackMcMetaResolution.java b/core/src/main/java/net/momirealms/craftengine/core/pack/conflict/resolution/MergePackMcMetaResolution.java
index ce2462475..20d86ed74 100644
--- a/core/src/main/java/net/momirealms/craftengine/core/pack/conflict/resolution/MergePackMcMetaResolution.java
+++ b/core/src/main/java/net/momirealms/craftengine/core/pack/conflict/resolution/MergePackMcMetaResolution.java
@@ -101,12 +101,13 @@ public class MergePackMcMetaResolution implements Resolution {
 
             if (customDescription != null && !isEmpty(customDescription)) {
                 pack.put("description", customDescription);
-            } else {
+            }
+/*            else {
                 String desc1 = getDescription(data1);
                 String desc2 = getDescription(data2);
                 String mergedDesc = desc1.isEmpty() ? desc2 : desc2.isEmpty() ? desc1 : desc1 + "\n" + desc2;
                 if (!mergedDesc.isEmpty()) pack.put("description", mergedDesc);
-            }
+            }*/
         }
     }