From 93174616c7569f4f063d17d1931d51312bb0c27c Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Mon, 7 Mar 2016 14:01:13 -0600 Subject: [PATCH] Fall back to null sided cap --- .../vazkii/botania/common/core/helper/InventoryHelper2.java | 2 ++ .../java/vazkii/botania/common/item/ItemCorporeaSpark.java | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/main/java/vazkii/botania/common/core/helper/InventoryHelper2.java b/src/main/java/vazkii/botania/common/core/helper/InventoryHelper2.java index 74c9847b2..d82f583e2 100644 --- a/src/main/java/vazkii/botania/common/core/helper/InventoryHelper2.java +++ b/src/main/java/vazkii/botania/common/core/helper/InventoryHelper2.java @@ -25,6 +25,8 @@ public final class InventoryHelper2 { return null; IItemHandler ret = te.hasCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, side) ? te.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, side) : null; + if(ret == null && te.hasCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, null)) + ret = te.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, null); if(te instanceof TileEntityChest) { Block chestBlock = world.getBlockState(pos).getBlock(); if(world.getBlockState(pos.west()).getBlock() == chestBlock) diff --git a/src/main/java/vazkii/botania/common/item/ItemCorporeaSpark.java b/src/main/java/vazkii/botania/common/item/ItemCorporeaSpark.java index 9e9db23d2..98384fb5c 100644 --- a/src/main/java/vazkii/botania/common/item/ItemCorporeaSpark.java +++ b/src/main/java/vazkii/botania/common/item/ItemCorporeaSpark.java @@ -42,7 +42,8 @@ public class ItemCorporeaSpark extends ItemMod { @Override public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, BlockPos pos, EnumFacing side, float xv, float yv, float zv) { TileEntity tile = world.getTileEntity(pos); - if(tile.hasCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, EnumFacing.UP) && !CorporeaHelper.doesBlockHaveSpark(world, pos)) { + if((tile.hasCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, EnumFacing.UP) || tile.hasCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, null)) + && !CorporeaHelper.doesBlockHaveSpark(world, pos)) { stack.stackSize--; if(!world.isRemote) { EntityCorporeaSpark spark = new EntityCorporeaSpark(world);