dave/refinedstorage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Disable re-equip animation.

Browse Source
This commit is contained in:
raoulvdberge
2018-07-30 12:20:39 +02:00
parent 3685660ddd
commit 39858c1a10
2 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/com/raoulvdberge/refinedstorage/item/ItemFilter.java
View File

@@ -88,6 +88,11 @@ public class ItemFilter extends ItemBase {
RenderUtils.addCombinedFluidsToTooltip(tooltip, false, fluids.getFilteredFluids()); RenderUtils.addCombinedFluidsToTooltip(tooltip, false, fluids.getFilteredFluids());
} }
@Override
public boolean shouldCauseReequipAnimation(ItemStack oldStack, ItemStack newStack, boolean slotChanged) {
return false;
}
public static int getCompare(ItemStack stack) { 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); return (stack.hasTagCompound() && stack.getTagCompound().hasKey(NBT_COMPARE)) ? stack.getTagCompound().getInteger(NBT_COMPARE) : (IComparer.COMPARE_DAMAGE | IComparer.COMPARE_NBT);
} }

10
src/main/java/com/raoulvdberge/refinedstorage/item/ItemNetworkItem.java
View File

@@ -122,15 +122,7 @@ public abstract class ItemNetworkItem extends ItemEnergyItem implements INetwork
@Override @Override
public boolean shouldCauseReequipAnimation(ItemStack oldStack, ItemStack newStack, boolean slotChanged) { public boolean shouldCauseReequipAnimation(ItemStack oldStack, ItemStack newStack, boolean slotChanged) {
if (oldStack.getItem() == newStack.getItem()) { return false;
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);
} }
public boolean isValid(ItemStack stack) { public boolean isValid(ItemStack stack) {