diff --git a/src/main/java/forestry/lepidopterology/genetics/ButterflyRoot.java b/src/main/java/forestry/lepidopterology/genetics/ButterflyRoot.java index d02dfa4c9..1bc07ff3d 100644 --- a/src/main/java/forestry/lepidopterology/genetics/ButterflyRoot.java +++ b/src/main/java/forestry/lepidopterology/genetics/ButterflyRoot.java @@ -10,14 +10,24 @@ ******************************************************************************/ package forestry.lepidopterology.genetics; +import com.google.common.base.Preconditions; + import javax.annotation.Nullable; import java.util.ArrayList; import java.util.Collections; import java.util.List; import java.util.Map.Entry; -import com.google.common.base.Preconditions; +import net.minecraft.block.Block; +import net.minecraft.block.state.IBlockState; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; + import com.mojang.authlib.GameProfile; + import forestry.api.genetics.AlleleManager; import forestry.api.genetics.IAllele; import forestry.api.genetics.IAlyzerPlugin; @@ -43,15 +53,9 @@ import forestry.core.utils.GeneticsUtil; import forestry.lepidopterology.PluginLepidopterology; import forestry.lepidopterology.blocks.BlockRegistryLepidopterology; import forestry.lepidopterology.entities.EntityButterfly; +import forestry.lepidopterology.items.ItemButterflyGE; import forestry.lepidopterology.items.ItemRegistryLepidopterology; import forestry.lepidopterology.tiles.TileCocoon; -import net.minecraft.block.Block; -import net.minecraft.block.state.IBlockState; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; public class ButterflyRoot extends SpeciesRoot implements IButterflyRoot { @@ -172,6 +176,9 @@ public class ButterflyRoot extends SpeciesRoot implements IButterflyRoot { butterfly.writeToNBT(nbttagcompound); ItemStack stack = new ItemStack(butterflyItem); stack.setTagCompound(nbttagcompound); + if(type == EnumFlutterType.CATERPILLAR){ + ItemButterflyGE.setAge(stack, 0); + } return stack; } diff --git a/src/main/java/forestry/lepidopterology/items/ItemButterflyGE.java b/src/main/java/forestry/lepidopterology/items/ItemButterflyGE.java index 3a9bd2104..51f7cdc8c 100755 --- a/src/main/java/forestry/lepidopterology/items/ItemButterflyGE.java +++ b/src/main/java/forestry/lepidopterology/items/ItemButterflyGE.java @@ -10,10 +10,31 @@ ******************************************************************************/ package forestry.lepidopterology.items; +import com.google.common.base.Preconditions; + import javax.annotation.Nullable; import java.util.Random; -import com.google.common.base.Preconditions; +import net.minecraft.block.state.IBlockState; +import net.minecraft.client.renderer.ItemMeshDefinition; +import net.minecraft.client.renderer.block.model.ModelBakery; +import net.minecraft.client.renderer.block.model.ModelResourceLocation; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.entity.item.EntityItem; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.EnumActionResult; +import net.minecraft.util.EnumFacing; +import net.minecraft.util.EnumHand; +import net.minecraft.util.NonNullList; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; + +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + import forestry.api.core.IModelManager; import forestry.api.core.ISpriteRegister; import forestry.api.core.ITextureManager; @@ -40,24 +61,6 @@ import forestry.core.utils.Translator; import forestry.lepidopterology.PluginLepidopterology; import forestry.lepidopterology.entities.EntityButterfly; import forestry.lepidopterology.genetics.ButterflyGenome; -import net.minecraft.block.state.IBlockState; -import net.minecraft.client.renderer.ItemMeshDefinition; -import net.minecraft.client.renderer.block.model.ModelBakery; -import net.minecraft.client.renderer.block.model.ModelResourceLocation; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.entity.item.EntityItem; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.EnumActionResult; -import net.minecraft.util.EnumFacing; -import net.minecraft.util.EnumHand; -import net.minecraft.util.NonNullList; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; public class ItemButterflyGE extends ItemGE implements ISpriteRegister, IColoredItem { @@ -183,7 +186,9 @@ public class ItemButterflyGE extends ItemGE implements ISpriteRegister, IColored public ModelResourceLocation getModelLocation(ItemStack itemstack) { NBTTagCompound tagCompound = itemstack.getTagCompound(); Preconditions.checkNotNull(tagCompound); - Preconditions.checkState(tagCompound.hasKey(NBT_AGE)); + if(!tagCompound.hasKey(NBT_AGE)){ + tagCompound.setInteger(NBT_AGE, 0); + } int age = tagCompound.getInteger(NBT_AGE); IIndividual individual = AlleleManager.alleleRegistry.getIndividual(itemstack); Preconditions.checkNotNull(individual);