Let cocoons work with pick block

This commit is contained in:
mezz committed 2016-05-01 14:04:25 -07:00
1 parent dc57e0826d
commit 3aef4aa2c1
2 files changed
+44 -14

No files matched your search

@@ -14,25 +14,33 @@ import java.util.Collections;
import java.util.List;
import java.util.Random;
import forestry.api.core.IStateMapperRegister;
import forestry.core.proxy.Proxies;
import forestry.core.tiles.TileUtil;
import forestry.lepidopterology.blocks.property.PropertyCocoon;
import forestry.lepidopterology.genetics.alleles.AlleleButterflyCocoon;
import forestry.lepidopterology.tiles.TileCocoon;
import net.minecraft.block.Block;
import net.minecraft.block.ITileEntityProvider;
import net.minecraft.block.state.BlockState;
import net.minecraft.block.state.IBlockState;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.AxisAlignedBB;
import net.minecraft.util.BlockPos;
import net.minecraft.util.MovingObjectPosition;
import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import forestry.api.core.IStateMapperRegister;
import forestry.api.lepidopterology.ButterflyManager;
import forestry.api.lepidopterology.EnumFlutterType;
import forestry.api.lepidopterology.IButterfly;
import forestry.core.proxy.Proxies;
import forestry.core.tiles.TileUtil;
import forestry.lepidopterology.blocks.property.PropertyCocoon;
import forestry.lepidopterology.genetics.alleles.AlleleButterflyCocoon;
import forestry.lepidopterology.items.ItemButterflyGE;
import forestry.lepidopterology.tiles.TileCocoon;
public class BlockCocoon extends Block implements ITileEntityProvider, IStateMapperRegister {
private static final PropertyCocoon COCOON = AlleleButterflyCocoon.COCOON;
@@ -115,9 +123,29 @@ public class BlockCocoon extends Block implements ITileEntityProvider, IStateMap
public List<ItemStack> getDrops(IBlockAccess world, BlockPos pos, IBlockState state, int fortune) {
return Collections.emptyList();
}
@Override
public AxisAlignedBB getSelectedBoundingBox(World world, BlockPos pos) {
@Override
public ItemStack getPickBlock(MovingObjectPosition target, World world, BlockPos pos, EntityPlayer player) {
TileCocoon tile = TileUtil.getTile(world, pos, TileCocoon.class);
if (tile == null) {
return null;
}
IButterfly caterpillar = tile.getCaterpillar();
int age = tile.getAge();
ItemStack stack = ButterflyManager.butterflyRoot.getMemberStack(caterpillar, EnumFlutterType.COCOON);
if (stack == null) {
return null;
}
stack.getTagCompound().setInteger(ItemButterflyGE.NBT_AGE, age);
return stack;
}
@Override
public AxisAlignedBB getSelectedBoundingBox(World world, BlockPos pos) {
setBlockBounds(0.3125F, 0.3125F, 0.3125F, 0.6875F, 1F, 0.6875F);
return super.getSelectedBoundingBox(world, pos);
}
@@ -27,7 +27,7 @@ import net.minecraft.world.World;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import forestry.api.arboriculture.IAlleleTreeSpecies;
import forestry.api.arboriculture.ITree;
import forestry.api.core.IModelManager;
import forestry.api.core.ISpriteRegister;
@@ -58,6 +58,7 @@ import forestry.lepidopterology.genetics.ButterflyGenome;
public class ItemButterflyGE extends ItemGE implements ISpriteRegister {
private static final Random rand = new Random();
public static final String NBT_AGE = "Age";
private final EnumFlutterType type;
@@ -108,7 +109,7 @@ public class ItemButterflyGE extends ItemGE implements ISpriteRegister {
ItemStack butterfly = ButterflyManager.butterflyRoot.getMemberStack(individual, type);
if(type == EnumFlutterType.COCOON){
butterfly.getTagCompound().setInteger("Age", age);
butterfly.getTagCompound().setInteger(NBT_AGE, age);
}
itemList.add(butterfly);
@@ -210,11 +211,11 @@ public class ItemButterflyGE extends ItemGE implements ISpriteRegister {
}
}
private class CocoonMeshDefinition implements ItemMeshDefinition{
private static class CocoonMeshDefinition implements ItemMeshDefinition {
@Override
public ModelResourceLocation getModelLocation(ItemStack itemstack) {
int age = itemstack.getTagCompound().getInteger("Age");
int age = itemstack.getTagCompound().getInteger(NBT_AGE);
IButterflyGenome genome = (IButterflyGenome) AlleleManager.alleleRegistry.getIndividual(itemstack).getGenome();
return genome.getCocoon().getCocoonItemModel(age);
}
@@ -234,7 +235,7 @@ public class ItemButterflyGE extends ItemGE implements ISpriteRegister {
}
if (type == EnumFlutterType.COCOON) {
int age = stack.getTagCompound().getInteger("Age");
int age = stack.getTagCompound().getInteger(NBT_AGE);
// x, y, z are the coordinates of the block "hit", can thus either be the soil or tall grass, etc.
int yShift;
@@ -304,6 +305,7 @@ public class ItemButterflyGE extends ItemGE implements ISpriteRegister {
/**
* Register butterfly item sprites
*/
@Override
@SideOnly(Side.CLIENT)
public void registerSprites(ITextureManager manager) {
for (IAllele allele : AlleleManager.alleleRegistry.getRegisteredAlleles().values()) {