From 39858c1a10c11b511bc600389ea8295db40b2e81 Mon Sep 17 00:00:00 2001 From: raoulvdberge Date: Mon, 30 Jul 2018 12:20:39 +0200 Subject: [PATCH] Disable re-equip animation. --- .../raoulvdberge/refinedstorage/item/ItemFilter.java | 5 +++++ .../refinedstorage/item/ItemNetworkItem.java | 10 +--------- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/src/main/java/com/raoulvdberge/refinedstorage/item/ItemFilter.java b/src/main/java/com/raoulvdberge/refinedstorage/item/ItemFilter.java index d91e23419..30a723936 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/item/ItemFilter.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/item/ItemFilter.java @@ -88,6 +88,11 @@ public class ItemFilter extends ItemBase { RenderUtils.addCombinedFluidsToTooltip(tooltip, false, fluids.getFilteredFluids()); } + @Override + public boolean shouldCauseReequipAnimation(ItemStack oldStack, ItemStack newStack, boolean slotChanged) { + return false; + } + public static int getCompare(ItemStack stack) { return (stack.hasTagCompound() && stack.getTagCompound().hasKey(NBT_COMPARE)) ? stack.getTagCompound().getInteger(NBT_COMPARE) : (IComparer.COMPARE_DAMAGE | IComparer.COMPARE_NBT); } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/item/ItemNetworkItem.java b/src/main/java/com/raoulvdberge/refinedstorage/item/ItemNetworkItem.java index a79815ca0..dc67599ea 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/item/ItemNetworkItem.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/item/ItemNetworkItem.java @@ -122,15 +122,7 @@ public abstract class ItemNetworkItem extends ItemEnergyItem implements INetwork @Override public boolean shouldCauseReequipAnimation(ItemStack oldStack, ItemStack newStack, boolean slotChanged) { - if (oldStack.getItem() == newStack.getItem()) { - if (isValid(oldStack) && isValid(newStack)) { - if (getX(oldStack) == getX(newStack) && getY(oldStack) == getY(newStack) && getZ(oldStack) == getZ(newStack) && getDimensionId(oldStack) == getDimensionId(newStack)) { - return false; - } - } - } - - return super.shouldCauseReequipAnimation(oldStack, newStack, slotChanged); + return false; } public boolean isValid(ItemStack stack) {