From ef2ab91b370e182f8d1786eb9b36b80e3f0bb16b Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sun, 28 Feb 2016 20:46:01 -0600 Subject: [PATCH] All basic tiles --- .../vazkii/botania/api/item/IAvatarTile.java | 10 +- .../botania/api/recipe/IFlowerComponent.java | 4 +- .../vazkii/botania/api/recipe/RecipeBrew.java | 5 +- .../botania/api/recipe/RecipePetals.java | 5 +- .../botania/client/model/ModelBrewery.java | 8 +- .../client/render/tile/RenderTileAltar.java | 6 +- .../client/render/tile/RenderTileAvatar.java | 2 +- .../render/tile/RenderTileHourglass.java | 2 +- .../render/tile/RenderTileIncensePlate.java | 2 +- .../client/render/tile/RenderTilePrism.java | 2 +- .../render/tile/RenderTileRuneAltar.java | 4 +- .../render/tile/RenderTileSparkChanger.java | 2 +- .../render/tile/RenderTileSpreader.java | 2 +- .../botania/common/block/BlockAltar.java | 6 +- .../botania/common/block/BlockAvatar.java | 8 +- .../botania/common/block/BlockHourglass.java | 8 +- .../common/block/BlockIncensePlate.java | 8 +- .../botania/common/block/BlockOpenCrate.java | 4 +- .../common/block/BlockSparkChanger.java | 10 +- .../block/corporea/BlockCorporeaBase.java | 2 +- .../common/block/mana/BlockBrewery.java | 6 +- .../botania/common/block/mana/BlockPrism.java | 8 +- .../common/block/mana/BlockRuneAltar.java | 6 +- .../common/block/mana/BlockSpreader.java | 8 +- .../botania/common/block/tile/TileAltar.java | 65 +++----- .../botania/common/block/tile/TileAvatar.java | 49 ++---- .../common/block/tile/TileBrewery.java | 55 +++---- .../common/block/tile/TileCraftCrate.java | 36 +++-- .../common/block/tile/TileHourglass.java | 26 ++-- .../common/block/tile/TileIncensePlate.java | 44 +++--- .../common/block/tile/TileOpenCrate.java | 9 +- .../common/block/tile/TileRuneAltar.java | 57 +++---- .../block/tile/TileSimpleInventory.java | 146 ++++++++---------- .../common/block/tile/TileSparkChanger.java | 29 ++-- .../corporea/TileCorporeaCrystalCube.java | 10 +- .../tile/corporea/TileCorporeaFunnel.java | 10 +- .../tile/corporea/TileCorporeaIndex.java | 5 - .../corporea/TileCorporeaInterceptor.java | 10 +- .../common/block/tile/mana/TilePrism.java | 31 ++-- .../common/block/tile/mana/TileSpreader.java | 34 ++-- .../common/crafting/recipe/HeadRecipe.java | 5 +- .../common/item/material/ItemManaPetal.java | 3 +- .../item/material/ItemManaResource.java | 3 +- .../common/item/material/ItemPetal.java | 3 +- .../common/item/material/ItemRune.java | 3 +- 45 files changed, 342 insertions(+), 419 deletions(-) diff --git a/src/main/java/vazkii/botania/api/item/IAvatarTile.java b/src/main/java/vazkii/botania/api/item/IAvatarTile.java index c89f903b2..5112d5cec 100644 --- a/src/main/java/vazkii/botania/api/item/IAvatarTile.java +++ b/src/main/java/vazkii/botania/api/item/IAvatarTile.java @@ -10,13 +10,19 @@ */ package vazkii.botania.api.item; -import net.minecraft.inventory.IInventory; +import net.minecraftforge.items.IItemHandler; import vazkii.botania.api.mana.IManaReceiver; /** * A TileEntity that implements this is considered an Avatar. */ -public interface IAvatarTile extends IInventory, IManaReceiver { +public interface IAvatarTile extends IManaReceiver { + + /** + * Gets the avatar's inventory + * @return An IItemhandler representing the avatar's inventory + */ + public IItemHandler getInventory(); /** * Gets the amount of ticks that have elapsed on this avatar while it's functional diff --git a/src/main/java/vazkii/botania/api/recipe/IFlowerComponent.java b/src/main/java/vazkii/botania/api/recipe/IFlowerComponent.java index ca4612412..329ad9ce2 100644 --- a/src/main/java/vazkii/botania/api/recipe/IFlowerComponent.java +++ b/src/main/java/vazkii/botania/api/recipe/IFlowerComponent.java @@ -10,15 +10,15 @@ */ package vazkii.botania.api.recipe; -import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; +import vazkii.botania.api.item.IPetalApothecary; /** * Have an Item implement this to allow it to be used in the Petal Apothecary. */ public interface IFlowerComponent { - public boolean canFit(ItemStack stack, IInventory apothecary); + public boolean canFit(ItemStack stack, IPetalApothecary apothecary); public int getParticleColor(ItemStack stack); diff --git a/src/main/java/vazkii/botania/api/recipe/RecipeBrew.java b/src/main/java/vazkii/botania/api/recipe/RecipeBrew.java index 5dec0cc6e..40ab346a1 100644 --- a/src/main/java/vazkii/botania/api/recipe/RecipeBrew.java +++ b/src/main/java/vazkii/botania/api/recipe/RecipeBrew.java @@ -16,6 +16,7 @@ import java.util.List; import net.minecraft.init.Items; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; +import net.minecraftforge.items.IItemHandler; import net.minecraftforge.oredict.OreDictionary; import vazkii.botania.api.brew.Brew; import vazkii.botania.api.brew.IBrewContainer; @@ -38,10 +39,10 @@ public class RecipeBrew { this.inputs = inputsToSet; } - public boolean matches(IInventory inv) { + public boolean matches(IItemHandler inv) { List inputsMissing = new ArrayList<>(inputs); - for(int i = 0; i < inv.getSizeInventory(); i++) { + for(int i = 0; i < inv.getSlots(); i++) { ItemStack stack = inv.getStackInSlot(i); if(stack == null) break; diff --git a/src/main/java/vazkii/botania/api/recipe/RecipePetals.java b/src/main/java/vazkii/botania/api/recipe/RecipePetals.java index 05f69049a..f2df5cc57 100644 --- a/src/main/java/vazkii/botania/api/recipe/RecipePetals.java +++ b/src/main/java/vazkii/botania/api/recipe/RecipePetals.java @@ -15,6 +15,7 @@ import java.util.List; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; +import net.minecraftforge.items.IItemHandler; import net.minecraftforge.oredict.OreDictionary; public class RecipePetals { @@ -35,10 +36,10 @@ public class RecipePetals { this.inputs = inputsToSet; } - public boolean matches(IInventory inv) { + public boolean matches(IItemHandler inv) { List inputsMissing = new ArrayList<>(inputs); - for(int i = 0; i < inv.getSizeInventory(); i++) { + for(int i = 0; i < inv.getSlots(); i++) { ItemStack stack = inv.getStackInSlot(i); if(stack == null) break; diff --git a/src/main/java/vazkii/botania/client/model/ModelBrewery.java b/src/main/java/vazkii/botania/client/model/ModelBrewery.java index c32f11f6f..47af8b4cd 100644 --- a/src/main/java/vazkii/botania/client/model/ModelBrewery.java +++ b/src/main/java/vazkii/botania/client/model/ModelBrewery.java @@ -57,11 +57,11 @@ public class ModelBrewery extends ModelBase { GlStateManager.translate(0F, offset, 0F); GlStateManager.rotate(polerot, 0F, 1F, 0F); - if(hasTile && render.brewery.getStackInSlot(0) != null) { + if(hasTile && render.brewery.getItemHandler().getStackInSlot(0) != null) { GlStateManager.rotate(180F, 1F, 0F, 0F); GlStateManager.translate(0, -0.45, 0); //GlStateManager.translate(-1F / 8F, -0.5F, 1F / 128F); - render.renderItemStack(render.brewery.getStackInSlot(0)); + render.renderItemStack(render.brewery.getItemHandler().getStackInSlot(0)); //GlStateManager.translate(1F / 8F, 0.5F, -1F / 128F); GlStateManager.translate(0, 0.45, 0); GlStateManager.rotate(-180F, 1F, 0F, 0F); @@ -80,7 +80,7 @@ public class ModelBrewery extends ModelBase { offset1 = 0F; GlStateManager.translate(0F, offset1, 0F); - if(hasTile && render.brewery.getStackInSlot(i + 1) != null) { + if(hasTile && render.brewery.getItemHandler().getStackInSlot(i + 1) != null) { float rot = Plate.rotateAngleY * 180F / (float) Math.PI; float transX = 0.3125F; float transY = 1.06F; @@ -89,7 +89,7 @@ public class ModelBrewery extends ModelBase { GlStateManager.translate(transX, transY, transZ); GlStateManager.rotate(-90F, 1F, 0F, 0F); GlStateManager.translate(0.125, 0.125, 0); - render.renderItemStack(render.brewery.getStackInSlot(i + 1)); + render.renderItemStack(render.brewery.getItemHandler().getStackInSlot(i + 1)); GlStateManager.translate(-0.125, -0.125, 0); GlStateManager.rotate(90F, 1F, 0F, 0F); GlStateManager.translate(-transX, -transY, -transZ); diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileAltar.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileAltar.java index 95c6c2317..694acc379 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileAltar.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileAltar.java @@ -26,8 +26,6 @@ import net.minecraftforge.fluids.FluidRegistry; import org.lwjgl.opengl.GL11; import vazkii.botania.client.core.handler.ClientTickHandler; -import vazkii.botania.client.lib.LibResources; -import vazkii.botania.client.model.ModelAltar; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.tile.TileAltar; @@ -57,7 +55,7 @@ public class RenderTileAltar extends TileEntitySpecialRenderer { if(water) { int petals = 0; for(int i = 0; i < altar.getSizeInventory(); i++) - if(altar.getStackInSlot(i) != null) + if(altar.getItemHandler().getStackInSlot(i) != null) petals++; else break; @@ -97,7 +95,7 @@ public class RenderTileAltar extends TileEntitySpecialRenderer { GlStateManager.color(1F, 1F, 1F, 1F); - ItemStack stack = altar.getStackInSlot(i); + ItemStack stack = altar.getItemHandler().getStackInSlot(i); Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationBlocksTexture); Minecraft.getMinecraft().getRenderItem().renderItem(stack, ItemCameraTransforms.TransformType.GROUND); GlStateManager.popMatrix(); diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileAvatar.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileAvatar.java index 38dde5c29..26b49fb02 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileAvatar.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileAvatar.java @@ -69,7 +69,7 @@ public class RenderTileAvatar extends TileEntitySpecialRenderer { return; } - ItemStack stack = avatar.getStackInSlot(0); + ItemStack stack = avatar.getItemHandler().getStackInSlot(0); if(stack != null) { GlStateManager.pushMatrix(); Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationBlocksTexture); diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileHourglass.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileHourglass.java index ef39061b1..b88d16f33 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileHourglass.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileHourglass.java @@ -47,7 +47,7 @@ public class RenderTileHourglass extends TileEntitySpecialRenderer { GlStateManager.translate(x, y, z); float pos = (float) Math.sin((ClientTickHandler.ticksInGame + partTicks) * 0.05F) * 0.5F * (1F - 1F / 16F) - 0.5F; - ItemStack stack = prism.getStackInSlot(0); + ItemStack stack = prism.getItemHandler().getStackInSlot(0); if(stack != null) { Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationBlocksTexture); diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileRuneAltar.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileRuneAltar.java index 3bce25066..6dd0f5ca7 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileRuneAltar.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileRuneAltar.java @@ -34,7 +34,7 @@ public class RenderTileRuneAltar extends TileEntitySpecialRenderer model.renderCube(); GlStateManager.popMatrix(); GlStateManager.scale(1F, -1F, -1F); - ItemStack stack = spreader.getStackInSlot(0); + ItemStack stack = spreader.getItemHandler().getStackInSlot(0); if(stack != null) { Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationBlocksTexture); diff --git a/src/main/java/vazkii/botania/common/block/BlockAltar.java b/src/main/java/vazkii/botania/common/block/BlockAltar.java index cd8f81078..47a44352e 100644 --- a/src/main/java/vazkii/botania/common/block/BlockAltar.java +++ b/src/main/java/vazkii/botania/common/block/BlockAltar.java @@ -145,12 +145,12 @@ public class BlockAltar extends BlockModContainer implements ILexiconable { TileAltar tile = (TileAltar) par1World.getTileEntity(pos); if(par5EntityPlayer.isSneaking()) { for(int i = tile.getSizeInventory() - 1; i >= 0; i--) { - ItemStack stackAt = tile.getStackInSlot(i); + ItemStack stackAt = tile.getItemHandler().getStackInSlot(i); if(stackAt != null) { ItemStack copy = stackAt.copy(); if(!par5EntityPlayer.inventory.addItemStackToInventory(copy)) par5EntityPlayer.dropPlayerItemWithRandomChoice(copy, false); - tile.setInventorySlotContents(i, null); + tile.getItemHandler().setStackInSlot(i, null); par1World.updateComparatorOutputLevel(pos, this); break; } @@ -269,7 +269,7 @@ public class BlockAltar extends BlockModContainer implements ILexiconable { if (inv != null) { for (int j1 = 0; j1 < inv.getSizeInventory(); ++j1) { - ItemStack itemstack = inv.getStackInSlot(j1); + ItemStack itemstack = inv.getItemHandler().getStackInSlot(j1); if (itemstack != null) { float f = random.nextFloat() * 0.8F + 0.1F; diff --git a/src/main/java/vazkii/botania/common/block/BlockAvatar.java b/src/main/java/vazkii/botania/common/block/BlockAvatar.java index 5d5c29382..5b455cf76 100644 --- a/src/main/java/vazkii/botania/common/block/BlockAvatar.java +++ b/src/main/java/vazkii/botania/common/block/BlockAvatar.java @@ -69,17 +69,17 @@ public class BlockAvatar extends BlockModContainer implements ILexiconable { @Override public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumFacing s, float xs, float ys, float zs) { TileAvatar avatar = (TileAvatar) world.getTileEntity(pos); - ItemStack stackOnAvatar = avatar.getStackInSlot(0); + ItemStack stackOnAvatar = avatar.getItemHandler().getStackInSlot(0); ItemStack stackOnPlayer = player.getCurrentEquippedItem(); if(stackOnAvatar != null) { ItemStack copyStack = stackOnAvatar.copy(); - avatar.setInventorySlotContents(0, null); + avatar.getItemHandler().setStackInSlot(0, null); if(!player.inventory.addItemStackToInventory(copyStack)) player.dropPlayerItemWithRandomChoice(copyStack, true); return true; } else if(stackOnPlayer != null && stackOnPlayer.getItem() instanceof IAvatarWieldable) { ItemStack copyStack = stackOnPlayer.copy(); - avatar.setInventorySlotContents(0, copyStack); + avatar.getItemHandler().setStackInSlot(0, copyStack); stackOnPlayer.stackSize--; return true; } @@ -110,7 +110,7 @@ public class BlockAvatar extends BlockModContainer implements ILexiconable { if (inv != null) { for (int j1 = 0; j1 < inv.getSizeInventory(); ++j1) { - ItemStack itemstack = inv.getStackInSlot(j1); + ItemStack itemstack = inv.getItemHandler().getStackInSlot(j1); if (itemstack != null) { float f = random.nextFloat() * 0.8F + 0.1F; diff --git a/src/main/java/vazkii/botania/common/block/BlockHourglass.java b/src/main/java/vazkii/botania/common/block/BlockHourglass.java index 9548b0627..78eab4dff 100644 --- a/src/main/java/vazkii/botania/common/block/BlockHourglass.java +++ b/src/main/java/vazkii/botania/common/block/BlockHourglass.java @@ -78,7 +78,7 @@ public class BlockHourglass extends BlockModContainer implements IManaTrigger, I @Override public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumFacing side, float xs, float ys, float zs) { TileHourglass hourglass = (TileHourglass) world.getTileEntity(pos); - ItemStack hgStack = hourglass.getStackInSlot(0); + ItemStack hgStack = hourglass.getItemHandler().getStackInSlot(0); ItemStack stack = player.getCurrentEquippedItem(); if(stack != null && stack.getItem() == ModItems.twigWand) return false; @@ -90,7 +90,7 @@ public class BlockHourglass extends BlockModContainer implements IManaTrigger, I } if(hgStack == null && TileHourglass.getStackItemTime(stack) > 0) { - hourglass.setInventorySlotContents(0, stack.copy()); + hourglass.getItemHandler().setStackInSlot(0, stack.copy()); hourglass.markDirty(); stack.stackSize = 0; return true; @@ -98,7 +98,7 @@ public class BlockHourglass extends BlockModContainer implements IManaTrigger, I ItemStack copy = hgStack.copy(); if(!player.inventory.addItemStackToInventory(copy)) player.dropPlayerItemWithRandomChoice(copy, false); - hourglass.setInventorySlotContents(0, null); + hourglass.getItemHandler().setStackInSlot(0, null); hourglass.markDirty(); return true; } @@ -133,7 +133,7 @@ public class BlockHourglass extends BlockModContainer implements IManaTrigger, I if (inv != null) { for (int j1 = 0; j1 < inv.getSizeInventory(); ++j1) { - ItemStack itemstack = inv.getStackInSlot(j1); + ItemStack itemstack = inv.getItemHandler().getStackInSlot(j1); if (itemstack != null) { float f = random.nextFloat() * 0.8F + 0.1F; diff --git a/src/main/java/vazkii/botania/common/block/BlockIncensePlate.java b/src/main/java/vazkii/botania/common/block/BlockIncensePlate.java index 0aab68bd4..00047ce15 100644 --- a/src/main/java/vazkii/botania/common/block/BlockIncensePlate.java +++ b/src/main/java/vazkii/botania/common/block/BlockIncensePlate.java @@ -63,14 +63,14 @@ public class BlockIncensePlate extends BlockModContainer implements ILexiconable public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumFacing s, float xs, float ys, float zs) { TileIncensePlate plate = (TileIncensePlate) world.getTileEntity(pos); ItemStack stack = player.getCurrentEquippedItem(); - ItemStack plateStack = plate.getStackInSlot(0); + ItemStack plateStack = plate.getItemHandler().getStackInSlot(0); boolean did = false; if(world.isRemote) return true; - if(plateStack == null && plate.isItemValidForSlot(0, stack)) { - plate.setInventorySlotContents(0, stack.copy()); + if(plateStack == null && plate.acceptsItem(stack)) { + plate.getItemHandler().setStackInSlot(0, stack.copy()); stack.stackSize--; did = true; } else if(plateStack != null && !plate.burning) { @@ -82,7 +82,7 @@ public class BlockIncensePlate extends BlockModContainer implements ILexiconable ItemStack addStack = plateStack.copy(); if(!player.inventory.addItemStackToInventory(addStack)) player.dropPlayerItemWithRandomChoice(addStack, false); - plate.setInventorySlotContents(0, null); + plate.getItemHandler().setStackInSlot(0, null); did = true; } diff --git a/src/main/java/vazkii/botania/common/block/BlockOpenCrate.java b/src/main/java/vazkii/botania/common/block/BlockOpenCrate.java index 1cb4f16b1..959731a50 100644 --- a/src/main/java/vazkii/botania/common/block/BlockOpenCrate.java +++ b/src/main/java/vazkii/botania/common/block/BlockOpenCrate.java @@ -134,7 +134,7 @@ public class BlockOpenCrate extends BlockModContainer implements ILexiconable, I if (inv != null) { for (int j1 = 0; j1 < inv.getSizeInventory(); ++j1) { - ItemStack itemstack = inv.getStackInSlot(j1); + ItemStack itemstack = inv.getItemHandler().getStackInSlot(j1); if (itemstack != null) { float f = random.nextFloat() * 0.8F + 0.1F; @@ -208,7 +208,7 @@ public class BlockOpenCrate extends BlockModContainer implements ILexiconable, I Gui.drawRect(xp, yp, xp + 16, yp + 16, enabled ? 0x22FFFFFF : 0x22FF0000); - ItemStack item = craft.getStackInSlot(index); + ItemStack item = craft.getItemHandler().getStackInSlot(index); net.minecraft.client.renderer.RenderHelper.enableGUIStandardItemLighting(); GlStateManager.enableRescaleNormal(); mc.getRenderItem().renderItemAndEffectIntoGUI(item, xp, yp); diff --git a/src/main/java/vazkii/botania/common/block/BlockSparkChanger.java b/src/main/java/vazkii/botania/common/block/BlockSparkChanger.java index 8b1b84a90..d2f28fad6 100644 --- a/src/main/java/vazkii/botania/common/block/BlockSparkChanger.java +++ b/src/main/java/vazkii/botania/common/block/BlockSparkChanger.java @@ -94,17 +94,17 @@ public class BlockSparkChanger extends BlockModContainer implements ILexiconable @Override public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumFacing s, float xs, float ys, float zs) { TileSparkChanger changer = (TileSparkChanger) world.getTileEntity(pos); - ItemStack cstack = changer.getStackInSlot(0); + ItemStack cstack = changer.getItemHandler().getStackInSlot(0); ItemStack pstack = player.getCurrentEquippedItem(); if(cstack != null) { - changer.setInventorySlotContents(0, null); + changer.getItemHandler().setStackInSlot(0, null); world.updateComparatorOutputLevel(pos, this); changer.markDirty(); if(!player.inventory.addItemStackToInventory(cstack)) player.dropPlayerItemWithRandomChoice(cstack, false); return true; } else if(pstack != null && pstack.getItem() == ModItems.sparkUpgrade) { - changer.setInventorySlotContents(0, pstack.copy().splitStack(1)); + changer.getItemHandler().setStackInSlot(0, pstack.copy().splitStack(1)); world.updateComparatorOutputLevel(pos, this); changer.markDirty(); @@ -124,7 +124,7 @@ public class BlockSparkChanger extends BlockModContainer implements ILexiconable if (inv != null) { for (int j1 = 0; j1 < inv.getSizeInventory(); ++j1) { - ItemStack itemstack = inv.getStackInSlot(j1); + ItemStack itemstack = inv.getItemHandler().getStackInSlot(j1); if (itemstack != null) { float f = random.nextFloat() * 0.8F + 0.1F; @@ -164,7 +164,7 @@ public class BlockSparkChanger extends BlockModContainer implements ILexiconable @Override public int getComparatorInputOverride(World world, BlockPos pos) { TileSparkChanger changer = (TileSparkChanger) world.getTileEntity(pos); - ItemStack stack = changer.getStackInSlot(0); + ItemStack stack = changer.getItemHandler().getStackInSlot(0); if(stack == null) return 0; return stack.getItemDamage() + 1; diff --git a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaBase.java b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaBase.java index 2b6c7504a..6e8aa7d53 100644 --- a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaBase.java +++ b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaBase.java @@ -45,7 +45,7 @@ public abstract class BlockCorporeaBase extends BlockModContainer= 0; i--) { - ItemStack stackAt = brew.getStackInSlot(i); + ItemStack stackAt = brew.getItemHandler().getStackInSlot(i); if(stackAt != null) { ItemStack copy = stackAt.copy(); if(!par5EntityPlayer.inventory.addItemStackToInventory(copy)) par5EntityPlayer.dropPlayerItemWithRandomChoice(copy, false); - brew.setInventorySlotContents(i, null); + brew.getItemHandler().setStackInSlot(i, null); par1World.updateComparatorOutputLevel(pos, this); break; } @@ -98,7 +98,7 @@ public class BlockBrewery extends BlockModContainer implements ILexiconable, IWa if (inv != null) { for (int j1 = 0; j1 < inv.getSizeInventory(); ++j1) { - ItemStack itemstack = inv.getStackInSlot(j1); + ItemStack itemstack = inv.getItemHandler().getStackInSlot(j1); if (itemstack != null) { float f = random.nextFloat() * 0.8F + 0.1F; diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockPrism.java b/src/main/java/vazkii/botania/common/block/mana/BlockPrism.java index bfbe9a649..3db03c1a7 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockPrism.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockPrism.java @@ -104,7 +104,7 @@ public class BlockPrism extends BlockModContainer implements IManaTrigger, ILexi return false; TilePrism prism = (TilePrism) tile; - ItemStack lens = prism.getStackInSlot(0); + ItemStack lens = prism.getItemHandler().getStackInSlot(0); ItemStack heldItem = par5EntityPlayer.getCurrentEquippedItem(); boolean isHeldItemLens = heldItem != null && heldItem.getItem() instanceof ILens; @@ -112,14 +112,14 @@ public class BlockPrism extends BlockModContainer implements IManaTrigger, ILexi if(!par5EntityPlayer.capabilities.isCreativeMode) par5EntityPlayer.inventory.setInventorySlotContents(par5EntityPlayer.inventory.currentItem, null); - prism.setInventorySlotContents(0, heldItem.copy()); + prism.getItemHandler().setStackInSlot(0, heldItem.copy()); prism.markDirty(); par1World.setBlockState(pos, state.withProperty(BotaniaStateProps.HAS_LENS, true), 1 | 2); } else if(lens != null) { ItemStack add = lens.copy(); if(!par5EntityPlayer.inventory.addItemStackToInventory(add)) par5EntityPlayer.dropPlayerItemWithRandomChoice(add, false); - prism.setInventorySlotContents(0, null); + prism.getItemHandler().setStackInSlot(0, null); prism.markDirty(); par1World.setBlockState(pos, state.withProperty(BotaniaStateProps.HAS_LENS, false), 1 | 2); } @@ -150,7 +150,7 @@ public class BlockPrism extends BlockModContainer implements IManaTrigger, ILexi if (inv != null) { for (int j1 = 0; j1 < inv.getSizeInventory(); ++j1) { - ItemStack itemstack = inv.getStackInSlot(j1); + ItemStack itemstack = inv.getItemHandler().getStackInSlot(j1); if (itemstack != null) { float f = random.nextFloat() * 0.8F + 0.1F; diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockRuneAltar.java b/src/main/java/vazkii/botania/common/block/mana/BlockRuneAltar.java index a71649683..002d44833 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockRuneAltar.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockRuneAltar.java @@ -67,12 +67,12 @@ public class BlockRuneAltar extends BlockModContainer implements IWandable, ILex if(par5EntityPlayer.isSneaking()) { if(altar.manaToGet == 0) for(int i = altar.getSizeInventory() - 1; i >= 0; i--) { - ItemStack stackAt = altar.getStackInSlot(i); + ItemStack stackAt = altar.getItemHandler().getStackInSlot(i); if(stackAt != null) { ItemStack copy = stackAt.copy(); if(!par5EntityPlayer.inventory.addItemStackToInventory(copy)) par5EntityPlayer.dropPlayerItemWithRandomChoice(copy, false); - altar.setInventorySlotContents(i, null); + altar.getItemHandler().setStackInSlot(i, null); par1World.updateComparatorOutputLevel(pos, this); break; } @@ -90,7 +90,7 @@ public class BlockRuneAltar extends BlockModContainer implements IWandable, ILex if (inv != null) { for (int j1 = 0; j1 < inv.getSizeInventory(); ++j1) { - ItemStack itemstack = inv.getStackInSlot(j1); + ItemStack itemstack = inv.getItemHandler().getStackInSlot(j1); if (itemstack != null) { float f = random.nextFloat() * 0.8F + 0.1F; diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockSpreader.java b/src/main/java/vazkii/botania/common/block/mana/BlockSpreader.java index 7ed9c7516..753aff781 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockSpreader.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockSpreader.java @@ -151,7 +151,7 @@ public class BlockSpreader extends BlockModContainer implements IWandable, IWand return false; TileSpreader spreader = (TileSpreader) tile; - ItemStack lens = spreader.getStackInSlot(0); + ItemStack lens = spreader.getItemHandler().getStackInSlot(0); ItemStack heldItem = par5EntityPlayer.getCurrentEquippedItem(); boolean isHeldItemLens = heldItem != null && heldItem.getItem() instanceof ILens; boolean wool = heldItem != null && heldItem.getItem() == Item.getItemFromBlock(Blocks.wool); @@ -164,13 +164,13 @@ public class BlockSpreader extends BlockModContainer implements IWandable, IWand if (!par5EntityPlayer.capabilities.isCreativeMode) par5EntityPlayer.inventory.setInventorySlotContents(par5EntityPlayer.inventory.currentItem, null); - spreader.setInventorySlotContents(0, heldItem.copy()); + spreader.getItemHandler().setStackInSlot(0, heldItem.copy()); spreader.markDirty(); } else if(lens != null && !wool) { ItemStack add = lens.copy(); if(!par5EntityPlayer.inventory.addItemStackToInventory(add)) par5EntityPlayer.dropPlayerItemWithRandomChoice(add, false); - spreader.setInventorySlotContents(0, null); + spreader.getItemHandler().setStackInSlot(0, null); spreader.markDirty(); } @@ -200,7 +200,7 @@ public class BlockSpreader extends BlockModContainer implements IWandable, IWand if (inv != null) { for (int j1 = 0; j1 < inv.getSizeInventory() + 1; ++j1) { - ItemStack itemstack = j1 >= inv.getSizeInventory() ? inv.paddingColor == -1 ? null : new ItemStack(Blocks.wool, 1, inv.paddingColor) : inv.getStackInSlot(j1); + ItemStack itemstack = j1 >= inv.getSizeInventory() ? inv.paddingColor == -1 ? null : new ItemStack(Blocks.wool, 1, inv.paddingColor) : inv.getItemHandler().getStackInSlot(j1); if(itemstack != null) { float f = random.nextFloat() * 0.8F + 0.1F; diff --git a/src/main/java/vazkii/botania/common/block/tile/TileAltar.java b/src/main/java/vazkii/botania/common/block/tile/TileAltar.java index fd3cc3ed1..9b82b0201 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileAltar.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileAltar.java @@ -32,6 +32,7 @@ import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumParticleTypes; import net.minecraft.util.StatCollector; +import net.minecraftforge.items.IItemHandlerModifiable; import org.lwjgl.opengl.GL11; import vazkii.botania.api.BotaniaAPI; @@ -46,7 +47,7 @@ import vazkii.botania.client.core.helper.RenderHelper; import vazkii.botania.common.Botania; import vazkii.botania.common.lib.LibBlockNames; -public class TileAltar extends TileSimpleInventory implements ISidedInventory, IPetalApothecary { +public class TileAltar extends TileSimpleInventory implements IPetalApothecary { private static final Pattern SEED_PATTERN = Pattern.compile("(?:(?:(?:[A-Z-_.:]|^)seed)|(?:(?:[a-z-_.:]|^)Seed))(?:[sA-Z-_.:]|$)"); @@ -102,7 +103,7 @@ public class TileAltar extends TileSimpleInventory implements ISidedInventory, I boolean didChange = false; if(stack.getItem() instanceof IFlowerComponent && ((IFlowerComponent) stack.getItem()).canFit(stack, this)) { - if(getStackInSlot(getSizeInventory() - 1) != null) + if(itemHandler.getStackInSlot(getSizeInventory() - 1) != null) return false; if(!worldObj.isRemote) { @@ -111,10 +112,10 @@ public class TileAltar extends TileSimpleInventory implements ISidedInventory, I item.setDead(); for(int i = 0; i < getSizeInventory(); i++) - if(getStackInSlot(i) == null) { + if(itemHandler.getStackInSlot(i) == null) { ItemStack stackToPut = stack.copy(); stackToPut.stackSize = 1; - setInventorySlotContents(i, stackToPut); + itemHandler.setStackInSlot(i, stackToPut); didChange = true; worldObj.playSoundAtEntity(item, "game.neutral.swim.splash", 0.1F, 1F); break; @@ -122,12 +123,12 @@ public class TileAltar extends TileSimpleInventory implements ISidedInventory, I } } else if(stack.getItem() != null && SEED_PATTERN.matcher(stack.getItem().getUnlocalizedName(stack)).find()) { for(RecipePetals recipe : BotaniaAPI.petalRecipes) { - if(recipe.matches(this)) { + if(recipe.matches(itemHandler)) { saveLastRecipe(); if(!worldObj.isRemote) { for(int i = 0; i < getSizeInventory(); i++) - setInventorySlotContents(i, null); + itemHandler.setStackInSlot(i, null); stack.stackSize--; if(stack.stackSize == 0) @@ -155,7 +156,7 @@ public class TileAltar extends TileSimpleInventory implements ISidedInventory, I public void saveLastRecipe() { lastRecipe = new ArrayList<>(); for(int i = 0; i < getSizeInventory(); i++) { - ItemStack stack = getStackInSlot(i); + ItemStack stack = itemHandler.getStackInSlot(i); if(stack == null) break; lastRecipe.add(stack.copy()); @@ -164,12 +165,12 @@ public class TileAltar extends TileSimpleInventory implements ISidedInventory, I } public void trySetLastRecipe(EntityPlayer player) { - tryToSetLastRecipe(player, this, lastRecipe); + tryToSetLastRecipe(player, itemHandler, lastRecipe); if(!isEmpty()) VanillaPacketDispatcher.dispatchTEToNearbyPlayers(worldObj, pos); } - public static void tryToSetLastRecipe(EntityPlayer player, IInventory inv, List lastRecipe) { + public static void tryToSetLastRecipe(EntityPlayer player, IItemHandlerModifiable inv, List lastRecipe) { if(lastRecipe == null || lastRecipe.isEmpty() || player.worldObj.isRemote) return; @@ -188,7 +189,7 @@ public class TileAltar extends TileSimpleInventory implements ISidedInventory, I ItemStack stackToPut = pstack.copy(); stackToPut.stackSize = 1; - inv.setInventorySlotContents(index, stackToPut); + inv.setStackInSlot(index, stackToPut); didAny = true; index++; break; @@ -218,7 +219,7 @@ public class TileAltar extends TileSimpleInventory implements ISidedInventory, I public boolean isEmpty() { for(int i = 0; i < getSizeInventory(); i++) - if(getStackInSlot(i) != null) + if(itemHandler.getStackInSlot(i) != null) return false; return true; @@ -236,7 +237,7 @@ public class TileAltar extends TileSimpleInventory implements ISidedInventory, I VanillaPacketDispatcher.dispatchTEToNearbyPlayers(worldObj, pos); for(int i = 0; i < getSizeInventory(); i++) { - ItemStack stackAt = getStackInSlot(i); + ItemStack stackAt = itemHandler.getStackInSlot(i); if(stackAt == null) break; @@ -281,39 +282,19 @@ public class TileAltar extends TileSimpleInventory implements ISidedInventory, I isMossy = cmp.getBoolean(TAG_IS_MOSSY); } - @Override - public String getName() { - return LibBlockNames.ALTAR; - } - @Override public int getSizeInventory() { return 16; } @Override - public int getInventoryStackLimit() { - return 1; - } - - @Override - public boolean isItemValidForSlot(int i, ItemStack itemstack) { - return false; - } - - @Override - public int[] getSlotsForFace(EnumFacing var1) { - return new int[0]; - } - - @Override - public boolean canInsertItem(int i, ItemStack itemstack, EnumFacing j) { - return false; - } - - @Override - public boolean canExtractItem(int i, ItemStack itemstack, EnumFacing j) { - return false; + protected IItemHandlerModifiable createItemHandler() { + return new SimpleItemStackHandler(this, false) { + @Override + protected int getStackLimit(int slot, ItemStack stack) { + return 1; + } + }; } @Override @@ -344,7 +325,7 @@ public class TileAltar extends TileSimpleInventory implements ISidedInventory, I int radius = 24; int amt = 0; for(int i = 0; i < getSizeInventory(); i++) { - if(getStackInSlot(i) == null) + if(itemHandler.getStackInSlot(i) == null) break; amt++; } @@ -353,7 +334,7 @@ public class TileAltar extends TileSimpleInventory implements ISidedInventory, I float anglePer = 360F / amt; for(RecipePetals recipe : BotaniaAPI.petalRecipes) - if(recipe.matches(this)) { + if(recipe.matches(itemHandler)) { GL11.glColor4f(1F, 1F, 1F, 1F); mc.renderEngine.bindTexture(HUDHandler.manaBar); RenderHelper.drawTexturedModalRect(xc + radius + 9, yc - 8, 0, 0, 8, 22, 15); @@ -372,7 +353,7 @@ public class TileAltar extends TileSimpleInventory implements ISidedInventory, I double xPos = xc + Math.cos(angle * Math.PI / 180D) * radius - 8; double yPos = yc + Math.sin(angle * Math.PI / 180D) * radius - 8; GL11.glTranslated(xPos, yPos, 0); - mc.getRenderItem().renderItemIntoGUI(getStackInSlot(i), 0, 0); + mc.getRenderItem().renderItemIntoGUI(itemHandler.getStackInSlot(i), 0, 0); GL11.glTranslated(-xPos, -yPos, 0); angle += anglePer; diff --git a/src/main/java/vazkii/botania/common/block/tile/TileAvatar.java b/src/main/java/vazkii/botania/common/block/tile/TileAvatar.java index 29959c5bf..1f374f5ea 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileAvatar.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileAvatar.java @@ -10,15 +10,15 @@ */ package vazkii.botania.common.block.tile; -import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.EnumFacing; +import net.minecraftforge.items.IItemHandler; +import net.minecraftforge.items.IItemHandlerModifiable; import vazkii.botania.api.item.IAvatarTile; import vazkii.botania.api.item.IAvatarWieldable; -import vazkii.botania.common.lib.LibBlockNames; -public class TileAvatar extends TileSimpleInventory implements IAvatarTile, ISidedInventory { +public class TileAvatar extends TileSimpleInventory implements IAvatarTile { private static final int MAX_MANA = 6400; @@ -41,7 +41,7 @@ public class TileAvatar extends TileSimpleInventory implements IAvatarTile, ISid } } - ItemStack stack = getStackInSlot(0); + ItemStack stack = itemHandler.getStackInSlot(0); if(stack != null && stack.getItem() instanceof IAvatarWieldable) { IAvatarWieldable wieldable = (IAvatarWieldable) stack.getItem(); wieldable.onAvatarUpdate(this, stack); @@ -73,33 +73,13 @@ public class TileAvatar extends TileSimpleInventory implements IAvatarTile, ISid } @Override - public int getInventoryStackLimit() { - return 1; - } - - @Override - public boolean isItemValidForSlot(int i, ItemStack itemstack) { - return itemstack != null && itemstack.getItem() instanceof IAvatarTile; - } - - @Override - public int[] getSlotsForFace(EnumFacing p_94128_1_) { - return new int[0]; - } - - @Override - public boolean canInsertItem(int p_102007_1_, ItemStack p_102007_2_, EnumFacing p_102007_3_) { - return false; - } - - @Override - public boolean canExtractItem(int p_102008_1_, ItemStack p_102008_2_, EnumFacing p_102008_3_) { - return false; - } - - @Override - public String getName() { - return LibBlockNames.AVATAR; + protected IItemHandlerModifiable createItemHandler() { + return new SimpleItemStackHandler(this, false) { + @Override + protected int getStackLimit(int slot, ItemStack stack) { + return 1; + } + }; } @Override @@ -114,7 +94,7 @@ public class TileAvatar extends TileSimpleInventory implements IAvatarTile, ISid @Override public boolean canRecieveManaFromBursts() { - return getStackInSlot(0) != null; + return itemHandler.getStackInSlot(0) != null; } @Override @@ -122,6 +102,11 @@ public class TileAvatar extends TileSimpleInventory implements IAvatarTile, ISid return mana; } + @Override + public IItemHandler getInventory() { + return getItemHandler(); + } + @Override public int getElapsedFunctionalTicks() { return ticksElapsed; diff --git a/src/main/java/vazkii/botania/common/block/tile/TileBrewery.java b/src/main/java/vazkii/botania/common/block/tile/TileBrewery.java index 42b2850f2..3040b4fff 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileBrewery.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileBrewery.java @@ -22,6 +22,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.EnumFacing; +import net.minecraftforge.items.IItemHandlerModifiable; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.brew.IBrewContainer; import vazkii.botania.api.brew.IBrewItem; @@ -35,7 +36,7 @@ import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.lib.LibBlockNames; // This is mostly copypasta from TileRuneAltar -public class TileBrewery extends TileSimpleInventory implements ISidedInventory, IManaReceiver { +public class TileBrewery extends TileSimpleInventory implements IManaReceiver { private static final String TAG_MANA = "mana"; @@ -45,17 +46,17 @@ public class TileBrewery extends TileSimpleInventory implements ISidedInventory, public int signal = 0; public boolean addItem(EntityPlayer player, ItemStack stack) { - if(recipe != null || stack == null || stack.getItem() instanceof IBrewItem && ((IBrewItem) stack.getItem()).getBrew(stack) != null && ((IBrewItem) stack.getItem()).getBrew(stack) != BotaniaAPI.fallbackBrew || getStackInSlot(0) == null != stack.getItem() instanceof IBrewContainer) + if(recipe != null || stack == null || stack.getItem() instanceof IBrewItem && ((IBrewItem) stack.getItem()).getBrew(stack) != null && ((IBrewItem) stack.getItem()).getBrew(stack) != BotaniaAPI.fallbackBrew || itemHandler.getStackInSlot(0) == null != stack.getItem() instanceof IBrewContainer) return false; boolean did = false; for(int i = 0; i < getSizeInventory(); i++) - if(getStackInSlot(i) == null) { + if(itemHandler.getStackInSlot(i) == null) { did = true; ItemStack stackToAdd = stack.copy(); stackToAdd.stackSize = 1; - setInventorySlotContents(i, stackToAdd); + itemHandler.setStackInSlot(i, stackToAdd); if(player == null || !player.capabilities.isCreativeMode) { stack.stackSize--; @@ -69,7 +70,7 @@ public class TileBrewery extends TileSimpleInventory implements ISidedInventory, if(did) { VanillaPacketDispatcher.dispatchTEToNearbyPlayers(worldObj, pos); for(RecipeBrew recipe : BotaniaAPI.brewRecipes) - if(recipe.matches(this) && recipe.getOutput(getStackInSlot(0)) != null) { + if(recipe.matches(itemHandler) && recipe.getOutput(itemHandler.getStackInSlot(0)) != null) { this.recipe = recipe; worldObj.setBlockState(pos, ModBlocks.brewery.getDefaultState().withProperty(BotaniaStateProps.POWERED, true), 1 | 2); } @@ -82,7 +83,7 @@ public class TileBrewery extends TileSimpleInventory implements ISidedInventory, public void updateEntity() { if(mana > 0 && recipe == null) { for(RecipeBrew recipe : BotaniaAPI.brewRecipes) - if(recipe.matches(this)) { + if(recipe.matches(itemHandler)) { this.recipe = recipe; worldObj.setBlockState(pos, ModBlocks.brewery.getDefaultState().withProperty(BotaniaStateProps.POWERED, true), 1 | 2); } @@ -105,14 +106,14 @@ public class TileBrewery extends TileSimpleInventory implements ISidedInventory, } if(recipe != null) { - if(!recipe.matches(this)) { + if(!recipe.matches(itemHandler)) { recipe = null; worldObj.setBlockState(pos, ModBlocks.brewery.getDefaultState(), 1 | 2); } if(recipe != null) { if(mana != manaLastTick) { - Color color = new Color(recipe.getBrew().getColor(getStackInSlot(0))); + Color color = new Color(recipe.getBrew().getColor(itemHandler.getStackInSlot(0))); float r = color.getRed() / 255F; float g = color.getGreen() / 255F; float b = color.getBlue() / 255F; @@ -127,13 +128,13 @@ public class TileBrewery extends TileSimpleInventory implements ISidedInventory, int mana = getManaCost(); recieveMana(-mana); if(!worldObj.isRemote) { - ItemStack output = recipe.getOutput(getStackInSlot(0)); + ItemStack output = recipe.getOutput(itemHandler.getStackInSlot(0)); EntityItem outputItem = new EntityItem(worldObj, pos.getX() + 0.5, pos.getY() + 1.5, pos.getZ() + 0.5, output); worldObj.spawnEntityInWorld(outputItem); } for(int i = 0; i < getSizeInventory(); i++) - setInventorySlotContents(i, null); + itemHandler.setStackInSlot(i, null); craftingFanciness(); } @@ -153,7 +154,7 @@ public class TileBrewery extends TileSimpleInventory implements ISidedInventory, } public int getManaCost() { - ItemStack stack = getStackInSlot(0); + ItemStack stack = itemHandler.getStackInSlot(0); if(recipe == null || stack == null || !(stack.getItem() instanceof IBrewContainer)) return 0; IBrewContainer container = (IBrewContainer) stack.getItem(); @@ -163,7 +164,7 @@ public class TileBrewery extends TileSimpleInventory implements ISidedInventory, public void craftingFanciness() { worldObj.playSoundEffect(pos.getX(), pos.getY(), pos.getZ(), "botania:potionCreate", 1F, 1.5F + (float) Math.random() * 0.25F); for(int i = 0; i < 25; i++) { - Color color = new Color(recipe.getBrew().getColor(getStackInSlot(0))); + Color color = new Color(recipe.getBrew().getColor(itemHandler.getStackInSlot(0))); float r = color.getRed() / 255F; float g = color.getGreen() / 255F; float b = color.getBlue() / 255F; @@ -197,17 +198,7 @@ public class TileBrewery extends TileSimpleInventory implements ISidedInventory, return INFINITE_EXTENT_AABB; } - @Override - public String getName() { - return LibBlockNames.RUNE_ALTAR; - } - - @Override - public int getInventoryStackLimit() { - return 1; - } - - @Override + /*@Override todo 1.8 public int[] getSlotsForFace(EnumFacing var1) { int accessibleSlot = -1; for(int i = 0; i < getSizeInventory(); i++) @@ -215,16 +206,16 @@ public class TileBrewery extends TileSimpleInventory implements ISidedInventory, accessibleSlot = i; return accessibleSlot == -1 ? new int[0] : new int[] { accessibleSlot }; - } + }*/ @Override - public boolean canInsertItem(int i, ItemStack itemstack, EnumFacing j) { - return true; - } - - @Override - public boolean canExtractItem(int i, ItemStack itemstack, EnumFacing j) { - return mana == 0; + protected IItemHandlerModifiable createItemHandler() { + return new SimpleItemStackHandler(this, false) { + @Override + protected int getStackLimit(int slot, ItemStack stack) { + return 1; + } + }; } @Override @@ -256,7 +247,7 @@ public class TileBrewery extends TileSimpleInventory implements ISidedInventory, if(recipe == null) return; - RenderHelper.renderProgressPie(x, y, (float) mana / (float) manaToGet, recipe.getOutput(getStackInSlot(0))); + RenderHelper.renderProgressPie(x, y, (float) mana / (float) manaToGet, recipe.getOutput(itemHandler.getStackInSlot(0))); } } diff --git a/src/main/java/vazkii/botania/common/block/tile/TileCraftCrate.java b/src/main/java/vazkii/botania/common/block/tile/TileCraftCrate.java index 59ea029c0..4d3655bb0 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileCraftCrate.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileCraftCrate.java @@ -21,6 +21,7 @@ import net.minecraft.item.crafting.IRecipe; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.NetworkManager; import net.minecraft.network.play.server.S35PacketUpdateTileEntity; +import net.minecraftforge.items.IItemHandlerModifiable; import vazkii.botania.api.internal.VanillaPacketDispatcher; import vazkii.botania.common.item.ModItems; @@ -77,13 +78,20 @@ public class TileCraftCrate extends TileOpenCrate { } @Override - public int getInventoryStackLimit() { - return 1; - } + protected IItemHandlerModifiable createItemHandler() { + return new SimpleItemStackHandler(this, true) { + @Override + protected int getStackLimit(int slot, ItemStack stack) { + return 1; + } - @Override - public boolean isItemValidForSlot(int i, ItemStack itemstack) { - return i != 9 && !isLocked(i); + @Override + public ItemStack insertItem(int slot, ItemStack stack, boolean simulate) { + if(slot != 9 && !isLocked(slot)) + return super.insertItem(slot, stack, simulate); + else return stack; + } + }; } public boolean isLocked(int slot) { @@ -100,7 +108,7 @@ public class TileCraftCrate extends TileOpenCrate { int newSignal = 0; for(; newSignal < 9; newSignal++) // dis for loop be derpy - if(!isLocked(newSignal) && getStackInSlot(newSignal) == null) + if(!isLocked(newSignal) && itemHandler.getStackInSlot(newSignal) == null) break; if(newSignal != signal) { @@ -120,7 +128,7 @@ public class TileCraftCrate extends TileOpenCrate { } }, 3, 3); for(int i = 0; i < 9; i++) { - ItemStack stack = getStackInSlot(i); + ItemStack stack = itemHandler.getStackInSlot(i); if(stack == null || isLocked(i) || stack.getItem() == ModItems.manaResource && stack.getItemDamage() == 11) continue; @@ -131,15 +139,15 @@ public class TileCraftCrate extends TileOpenCrate { List recipes = CraftingManager.getInstance().getRecipeList(); for(IRecipe recipe : recipes) if(recipe.matches(craft, worldObj)) { - setInventorySlotContents(9, recipe.getCraftingResult(craft)); + itemHandler.setStackInSlot(9, recipe.getCraftingResult(craft)); for(int i = 0; i < 9; i++) { - ItemStack stack = getStackInSlot(i); + ItemStack stack = itemHandler.getStackInSlot(i); if(stack == null) continue; ItemStack container = stack.getItem().getContainerItem(stack); - setInventorySlotContents(i, container); + itemHandler.setStackInSlot(i, container); } return true; } @@ -149,7 +157,7 @@ public class TileCraftCrate extends TileOpenCrate { boolean isFull() { for(int i = 0; i < 9; i++) - if(!isLocked(i) && getStackInSlot(i) == null) + if(!isLocked(i) && itemHandler.getStackInSlot(i) == null) return false; return true; @@ -157,10 +165,10 @@ public class TileCraftCrate extends TileOpenCrate { void ejectAll() { for(int i = 0; i < getSizeInventory(); ++i) { - ItemStack stack = getStackInSlot(i); + ItemStack stack = itemHandler.getStackInSlot(i); if(stack != null) eject(stack, false); - setInventorySlotContents(i, null); + itemHandler.setStackInSlot(i, null); markDirty(); } } diff --git a/src/main/java/vazkii/botania/common/block/tile/TileHourglass.java b/src/main/java/vazkii/botania/common/block/tile/TileHourglass.java index 3edad2b90..42427be9c 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileHourglass.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileHourglass.java @@ -21,6 +21,7 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.StatCollector; import net.minecraft.util.StringUtils; +import net.minecraftforge.items.IItemHandlerModifiable; import vazkii.botania.api.internal.VanillaPacketDispatcher; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.common.lib.LibBlockNames; @@ -67,7 +68,7 @@ public class TileHourglass extends TileSimpleInventory { } public int getTotalTime() { - ItemStack stack = getStackInSlot(0); + ItemStack stack = itemHandler.getStackInSlot(0); if(stack == null) return 0; @@ -85,7 +86,7 @@ public class TileHourglass extends TileSimpleInventory { } public int getColor() { - ItemStack stack = getStackInSlot(0); + ItemStack stack = itemHandler.getStackInSlot(0); if(stack == null) return 0; if(stack.getItem() == Item.getItemFromBlock(Blocks.sand)) @@ -96,11 +97,15 @@ public class TileHourglass extends TileSimpleInventory { } @Override - public boolean isItemValidForSlot(int i, ItemStack itemstack) { - if(itemstack == null) - return false; - Item item = itemstack.getItem(); - return item == Item.getItemFromBlock(Blocks.sand) || item == Item.getItemFromBlock(Blocks.soul_sand); + protected IItemHandlerModifiable createItemHandler() { + return new SimpleItemStackHandler(this, true) { + @Override + public ItemStack insertItem(int slot, ItemStack stack, boolean simulate) { + if(stack != null && (stack.getItem() == Item.getItemFromBlock(Blocks.sand) || stack.getItem() == Item.getItemFromBlock(Blocks.soul_sand))) + return super.insertItem(slot, stack, simulate); + else return stack; + } + }; } @Override @@ -143,7 +148,7 @@ public class TileHourglass extends TileSimpleInventory { int x = res.getScaledWidth() / 2 + 10; int y = res.getScaledHeight() / 2 - 10; - ItemStack stack = getStackInSlot(0); + ItemStack stack = itemHandler.getStackInSlot(0); if(stack != null) { RenderHelper.enableGUIStandardItemLighting(); GlStateManager.enableRescaleNormal(); @@ -167,9 +172,4 @@ public class TileHourglass extends TileSimpleInventory { } - @Override - public String getName() { - return LibBlockNames.HOURGLASS; - } - } diff --git a/src/main/java/vazkii/botania/common/block/tile/TileIncensePlate.java b/src/main/java/vazkii/botania/common/block/tile/TileIncensePlate.java index afe409951..3542dcbfe 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileIncensePlate.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileIncensePlate.java @@ -22,6 +22,8 @@ import net.minecraft.potion.PotionEffect; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.EnumFacing; import net.minecraftforge.fml.common.registry.GameData; +import net.minecraftforge.items.IItemHandler; +import net.minecraftforge.items.IItemHandlerModifiable; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.brew.Brew; import vazkii.botania.api.internal.VanillaPacketDispatcher; @@ -30,7 +32,7 @@ import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.brew.ItemIncenseStick; import vazkii.botania.common.lib.LibBlockNames; -public class TileIncensePlate extends TileSimpleInventory implements ISidedInventory { +public class TileIncensePlate extends TileSimpleInventory { private static final String TAG_TIME_LEFT = "timeLeft"; private static final String TAG_BURNING = "burning"; @@ -43,7 +45,7 @@ public class TileIncensePlate extends TileSimpleInventory implements ISidedInven @Override public void updateEntity() { - ItemStack stack = getStackInSlot(0); + ItemStack stack = itemHandler.getStackInSlot(0); if(stack != null && burning) { Brew brew = ((ItemIncenseStick) ModItems.incenseStick).getBrew(stack); PotionEffect effect = brew.getPotionEffects(stack).get(0); @@ -74,7 +76,7 @@ public class TileIncensePlate extends TileSimpleInventory implements ISidedInven Botania.proxy.wispFX(worldObj, x - (Math.random() - 0.5) * 0.2, y - (Math.random() - 0.5) * 0.2, z - (Math.random() - 0.5) * 0.2, 0.2F, 0.2F, 0.2F, 0.05F + (float) Math.random() * 0.02F, 0.005F - (float) Math.random() * 0.01F, 0.01F + (float) Math.random() * 0.001F, 0.005F - (float) Math.random() * 0.01F); } } else { - setInventorySlotContents(0, null); + itemHandler.setStackInSlot(0, null); burning = false; VanillaPacketDispatcher.dispatchTEToNearbyPlayers(this); } @@ -92,7 +94,7 @@ public class TileIncensePlate extends TileSimpleInventory implements ISidedInven } public void ignite() { - ItemStack stack = getStackInSlot(0); + ItemStack stack = itemHandler.getStackInSlot(0); if(stack == null || burning) return; @@ -106,11 +108,6 @@ public class TileIncensePlate extends TileSimpleInventory implements ISidedInven return 1; } - @Override - public String getName() { - return LibBlockNames.INCENSE_PLATE; - } - @Override public void writeCustomNBT(NBTTagCompound par1nbtTagCompound) { super.writeCustomNBT(par1nbtTagCompound); @@ -125,24 +122,25 @@ public class TileIncensePlate extends TileSimpleInventory implements ISidedInven burning = par1nbtTagCompound.getBoolean(TAG_BURNING); } - @Override - public boolean isItemValidForSlot(int i, ItemStack itemstack) { - return itemstack != null && itemstack.getItem() == ModItems.incenseStick && ((ItemIncenseStick) ModItems.incenseStick).getBrew(itemstack) != BotaniaAPI.fallbackBrew; + public boolean acceptsItem(ItemStack stack) { + return stack != null && stack.getItem() == ModItems.incenseStick && ((ItemIncenseStick) ModItems.incenseStick).getBrew(stack) != BotaniaAPI.fallbackBrew; } @Override - public int[] getSlotsForFace(EnumFacing side) { - return new int[] { 0 }; - } + protected IItemHandlerModifiable createItemHandler() { + return new SimpleItemStackHandler(this, true) { + @Override + public ItemStack insertItem(int slot, ItemStack stack, boolean simulate) { + if(acceptsItem(stack)) + return super.insertItem(slot, stack, simulate); + else return stack; + } - @Override - public boolean canInsertItem(int slot, ItemStack stack, EnumFacing side) { - return isItemValidForSlot(slot, stack); - } - - @Override - public boolean canExtractItem(int p_102008_1_, ItemStack p_102008_2_, EnumFacing p_102008_3_) { - return false; + @Override + public ItemStack extractItem(int slot, int amount, boolean simulate) { + return null; + } + }; } @Override diff --git a/src/main/java/vazkii/botania/common/block/tile/TileOpenCrate.java b/src/main/java/vazkii/botania/common/block/tile/TileOpenCrate.java index 973fe91b4..0a36335b8 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileOpenCrate.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileOpenCrate.java @@ -33,11 +33,6 @@ public class TileOpenCrate extends TileSimpleInventory { return 1; } - @Override - public String getName() { - return LibBlockNames.OPEN_CRATE; - } - @Override public void updateEntity() { if (worldObj.isRemote) @@ -53,7 +48,7 @@ public class TileOpenCrate extends TileSimpleInventory { } if(canEject()) { - ItemStack stack = getStackInSlot(0); + ItemStack stack = itemHandler.getStackInSlot(0); if(stack != null) eject(stack, redstone); } @@ -77,7 +72,7 @@ public class TileOpenCrate extends TileSimpleInventory { } - setInventorySlotContents(0, null); + itemHandler.setStackInSlot(0, null); worldObj.spawnEntityInWorld(item); } diff --git a/src/main/java/vazkii/botania/common/block/tile/TileRuneAltar.java b/src/main/java/vazkii/botania/common/block/tile/TileRuneAltar.java index 3256491a2..fe6b19b4c 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileRuneAltar.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileRuneAltar.java @@ -26,6 +26,7 @@ import net.minecraft.util.EnumFacing; import net.minecraft.util.StatCollector; import net.minecraftforge.fml.common.ObfuscationReflectionHelper; +import net.minecraftforge.items.IItemHandlerModifiable; import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; @@ -42,7 +43,7 @@ import vazkii.botania.common.item.ModItems; import vazkii.botania.common.lib.LibBlockNames; import vazkii.botania.common.lib.LibObfuscation; -public class TileRuneAltar extends TileSimpleInventory implements ISidedInventory, IManaReceiver { +public class TileRuneAltar extends TileSimpleInventory implements IManaReceiver { private static final String TAG_MANA = "mana"; private static final String TAG_MANA_TO_GET = "manaToGet"; @@ -83,11 +84,11 @@ public class TileRuneAltar extends TileSimpleInventory implements ISidedInventor boolean did = false; for(int i = 0; i < getSizeInventory(); i++) - if(getStackInSlot(i) == null) { + if(itemHandler.getStackInSlot(i) == null) { did = true; ItemStack stackToAdd = stack.copy(); stackToAdd.stackSize = 1; - setInventorySlotContents(i, stackToAdd); + itemHandler.setStackInSlot(i, stackToAdd); if(player == null || !player.capabilities.isCreativeMode) { stack.stackSize--; @@ -161,7 +162,7 @@ public class TileRuneAltar extends TileSimpleInventory implements ISidedInventor this.manaToGet = currentRecipe.getManaUsage(); else { for(RecipeRuneAltar recipe : BotaniaAPI.runeAltarRecipes) - if(recipe.matches(this)) { + if(recipe.matches(itemHandler)) { this.manaToGet = recipe.getManaUsage(); break getMana; } @@ -178,7 +179,7 @@ public class TileRuneAltar extends TileSimpleInventory implements ISidedInventor public void saveLastRecipe() { lastRecipe = new ArrayList<>(); for(int i = 0; i < getSizeInventory(); i++) { - ItemStack stack = getStackInSlot(i); + ItemStack stack = itemHandler.getStackInSlot(i); if(stack == null) break; lastRecipe.add(stack.copy()); @@ -187,14 +188,14 @@ public class TileRuneAltar extends TileSimpleInventory implements ISidedInventor } public void trySetLastRecipe(EntityPlayer player) { - TileAltar.tryToSetLastRecipe(player, this, lastRecipe); + TileAltar.tryToSetLastRecipe(player, itemHandler, lastRecipe); if(!isEmpty()) VanillaPacketDispatcher.dispatchTEToNearbyPlayers(worldObj, pos); } public boolean hasValidRecipe() { for(RecipeRuneAltar recipe : BotaniaAPI.runeAltarRecipes) - if(recipe.matches(this)) + if(recipe.matches(itemHandler)) return true; return false; @@ -206,7 +207,7 @@ public class TileRuneAltar extends TileSimpleInventory implements ISidedInventor if(currentRecipe != null) recipe = currentRecipe; else for(RecipeRuneAltar recipe_ : BotaniaAPI.runeAltarRecipes) { - if(recipe_.matches(this)) { + if(recipe_.matches(itemHandler)) { recipe = recipe_; break; } @@ -235,14 +236,14 @@ public class TileRuneAltar extends TileSimpleInventory implements ISidedInventor saveLastRecipe(); if(!worldObj.isRemote) { for(int i = 0; i < getSizeInventory(); i++) { - ItemStack stack = getStackInSlot(i); + ItemStack stack = itemHandler.getStackInSlot(i); if(stack != null) { if(stack.getItem() == ModItems.rune && (player == null || !player.capabilities.isCreativeMode)) { EntityItem outputItem = new EntityItem(worldObj, getPos().getX() + 0.5, getPos().getY() + 1.5, getPos().getZ() + 0.5, stack.copy()); worldObj.spawnEntityInWorld(outputItem); } - setInventorySlotContents(i, null); + itemHandler.setStackInSlot(i, null); } } @@ -269,7 +270,7 @@ public class TileRuneAltar extends TileSimpleInventory implements ISidedInventor public boolean isEmpty() { for(int i = 0; i < getSizeInventory(); i++) - if(getStackInSlot(i) != null) + if(itemHandler.getStackInSlot(i) != null) return false; return true; @@ -301,17 +302,7 @@ public class TileRuneAltar extends TileSimpleInventory implements ISidedInventor return INFINITE_EXTENT_AABB; } - @Override - public String getName() { - return LibBlockNames.RUNE_ALTAR; - } - - @Override - public int getInventoryStackLimit() { - return 1; - } - - @Override + /*@Override todo 1.8 public int[] getSlotsForFace(EnumFacing var1) { int accessibleSlot = -1; for(int i = 0; i < getSizeInventory(); i++) @@ -319,16 +310,16 @@ public class TileRuneAltar extends TileSimpleInventory implements ISidedInventor accessibleSlot = i; return accessibleSlot == -1 ? new int[0] : new int[] { accessibleSlot }; - } + }*/ @Override - public boolean canInsertItem(int i, ItemStack itemstack, EnumFacing j) { - return true; - } - - @Override - public boolean canExtractItem(int i, ItemStack itemstack, EnumFacing j) { - return mana == 0; + protected IItemHandlerModifiable createItemHandler() { + return new SimpleItemStackHandler(this, false) { + @Override + protected int getStackLimit(int slot, ItemStack stack) { + return 1; + } + }; } @Override @@ -359,7 +350,7 @@ public class TileRuneAltar extends TileSimpleInventory implements ISidedInventor int radius = 24; int amt = 0; for(int i = 0; i < getSizeInventory(); i++) { - if(getStackInSlot(i) == null) + if(itemHandler.getStackInSlot(i) == null) break; amt++; } @@ -367,7 +358,7 @@ public class TileRuneAltar extends TileSimpleInventory implements ISidedInventor if(amt > 0) { float anglePer = 360F / amt; for(RecipeRuneAltar recipe : BotaniaAPI.runeAltarRecipes) - if(recipe.matches(this)) { + if(recipe.matches(itemHandler)) { GL11.glEnable(GL11.GL_BLEND); GL11.glEnable(GL12.GL_RESCALE_NORMAL); GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); @@ -399,7 +390,7 @@ public class TileRuneAltar extends TileSimpleInventory implements ISidedInventor double xPos = xc + Math.cos(angle * Math.PI / 180D) * radius - 8; double yPos = yc + Math.sin(angle * Math.PI / 180D) * radius - 8; GL11.glTranslated(xPos, yPos, 0); - mc.getRenderItem().renderItemIntoGUI(getStackInSlot(i), 0, 0); + mc.getRenderItem().renderItemIntoGUI(itemHandler.getStackInSlot(i), 0, 0); GL11.glTranslated(-xPos, -yPos, 0); angle += anglePer; diff --git a/src/main/java/vazkii/botania/common/block/tile/TileSimpleInventory.java b/src/main/java/vazkii/botania/common/block/tile/TileSimpleInventory.java index 7ce6c6c8e..a21995e7f 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileSimpleInventory.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileSimpleInventory.java @@ -10,19 +10,19 @@ */ package vazkii.botania.common.block.tile; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; -import net.minecraft.util.ChatComponentText; -import net.minecraft.util.IChatComponent; +import net.minecraft.util.EnumFacing; +import net.minecraftforge.common.capabilities.Capability; +import net.minecraftforge.items.CapabilityItemHandler; +import net.minecraftforge.items.IItemHandlerModifiable; +import net.minecraftforge.items.ItemStackHandler; -import java.util.Arrays; - -public abstract class TileSimpleInventory extends TileMod implements IInventory { +public abstract class TileSimpleInventory extends TileMod { ItemStack[] inventorySlots = new ItemStack[getSizeInventory()]; + protected IItemHandlerModifiable itemHandler = createItemHandler(); @Override public void readCustomNBT(NBTTagCompound par1NBTTagCompound) { @@ -34,6 +34,7 @@ public abstract class TileSimpleInventory extends TileMod implements IInventory if (var5 >= 0 && var5 < inventorySlots.length) inventorySlots[var5] = ItemStack.loadItemStackFromNBT(var4); } + itemHandler = createItemHandler(); } @Override @@ -50,93 +51,72 @@ public abstract class TileSimpleInventory extends TileMod implements IInventory par1NBTTagCompound.setTag("Items", var2); } - @Override - public ItemStack getStackInSlot(int i) { - return inventorySlots[i]; + public abstract int getSizeInventory(); + + protected IItemHandlerModifiable createItemHandler() { + return new SimpleItemStackHandler(this, true); + } + + public IItemHandlerModifiable getItemHandler() { + return itemHandler; } @Override - public ItemStack decrStackSize(int i, int j) { - if (inventorySlots[i] != null) { - ItemStack stackAt; + public boolean hasCapability(Capability cap, EnumFacing side) { + return cap == CapabilityItemHandler.ITEM_HANDLER_CAPABILITY || super.hasCapability(cap, side); + } - if (inventorySlots[i].stackSize <= j) { - stackAt = inventorySlots[i]; - inventorySlots[i] = null; - return stackAt; - } else { - stackAt = inventorySlots[i].splitStack(j); + @Override + @SuppressWarnings("unchecked") + public T getCapability(Capability cap, EnumFacing side) { + if(cap == CapabilityItemHandler.ITEM_HANDLER_CAPABILITY) + return (T) itemHandler; + return super.getCapability(cap, side); + } - if (inventorySlots[i].stackSize == 0) - inventorySlots[i] = null; + /* Extension of ItemStackHandler that uses our own slot array, allows for control of writing, + allows control over stack limits, and allows for itemstack-slot validation */ + protected static class SimpleItemStackHandler extends ItemStackHandler { - return stackAt; - } + private final boolean allowWrite; + private final TileSimpleInventory tile; + + public SimpleItemStackHandler(TileSimpleInventory inv, boolean allowWrite) { + super(0); + // Overwrite with our array + this.stacks = inv.inventorySlots; + this.allowWrite = allowWrite; + this.tile = inv; } - return null; - } + @Override + public ItemStack insertItem(int slot, ItemStack stack, boolean simulate) { + if(allowWrite) { + ItemStack ret = super.insertItem(slot, stack, simulate); + if(!simulate) + tile.markDirty(); + return ret; + } else return stack; + } - @Override - public ItemStack removeStackFromSlot(int i) { - return getStackInSlot(i); - } + @Override + public ItemStack extractItem(int slot, int amount, boolean simulate) { + if(allowWrite) { + ItemStack ret = super.extractItem(slot, amount, simulate); + if(!simulate) + tile.markDirty(); + return ret; + } else return null; + } - @Override - public void setInventorySlotContents(int i, ItemStack itemstack) { - inventorySlots[i] = itemstack; - } + // Override since our tile handles serialization itself - @Override - public int getInventoryStackLimit() { - return 64; - } + @Override + public NBTTagCompound serializeNBT() { return new NBTTagCompound(); } - @Override - public boolean isUseableByPlayer(EntityPlayer entityplayer) { - return worldObj.getTileEntity(getPos()) != this ? false : entityplayer.getDistanceSq(pos.getX() + 0.5D, pos.getY() + 0.5D, pos.getZ() + 0.5D) <= 64; - } - - @Override - public boolean isItemValidForSlot(int i, ItemStack itemstack) { - return true; - } - - @Override - public boolean hasCustomName() { - return false; - } - - @Override - public void openInventory(EntityPlayer player) { - // NO-OP - } - - @Override - public void closeInventory(EntityPlayer player) { - // NO-OP - } - - @Override - public int getField(int id) { - return 0; - } - - @Override - public void setField(int id, int value) {} - - @Override - public int getFieldCount() { - return 0; - } - - @Override - public void clear() { - Arrays.fill(inventorySlots, null); - } - - @Override - public IChatComponent getDisplayName() { - return new ChatComponentText(getName()); + @Override + public void deserializeNBT(NBTTagCompound nbt) { + onLoad(); + } } } diff --git a/src/main/java/vazkii/botania/common/block/tile/TileSparkChanger.java b/src/main/java/vazkii/botania/common/block/tile/TileSparkChanger.java index 0611990f9..8a4aaabe5 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileSparkChanger.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileSparkChanger.java @@ -17,6 +17,7 @@ import java.util.List; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; +import net.minecraftforge.items.IItemHandlerModifiable; import vazkii.botania.api.internal.VanillaPacketDispatcher; import vazkii.botania.api.mana.spark.ISparkAttachable; import vazkii.botania.api.mana.spark.ISparkEntity; @@ -30,7 +31,7 @@ public class TileSparkChanger extends TileSimpleInventory { if(worldObj.isRemote) return; - ItemStack changeStack = getStackInSlot(0); + ItemStack changeStack = itemHandler.getStackInSlot(0); List attachables = new ArrayList<>(); for(EnumFacing dir : LibMisc.CARDINAL_DIRECTIONS) { TileEntity tile = worldObj.getTileEntity(pos.offset(dir)); @@ -56,7 +57,7 @@ public class TileSparkChanger extends TileSimpleInventory { Collection transfers = spark.getTransfers(); if(transfers != null) transfers.clear(); - setInventorySlotContents(0, sparkStack); + itemHandler.setStackInSlot(0, sparkStack); worldObj.updateComparatorOutputLevel(pos, worldObj.getBlockState(pos).getBlock()); markDirty(); } @@ -68,13 +69,20 @@ public class TileSparkChanger extends TileSimpleInventory { } @Override - public boolean isItemValidForSlot(int i, ItemStack itemstack) { - return itemstack != null && itemstack.getItem() == ModItems.sparkUpgrade; - } + protected IItemHandlerModifiable createItemHandler() { + return new SimpleItemStackHandler(this, true) { + @Override + protected int getStackLimit(int slot, ItemStack stack) { + return 1; + } - @Override - public int getInventoryStackLimit() { - return 1; + @Override + public ItemStack insertItem(int slot, ItemStack stack, boolean simulate) { + if(stack != null && stack.getItem() == ModItems.sparkUpgrade) + return super.insertItem(slot, stack, simulate); + else return stack; + } + }; } @Override @@ -83,9 +91,4 @@ public class TileSparkChanger extends TileSimpleInventory { VanillaPacketDispatcher.dispatchTEToNearbyPlayers(this); } - @Override - public String getName() { - return LibBlockNames.SPARK_CHANGER; - } - } diff --git a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaCrystalCube.java b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaCrystalCube.java index 8e81721f9..1277e38bd 100644 --- a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaCrystalCube.java +++ b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaCrystalCube.java @@ -23,6 +23,7 @@ import net.minecraftforge.client.model.animation.TimeValues; import net.minecraftforge.common.model.animation.IAnimationStateMachine; import net.minecraftforge.fml.common.FMLCommonHandler; import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.items.IItemHandlerModifiable; import vazkii.botania.api.corporea.CorporeaHelper; import vazkii.botania.api.corporea.ICorporeaRequestor; import vazkii.botania.api.corporea.ICorporeaSpark; @@ -143,13 +144,8 @@ public class TileCorporeaCrystalCube extends TileCorporeaBase implements ICorpor } @Override - public boolean isItemValidForSlot(int i, ItemStack itemstack) { - return false; - } - - @Override - public String getName() { - return LibBlockNames.CORPOREA_CRYSTAL_CUBE; + protected IItemHandlerModifiable createItemHandler() { + return new SimpleItemStackHandler(this, false); } @Override 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 cb6fd4f1e..7d5711a5c 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 @@ -19,6 +19,7 @@ import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.EnumFacing; +import net.minecraftforge.items.IItemHandlerModifiable; import vazkii.botania.api.corporea.CorporeaHelper; import vazkii.botania.api.corporea.ICorporeaRequestor; import vazkii.botania.api.corporea.ICorporeaSpark; @@ -66,19 +67,14 @@ public class TileCorporeaFunnel extends TileCorporeaBase implements ICorporeaReq return filter; } - @Override - public boolean isItemValidForSlot(int i, ItemStack itemstack) { - return false; - } - @Override public int getSizeInventory() { return 1; } @Override - public String getName() { - return LibBlockNames.CORPOREA_FUNNEL; + protected IItemHandlerModifiable createItemHandler() { + return new SimpleItemStackHandler(this, false); } @Override diff --git a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaIndex.java b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaIndex.java index beae3b9e8..db37ffa14 100644 --- a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaIndex.java +++ b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaIndex.java @@ -194,11 +194,6 @@ public class TileCorporeaIndex extends TileCorporeaBase implements ICorporeaRequ return 0; } - @Override - public String getName() { - return LibBlockNames.CORPOREA_INDEX; - } - @Override public void doCorporeaRequest(Object request, int count, ICorporeaSpark spark) { if(!(request instanceof String)) diff --git a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaInterceptor.java b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaInterceptor.java index 7a72445ea..704bdc1b2 100644 --- a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaInterceptor.java +++ b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaInterceptor.java @@ -19,6 +19,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.EnumFacing; +import net.minecraftforge.items.IItemHandlerModifiable; import vazkii.botania.api.corporea.CorporeaHelper; import vazkii.botania.api.corporea.ICorporeaInterceptor; import vazkii.botania.api.corporea.ICorporeaSpark; @@ -29,8 +30,8 @@ import vazkii.botania.common.lib.LibMisc; public class TileCorporeaInterceptor extends TileCorporeaBase implements ICorporeaInterceptor { @Override - public boolean isItemValidForSlot(int i, ItemStack itemstack) { - return false; + protected IItemHandlerModifiable createItemHandler() { + return new SimpleItemStackHandler(this, false); } @Override @@ -38,11 +39,6 @@ public class TileCorporeaInterceptor extends TileCorporeaBase implements ICorpor return 1; } - @Override - public String getName() { - return LibBlockNames.CORPOREA_INTERCEPTOR; - } - @Override public void interceptRequest(Object request, int count, ICorporeaSpark spark, ICorporeaSpark source, List stacks, List inventories, boolean doit) { // NO-OP diff --git a/src/main/java/vazkii/botania/common/block/tile/mana/TilePrism.java b/src/main/java/vazkii/botania/common/block/tile/mana/TilePrism.java index 8f8b571a5..1ac0be249 100644 --- a/src/main/java/vazkii/botania/common/block/tile/mana/TilePrism.java +++ b/src/main/java/vazkii/botania/common/block/tile/mana/TilePrism.java @@ -14,6 +14,7 @@ import net.minecraft.entity.Entity; import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumFacing; +import net.minecraftforge.items.IItemHandlerModifiable; import vazkii.botania.api.internal.IManaBurst; import vazkii.botania.api.mana.BurstProperties; import vazkii.botania.api.mana.ILens; @@ -23,10 +24,10 @@ import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.common.block.tile.TileSimpleInventory; import vazkii.botania.common.lib.LibBlockNames; -public class TilePrism extends TileSimpleInventory implements IManaCollisionGhost, ISidedInventory { +public class TilePrism extends TileSimpleInventory implements IManaCollisionGhost { public void onBurstCollision(IManaBurst burst) { - ItemStack lens = getStackInSlot(0); + ItemStack lens = itemHandler.getStackInSlot(0); boolean active = worldObj.getBlockState(getPos()).getValue(BotaniaStateProps.POWERED); boolean valid = lens != null && lens.getItem() instanceof ILens && (!(lens.getItem() instanceof ITinyPlanetExcempt) || ((ITinyPlanetExcempt) lens.getItem()).shouldPull(lens)); @@ -62,23 +63,15 @@ public class TilePrism extends TileSimpleInventory implements IManaCollisionGhos } @Override - public String getName() { - return LibBlockNames.PRISM; - } - - @Override - public int[] getSlotsForFace(EnumFacing p_94128_1_) { - return new int[] { 0 }; - } - - @Override - public boolean canInsertItem(int p_102007_1_, ItemStack p_102007_2_, EnumFacing p_102007_3_) { - return p_102007_2_.getItem() instanceof ILens; - } - - @Override - public boolean canExtractItem(int p_102008_1_, ItemStack p_102008_2_, EnumFacing p_102008_3_) { - return true; + protected IItemHandlerModifiable createItemHandler() { + return new SimpleItemStackHandler(this, true) { + @Override + public ItemStack insertItem(int slot, ItemStack stack, boolean simulate) { + if(stack != null && stack.getItem() instanceof ILens) + return super.insertItem(slot, stack, simulate); + else return stack; + } + }; } } diff --git a/src/main/java/vazkii/botania/common/block/tile/mana/TileSpreader.java b/src/main/java/vazkii/botania/common/block/tile/mana/TileSpreader.java index 67518be86..f85f09bdb 100644 --- a/src/main/java/vazkii/botania/common/block/tile/mana/TileSpreader.java +++ b/src/main/java/vazkii/botania/common/block/tile/mana/TileSpreader.java @@ -29,6 +29,7 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.*; import net.minecraft.world.World; +import net.minecraftforge.items.IItemHandlerModifiable; import org.lwjgl.opengl.GL11; import vazkii.botania.api.internal.IManaBurst; @@ -57,6 +58,7 @@ import vazkii.botania.common.core.handler.ManaNetworkHandler; import vazkii.botania.common.core.helper.Vector3; import vazkii.botania.common.entity.EntityManaBurst; import vazkii.botania.common.entity.EntityManaBurst.PositionProperties; +import vazkii.botania.common.item.ModItems; import vazkii.botania.common.lib.LibBlockNames; public class TileSpreader extends TileSimpleInventory implements IManaCollector, IWandBindable, IKeyLocked, IThrottledPacket, IManaSpreader, IRedirectable, ITickable { @@ -234,7 +236,7 @@ public class TileSpreader extends TileSimpleInventory implements IManaCollector, if(shouldShoot && receiver != null && receiver instanceof IKeyLocked) shouldShoot = ((IKeyLocked) receiver).getInputKey().equals(getOutputKey()); - ItemStack lens = getStackInSlot(0); + ItemStack lens = itemHandler.getStackInSlot(0); ILensControl control = getLensController(lens); if(control != null) { if(isredstone) { @@ -452,7 +454,7 @@ public class TileSpreader extends TileSimpleInventory implements IManaCollector, } public void checkForReceiver() { - ItemStack stack = getStackInSlot(0); + ItemStack stack = itemHandler.getStackInSlot(0); ILensControl control = getLensController(stack); if(control != null && !control.allowBurstShooting(stack, this, false)) return; @@ -480,7 +482,7 @@ public class TileSpreader extends TileSimpleInventory implements IManaCollector, float gravity = 0F; BurstProperties props = new BurstProperties(maxMana, ticksBeforeManaLoss, manaLossPerTick, gravity, motionModifier, color); - ItemStack lens = getStackInSlot(0); + ItemStack lens = itemHandler.getStackInSlot(0); if(lens != null && lens.getItem() instanceof ILensEffect) ((ILensEffect) lens.getItem()).apply(lens, props); @@ -547,7 +549,7 @@ public class TileSpreader extends TileSimpleInventory implements IManaCollector, int color = isRedstone() ? 0xFF0000 : isDreamwood() ? 0xFF00AE : 0x00FF00; HUDHandler.drawSimpleManaHUD(color, knownMana, getMaxMana(), name, res); - ItemStack lens = getStackInSlot(0); + ItemStack lens = itemHandler.getStackInSlot(0); if(lens != null) { GlStateManager.enableBlend(); GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); @@ -607,18 +609,20 @@ public class TileSpreader extends TileSimpleInventory implements IManaCollector, } @Override - public String getName() { - return LibBlockNames.SPREADER; - } + protected IItemHandlerModifiable createItemHandler() { + return new SimpleItemStackHandler(this, true) { + @Override + protected int getStackLimit(int slot, ItemStack stack) { + return 1; + } - @Override - public int getInventoryStackLimit() { - return 1; - } - - @Override - public boolean isItemValidForSlot(int i, ItemStack itemstack) { - return itemstack.getItem() instanceof ILens; + @Override + public ItemStack insertItem(int slot, ItemStack stack, boolean simulate) { + if(stack != null && stack.getItem() instanceof ILens) + return super.insertItem(slot, stack, simulate); + else return stack; + } + }; } @Override diff --git a/src/main/java/vazkii/botania/common/crafting/recipe/HeadRecipe.java b/src/main/java/vazkii/botania/common/crafting/recipe/HeadRecipe.java index 5472e75ad..8a13a5ce1 100644 --- a/src/main/java/vazkii/botania/common/crafting/recipe/HeadRecipe.java +++ b/src/main/java/vazkii/botania/common/crafting/recipe/HeadRecipe.java @@ -14,6 +14,7 @@ import net.minecraft.init.Items; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.util.StatCollector; +import net.minecraftforge.items.IItemHandler; import vazkii.botania.api.recipe.RecipeRuneAltar; import vazkii.botania.common.core.helper.ItemNBTHelper; @@ -26,11 +27,11 @@ public class HeadRecipe extends RecipeRuneAltar { } @Override - public boolean matches(IInventory inv) { + public boolean matches(IItemHandler inv) { boolean matches = super.matches(inv); if(matches) { - for(int i = 0; i < inv.getSizeInventory(); i++) { + for(int i = 0; i < inv.getSlots(); i++) { ItemStack stack = inv.getStackInSlot(i); if(stack == null) break; diff --git a/src/main/java/vazkii/botania/common/item/material/ItemManaPetal.java b/src/main/java/vazkii/botania/common/item/material/ItemManaPetal.java index 0c35bf25a..c1382d334 100644 --- a/src/main/java/vazkii/botania/common/item/material/ItemManaPetal.java +++ b/src/main/java/vazkii/botania/common/item/material/ItemManaPetal.java @@ -12,6 +12,7 @@ package vazkii.botania.common.item.material; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; +import vazkii.botania.api.item.IPetalApothecary; import vazkii.botania.api.recipe.IFlowerComponent; import vazkii.botania.common.item.Item16Colors; import vazkii.botania.common.lib.LibItemNames; @@ -23,7 +24,7 @@ public class ItemManaPetal extends Item16Colors implements IFlowerComponent { } @Override - public boolean canFit(ItemStack stack, IInventory apothecary) { + public boolean canFit(ItemStack stack, IPetalApothecary apothecary) { return true; } diff --git a/src/main/java/vazkii/botania/common/item/material/ItemManaResource.java b/src/main/java/vazkii/botania/common/item/material/ItemManaResource.java index bd90b4008..34b688555 100644 --- a/src/main/java/vazkii/botania/common/item/material/ItemManaResource.java +++ b/src/main/java/vazkii/botania/common/item/material/ItemManaResource.java @@ -28,6 +28,7 @@ import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.player.PlayerInteractEvent; import net.minecraftforge.event.entity.player.PlayerInteractEvent.Action; +import vazkii.botania.api.item.IPetalApothecary; import vazkii.botania.api.recipe.IElvenItem; import vazkii.botania.api.recipe.IFlowerComponent; import vazkii.botania.common.Botania; @@ -138,7 +139,7 @@ public class ItemManaResource extends ItemMod implements IFlowerComponent, IElve } @Override - public boolean canFit(ItemStack stack, IInventory apothecary) { + public boolean canFit(ItemStack stack, IPetalApothecary apothecary) { int meta = stack.getItemDamage(); return meta == 6 || meta == 8 || meta == 5 || meta == 23; } diff --git a/src/main/java/vazkii/botania/common/item/material/ItemPetal.java b/src/main/java/vazkii/botania/common/item/material/ItemPetal.java index 51aa99dce..e13f09c69 100644 --- a/src/main/java/vazkii/botania/common/item/material/ItemPetal.java +++ b/src/main/java/vazkii/botania/common/item/material/ItemPetal.java @@ -16,6 +16,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.world.World; +import vazkii.botania.api.item.IPetalApothecary; import vazkii.botania.api.recipe.IFlowerComponent; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.item.Item16Colors; @@ -42,7 +43,7 @@ public class ItemPetal extends Item16Colors implements IFlowerComponent { } @Override - public boolean canFit(ItemStack stack, IInventory apothecary) { + public boolean canFit(ItemStack stack, IPetalApothecary apothecary) { return true; } diff --git a/src/main/java/vazkii/botania/common/item/material/ItemRune.java b/src/main/java/vazkii/botania/common/item/material/ItemRune.java index 71bc42e17..d7c658ff6 100644 --- a/src/main/java/vazkii/botania/common/item/material/ItemRune.java +++ b/src/main/java/vazkii/botania/common/item/material/ItemRune.java @@ -19,6 +19,7 @@ import net.minecraft.inventory.IInventory; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.stats.Achievement; +import vazkii.botania.api.item.IPetalApothecary; import vazkii.botania.api.recipe.IFlowerComponent; import vazkii.botania.common.achievement.IPickupAchievement; import vazkii.botania.common.achievement.ModAchievements; @@ -49,7 +50,7 @@ public class ItemRune extends ItemMod implements IFlowerComponent, IPickupAchiev } @Override - public boolean canFit(ItemStack stack, IInventory apothecary) { + public boolean canFit(ItemStack stack, IPetalApothecary apothecary) { return true; }