Merge branch 'capability' into MC18

This commit is contained in:
Vincent Lee committed 2016-03-05 20:30:08 -06:00
commit 0d9fe52f5d
48 files changed
+397 -612

No files matched your search

@@ -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
@@ -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);
@@ -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<Object> 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;
@@ -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<Object> 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;
@@ -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);
@@ -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<TileAltar> {
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<TileAltar> {
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();
@@ -69,7 +69,7 @@ public class RenderTileAvatar extends TileEntitySpecialRenderer<TileAvatar> {
return;
}
ItemStack stack = avatar.getStackInSlot(0);
ItemStack stack = avatar.getItemHandler().getStackInSlot(0);
if(stack != null) {
GlStateManager.pushMatrix();
Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationBlocksTexture);
@@ -47,7 +47,7 @@ public class RenderTileHourglass extends TileEntitySpecialRenderer<TileHourglass
float x = 0.5F + (float) Math.cos(time * 0.05F) * 0.025F;
float y = 0.55F + (float) (Math.sin(time * 0.04F) + 1F) * 0.05F;
float z = 0.5F + (float) Math.sin(time * 0.05F) * 0.025F;
ItemStack stack = hasWorld ? hourglass.getStackInSlot(0) : null;
ItemStack stack = hasWorld ? hourglass.getItemHandler().getStackInSlot(0) : null;
float fract1 = stack == null ? 0 : hourglass.timeFraction;
float fract2 = stack == null ? 0 : 1F - hourglass.timeFraction;
@@ -44,7 +44,7 @@ public class RenderTileIncensePlate extends TileEntitySpecialRenderer<TileIncens
GlStateManager.translate(0.5F, 1.5F, 0.5F);
GlStateManager.rotate(ROTATIONS.get(facing), 0F, 1F, 0F);
ItemStack stack = plate.getStackInSlot(0);
ItemStack stack = plate.getItemHandler().getStackInSlot(0);
if(stack != null) {
Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationBlocksTexture);
float s = 0.4F;
@@ -30,7 +30,7 @@ public class RenderTilePrism extends TileEntitySpecialRenderer<TilePrism> {
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);
@@ -34,7 +34,7 @@ public class RenderTileRuneAltar extends TileEntitySpecialRenderer<TileRuneAltar
int items = 0;
for(int i = 0; i < altar.getSizeInventory(); i++)
if(altar.getStackInSlot(i) == null)
if(altar.getItemHandler().getStackInSlot(i) == null)
break;
else items++;
float[] angles = new float[altar.getSizeInventory()];
@@ -54,7 +54,7 @@ public class RenderTileRuneAltar extends TileEntitySpecialRenderer<TileRuneAltar
GlStateManager.translate(2.25F, 0F, 0.5F);
GlStateManager.rotate(90F, 0F, 1F, 0F);
GlStateManager.translate(0D, 0.15 * Math.sin((time + i * 10) / 5D), 0F);
ItemStack stack = altar.getStackInSlot(i);
ItemStack stack = altar.getItemHandler().getStackInSlot(i);
Minecraft mc = Minecraft.getMinecraft();
if(stack != null) {
mc.renderEngine.bindTexture(TextureMap.locationBlocksTexture);
@@ -28,7 +28,7 @@ public class RenderTileSparkChanger extends TileEntitySpecialRenderer<TileSparkC
GlStateManager.rotate(90F, 1F, 0F, 0F);
GlStateManager.translate(0.8F, 0.2F, -0.22F);
GlStateManager.color(1F, 1F, 1F, 1F);
ItemStack stack = tileentity.getStackInSlot(0);
ItemStack stack = tileentity.getItemHandler().getStackInSlot(0);
if(stack != null) {
GlStateManager.pushMatrix();
Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationBlocksTexture);
@@ -85,7 +85,7 @@ public class RenderTileSpreader extends TileEntitySpecialRenderer<TileSpreader>
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);
@@ -145,12 +145,12 @@ public class BlockAltar extends BlockMod 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;
}
@@ -274,7 +274,7 @@ public class BlockAltar extends BlockMod 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;
@@ -69,17 +69,17 @@ public class BlockAvatar extends BlockMod 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 BlockMod 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;
@@ -78,7 +78,7 @@ public class BlockHourglass extends BlockMod implements IManaTrigger, IWandable,
@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 BlockMod implements IManaTrigger, IWandable,
}
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 BlockMod implements IManaTrigger, IWandable,
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 BlockMod implements IManaTrigger, IWandable,
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;
@@ -63,14 +63,14 @@ public class BlockIncensePlate extends BlockMod 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 BlockMod 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;
}
@@ -134,7 +134,7 @@ public class BlockOpenCrate extends BlockMod implements ILexiconable, IWandable,
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;
@@ -213,7 +213,7 @@ public class BlockOpenCrate extends BlockMod implements ILexiconable, IWandable,
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);
@@ -94,17 +94,17 @@ public class BlockSparkChanger extends BlockMod 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 BlockMod 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 BlockMod 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;
@@ -44,7 +44,7 @@ public abstract class BlockCorporeaBase extends BlockMod implements ICraftAchiev
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;
@@ -74,12 +74,12 @@ public class BlockBrewery extends BlockMod implements ILexiconable, IWandHUD {
if(par5EntityPlayer.isSneaking()) {
if(brew.recipe == null && !state.getValue(BotaniaStateProps.POWERED))
for(int i = brew.getSizeInventory() - 1; i >= 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 BlockMod implements ILexiconable, IWandHUD {
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;
@@ -104,7 +104,7 @@ public class BlockPrism extends BlockMod implements IManaTrigger, ILexiconable {
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 BlockMod implements IManaTrigger, ILexiconable {
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 BlockMod implements IManaTrigger, 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;
@@ -67,12 +67,12 @@ public class BlockRuneAltar extends BlockMod implements IWandable, ILexiconable
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 BlockMod implements IWandable, 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;
@@ -151,7 +151,7 @@ public class BlockSpreader extends BlockMod implements IWandable, IWandHUD, ILex
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 BlockMod implements IWandable, IWandHUD, ILex
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 BlockMod implements IWandable, IWandHUD, ILex
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;
@@ -15,6 +15,7 @@ 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;
@@ -33,6 +34,8 @@ import net.minecraft.util.BlockPos;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.StatCollector;
import net.minecraftforge.items.IItemHandler;
import net.minecraftforge.items.ItemHandlerHelper;
import org.lwjgl.opengl.GL11;
import vazkii.botania.api.lexicon.LexiconEntry;
@@ -41,6 +44,7 @@ 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;
@@ -84,8 +88,7 @@ public class SubTileHopperhock extends SubTileFunctional {
continue;
ItemStack stack = item.getEntityItem();
IInventory invToPutItemIn = null;
IItemHandler invToPutItemIn = null;
EnumFacing sideToPutItemIn = null;
boolean priorityInv = false;
int amountToPutIn = 0;
@@ -93,11 +96,14 @@ public class SubTileHopperhock extends SubTileFunctional {
for(EnumFacing dir : EnumFacing.VALUES) {
BlockPos pos_ = pos.offset(dir);
IInventory inv = InventoryHelper.getInventory(supertile.getWorld(), pos_);
IItemHandler inv = InventoryHelper2.getInventory(supertile.getWorld(), pos_, dir);
if(inv != null) {
List<ItemStack> filter = getFilterForInventory(inv, pos_, true);
List<ItemStack> filter = getFilterForInventory(pos_, true);
boolean canAccept = canAcceptItem(stack, filter, filterType);
int availablePut = supertile.getWorld().isRemote ? 1 : InventoryHelper.testInventoryInsertion(inv, stack, dir);
ItemStack simulate = ItemHandlerHelper.insertItem(inv, stack.copy(), true);
int availablePut = supertile.getWorld().isRemote ? 1 : stack.stackSize - (simulate == null ? 0 : simulate.stackSize);
canAccept &= availablePut > 0;
if(canAccept) {
@@ -124,9 +130,8 @@ public class SubTileHopperhock extends SubTileFunctional {
particled.add(item);
}
} else {
InventoryHelper.insertItemIntoInventory(invToPutItemIn, stack.splitStack(amountToPutIn), sideToPutItemIn, -1);
ItemHandlerHelper.insertItem(invToPutItemIn, stack.splitStack(amountToPutIn), false);
item.setEntityItemStack(stack); // Just in case someone subclasses EntityItem and changes something important.
invToPutItemIn.markDirty();
if(item.getEntityItem().stackSize == 0)
item.setDead();
pulledAny = true;
@@ -174,7 +179,7 @@ public class SubTileHopperhock extends SubTileFunctional {
}
}
public List<ItemStack> getFilterForInventory(IInventory inv, BlockPos pos, boolean recursiveForDoubleChests) {
public List<ItemStack> getFilterForInventory(BlockPos pos, boolean recursiveForDoubleChests) {
List<ItemStack> filter = new ArrayList<>();
if(recursiveForDoubleChests) {
@@ -184,7 +189,7 @@ public class SubTileHopperhock extends SubTileFunctional {
if(tileEntity instanceof TileEntityChest)
for(EnumFacing dir : LibMisc.CARDINAL_DIRECTIONS)
if(supertile.getWorld().getBlockState(pos.offset(dir)).getBlock() == chest) {
filter.addAll(getFilterForInventory((IInventory) supertile.getWorld().getTileEntity(pos.offset(dir)), pos.offset(dir), false));
filter.addAll(getFilterForInventory(pos.offset(dir), false));
break;
}
}
@@ -22,16 +22,14 @@ import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.EntityPlayerMP;
import net.minecraft.init.Blocks;
import net.minecraft.init.Items;
import net.minecraft.inventory.IInventory;
import net.minecraft.inventory.ISidedInventory;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.AxisAlignedBB;
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;
@@ -44,9 +42,8 @@ import vazkii.botania.api.state.enums.AltarVariant;
import vazkii.botania.client.core.handler.HUDHandler;
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 +99,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 +108,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 +119,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 +152,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 +161,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<ItemStack> lastRecipe) {
public static void tryToSetLastRecipe(EntityPlayer player, IItemHandlerModifiable inv, List<ItemStack> lastRecipe) {
if(lastRecipe == null || lastRecipe.isEmpty() || player.worldObj.isRemote)
return;
@@ -188,7 +185,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 +215,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 +233,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 +278,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 SimpleItemStackHandler createItemHandler() {
return new SimpleItemStackHandler(this, false) {
@Override
protected int getStackLimit(int slot, ItemStack stack) {
return 1;
}
};
}
@Override
@@ -344,7 +321,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 +330,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 +349,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;
@@ -10,15 +10,14 @@
*/
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 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 +40,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 +72,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 SimpleItemStackHandler createItemHandler() {
return new SimpleItemStackHandler(this, false) {
@Override
protected int getStackLimit(int slot, ItemStack stack) {
return 1;
}
};
}
@Override
@@ -114,7 +93,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 +101,11 @@ public class TileAvatar extends TileSimpleInventory implements IAvatarTile, ISid
return mana;
}
@Override
public IItemHandler getInventory() {
return getItemHandler();
}
@Override
public int getElapsedFunctionalTicks() {
return ticksElapsed;
@@ -17,11 +17,9 @@ import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.ScaledResolution;
import net.minecraft.entity.item.EntityItem;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.inventory.ISidedInventory;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.AxisAlignedBB;
import net.minecraft.util.EnumFacing;
import vazkii.botania.api.BotaniaAPI;
import vazkii.botania.api.brew.IBrewContainer;
import vazkii.botania.api.brew.IBrewItem;
@@ -32,10 +30,9 @@ import vazkii.botania.api.state.BotaniaStateProps;
import vazkii.botania.client.core.helper.RenderHelper;
import vazkii.botania.common.Botania;
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 +42,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 +66,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 +79,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 +102,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 +124,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 +150,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 +160,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 +194,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 +202,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 SimpleItemStackHandler createItemHandler() {
return new SimpleItemStackHandler(this, false) {
@Override
protected int getStackLimit(int slot, ItemStack stack) {
return 1;
}
};
}
@Override
@@ -256,7 +243,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)));
}
}
@@ -77,13 +77,20 @@ public class TileCraftCrate extends TileOpenCrate {
}
@Override
public int getInventoryStackLimit() {
return 1;
}
protected SimpleItemStackHandler 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 +107,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 +127,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 +138,15 @@ public class TileCraftCrate extends TileOpenCrate {
List<IRecipe> 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 +156,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 +164,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();
}
}
@@ -23,7 +23,6 @@ import net.minecraft.util.StringUtils;
import vazkii.botania.api.internal.VanillaPacketDispatcher;
import vazkii.botania.api.state.BotaniaStateProps;
import vazkii.botania.common.lib.LibBlockNames;
public class TileHourglass extends TileSimpleInventory {
@@ -67,7 +66,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 +84,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 +95,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 SimpleItemStackHandler 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 +146,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 +170,4 @@ public class TileHourglass extends TileSimpleInventory {
}
@Override
public String getName() {
return LibBlockNames.HOURGLASS;
}
}
@@ -14,13 +14,11 @@ import java.awt.Color;
import java.util.List;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.inventory.ISidedInventory;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.potion.Potion;
import net.minecraft.potion.PotionEffect;
import net.minecraft.util.AxisAlignedBB;
import net.minecraft.util.EnumFacing;
import net.minecraftforge.fml.common.registry.GameData;
import vazkii.botania.api.BotaniaAPI;
import vazkii.botania.api.brew.Brew;
@@ -28,9 +26,8 @@ import vazkii.botania.api.internal.VanillaPacketDispatcher;
import vazkii.botania.common.Botania;
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 +40,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 +71,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 +89,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 +103,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 +117,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 SimpleItemStackHandler 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
@@ -39,11 +39,6 @@ public class TileOpenCrate extends TileSimpleInventory {
return 1;
}
@Override
public String getName() {
return LibBlockNames.OPEN_CRATE;
}
@Override
public void updateEntity() {
if (worldObj.isRemote)
@@ -59,7 +54,7 @@ public class TileOpenCrate extends TileSimpleInventory {
}
if(canEject()) {
ItemStack stack = getStackInSlot(0);
ItemStack stack = itemHandler.getStackInSlot(0);
if(stack != null)
eject(stack, redstone);
}
@@ -83,7 +78,7 @@ public class TileOpenCrate extends TileSimpleInventory {
}
setInventorySlotContents(0, null);
itemHandler.setStackInSlot(0, null);
worldObj.spawnEntityInWorld(item);
}
@@ -17,15 +17,12 @@ import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.ScaledResolution;
import net.minecraft.entity.item.EntityItem;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.inventory.ISidedInventory;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.AxisAlignedBB;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.StatCollector;
import net.minecraftforge.fml.common.ObfuscationReflectionHelper;
import org.lwjgl.opengl.GL11;
import org.lwjgl.opengl.GL12;
@@ -39,10 +36,8 @@ import vazkii.botania.common.Botania;
import vazkii.botania.common.block.ModBlocks;
import vazkii.botania.common.core.helper.Vector3;
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 +78,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 +156,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 +173,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 +182,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 +201,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 +230,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 +264,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 +296,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 +304,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 SimpleItemStackHandler createItemHandler() {
return new SimpleItemStackHandler(this, false) {
@Override
protected int getStackLimit(int slot, ItemStack stack) {
return 1;
}
};
}
@Override
@@ -359,7 +344,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 +352,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 +384,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;
@@ -10,133 +10,82 @@
*/
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 {
public abstract class TileSimpleInventory extends TileMod implements IInventory {
ItemStack[] inventorySlots = new ItemStack[getSizeInventory()];
protected SimpleItemStackHandler itemHandler = createItemHandler();
@Override
public void readCustomNBT(NBTTagCompound par1NBTTagCompound) {
NBTTagList var2 = par1NBTTagCompound.getTagList("Items", 10);
inventorySlots = new ItemStack[getSizeInventory()];
for (int var3 = 0; var3 < var2.tagCount(); ++var3) {
NBTTagCompound var4 = var2.getCompoundTagAt(var3);
byte var5 = var4.getByte("Slot");
if (var5 >= 0 && var5 < inventorySlots.length)
inventorySlots[var5] = ItemStack.loadItemStackFromNBT(var4);
}
itemHandler = createItemHandler();
itemHandler.deserializeNBT(par1NBTTagCompound);
}
@Override
public void writeCustomNBT(NBTTagCompound par1NBTTagCompound) {
NBTTagList var2 = new NBTTagList();
for (int var3 = 0; var3 < inventorySlots.length; ++var3) {
if (inventorySlots[var3] != null) {
NBTTagCompound var4 = new NBTTagCompound();
var4.setByte("Slot", (byte)var3);
inventorySlots[var3].writeToNBT(var4);
var2.appendTag(var4);
}
}
par1NBTTagCompound.setTag("Items", var2);
par1NBTTagCompound.merge(itemHandler.serializeNBT());
}
public abstract int getSizeInventory();
protected SimpleItemStackHandler createItemHandler() {
return new SimpleItemStackHandler(this, true);
}
public IItemHandlerModifiable getItemHandler() {
return itemHandler;
}
@Override
public ItemStack getStackInSlot(int i) {
return inventorySlots[i];
public boolean hasCapability(Capability<?> cap, EnumFacing side) {
return cap == CapabilityItemHandler.ITEM_HANDLER_CAPABILITY || super.hasCapability(cap, side);
}
@Override
public ItemStack decrStackSize(int i, int j) {
if (inventorySlots[i] != null) {
ItemStack stackAt;
@SuppressWarnings("unchecked")
public <T> T getCapability(Capability<T> cap, EnumFacing side) {
if(cap == CapabilityItemHandler.ITEM_HANDLER_CAPABILITY)
return (T) itemHandler;
return super.getCapability(cap, side);
}
if (inventorySlots[i].stackSize <= j) {
stackAt = inventorySlots[i];
inventorySlots[i] = null;
return stackAt;
} else {
stackAt = inventorySlots[i].splitStack(j);
/* 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 {
if (inventorySlots[i].stackSize == 0)
inventorySlots[i] = null;
private final boolean allowWrite;
private final TileSimpleInventory tile;
return stackAt;
}
public SimpleItemStackHandler(TileSimpleInventory inv, boolean allowWrite) {
super(inv.getSizeInventory());
this.allowWrite = allowWrite;
this.tile = inv;
}
return null;
}
@Override
public ItemStack insertItem(int slot, ItemStack stack, boolean simulate) {
if(allowWrite) {
return super.insertItem(slot, stack, simulate);
} else return stack;
}
@Override
public ItemStack removeStackFromSlot(int i) {
return getStackInSlot(i);
}
@Override
public ItemStack extractItem(int slot, int amount, boolean simulate) {
if(allowWrite) {
return super.extractItem(slot, amount, simulate);
} else return null;
}
@Override
public void setInventorySlotContents(int i, ItemStack itemstack) {
inventorySlots[i] = itemstack;
}
@Override
public int getInventoryStackLimit() {
return 64;
}
@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 onContentsChanged(int slot) {
tile.markDirty();
}
}
}
@@ -21,7 +21,6 @@ import vazkii.botania.api.internal.VanillaPacketDispatcher;
import vazkii.botania.api.mana.spark.ISparkAttachable;
import vazkii.botania.api.mana.spark.ISparkEntity;
import vazkii.botania.common.item.ModItems;
import vazkii.botania.common.lib.LibBlockNames;
import vazkii.botania.common.lib.LibMisc;
public class TileSparkChanger extends TileSimpleInventory {
@@ -30,7 +29,7 @@ public class TileSparkChanger extends TileSimpleInventory {
if(worldObj.isRemote)
return;
ItemStack changeStack = getStackInSlot(0);
ItemStack changeStack = itemHandler.getStackInSlot(0);
List<ISparkAttachable> attachables = new ArrayList<>();
for(EnumFacing dir : LibMisc.CARDINAL_DIRECTIONS) {
TileEntity tile = worldObj.getTileEntity(pos.offset(dir));
@@ -56,7 +55,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 +67,20 @@ public class TileSparkChanger extends TileSimpleInventory {
}
@Override
public boolean isItemValidForSlot(int i, ItemStack itemstack) {
return itemstack != null && itemstack.getItem() == ModItems.sparkUpgrade;
}
protected SimpleItemStackHandler 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 +89,4 @@ public class TileSparkChanger extends TileSimpleInventory {
VanillaPacketDispatcher.dispatchTEToNearbyPlayers(this);
}
@Override
public String getName() {
return LibBlockNames.SPARK_CHANGER;
}
}
@@ -19,7 +19,6 @@ import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.ResourceLocation;
import net.minecraftforge.client.model.animation.Animation;
import net.minecraftforge.client.model.animation.IAnimationProvider;
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;
@@ -27,7 +26,6 @@ import vazkii.botania.api.corporea.CorporeaHelper;
import vazkii.botania.api.corporea.ICorporeaRequestor;
import vazkii.botania.api.corporea.ICorporeaSpark;
import vazkii.botania.api.internal.VanillaPacketDispatcher;
import vazkii.botania.common.lib.LibBlockNames;
public class TileCorporeaCrystalCube extends TileCorporeaBase implements ICorporeaRequestor, IAnimationProvider {
@@ -143,13 +141,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 SimpleItemStackHandler createItemHandler() {
return new SimpleItemStackHandler(this, false);
}
@Override
@@ -23,7 +23,6 @@ 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.lib.LibBlockNames;
import vazkii.botania.common.lib.LibMisc;
public class TileCorporeaFunnel extends TileCorporeaBase implements ICorporeaRequestor {
@@ -66,19 +65,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 SimpleItemStackHandler createItemHandler() {
return new SimpleItemStackHandler(this, false);
}
@Override
@@ -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))
@@ -23,14 +23,13 @@ import vazkii.botania.api.corporea.CorporeaHelper;
import vazkii.botania.api.corporea.ICorporeaInterceptor;
import vazkii.botania.api.corporea.ICorporeaSpark;
import vazkii.botania.api.state.BotaniaStateProps;
import vazkii.botania.common.lib.LibBlockNames;
import vazkii.botania.common.lib.LibMisc;
public class TileCorporeaInterceptor extends TileCorporeaBase implements ICorporeaInterceptor {
@Override
public boolean isItemValidForSlot(int i, ItemStack itemstack) {
return false;
protected SimpleItemStackHandler createItemHandler() {
return new SimpleItemStackHandler(this, false);
}
@Override
@@ -38,11 +37,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<ItemStack> stacks, List<IInventory> inventories, boolean doit) {
// NO-OP
@@ -11,9 +11,7 @@
package vazkii.botania.common.block.tile.mana;
import net.minecraft.entity.Entity;
import net.minecraft.inventory.ISidedInventory;
import net.minecraft.item.ItemStack;
import net.minecraft.util.EnumFacing;
import vazkii.botania.api.internal.IManaBurst;
import vazkii.botania.api.mana.BurstProperties;
import vazkii.botania.api.mana.ILens;
@@ -21,12 +19,11 @@ import vazkii.botania.api.mana.IManaCollisionGhost;
import vazkii.botania.api.mana.ITinyPlanetExcempt;
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 +59,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 SimpleItemStackHandler 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;
}
};
}
}
@@ -57,7 +57,6 @@ 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.lib.LibBlockNames;
public class TileSpreader extends TileSimpleInventory implements IManaCollector, IWandBindable, IKeyLocked, IThrottledPacket, IManaSpreader, IRedirectable, ITickable {
@@ -238,7 +237,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) {
@@ -456,7 +455,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;
@@ -484,7 +483,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);
@@ -551,7 +550,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);
@@ -611,18 +610,20 @@ public class TileSpreader extends TileSimpleInventory implements IManaCollector,
}
@Override
public String getName() {
return LibBlockNames.SPREADER;
}
protected SimpleItemStackHandler 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
@@ -19,147 +19,39 @@ import net.minecraft.util.BlockPos;
import net.minecraft.util.ChatComponentText;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.IChatComponent;
import net.minecraftforge.common.capabilities.Capability;
import net.minecraftforge.items.CapabilityItemHandler;
import vazkii.botania.common.core.helper.InventoryHelper;
import vazkii.botania.common.lib.LibBlockNames;
public class TileRedStringContainer extends TileRedString implements ISidedInventory {
import java.util.Arrays;
public class TileRedStringContainer extends TileRedString {
@Override
public boolean acceptBlock(BlockPos pos) {
TileEntity tile = worldObj.getTileEntity(pos);
if(tile != null && tile instanceof IInventory) {
IInventory inv = (IInventory) tile;
if(inv instanceof ISidedInventory) {
ISidedInventory sidedInv = (ISidedInventory) inv;
for(EnumFacing e : EnumFacing.VALUES)
if(sidedInv.getSlotsForFace(e).length != 0)
return true;
return false;
}
return tile != null
&& Arrays.stream(EnumFacing.VALUES)
.anyMatch(e -> tile.hasCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, e));
}
@Override
public boolean hasCapability(Capability<?> cap, EnumFacing side) {
if(cap == CapabilityItemHandler.ITEM_HANDLER_CAPABILITY
&& getTileAtBinding() != null
&& getTileAtBinding().hasCapability(cap, side))
return true;
}
return false;
return super.hasCapability(cap, side);
}
@Override
public int getSizeInventory() {
IInventory inv = getInventory();
return inv != null ? inv.getSizeInventory() : 0;
}
@Override
public ItemStack getStackInSlot(int slot) {
IInventory inv = getInventory();
return inv != null ? inv.getStackInSlot(slot) : null;
}
@Override
public ItemStack decrStackSize(int slot, int count) {
IInventory inv = getInventory();
return inv != null ? inv.decrStackSize(slot, count) : null;
}
@Override
public ItemStack removeStackFromSlot(int slot) {
IInventory inv = getInventory();
return inv != null ? inv.removeStackFromSlot(slot) : null;
}
@Override
public void setInventorySlotContents(int slot, ItemStack stack) {
IInventory inv = getInventory();
if(inv != null)
inv.setInventorySlotContents(slot, stack);
}
@Override
public String getName() {
IInventory inv = getInventory();
return inv != null ? inv.getName() : LibBlockNames.RED_STRING_CONTAINER;
}
@Override
public boolean hasCustomName() {
IInventory inv = getInventory();
return inv != null ? inv.hasCustomName() : false;
}
@Override
public IChatComponent getDisplayName() {
IInventory inv = getInventory();
return inv != null ? inv.getDisplayName() : new ChatComponentText(getName());
}
@Override
public int getInventoryStackLimit() {
IInventory inv = getInventory();
return inv != null ? inv.getInventoryStackLimit() : 0;
}
@Override
public boolean isUseableByPlayer(EntityPlayer player) {
IInventory inv = getInventory();
return inv != null ? inv.isUseableByPlayer(player) : false;
}
@Override
public void openInventory(EntityPlayer player) {
IInventory inv = getInventory();
if(inv != null)
inv.openInventory(player);
}
@Override
public void closeInventory(EntityPlayer player) {
IInventory inv = getInventory();
if(inv != null)
inv.closeInventory(player);
}
@Override
public boolean isItemValidForSlot(int slot, ItemStack stack) {
IInventory inv = getInventory();
return inv != null ? inv.isItemValidForSlot(slot, stack) : false;
}
@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() {
}
@Override
public int[] getSlotsForFace(EnumFacing side) {
IInventory inv = getInventory();
return inv instanceof ISidedInventory ? ((ISidedInventory) inv).getSlotsForFace(side) : inv instanceof IInventory ? InventoryHelper.buildSlotsForLinearInventory(inv) : new int[0];
}
@Override
public boolean canInsertItem(int slot, ItemStack stack, EnumFacing side) {
IInventory inv = getInventory();
return inv instanceof ISidedInventory ? ((ISidedInventory) inv).canInsertItem(slot, stack, side) : true;
}
@Override
public boolean canExtractItem(int slot, ItemStack stack, EnumFacing side) {
IInventory inv = getInventory();
return inv instanceof ISidedInventory ? ((ISidedInventory) inv).canExtractItem(slot, stack, side) : true;
public <T> T getCapability(Capability<T> cap, EnumFacing side) {
if(cap == CapabilityItemHandler.ITEM_HANDLER_CAPABILITY
&& getTileAtBinding() != null
&& getTileAtBinding().hasCapability(cap, side))
return getTileAtBinding().getCapability(cap, side);
return super.getCapability(cap, side);
}
@Override
@@ -170,12 +62,4 @@ public class TileRedStringContainer extends TileRedString implements ISidedInven
tile.markDirty();
}
IInventory getInventory() {
TileEntity tile = getTileAtBinding();
if(tile == null || !(tile instanceof IInventory))
return null;
return InventoryHelper.getInventory((IInventory) tile);
}
}
@@ -0,0 +1,43 @@
package vazkii.botania.common.core.helper;
import net.minecraft.block.Block;
import net.minecraft.inventory.IInventory;
import net.minecraft.inventory.ISidedInventory;
import net.minecraft.inventory.InventoryLargeChest;
import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.tileentity.TileEntityChest;
import net.minecraft.util.BlockPos;
import net.minecraft.util.EnumFacing;
import net.minecraft.world.ILockableContainer;
import net.minecraft.world.World;
import net.minecraftforge.items.CapabilityItemHandler;
import net.minecraftforge.items.IItemHandler;
import net.minecraftforge.items.wrapper.InvWrapper;
public final class InventoryHelper2 {
public static IItemHandler getInventory(World world, BlockPos pos, EnumFacing side) {
TileEntity te = world.getTileEntity(pos);
if(te == null)
return null;
if(te instanceof TileEntityChest) {
Block chestBlock = world.getBlockState(pos).getBlock();
if(world.getBlockState(pos.west()).getBlock() == chestBlock)
return new InvWrapper(new InventoryLargeChest("Large chest", (ILockableContainer) world.getTileEntity(pos.west()), (ILockableContainer) te));
if(world.getBlockState(pos.east()).getBlock() == chestBlock)
return new InvWrapper(new InventoryLargeChest("Large chest", (ILockableContainer) te, (ILockableContainer) world.getTileEntity(pos.east())));
if(world.getBlockState(pos.north()).getBlock() == chestBlock)
return new InvWrapper(new InventoryLargeChest("Large chest", (ILockableContainer) world.getTileEntity(pos.north()), (ILockableContainer) te));
if(world.getBlockState(pos.south()).getBlock() == chestBlock)
return new InvWrapper(new InventoryLargeChest("Large chest", (ILockableContainer) te, (ILockableContainer) world.getTileEntity(pos.south())));
}
return te.hasCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, side) ?
te.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, side) : null;
}
private InventoryHelper2() {}
}
@@ -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;
@@ -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;
}
@@ -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;
}
@@ -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;
}
@@ -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;
}