diff --git a/common-files/src/main/resources/resources/legacy_armor/resourcepack/assets/minecraft/textures/trims/entity/humanoid/chainmail.png b/common-files/src/main/resources/resources/internal/resourcepack/assets/minecraft/textures/trims/entity/humanoid/chainmail.png similarity index 100% rename from common-files/src/main/resources/resources/legacy_armor/resourcepack/assets/minecraft/textures/trims/entity/humanoid/chainmail.png rename to common-files/src/main/resources/resources/internal/resourcepack/assets/minecraft/textures/trims/entity/humanoid/chainmail.png diff --git a/common-files/src/main/resources/resources/legacy_armor/resourcepack/assets/minecraft/textures/trims/entity/humanoid_leggings/chainmail.png b/common-files/src/main/resources/resources/internal/resourcepack/assets/minecraft/textures/trims/entity/humanoid_leggings/chainmail.png similarity index 100% rename from common-files/src/main/resources/resources/legacy_armor/resourcepack/assets/minecraft/textures/trims/entity/humanoid_leggings/chainmail.png rename to common-files/src/main/resources/resources/internal/resourcepack/assets/minecraft/textures/trims/entity/humanoid_leggings/chainmail.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 934b2c29d..62578ed24 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 @@ -439,8 +439,6 @@ public abstract class AbstractPackManager implements PackManager { plugin.saveResource("resources/remove_shulker_head/pack.yml"); // legacy armor - plugin.saveResource("resources/legacy_armor/resourcepack/assets/minecraft/textures/trims/entity/humanoid/chainmail.png"); - plugin.saveResource("resources/legacy_armor/resourcepack/assets/minecraft/textures/trims/entity/humanoid_leggings/chainmail.png"); plugin.saveResource("resources/legacy_armor/configuration/chainmail.yml"); plugin.saveResource("resources/legacy_armor/pack.yml"); @@ -451,6 +449,8 @@ public abstract class AbstractPackManager implements PackManager { plugin.saveResource("resources/internal/configuration/offset_chars.yml"); plugin.saveResource("resources/internal/configuration/gui.yml"); plugin.saveResource("resources/internal/configuration/mappings.yml"); + plugin.saveResource("resources/internal/resourcepack/assets/minecraft/textures/trims/entity/humanoid/chainmail.png"); + plugin.saveResource("resources/internal/resourcepack/assets/minecraft/textures/trims/entity/humanoid_leggings/chainmail.png"); plugin.saveResource("resources/internal/resourcepack/assets/minecraft/textures/font/offset/space_split.png"); plugin.saveResource("resources/internal/resourcepack/assets/minecraft/textures/font/gui/custom/item_browser.png"); plugin.saveResource("resources/internal/resourcepack/assets/minecraft/textures/font/gui/custom/category.png"); @@ -1479,6 +1479,7 @@ public abstract class AbstractPackManager implements PackManager { 收集全部 含有贴图的有效模型阶段 有效指的是被实际使用的模型 + */ // 获取所有带贴图的模型以及自定义父模型 diff --git a/core/src/main/java/net/momirealms/craftengine/core/pack/atlas/Atlas.java b/core/src/main/java/net/momirealms/craftengine/core/pack/atlas/Atlas.java index 7717bb219..711c8e00d 100644 --- a/core/src/main/java/net/momirealms/craftengine/core/pack/atlas/Atlas.java +++ b/core/src/main/java/net/momirealms/craftengine/core/pack/atlas/Atlas.java @@ -145,6 +145,7 @@ public final class Atlas { public void addSingle(Key key) { this.single.add(key); + this.defined.add(key); } // 获取贴图源文件路径,有些类型可能查不到 diff --git a/gradle.properties b/gradle.properties index 4774bf29f..cb1959f55 100644 --- a/gradle.properties +++ b/gradle.properties @@ -38,7 +38,7 @@ zstd_version=1.5.7-6 commons_io_version=2.21.0 commons_lang3_version=3.20.0 sparrow_nbt_version=0.10.9 -sparrow_util_version=0.72 +sparrow_util_version=0.74 fastutil_version=8.5.18 netty_version=4.1.128.Final joml_version=1.10.8