From b5d585555964b6149707514454ec3202a69cb66f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=ED=95=9C=ED=98=84=EB=B9=88?= <41675181+tmvkrpxl0@users.noreply.github.com> Date: Sat, 20 Aug 2022 18:38:24 +0900 Subject: [PATCH] Hotfix for 1.19.2 item animation bug (#8987) * [HOT FIX]: Fixes #8985 by no-oping for vanilla models instead of throwing error Signed-off-by: tmvkrpxl0 --- .../net/minecraft/client/model/HumanoidModel.java.patch | 5 ++--- .../debug/entity/player/ItemUseAnimationTest.java | 3 +++ src/test/resources/META-INF/mods.toml | 2 ++ 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/patches/minecraft/net/minecraft/client/model/HumanoidModel.java.patch b/patches/minecraft/net/minecraft/client/model/HumanoidModel.java.patch index 2edd054f32..f31293050a 100644 --- a/patches/minecraft/net/minecraft/client/model/HumanoidModel.java.patch +++ b/patches/minecraft/net/minecraft/client/model/HumanoidModel.java.patch @@ -27,7 +27,7 @@ EMPTY(false), ITEM(false), BLOCK(false), -@@ -411,10 +_,30 @@ +@@ -411,10 +_,29 @@ private ArmPose(boolean p_102896_) { this.f_102890_ = p_102896_; @@ -52,8 +52,7 @@ + } + + public void applyTransform(HumanoidModel model, T entity, net.minecraft.world.entity.HumanoidArm arm) { -+ com.google.common.base.Preconditions.checkNotNull(this.forgeArmPose, "applyTransform() must not be called on a vanilla ArmPose!"); -+ this.forgeArmPose.applyTransform(model, entity, arm); ++ if (this.forgeArmPose != null) this.forgeArmPose.applyTransform(model, entity, arm); + } + // FORGE END } diff --git a/src/test/java/net/minecraftforge/debug/entity/player/ItemUseAnimationTest.java b/src/test/java/net/minecraftforge/debug/entity/player/ItemUseAnimationTest.java index d37f0f4f80..b5ba19096d 100644 --- a/src/test/java/net/minecraftforge/debug/entity/player/ItemUseAnimationTest.java +++ b/src/test/java/net/minecraftforge/debug/entity/player/ItemUseAnimationTest.java @@ -92,6 +92,9 @@ public class ItemUseAnimationTest @Override public boolean applyForgeHandTransform(PoseStack poseStack, LocalPlayer player, HumanoidArm arm, ItemStack itemInHand, float partialTick, float equipProcess, float swingProcess) { applyItemArmTransform(poseStack, arm); + if (player.getUseItem() != itemInHand) { + return true; + } if (player.isUsingItem()) { poseStack.translate(0.0, -0.05, 0.0); } diff --git a/src/test/resources/META-INF/mods.toml b/src/test/resources/META-INF/mods.toml index 7932bf81bf..8bb3a9b314 100644 --- a/src/test/resources/META-INF/mods.toml +++ b/src/test/resources/META-INF/mods.toml @@ -248,6 +248,8 @@ modId="anvil_update_event_fix" modId="item_use_animation_test" [[mods]] modId="custom_color_resolver_test" +[[mods]] +modId="custom_item_decorations_test"