From d75a87eb24a7217303d89ff03c3e9cd49f05fa7f Mon Sep 17 00:00:00 2001 From: jhqwqmc <2110242767@qq.com> Date: Mon, 16 Jun 2025 17:06:35 +0800 Subject: [PATCH] =?UTF-8?q?feat(bukkit):=20=E5=85=BC=E5=AE=B91.21.6?= =?UTF-8?q?=E7=89=A9=E5=93=81=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../assets/minecraft/items/player_head.json | 11 +++++++++++ .../craftengine/core/pack/AbstractPackManager.java | 7 ++++++- gradle.properties | 4 ++-- 3 files changed, 19 insertions(+), 3 deletions(-) create mode 100644 common-files/src/main/resources/resources/default/resourcepack/assets/minecraft/items/player_head.json diff --git a/common-files/src/main/resources/resources/default/resourcepack/assets/minecraft/items/player_head.json b/common-files/src/main/resources/resources/default/resourcepack/assets/minecraft/items/player_head.json new file mode 100644 index 000000000..c2b8ec102 --- /dev/null +++ b/common-files/src/main/resources/resources/default/resourcepack/assets/minecraft/items/player_head.json @@ -0,0 +1,11 @@ +{ + "oversized_in_gui": true, + "model": { + "type": "minecraft:special", + "base": "minecraft:item/template_skull", + "model": { + "type": "minecraft:head", + "kind": "player" + } + } +} \ No newline at end of file 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 3a7b111b4..f0772f226 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 @@ -381,6 +381,7 @@ public abstract class AbstractPackManager implements PackManager { plugin.saveResource("resources/default/resourcepack/assets/minecraft/textures/block/custom/copper_coil_on_side.png"); // items plugin.saveResource("resources/default/configuration/items.yml"); + plugin.saveResource("resources/default/resourcepack/assets/minecraft/items/player_head.json"); plugin.saveResource("resources/default/resourcepack/assets/minecraft/textures/item/custom/topaz_rod.png"); plugin.saveResource("resources/default/resourcepack/assets/minecraft/textures/item/custom/topaz_rod_cast.png"); plugin.saveResource("resources/default/resourcepack/assets/minecraft/textures/item/custom/topaz_bow.png"); @@ -1288,6 +1289,7 @@ public abstract class AbstractPackManager implements PackManager { } boolean handAnimationOnSwap = Optional.ofNullable(originalItemModel.get("hand_animation_on_swap")).map(JsonElement::getAsBoolean).orElse(true); + boolean oversizedInGui = Optional.ofNullable(originalItemModel.get("oversized_in_gui")).map(JsonElement::getAsBoolean).orElse(false); JsonObject fallbackModel = originalItemModel.get("model").getAsJsonObject(); JsonObject newJson = new JsonObject(); JsonObject model = new JsonObject(); @@ -1295,7 +1297,10 @@ public abstract class AbstractPackManager implements PackManager { model.addProperty("type", "minecraft:range_dispatch"); model.addProperty("property", "minecraft:custom_model_data"); if (!handAnimationOnSwap) { - model.addProperty("hand_animation_on_swap", false); + newJson.addProperty("hand_animation_on_swap", false); + } + if (oversizedInGui) { + newJson.addProperty("oversized_in_gui", true); } // 将原有的json读成fallback model.add("fallback", fallbackModel); diff --git a/gradle.properties b/gradle.properties index 1b5c0f897..77ed33ffc 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,11 +2,11 @@ org.gradle.jvmargs=-Xmx1G # Project settings # Rule: [major update].[feature update].[bug fix] -project_version=0.0.57.3 +project_version=0.0.57.4 config_version=37 lang_version=16 project_group=net.momirealms -latest_supported_version=1.21.5 +latest_supported_version=1.21.6 # Supported languages supported_languages=en,zh_cn,zh_tw,es,tr