From 0f228e996b93ba0acf0cc9bec433531b10b47637 Mon Sep 17 00:00:00 2001 From: Lizbeth Rika Date: Mon, 27 Jul 2015 22:16:49 +0100 Subject: [PATCH] Better hopperhock detection. --- .../block/subtile/functional/SubTileHopperhock.java | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHopperhock.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHopperhock.java index 3a490aa76..7b79c713a 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHopperhock.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHopperhock.java @@ -31,6 +31,7 @@ import net.minecraftforge.common.util.ForgeDirection; import org.lwjgl.opengl.GL11; import vazkii.botania.api.lexicon.LexiconEntry; +import vazkii.botania.api.mana.IManaItem; import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.SubTileFunctional; import vazkii.botania.common.core.helper.InventoryHelper; @@ -126,7 +127,17 @@ public class SubTileHopperhock extends SubTileFunctional { continue; anyFilter = true; - if(stack.isItemEqual(filterEntry) && ItemStack.areItemStackTagsEqual(filterEntry, stack)) + boolean itemEqual = stack.getItem() == filterEntry.getItem(); + boolean damageEqual = stack.getItemDamage() == filterEntry.getItemDamage(); + boolean nbtEqual = ItemStack.areItemStackTagsEqual(filterEntry, stack); + + if(itemEqual && damageEqual && nbtEqual) + return true; + + if(!stack.getHasSubtypes() && stack.isItemStackDamageable() && stack.getMaxStackSize() == 1 && itemEqual && nbtEqual) + return true; + + if(stack.getItem() instanceof IManaItem && itemEqual) return true; }