From a4d5760539d3b4d72b9989f0606d3e17a137b16f Mon Sep 17 00:00:00 2001 From: LexManos Date: Mon, 21 Mar 2016 20:43:22 -0700 Subject: [PATCH] Fix swap animations for sure this time. --- .../net/minecraft/client/renderer/ItemRenderer.java.patch | 4 ++-- .../java/net/minecraftforge/client/ForgeHooksClient.java | 7 +++---- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/patches/minecraft/net/minecraft/client/renderer/ItemRenderer.java.patch b/patches/minecraft/net/minecraft/client/renderer/ItemRenderer.java.patch index 0bbb0a806c..d0f3d8a146 100644 --- a/patches/minecraft/net/minecraft/client/renderer/ItemRenderer.java.patch +++ b/patches/minecraft/net/minecraft/client/renderer/ItemRenderer.java.patch @@ -51,8 +51,8 @@ float f = entityplayersp.func_184825_o(1.0F); - this.field_187469_f += MathHelper.func_76131_a((Objects.equal(this.field_187467_d, itemstack) ? f * f * f : 0.0F) - this.field_187469_f, -0.4F, 0.4F); - this.field_187471_h += MathHelper.func_76131_a((float)(Objects.equal(this.field_187468_e, itemstack1) ? 1 : 0) - this.field_187471_h, -0.4F, 0.4F); -+ this.field_187469_f += MathHelper.func_76131_a((net.minecraftforge.client.ForgeHooksClient.shouldCauseReequipAnimation(this.field_187467_d, itemstack, entityplayersp.field_71071_by.field_70461_c) ? f * f * f : 0.0F) - this.field_187469_f, -0.4F, 0.4F); -+ this.field_187471_h += MathHelper.func_76131_a((float)(net.minecraftforge.client.ForgeHooksClient.shouldCauseReequipAnimation(this.field_187468_e, itemstack1, -1) ? 1 : 0) - this.field_187471_h, -0.4F, 0.4F); ++ this.field_187469_f += MathHelper.func_76131_a((!net.minecraftforge.client.ForgeHooksClient.shouldCauseReequipAnimation(this.field_187467_d, itemstack, entityplayersp.field_71071_by.field_70461_c) ? f * f * f : 0.0F) - this.field_187469_f, -0.4F, 0.4F); ++ this.field_187471_h += MathHelper.func_76131_a((float)(!net.minecraftforge.client.ForgeHooksClient.shouldCauseReequipAnimation(this.field_187468_e, itemstack1, -1) ? 1 : 0) - this.field_187471_h, -0.4F, 0.4F); } if (this.field_187469_f < 0.1F) diff --git a/src/main/java/net/minecraftforge/client/ForgeHooksClient.java b/src/main/java/net/minecraftforge/client/ForgeHooksClient.java index 56eddd0923..972d696e90 100644 --- a/src/main/java/net/minecraftforge/client/ForgeHooksClient.java +++ b/src/main/java/net/minecraftforge/client/ForgeHooksClient.java @@ -629,10 +629,9 @@ public class ForgeHooksClient // FIXME public static boolean shouldCauseReequipAnimation(ItemStack from, ItemStack to, int slot) { - if(!Objects.equal(from, to) || from == null) - { - return Objects.equal(from, to); - } + if (from == null && to != null) return true; + if (from == null && to == null) return false; + if (from != null && to == null) return true; boolean changed = false; if (slot != -1) {