diff --git a/src/main/java/vazkii/botania/api/internal/DummyMethodHandler.java b/src/main/java/vazkii/botania/api/internal/DummyMethodHandler.java index ad2e66af1..9cc9a22d2 100644 --- a/src/main/java/vazkii/botania/api/internal/DummyMethodHandler.java +++ b/src/main/java/vazkii/botania/api/internal/DummyMethodHandler.java @@ -26,6 +26,8 @@ import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; +import net.minecraftforge.items.IItemHandler; +import net.minecraftforge.items.IItemHandlerModifiable; import vazkii.botania.api.boss.IBotaniaBoss; import vazkii.botania.api.corporea.IWrappedInventory; import vazkii.botania.api.corporea.InvWithLocation; @@ -179,6 +181,11 @@ public class DummyMethodHandler implements IInternalMethodHandler { return null; } + @Override + public IItemHandlerModifiable getBaublesInventoryWrapped(EntityPlayer player) { + return null; + } + @Override public boolean shouldForceCheck() { return true; diff --git a/src/main/java/vazkii/botania/api/internal/IInternalMethodHandler.java b/src/main/java/vazkii/botania/api/internal/IInternalMethodHandler.java index eaff0b353..311a7b1ca 100644 --- a/src/main/java/vazkii/botania/api/internal/IInternalMethodHandler.java +++ b/src/main/java/vazkii/botania/api/internal/IInternalMethodHandler.java @@ -25,6 +25,8 @@ import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; +import net.minecraftforge.items.IItemHandler; +import net.minecraftforge.items.IItemHandlerModifiable; import vazkii.botania.api.boss.IBotaniaBoss; import vazkii.botania.api.corporea.IWrappedInventory; import vazkii.botania.api.corporea.InvWithLocation; @@ -98,6 +100,8 @@ public interface IInternalMethodHandler { public IInventory getBaublesInventory(EntityPlayer player); + public IItemHandlerModifiable getBaublesInventoryWrapped(EntityPlayer player); + public void breakOnAllCursors(EntityPlayer player, Item item, ItemStack stack, BlockPos pos, EnumFacing side); public boolean hasSolegnoliaAround(Entity e); 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 0735e0312..9cda57a15 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 @@ -15,7 +15,6 @@ import java.util.Collections; import java.util.List; import java.util.Set; import java.util.WeakHashMap; -import java.util.stream.IntStream; import net.minecraft.block.Block; import net.minecraft.client.Minecraft; @@ -24,7 +23,6 @@ import net.minecraft.client.renderer.GlStateManager; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.item.EntityItemFrame; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; @@ -44,7 +42,6 @@ import vazkii.botania.api.mana.IManaItem; import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.SubTileFunctional; import vazkii.botania.common.core.handler.MethodHandles; -import vazkii.botania.common.core.helper.InventoryHelper; import vazkii.botania.common.core.helper.InventoryHelper2; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibMisc; @@ -97,7 +94,7 @@ public class SubTileHopperhock extends SubTileFunctional { for(EnumFacing dir : EnumFacing.VALUES) { BlockPos pos_ = pos.offset(dir); - InvWithLocation inv = InventoryHelper2.getInventory(supertile.getWorld(), pos_, dir); + InvWithLocation inv = InventoryHelper2.getInventoryWithLocation(supertile.getWorld(), pos_, dir); if(inv != null) { List filter = getFilterForInventory(pos_, true); boolean canAccept = canAcceptItem(stack, filter, filterType); diff --git a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaFunnel.java b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaFunnel.java index 504a28265..c09def4f8 100644 --- a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaFunnel.java +++ b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaFunnel.java @@ -15,14 +15,17 @@ import java.util.List; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.item.EntityItemFrame; -import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.EnumFacing; +import net.minecraftforge.items.IItemHandler; +import net.minecraftforge.items.ItemHandlerHelper; import vazkii.botania.api.corporea.CorporeaHelper; import vazkii.botania.api.corporea.ICorporeaRequestor; import vazkii.botania.api.corporea.ICorporeaSpark; import vazkii.botania.common.core.helper.InventoryHelper; +import vazkii.botania.common.core.helper.InventoryHelper2; import vazkii.botania.common.lib.LibMisc; public class TileCorporeaFunnel extends TileCorporeaBase implements ICorporeaRequestor { @@ -80,15 +83,13 @@ public class TileCorporeaFunnel extends TileCorporeaBase implements ICorporeaReq if(!(request instanceof ItemStack)) return; - IInventory inv = InventoryHelper.getInventory(worldObj, getPos().down()); - if(inv == null || inv instanceof TileCorporeaFunnel) - inv = InventoryHelper.getInventory(worldObj, getPos().down(2)); + IItemHandler inv = getInv(); List stacks = CorporeaHelper.requestItem(request, count, spark, true, true); spark.onItemsRequested(stacks); for(ItemStack reqStack : stacks) { - if(inv != null && !(inv instanceof TileCorporeaFunnel) && reqStack.stackSize == InventoryHelper.testInventoryInsertion(inv, reqStack, EnumFacing.UP)) - InventoryHelper.insertItemIntoInventory(inv, reqStack); + if(inv != null && ItemHandlerHelper.insertItemStacked(inv, reqStack, true) == null) + ItemHandlerHelper.insertItemStacked(inv, reqStack, false); else { EntityItem item = new EntityItem(worldObj, pos.getX() + 0.5, pos.getY() + 1.5, pos.getZ() + 0.5, reqStack); worldObj.spawnEntityInWorld(item); @@ -96,4 +97,22 @@ public class TileCorporeaFunnel extends TileCorporeaBase implements ICorporeaReq } } + private IItemHandler getInv() { + TileEntity te = worldObj.getTileEntity(pos.down()); + IItemHandler ret = InventoryHelper2.getInventory(worldObj, pos.down(), EnumFacing.UP); + if(ret == null) + ret = InventoryHelper2.getInventory(worldObj, pos.down(), null); + if(ret != null && !(te instanceof TileCorporeaFunnel)) + return ret; + + te = worldObj.getTileEntity(pos.down(2)); + ret = InventoryHelper2.getInventory(worldObj, pos.down(2), EnumFacing.UP); + if(ret == null) + ret = InventoryHelper2.getInventory(worldObj, pos.down(2), null); + if(ret != null && !(te instanceof TileCorporeaFunnel)) + return ret; + + return null; + } + } diff --git a/src/main/java/vazkii/botania/common/core/handler/InternalMethodHandler.java b/src/main/java/vazkii/botania/common/core/handler/InternalMethodHandler.java index e1ba0ac87..5c1b46411 100644 --- a/src/main/java/vazkii/botania/common/core/handler/InternalMethodHandler.java +++ b/src/main/java/vazkii/botania/common/core/handler/InternalMethodHandler.java @@ -28,6 +28,9 @@ import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; +import net.minecraftforge.items.IItemHandler; +import net.minecraftforge.items.IItemHandlerModifiable; +import net.minecraftforge.items.wrapper.InvWrapper; import vazkii.botania.api.BotaniaAPIClient; import vazkii.botania.api.boss.IBotaniaBoss; import vazkii.botania.api.corporea.CorporeaHelper; @@ -185,6 +188,11 @@ public class InternalMethodHandler extends DummyMethodHandler { return PlayerHandler.getPlayerBaubles(player); } + @Override + public IItemHandlerModifiable getBaublesInventoryWrapped(EntityPlayer player) { + return new InvWrapper(getBaublesInventory(player)); + } + @Override public void drawSimpleManaHUD(int color, int mana, int maxMana, String name, ScaledResolution res) { HUDHandler.drawSimpleManaHUD(color, mana, maxMana, name, res); 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 d82f583e2..79c9e1b29 100644 --- a/src/main/java/vazkii/botania/common/core/helper/InventoryHelper2.java +++ b/src/main/java/vazkii/botania/common/core/helper/InventoryHelper2.java @@ -16,9 +16,18 @@ import net.minecraftforge.items.IItemHandler; import net.minecraftforge.items.wrapper.InvWrapper; import vazkii.botania.api.corporea.InvWithLocation; +import java.util.Iterator; + public final class InventoryHelper2 { - - public static InvWithLocation getInventory(World world, BlockPos pos, EnumFacing side) { + + public static InvWithLocation getInventoryWithLocation(World world, BlockPos pos, EnumFacing side) { + IItemHandler ret = getInventory(world, pos, side); + if(ret == null) + return null; + else return new InvWithLocation(ret, world, pos); + } + + public static IItemHandler getInventory(World world, BlockPos pos, EnumFacing side) { TileEntity te = world.getTileEntity(pos); if(te == null) @@ -39,7 +48,23 @@ public final class InventoryHelper2 { ret = new InvWrapper(new InventoryLargeChest("Large chest", (ILockableContainer) te, (ILockableContainer) world.getTileEntity(pos.south()))); } - return ret == null ? null : new InvWithLocation(ret, world, pos); + return ret; + } + + public static Iterable toIterable(IItemHandler itemHandler) { + return () -> new Iterator() { + int index = 0; + + @Override + public boolean hasNext() { + return index < itemHandler.getSlots(); + } + + @Override + public ItemStack next() { + return itemHandler.getStackInSlot(index++); + } + }; } private InventoryHelper2() {} diff --git a/src/main/java/vazkii/botania/common/entity/EntityCorporeaSpark.java b/src/main/java/vazkii/botania/common/entity/EntityCorporeaSpark.java index f898723ef..ad8d4bee5 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityCorporeaSpark.java +++ b/src/main/java/vazkii/botania/common/entity/EntityCorporeaSpark.java @@ -17,7 +17,6 @@ import com.google.common.base.Predicates; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; -import net.minecraft.inventory.IInventory; import net.minecraft.item.EnumDyeColor; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -28,7 +27,6 @@ import net.minecraft.util.MathHelper; import net.minecraft.world.World; import vazkii.botania.api.corporea.ICorporeaSpark; import vazkii.botania.api.corporea.InvWithLocation; -import vazkii.botania.common.core.helper.InventoryHelper; import vazkii.botania.common.core.helper.InventoryHelper2; import vazkii.botania.common.item.ModItems; @@ -191,7 +189,7 @@ public class EntityCorporeaSpark extends Entity implements ICorporeaSpark { int x = MathHelper.floor_double(posX); int y = MathHelper.floor_double(posY - 1); int z = MathHelper.floor_double(posZ); - return InventoryHelper2.getInventory(worldObj, new BlockPos(x, y, z), EnumFacing.UP); + return InventoryHelper2.getInventoryWithLocation(worldObj, new BlockPos(x, y, z), EnumFacing.UP); } @Override diff --git a/src/main/java/vazkii/botania/common/item/ItemFlowerBag.java b/src/main/java/vazkii/botania/common/item/ItemFlowerBag.java index 00486feba..0d4efb32e 100644 --- a/src/main/java/vazkii/botania/common/item/ItemFlowerBag.java +++ b/src/main/java/vazkii/botania/common/item/ItemFlowerBag.java @@ -23,6 +23,10 @@ import net.minecraft.util.EnumFacing; import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.player.EntityItemPickupEvent; +import net.minecraftforge.items.CapabilityItemHandler; +import net.minecraftforge.items.IItemHandler; +import net.minecraftforge.items.ItemHandlerHelper; +import net.minecraftforge.items.wrapper.InvWrapper; import vazkii.botania.common.Botania; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.core.helper.InventoryHelper; @@ -94,9 +98,17 @@ public class ItemFlowerBag extends ItemMod { @Override public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, BlockPos pos, EnumFacing side, float xs, float ys, float zs) { TileEntity tile = world.getTileEntity(pos); - if(tile != null && tile instanceof IInventory) { + if(tile != null) { if(!world.isRemote) { - IInventory inv = (IInventory) tile; + IItemHandler inv = null; + if(tile.hasCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, null)) + inv = tile.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, null); + else if(tile instanceof IInventory) + inv = new InvWrapper(((IInventory) tile)); + + if(inv == null) + return true; + ItemStack[] stacks = loadStacks(stack); ItemStack[] newStacks = new ItemStack[stacks.length]; boolean putAny = false; @@ -104,14 +116,10 @@ public class ItemFlowerBag extends ItemMod { int i = 0; for(ItemStack petal : stacks) { if(petal != null) { - int count = InventoryHelper.testInventoryInsertion(inv, petal, side); - InventoryHelper.insertItemIntoInventory(inv, petal, side, -1); - - ItemStack newPetal = petal.copy(); - if(newPetal.stackSize == 0) - newPetal = null; - - newStacks[i] = newPetal; + newStacks[i] = ItemHandlerHelper.insertItemStacked(inv, petal, false); + int count = petal.stackSize; + if(newStacks[i] != null) + count = petal.stackSize - newStacks[i].stackSize; putAny |= count > 0; } @@ -119,9 +127,8 @@ public class ItemFlowerBag extends ItemMod { } setStacks(stack, newStacks); - if(putAny && inv instanceof TileEntityChest) { - inv = InventoryHelper.getInventory(inv); - player.displayGUIChest(inv); + if(putAny && tile instanceof TileEntityChest) { + player.displayGUIChest(((TileEntityChest) tile)); } } diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemItemFinder.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemItemFinder.java index e4c6c0a8f..e17804d7d 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemItemFinder.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemItemFinder.java @@ -31,8 +31,13 @@ import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.BlockPos; +import net.minecraft.util.EnumFacing; import net.minecraft.village.MerchantRecipe; +import net.minecraftforge.items.CapabilityItemHandler; +import net.minecraftforge.items.IItemHandler; +import net.minecraftforge.items.wrapper.InvWrapper; +import net.minecraftforge.items.wrapper.PlayerInvWrapper; import vazkii.botania.api.item.IBaubleRender; import vazkii.botania.client.core.handler.MiscellaneousIcons; import vazkii.botania.client.core.helper.IconHelper; @@ -112,8 +117,10 @@ public class ItemItemFinder extends ItemBauble implements IBaubleRender { for(Entity e : entities) { if(e == player) continue; - - if(e instanceof EntityItem) { + if(e.hasCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, null)) { + if(scanInventory(e.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, null), pstack)) + positionsBuilder.append(e.getEntityId()).append(";"); + } else if(e instanceof EntityItem) { EntityItem item = (EntityItem) e; ItemStack istack = item.getEntityItem(); if(player.isSneaking() || istack.isItemEqual(pstack) && ItemStack.areItemStackTagsEqual(istack, pstack)) @@ -121,20 +128,20 @@ public class ItemItemFinder extends ItemBauble implements IBaubleRender { } else if(e instanceof IInventory) { IInventory inv = (IInventory) e; - if(scanInventory(inv, pstack)) + if(scanInventory(new InvWrapper(inv), pstack)) positionsBuilder.append(e.getEntityId()).append(";"); } else if(e instanceof EntityHorse) { EntityHorse horse = (EntityHorse) e; AnimalChest chest = ReflectionHelper.getPrivateValue(EntityHorse.class, horse, LibObfuscation.HORSE_CHEST); - if(scanInventory(chest, pstack)) + if(scanInventory(new InvWrapper(chest), pstack)) positionsBuilder.append(horse.getEntityId()).append(";"); } else if(e instanceof EntityPlayer) { EntityPlayer player_ = (EntityPlayer) e; - InventoryPlayer inv = player_.inventory; - InventoryBaubles binv = PlayerHandler.getPlayerBaubles(player_); - if(scanInventory(inv, pstack) || scanInventory(binv, pstack)) + IItemHandler playerInv = new PlayerInvWrapper(player_.inventory); + IItemHandler binv = new InvWrapper(PlayerHandler.getPlayerBaubles(player_)); + if(scanInventory(playerInv, pstack) || scanInventory(binv, pstack)) positionsBuilder.append(player_.getEntityId()).append(";"); } else if(e instanceof EntityVillager) { @@ -161,10 +168,21 @@ public class ItemItemFinder extends ItemBauble implements IBaubleRender { for(int k = -range; k < range + 1; k++) { BlockPos pos_ = pos.add(i, j, k); TileEntity tile = player.worldObj.getTileEntity(pos_); - if(tile != null && tile instanceof IInventory) { - IInventory inv = (IInventory) tile; - if(scanInventory(inv, pstack)) - positionsBuilder.append(pos_.getX()).append(",").append(pos_.getY()).append(",").append(pos_.getZ()).append(";"); + if(tile != null) { + boolean foundCap = false; + for(EnumFacing e : EnumFacing.VALUES) { + if(tile.hasCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, e) + && scanInventory(tile.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, e), pstack)) { + positionsBuilder.append(pos_.getX()).append(",").append(pos_.getY()).append(",").append(pos_.getZ()).append(";"); + foundCap = true; + break; + } + } + if(!foundCap && tile instanceof IInventory) { + IInventory inv = (IInventory) tile; + if(scanInventory(new InvWrapper(inv), pstack)) + positionsBuilder.append(pos_.getX()).append(",").append(pos_.getY()).append(",").append(pos_.getZ()).append(";"); + } } } } @@ -182,11 +200,11 @@ public class ItemItemFinder extends ItemBauble implements IBaubleRender { return stack1.isItemEqual(stack2) && ItemStack.areItemStackTagsEqual(stack1, stack2); } - boolean scanInventory(IInventory inv, ItemStack pstack) { + boolean scanInventory(IItemHandler inv, ItemStack pstack) { if(pstack == null) return false; - for(int l = 0; l < inv.getSizeInventory(); l++) { + for(int l = 0; l < inv.getSlots(); l++) { ItemStack istack = inv.getStackInSlot(l); if(istack != null && equalStacks(istack, pstack)) return true;