From 419d8c975355ced9886bf3840642348914766acb Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sat, 28 Jan 2017 16:11:37 -0600 Subject: [PATCH] A few more spots I missed in b76f9d4 --- .../botania/api/mana/ManaItemHandler.java | 11 +++++---- .../botania/common/item/ItemEnderHand.java | 7 +++--- .../common/item/rod/ItemExchangeRod.java | 24 +++++++++---------- 3 files changed, 21 insertions(+), 21 deletions(-) diff --git a/src/main/java/vazkii/botania/api/mana/ManaItemHandler.java b/src/main/java/vazkii/botania/api/mana/ManaItemHandler.java index 04be0b25c..103333e30 100644 --- a/src/main/java/vazkii/botania/api/mana/ManaItemHandler.java +++ b/src/main/java/vazkii/botania/api/mana/ManaItemHandler.java @@ -19,9 +19,10 @@ import java.util.Map.Entry; import javax.annotation.Nullable; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.items.CapabilityItemHandler; +import net.minecraftforge.items.IItemHandler; import vazkii.botania.api.BotaniaAPI; public final class ManaItemHandler { @@ -36,10 +37,10 @@ public final class ManaItemHandler { if (player == null) return new ArrayList(); - IInventory mainInv = player.inventory; + IItemHandler mainInv = player.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, null); List toReturn = new ArrayList(); - int size = mainInv.getSizeInventory(); + int size = mainInv.getSlots(); for(int slot = 0; slot < size; slot++) { ItemStack stackInSlot = mainInv.getStackInSlot(slot); @@ -63,13 +64,13 @@ public final class ManaItemHandler { if (player == null) return new HashMap(); - IInventory baublesInv = BotaniaAPI.internalHandler.getBaublesInventory(player); + IItemHandler baublesInv = BotaniaAPI.internalHandler.getBaublesInventoryWrapped(player); if (baublesInv == null) return new HashMap(); Map toReturn = new HashMap(); - int size = baublesInv.getSizeInventory(); + int size = baublesInv.getSlots(); for(int slot = 0; slot < size; slot++) { ItemStack stackInSlot = baublesInv.getStackInSlot(slot); diff --git a/src/main/java/vazkii/botania/common/item/ItemEnderHand.java b/src/main/java/vazkii/botania/common/item/ItemEnderHand.java index 212e8ec86..3b415d140 100644 --- a/src/main/java/vazkii/botania/common/item/ItemEnderHand.java +++ b/src/main/java/vazkii/botania/common/item/ItemEnderHand.java @@ -21,6 +21,7 @@ import net.minecraft.util.ActionResult; import net.minecraft.util.EnumActionResult; import net.minecraft.util.EnumHand; import net.minecraft.world.World; +import net.minecraftforge.items.wrapper.InvWrapper; import vazkii.botania.api.item.IBlockProvider; import vazkii.botania.api.mana.IManaUsingItem; import vazkii.botania.api.mana.ManaItemHandler; @@ -76,13 +77,13 @@ public class ItemEnderHand extends ItemMod implements IManaUsingItem, IBlockProv if(requestor != null && requestor.getItem() == this) return false; - ItemStack istack = ItemExchangeRod.removeFromInventory(player, player.getInventoryEnderChest(), stack, block, meta, false); + ItemStack istack = ItemExchangeRod.removeFromInventory(player, new InvWrapper(player.getInventoryEnderChest()), stack, block, meta, false); if(!istack.isEmpty()) { boolean mana = ManaItemHandler.requestManaExact(stack, player, COST_PROVIDE, false); if(mana) { if(doit) { ManaItemHandler.requestManaExact(stack, player, COST_PROVIDE, true); - ItemExchangeRod.removeFromInventory(player, player.getInventoryEnderChest(), stack, block, meta, true); + ItemExchangeRod.removeFromInventory(player, new InvWrapper(player.getInventoryEnderChest()), stack, block, meta, true); } return true; @@ -97,7 +98,7 @@ public class ItemEnderHand extends ItemMod implements IManaUsingItem, IBlockProv if(requestor != null && requestor.getItem() == this) return 0; - return ItemExchangeRod.getInventoryItemCount(player, player.getInventoryEnderChest(), stack, block, meta); + return ItemExchangeRod.getInventoryItemCount(player, new InvWrapper(player.getInventoryEnderChest()), stack, block, meta); } } 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 87e89c677..bb72a27eb 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemExchangeRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemExchangeRod.java @@ -41,6 +41,8 @@ import net.minecraftforge.event.entity.player.PlayerInteractEvent; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import net.minecraftforge.items.CapabilityItemHandler; +import net.minecraftforge.items.IItemHandler; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.item.IBlockProvider; import vazkii.botania.api.item.IManaProficiencyArmor; @@ -247,20 +249,16 @@ public class ItemExchangeRod extends ItemMod implements IManaUsingItem, IWirefra return block != null && block != Blocks.AIR; } - public static ItemStack removeFromInventory(EntityPlayer player, IInventory inv, ItemStack stack, Block block, int meta, boolean doit) { + public static ItemStack removeFromInventory(EntityPlayer player, IItemHandler inv, ItemStack stack, Block block, int meta, boolean doit) { List providers = new ArrayList<>(); - for(int i = inv.getSizeInventory() - 1; i >= 0; i--) { + for(int i = inv.getSlots() - 1; i >= 0; i--) { ItemStack invStack = inv.getStackInSlot(i); if(invStack.isEmpty()) continue; Item item = invStack.getItem(); if(item == Item.getItemFromBlock(block) && invStack.getItemDamage() == meta) { - ItemStack retStack = invStack.copy(); - if(doit) { - invStack.shrink(1); - } - return retStack; + return inv.extractItem(i, 1, !doit); } if(item instanceof IBlockProvider) @@ -280,9 +278,9 @@ public class ItemExchangeRod extends ItemMod implements IManaUsingItem, IWirefra if(player.capabilities.isCreativeMode) return new ItemStack(block, 1, meta); - ItemStack outStack = removeFromInventory(player, BotaniaAPI.internalHandler.getBaublesInventory(player), stack, block, meta, doit); + ItemStack outStack = removeFromInventory(player, BotaniaAPI.internalHandler.getBaublesInventoryWrapped(player), stack, block, meta, doit); if (outStack.isEmpty()) - outStack = removeFromInventory(player, player.inventory, stack, block, meta, doit); + outStack = removeFromInventory(player, player.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, null), stack, block, meta, doit); return outStack; } @@ -290,21 +288,21 @@ public class ItemExchangeRod extends ItemMod implements IManaUsingItem, IWirefra if(player.capabilities.isCreativeMode) return -1; - int baubleCount = getInventoryItemCount(player, BotaniaAPI.internalHandler.getBaublesInventory(player), stack, block, meta); + int baubleCount = getInventoryItemCount(player, BotaniaAPI.internalHandler.getBaublesInventoryWrapped(player), stack, block, meta); if (baubleCount == -1) return -1; - int count = getInventoryItemCount(player, player.inventory, stack, block, meta); + int count = getInventoryItemCount(player, player.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, null), 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) { + public static int getInventoryItemCount(EntityPlayer player, IItemHandler inv, ItemStack stack, Block block, int meta) { if(player.capabilities.isCreativeMode) return -1; int count = 0; - for(int i = 0; i < inv.getSizeInventory(); i++) { + for(int i = 0; i < inv.getSlots(); i++) { ItemStack invStack = inv.getStackInSlot(i); if(invStack.isEmpty()) continue;