From 511d1fd09e1c306d32f183f1d818f00ccc26e9cf Mon Sep 17 00:00:00 2001
From: XiaoMoMi <littlemomi@qq.com>
Date: Wed, 26 Mar 2025 02:09:57 +0800
Subject: [PATCH] fix template

---
 .../resources/resources/internal/configuration/gui.yml |  9 ++++++++-
 .../craftengine/bukkit/item/BukkitItemManager.java     | 10 ----------
 .../plugin/config/template/TemplateManagerImpl.java    |  6 ++++--
 3 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/bukkit/loader/src/main/resources/resources/internal/configuration/gui.yml b/bukkit/loader/src/main/resources/resources/internal/configuration/gui.yml
index 827a861ed..9c32bd009 100644
--- a/bukkit/loader/src/main/resources/resources/internal/configuration/gui.yml
+++ b/bukkit/loader/src/main/resources/resources/internal/configuration/gui.yml
@@ -74,9 +74,16 @@ templates:
       item-name: "{name}"
       lore: "{lore}"
     model:
-      template: "default:model/simplified_generated"
+      template: "internal:model/simplified_generated"
       arguments:
         path: "minecraft:item/custom/gui/{texture}"
+  internal:model/simplified_generated:
+    type: "minecraft:model"
+    path: "{path}"
+    generation:
+      parent: "minecraft:item/generated"
+      textures:
+        "layer0": "{path}"
 
 items:
   internal:next_page_0:
diff --git a/bukkit/src/main/java/net/momirealms/craftengine/bukkit/item/BukkitItemManager.java b/bukkit/src/main/java/net/momirealms/craftengine/bukkit/item/BukkitItemManager.java
index 16a7458ad..0f965dbc8 100644
--- a/bukkit/src/main/java/net/momirealms/craftengine/bukkit/item/BukkitItemManager.java
+++ b/bukkit/src/main/java/net/momirealms/craftengine/bukkit/item/BukkitItemManager.java
@@ -111,16 +111,6 @@ public class BukkitItemManager extends AbstractItemManager<ItemStack> {
         return getCustomItem(id).map(it -> it.settings().fuelTime()).orElse(0);
     }
 
-    @Override
-    public void load() {
-        super.load();
-    }
-
-    @Override
-    public void unload() {
-        super.unload();
-    }
-
     @Override
     public void disable() {
         this.unload();
diff --git a/core/src/main/java/net/momirealms/craftengine/core/plugin/config/template/TemplateManagerImpl.java b/core/src/main/java/net/momirealms/craftengine/core/plugin/config/template/TemplateManagerImpl.java
index e50fe5837..7afd0daf1 100644
--- a/core/src/main/java/net/momirealms/craftengine/core/plugin/config/template/TemplateManagerImpl.java
+++ b/core/src/main/java/net/momirealms/craftengine/core/plugin/config/template/TemplateManagerImpl.java
@@ -76,7 +76,9 @@ public class TemplateManagerImpl implements TemplateManager {
             for (Object template : templates) {
                 processUnknownTypeMember(template, processingResult.arguments(), processedTemplates::add);
             }
-
+            if (processedTemplates.isEmpty()) {
+                return;
+            }
             Object firstTemplate = processedTemplates.get(0);
             // 对于map和list，应当对多模板合并
             if (firstTemplate instanceof Map<?,?>) {
@@ -187,7 +189,7 @@ public class TemplateManagerImpl implements TemplateManager {
     // 合并参数
     private Map<String, TemplateArgument> mergeArguments(@NotNull Map<String, Object> rawChildArguments,
                                                          @NotNull Map<String, TemplateArgument> parentArguments) {
-        Map<String, TemplateArgument> result = new HashMap<>();
+        Map<String, TemplateArgument> result = new HashMap<>(parentArguments);
         // 我们遍历一下当前节点下的所有参数，这些参数可能含有内嵌参数。所以需要对参数map先处理一次后再合并
         // arguments:
         //   argument_1: "{parent_argument}"