From 84a8fd8692489ce7e955ddfa5ce8ac1ba097b0cd Mon Sep 17 00:00:00 2001 From: XiaoMoMi Date: Sun, 11 May 2025 04:05:58 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BD=8E=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E6=A8=A1=E5=9E=8B=E7=94=9F=E6=88=90=E9=87=8D=E5=A4=8D=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../models/item/custom/topaz_trident_in_hand.json | 14 ++++++++++++++ .../models/item/custom/topaz_trident_throwing.json | 14 ++++++++++++++ .../craftengine/core/pack/AbstractPackManager.java | 2 ++ 3 files changed, 30 insertions(+) diff --git a/bukkit/loader/src/main/resources/resources/default/resourcepack/assets/minecraft/models/item/custom/topaz_trident_in_hand.json b/bukkit/loader/src/main/resources/resources/default/resourcepack/assets/minecraft/models/item/custom/topaz_trident_in_hand.json index 52fbb8b40..a56ed9681 100644 --- a/bukkit/loader/src/main/resources/resources/default/resourcepack/assets/minecraft/models/item/custom/topaz_trident_in_hand.json +++ b/bukkit/loader/src/main/resources/resources/default/resourcepack/assets/minecraft/models/item/custom/topaz_trident_in_hand.json @@ -71,6 +71,7 @@ } } ], + "gui_light": "front", "display": { "thirdperson_righthand": { "rotation": [0, 60, 0], @@ -89,6 +90,19 @@ "firstperson_lefthand": { "rotation": [0, 90, -25], "translation": [-2.5, 7.5, 4.75] + }, + "ground": { + "rotation": [0, 0, 45], + "translation": [-2, 2, 0], + "scale": [0.5, 0.5, 0.5] + }, + "gui": { + "rotation": [0, 0, -45], + "translation": [5, 5, 0], + "scale": [1.25, 1.25, 1.25] + }, + "fixed": { + "translation": [0, 6, 0] } } } \ No newline at end of file diff --git a/bukkit/loader/src/main/resources/resources/default/resourcepack/assets/minecraft/models/item/custom/topaz_trident_throwing.json b/bukkit/loader/src/main/resources/resources/default/resourcepack/assets/minecraft/models/item/custom/topaz_trident_throwing.json index fded0b6dc..90b814746 100644 --- a/bukkit/loader/src/main/resources/resources/default/resourcepack/assets/minecraft/models/item/custom/topaz_trident_throwing.json +++ b/bukkit/loader/src/main/resources/resources/default/resourcepack/assets/minecraft/models/item/custom/topaz_trident_throwing.json @@ -71,6 +71,7 @@ } } ], + "gui_light": "front", "display": { "thirdperson_righthand": { "rotation": [0, 90, 180], @@ -91,6 +92,19 @@ "rotation": [0, 90, -25], "translation": [0.75, -5, -0.75], "scale": [0.5, 0.5, 0.5] + }, + "ground": { + "rotation": [0, 0, 45], + "translation": [-2, 2, 0], + "scale": [0.5, 0.5, 0.5] + }, + "gui": { + "rotation": [0, 0, -45], + "translation": [5, 5, 0], + "scale": [1.25, 1.25, 1.25] + }, + "fixed": { + "translation": [0, 6, 0] } } } \ 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 df19992c8..34ead8527 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 @@ -1085,6 +1085,8 @@ public abstract class AbstractPackManager implements PackManager { if (originalItemModel == null) { plugin.logger().warn("Failed to load item model for [" + key + "] (legacy)"); continue; + } else { + originalItemModel = originalItemModel.deepCopy(); } JsonArray overrides; if (originalItemModel.has("overrides")) {