From c20247b680d99a061d4de5d5a8bd313a09327299 Mon Sep 17 00:00:00 2001 From: yrsegal Date: Sun, 10 Jan 2016 11:38:14 -0500 Subject: [PATCH] Baubles now able to IBlockProvide MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This allows for things like Botanical Addons’ Toolbelt to provide from the tools in them while worn. --- .../botania/common/item/rod/ItemExchangeRod.java | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/src/main/java/vazkii/botania/common/item/rod/ItemExchangeRod.java b/src/main/java/vazkii/botania/common/item/rod/ItemExchangeRod.java index ebd0d40d6..c247c2b55 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemExchangeRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemExchangeRod.java @@ -31,6 +31,7 @@ import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.event.entity.player.PlayerInteractEvent; import net.minecraftforge.event.entity.player.PlayerInteractEvent.Action; +import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.item.IBlockProvider; import vazkii.botania.api.item.IManaProficiencyArmor; import vazkii.botania.api.item.IWireframeCoordinateListProvider; @@ -278,13 +279,23 @@ public class ItemExchangeRod extends ItemMod implements IManaUsingItem, IWirefra if(player.capabilities.isCreativeMode) return new ItemStack(block, 1, meta); - return removeFromInventory(player, player.inventory, stack, block, meta, doit); + ItemStack outStack = removeFromInventory(player, BotaniaAPI.internalHandler.getBaublesInventory(player), stack, block, meta, doit); + if (outStack == null) + outStack = removeFromInventory(player, player.inventory, stack, block, meta, doit); + return outStack; } public static int getInventoryItemCount(EntityPlayer player, ItemStack stack, Block block, int meta) { if(player.capabilities.isCreativeMode) return -1; - return getInventoryItemCount(player, player.inventory, stack, block, meta); + + int baubleCount = getInventoryItemCount(player, BotaniaAPI.internalHandler.getBaublesInventory(player), stack, block, meta); + if (baubleCount == -1) return -1; + + int count = getInventoryItemCount(player, player.inventory, stack, block, meta); + if (count == -1) return -1; + + return count+baubleCount; } public static int getInventoryItemCount(EntityPlayer player, IInventory inv, ItemStack stack, Block block, int meta) {