From cceb8db74e4957b5d87b03d093a1c012c4fb5578 Mon Sep 17 00:00:00 2001 From: Autovw <68228006+Autovw@users.noreply.github.com> Date: Sun, 5 Jun 2022 17:34:02 +0200 Subject: [PATCH] [1.18.x] Fix 2 crossbow animations not applying to custom variants (#8625) --- .../client/renderer/ItemInHandRenderer.java.patch | 9 +++++++++ .../renderer/entity/player/PlayerRenderer.java.patch | 9 +++++++++ 2 files changed, 18 insertions(+) diff --git a/patches/minecraft/net/minecraft/client/renderer/ItemInHandRenderer.java.patch b/patches/minecraft/net/minecraft/client/renderer/ItemInHandRenderer.java.patch index f4ae49b78d..deb2c7f20b 100644 --- a/patches/minecraft/net/minecraft/client/renderer/ItemInHandRenderer.java.patch +++ b/patches/minecraft/net/minecraft/client/renderer/ItemInHandRenderer.java.patch @@ -15,6 +15,15 @@ this.m_109371_(p_109318_, p_109315_, f1, InteractionHand.OFF_HAND, f6, this.f_109301_, f7, p_109316_, p_109317_, p_109319_); } +@@ -342,7 +_,7 @@ + } else { + this.m_109353_(p_109379_, p_109380_, p_109381_, p_109378_, humanoidarm, p_109376_, p_109377_); + } +- } else if (p_109377_.m_150930_(Items.f_42717_)) { ++ } else if (p_109377_.m_41720_() instanceof CrossbowItem) { + boolean flag1 = CrossbowItem.m_40932_(p_109377_); + boolean flag2 = humanoidarm == HumanoidArm.RIGHT; + int i = flag2 ? 1 : -1; @@ -487,8 +_,16 @@ this.f_109304_ = Mth.m_14036_(this.f_109304_ - 0.4F, 0.0F, 1.0F); } else { diff --git a/patches/minecraft/net/minecraft/client/renderer/entity/player/PlayerRenderer.java.patch b/patches/minecraft/net/minecraft/client/renderer/entity/player/PlayerRenderer.java.patch index f66116857d..18cb857800 100644 --- a/patches/minecraft/net/minecraft/client/renderer/entity/player/PlayerRenderer.java.patch +++ b/patches/minecraft/net/minecraft/client/renderer/entity/player/PlayerRenderer.java.patch @@ -10,6 +10,15 @@ } public Vec3 m_7860_(AbstractClientPlayer p_117785_, float p_117786_) { +@@ -123,7 +_,7 @@ + if (useanim == UseAnim.SPYGLASS) { + return HumanoidModel.ArmPose.SPYGLASS; + } +- } else if (!p_117795_.f_20911_ && itemstack.m_150930_(Items.f_42717_) && CrossbowItem.m_40932_(itemstack)) { ++ } else if (!p_117795_.f_20911_ && itemstack.m_41720_() instanceof CrossbowItem && CrossbowItem.m_40932_(itemstack)) { + return HumanoidModel.ArmPose.CROSSBOW_HOLD; + } + @@ -158,10 +_,12 @@ }