diff --git a/src/main/java/forestry/api/lepidopterology/IAlleleButterflyCocoon.java b/src/main/java/forestry/api/lepidopterology/IAlleleButterflyCocoon.java index e8d4143c5..440b1cdc9 100644 --- a/src/main/java/forestry/api/lepidopterology/IAlleleButterflyCocoon.java +++ b/src/main/java/forestry/api/lepidopterology/IAlleleButterflyCocoon.java @@ -13,6 +13,7 @@ package forestry.api.lepidopterology; import java.util.Map; import forestry.api.genetics.IAllele; +import net.minecraft.client.resources.model.ModelResourceLocation; import net.minecraft.item.ItemStack; public interface IAlleleButterflyCocoon extends IAllele { @@ -21,6 +22,8 @@ public interface IAlleleButterflyCocoon extends IAllele { String getCocoonTexture(int age); + ModelResourceLocation getCocoonItemModel(int age); + Map getCocoonLoot(); } diff --git a/src/main/java/forestry/lepidopterology/genetics/alleles/AlleleButterflyCocoon.java b/src/main/java/forestry/lepidopterology/genetics/alleles/AlleleButterflyCocoon.java index b6f26040b..3542e9948 100644 --- a/src/main/java/forestry/lepidopterology/genetics/alleles/AlleleButterflyCocoon.java +++ b/src/main/java/forestry/lepidopterology/genetics/alleles/AlleleButterflyCocoon.java @@ -24,6 +24,7 @@ import forestry.api.lepidopterology.IAlleleButterflyCocoon; import forestry.core.PluginCore; import forestry.core.config.Constants; import forestry.core.genetics.alleles.AlleleCategorized; +import net.minecraft.client.resources.model.ModelResourceLocation; import net.minecraft.item.ItemStack; public class AlleleButterflyCocoon extends AlleleCategorized implements IAlleleButterflyCocoon { @@ -64,6 +65,11 @@ public class AlleleButterflyCocoon extends AlleleCategorized implements IAlleleB public String getCocoonTexture(int age) { return "textures/blocks/lepidopterology/cocoons/" + type + "_" + age + ".png"; } + + @Override + public ModelResourceLocation getCocoonItemModel(int age) { + return new ModelResourceLocation(Constants.RESOURCE_ID + ":lepidopterology/cocoons/" + type + "_" + age + ".png", "inventory"); + } @Override public Map getCocoonLoot() { diff --git a/src/main/java/forestry/lepidopterology/items/ItemButterflyGE.java b/src/main/java/forestry/lepidopterology/items/ItemButterflyGE.java index fce5cefa5..28d52379d 100755 --- a/src/main/java/forestry/lepidopterology/items/ItemButterflyGE.java +++ b/src/main/java/forestry/lepidopterology/items/ItemButterflyGE.java @@ -13,6 +13,8 @@ package forestry.lepidopterology.items; import java.util.List; import java.util.Random; +import net.minecraft.client.renderer.ItemMeshDefinition; +import net.minecraft.client.resources.model.ModelResourceLocation; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; @@ -36,6 +38,7 @@ import forestry.api.lepidopterology.ButterflyManager; import forestry.api.lepidopterology.EnumFlutterType; import forestry.api.lepidopterology.IAlleleButterflySpecies; import forestry.api.lepidopterology.IButterfly; +import forestry.api.lepidopterology.IButterflyGenome; import forestry.api.lepidopterology.IButterflyNursery; import forestry.core.config.Config; import forestry.core.genetics.ItemGE; @@ -189,12 +192,23 @@ public class ItemButterflyGE extends ItemGE { manager.registerItemModel(item, 0, "butterflyGE"); break; case COCOON: - manager.registerItemModel(item, 0, "cocoon"); + manager.registerItemModel(item, new CocoonMeshDefinition()); break; default: manager.registerItemModel(item, 0, "liquids/jar"); } } + + private class CocoonMeshDefinition implements ItemMeshDefinition{ + + @Override + public ModelResourceLocation getModelLocation(ItemStack itemstack) { + int age = itemstack.getTagCompound().getInteger("Age"); + IButterflyGenome genome = (IButterflyGenome) AlleleManager.alleleRegistry.getIndividual(itemstack).getGenome(); + return genome.getCocoon().getCocoonItemModel(age); + } + + } @Override public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, BlockPos pos, EnumFacing side, float hitX, float hitY, float hitZ) {