From 5b42b5fbae6682efc5147beaa34755d6f32c2067 Mon Sep 17 00:00:00 2001 From: Nedelosk Date: Sat, 26 Mar 2016 00:50:51 +0100 Subject: [PATCH] Add cocoons and fix bugs --- .../IAlleleButterflySpecies.java | 5 + .../api/lepidopterology/IButterflyCocoon.java | 25 ++ .../IButterflyCocoonProvider.java | 17 ++ .../lepidopterology/IButterflyFactory.java | 5 +- .../api/lepidopterology/IButterflyRoot.java | 2 + .../api/lepidopterology/IEntityButterfly.java | 4 + .../alleles/AlleleEffectRadioactive.java | 2 +- .../forestry/apiculture/worldgen/HiveGen.java | 4 +- .../blocks/BlockForestryLeaves.java | 5 +- .../arboriculture/tiles/TileLeaves.java | 21 +- .../java/forestry/core/genetics/Genome.java | 1 - .../core/render/EmptyStateMapper.java | 24 ++ .../PluginLepidopterology.java | 6 +- .../lepidopterology/blocks/BlockCocoon.java | 126 ++++++++++ .../blocks/BlockRegistryLepidopterology.java | 2 + .../entities/AIButterflyMate.java | 87 ++++++- .../entities/AIButterflyRest.java | 4 +- .../entities/EntityButterfly.java | 20 ++ .../genetics/ButterflyDefinition.java | 4 +- .../genetics/ButterflyFactory.java | 5 +- .../genetics/ButterflyGenome.java | 1 - .../genetics/ButterflyRoot.java | 55 +++++ .../genetics/DefaultCocoonProvider.java | 22 ++ .../genetics/MothDefinition.java | 5 +- .../alleles/AlleleButterflySpecies.java | 15 +- .../proxy/ProxyLepidopterology.java | 2 +- .../proxy/ProxyLepidopterologyClient.java | 8 +- .../lepidopterology/render/ModelCocoon.java | 111 +++++++++ .../render/RenderButterflyEntity.java | 17 +- .../render/RendererCocoon.java | 57 +++++ .../lepidopterology/tiles/TileCocoon.java | 220 ++++++++++++++++++ .../assets/forestry/blockstates/cocoon.json | 0 .../assets/forestry/models/item/cocoon.json | 3 + .../lepidopterology/cocoons/default_0.png | Bin 0 -> 15739 bytes .../lepidopterology/cocoons/default_1.png | Bin 0 -> 15503 bytes .../lepidopterology/cocoons/default_2.png | Bin 0 -> 15316 bytes .../textures/items/scentedPaneling.png | Bin 14656 -> 181 bytes 37 files changed, 831 insertions(+), 54 deletions(-) create mode 100644 src/main/java/forestry/api/lepidopterology/IButterflyCocoon.java create mode 100644 src/main/java/forestry/api/lepidopterology/IButterflyCocoonProvider.java create mode 100644 src/main/java/forestry/core/render/EmptyStateMapper.java create mode 100644 src/main/java/forestry/lepidopterology/blocks/BlockCocoon.java create mode 100644 src/main/java/forestry/lepidopterology/genetics/DefaultCocoonProvider.java create mode 100644 src/main/java/forestry/lepidopterology/render/ModelCocoon.java create mode 100644 src/main/java/forestry/lepidopterology/render/RendererCocoon.java create mode 100644 src/main/java/forestry/lepidopterology/tiles/TileCocoon.java create mode 100644 src/main/resources/assets/forestry/blockstates/cocoon.json create mode 100644 src/main/resources/assets/forestry/models/item/cocoon.json create mode 100644 src/main/resources/assets/forestry/textures/blocks/lepidopterology/cocoons/default_0.png create mode 100644 src/main/resources/assets/forestry/textures/blocks/lepidopterology/cocoons/default_1.png create mode 100644 src/main/resources/assets/forestry/textures/blocks/lepidopterology/cocoons/default_2.png diff --git a/src/main/java/forestry/api/lepidopterology/IAlleleButterflySpecies.java b/src/main/java/forestry/api/lepidopterology/IAlleleButterflySpecies.java index 468de7577..822f21e5e 100644 --- a/src/main/java/forestry/api/lepidopterology/IAlleleButterflySpecies.java +++ b/src/main/java/forestry/api/lepidopterology/IAlleleButterflySpecies.java @@ -66,6 +66,11 @@ public interface IAlleleButterflySpecies extends IAlleleSpecies { ISpriteProvider getSpriteProvider(); + /** + * @return the IButterflyCocoonProvider + */ + IButterflyCocoonProvider getCocoonProvider(); + /** * @return The modid from the mod of the species. */ diff --git a/src/main/java/forestry/api/lepidopterology/IButterflyCocoon.java b/src/main/java/forestry/api/lepidopterology/IButterflyCocoon.java new file mode 100644 index 000000000..4b5aa217c --- /dev/null +++ b/src/main/java/forestry/api/lepidopterology/IButterflyCocoon.java @@ -0,0 +1,25 @@ +/******************************************************************************* + * Copyright (c) 2011-2014 SirSengir. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the GNU Lesser Public License v3 + * which accompanies this distribution, and is available at + * http://www.gnu.org/licenses/lgpl-3.0.txt + * + * Various Contributors including, but not limited to: + * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges + ******************************************************************************/ +package forestry.api.lepidopterology; + +import forestry.api.genetics.IHousing; + +public interface IButterflyCocoon extends IHousing{ + + IButterfly getCaterpillar(); + + void setCaterpillar(IButterfly butterfly); + + IButterflyNursery getNursery(); + + void setNursery(IButterflyNursery nursery); + +} diff --git a/src/main/java/forestry/api/lepidopterology/IButterflyCocoonProvider.java b/src/main/java/forestry/api/lepidopterology/IButterflyCocoonProvider.java new file mode 100644 index 000000000..3cfe7ffe7 --- /dev/null +++ b/src/main/java/forestry/api/lepidopterology/IButterflyCocoonProvider.java @@ -0,0 +1,17 @@ +/******************************************************************************* + * Copyright (c) 2011-2014 SirSengir. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the GNU Lesser Public License v3 + * which accompanies this distribution, and is available at + * http://www.gnu.org/licenses/lgpl-3.0.txt + * + * Various Contributors including, but not limited to: + * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges + ******************************************************************************/ +package forestry.api.lepidopterology; + +public interface IButterflyCocoonProvider { + + String getCocoonTexture(int age); + +} diff --git a/src/main/java/forestry/api/lepidopterology/IButterflyFactory.java b/src/main/java/forestry/api/lepidopterology/IButterflyFactory.java index 6dd965589..a21b1f803 100644 --- a/src/main/java/forestry/api/lepidopterology/IButterflyFactory.java +++ b/src/main/java/forestry/api/lepidopterology/IButterflyFactory.java @@ -25,12 +25,13 @@ public interface IButterflyFactory { * @param authority Authority for the binomial name, e.g. "Sengir" on species of base Forestry. * @param unlocalizedDescription Unlocalized description for this species * @param modID The modID form the mod of the butterfly - * @param texturePath String texture path for this butterfly e.g. "forestry:textures/entities/butterfly/..." + * @param texturePath String texture path for this butterfly e.g. "forestry:butterfly/..." * @param dominant Whether this species is genetically dominant (false means it is recessive) * @param branch Classification of this species * @param binomial Binomial name of the species sans genus. "humboldti" will have the bee species flavour name be "Apis humboldti". Feel free to use fun names or null. * @param serumColour The color of this butterfly's serum. + * @param cocoonProvider A IButterflyCocoonProvider for the butterfly * @return a new butterfly species allele. */ - IAlleleButterflySpeciesBuilder createSpecies(String uid, String unlocalizedName, String authority, String unlocalizedDescription, String modID, String texturePath, boolean dominant, IClassification branch, String binomial, Color serumColour); + IAlleleButterflySpeciesBuilder createSpecies(String uid, String unlocalizedName, String authority, String unlocalizedDescription, String modID, String texturePath, boolean dominant, IClassification branch, String binomial, Color serumColour, IButterflyCocoonProvider cocoonProvider); } diff --git a/src/main/java/forestry/api/lepidopterology/IButterflyRoot.java b/src/main/java/forestry/api/lepidopterology/IButterflyRoot.java index 8929d07f9..7ba32687f 100644 --- a/src/main/java/forestry/api/lepidopterology/IButterflyRoot.java +++ b/src/main/java/forestry/api/lepidopterology/IButterflyRoot.java @@ -53,6 +53,8 @@ public interface IButterflyRoot extends ISpeciesRoot { * @return butterfly entity on success, null otherwise. */ EntityLiving spawnButterflyInWorld(World world, IButterfly butterfly, double x, double y, double z); + + boolean plantCocoon(World world, IButterflyNursery nursery, GameProfile owner); /** * @return true if passed item is mated. diff --git a/src/main/java/forestry/api/lepidopterology/IEntityButterfly.java b/src/main/java/forestry/api/lepidopterology/IEntityButterfly.java index be33d41a4..a798642ee 100644 --- a/src/main/java/forestry/api/lepidopterology/IEntityButterfly.java +++ b/src/main/java/forestry/api/lepidopterology/IEntityButterfly.java @@ -26,4 +26,8 @@ public interface IEntityButterfly extends IAnimals { ITree getPollen(); void setPollen(ITree pollen); + + boolean canMateWith(IEntityButterfly butterfly); + + boolean canMate(); } diff --git a/src/main/java/forestry/apiculture/genetics/alleles/AlleleEffectRadioactive.java b/src/main/java/forestry/apiculture/genetics/alleles/AlleleEffectRadioactive.java index 4739d0740..57ee7baf4 100644 --- a/src/main/java/forestry/apiculture/genetics/alleles/AlleleEffectRadioactive.java +++ b/src/main/java/forestry/apiculture/genetics/alleles/AlleleEffectRadioactive.java @@ -49,7 +49,7 @@ public class AlleleEffectRadioactive extends AlleleEffectThrottled { // Entities are not attacked if they wear a full set of apiarist's armor. int count = BeeManager.armorApiaristHelper.wearsItems(entity, getUID(), true); - damage -= (count * 2); + damage -= count * 2; if (damage <= 0) { continue; } diff --git a/src/main/java/forestry/apiculture/worldgen/HiveGen.java b/src/main/java/forestry/apiculture/worldgen/HiveGen.java index a4c359042..112fbf3e8 100644 --- a/src/main/java/forestry/apiculture/worldgen/HiveGen.java +++ b/src/main/java/forestry/apiculture/worldgen/HiveGen.java @@ -24,8 +24,8 @@ public abstract class HiveGen implements IHiveGen { public boolean canReplace(World world, BlockPos pos) { Block block = BlockUtil.getBlock(world, pos); Material material = block.getMaterial(); - return material.isReplaceable() && !material.isLiquid() || - material == Material.air || + return block.isReplaceable(world, pos) && !material.isLiquid() || + block.isAir(world, pos) || material == Material.plants; } } diff --git a/src/main/java/forestry/arboriculture/blocks/BlockForestryLeaves.java b/src/main/java/forestry/arboriculture/blocks/BlockForestryLeaves.java index 9a6ba75ce..fee2c0c99 100644 --- a/src/main/java/forestry/arboriculture/blocks/BlockForestryLeaves.java +++ b/src/main/java/forestry/arboriculture/blocks/BlockForestryLeaves.java @@ -76,8 +76,11 @@ public class BlockForestryLeaves extends BlockLeavesBase implements ITileEntityP public BlockForestryLeaves() { super(Material.leaves, false); - this.setCreativeTab(Tabs.tabArboriculture); + setCreativeTab(Tabs.tabArboriculture); setStepSound(soundTypeGrass); + setTickRandomly(true); + setHardness(0.2F); + setLightOpacity(1); } @Override diff --git a/src/main/java/forestry/arboriculture/tiles/TileLeaves.java b/src/main/java/forestry/arboriculture/tiles/TileLeaves.java index 3788036d6..e3e44278a 100644 --- a/src/main/java/forestry/arboriculture/tiles/TileLeaves.java +++ b/src/main/java/forestry/arboriculture/tiles/TileLeaves.java @@ -22,8 +22,6 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.BlockPos; -import net.minecraft.world.World; - import net.minecraftforge.common.EnumPlantType; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -59,7 +57,6 @@ import forestry.core.proxy.Proxies; import forestry.core.render.TextureManager; import forestry.core.utils.ColourUtil; import forestry.core.utils.GeneticsUtil; -import forestry.core.utils.Log; public class TileLeaves extends TileTreeContainer implements IPollinatable, IFruitBearer, IButterflyNursery, IRipeningPacketReceiver { @@ -458,28 +455,14 @@ public class TileLeaves extends TileTreeContainer implements IPollinatable, IFru IButterflyGenome caterpillarGenome = caterpillar.getGenome(); int caterpillarMatureTime = Math.round((float) caterpillarGenome.getLifespan() / (caterpillarGenome.getFertility() * 2)); - if (maturationTime >= caterpillarMatureTime && caterpillar.canTakeFlight(worldObj, getPos().getX(), getPos().getY(), getPos().getZ())) { - if (worldObj.isAirBlock(getPos().add(-1, 0, 0))) { - attemptButterflySpawn(worldObj, caterpillar, getPos().add(-1, 0, 0)); - } else if (worldObj.isAirBlock(getPos().add(1, 0, 0))) { - attemptButterflySpawn(worldObj, caterpillar, getPos().add(1, 0, 0)); - } else if (worldObj.isAirBlock(getPos().add(0, 0, -1))) { - attemptButterflySpawn(worldObj, caterpillar, getPos().add(0, 0, -1)); - } else if (worldObj.isAirBlock(getPos().add(0, 0, 1))) { - attemptButterflySpawn(worldObj, caterpillar, getPos().add(0, 0, 1)); - } + if (maturationTime >= caterpillarMatureTime) { + ButterflyManager.butterflyRoot.plantCocoon(worldObj, this, getOwner()); setCaterpillar(null); } else if (!wasDestroyed && isDestroyed(tree, damage)) { sendNetworkUpdate(); } } - private static void attemptButterflySpawn(World world, IButterfly butterfly, BlockPos pos) { - if (ButterflyManager.butterflyRoot.spawnButterflyInWorld(world, butterfly.copy(), pos.getX(), pos.getY() + 0.1f, pos.getZ()) != null) { - Log.trace("A caterpillar '%s' hatched at %s/%s/%s.", butterfly.getDisplayName(), pos.getX(), pos.getY(), pos.getZ()); - } - } - @Override public BlockPos getCoordinates() { return getPos(); diff --git a/src/main/java/forestry/core/genetics/Genome.java b/src/main/java/forestry/core/genetics/Genome.java index 6069c7302..4370a86e4 100755 --- a/src/main/java/forestry/core/genetics/Genome.java +++ b/src/main/java/forestry/core/genetics/Genome.java @@ -18,7 +18,6 @@ import java.util.Arrays; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; - import forestry.api.genetics.IAllele; import forestry.api.genetics.IAlleleSpecies; import forestry.api.genetics.IChromosome; diff --git a/src/main/java/forestry/core/render/EmptyStateMapper.java b/src/main/java/forestry/core/render/EmptyStateMapper.java new file mode 100644 index 000000000..99916e98f --- /dev/null +++ b/src/main/java/forestry/core/render/EmptyStateMapper.java @@ -0,0 +1,24 @@ +package forestry.core.render; + +import java.util.Collections; +import java.util.Map; + +import net.minecraft.block.Block; +import net.minecraft.client.renderer.block.statemap.IStateMapper; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + +@SideOnly(Side.CLIENT) +public class EmptyStateMapper implements IStateMapper { + + public static final EmptyStateMapper instance = new EmptyStateMapper(); + + private EmptyStateMapper() { + } + + @Override + public Map putStateModelLocations(Block block) { + return Collections.emptyMap(); + } + +} diff --git a/src/main/java/forestry/lepidopterology/PluginLepidopterology.java b/src/main/java/forestry/lepidopterology/PluginLepidopterology.java index b17cf889c..5b46c727f 100644 --- a/src/main/java/forestry/lepidopterology/PluginLepidopterology.java +++ b/src/main/java/forestry/lepidopterology/PluginLepidopterology.java @@ -21,6 +21,7 @@ import net.minecraftforge.client.event.TextureStitchEvent; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.fml.common.SidedProxy; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; +import net.minecraftforge.fml.common.registry.GameRegistry; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import net.minecraftforge.oredict.OreDictionary; @@ -51,6 +52,7 @@ import forestry.lepidopterology.items.ItemButterflyGE; import forestry.lepidopterology.items.ItemRegistryLepidopterology; import forestry.lepidopterology.proxy.ProxyLepidopterology; import forestry.lepidopterology.recipes.MatingRecipe; +import forestry.lepidopterology.tiles.TileCocoon; import forestry.plugins.BlankForestryPlugin; import forestry.plugins.ForestryPlugin; import forestry.plugins.ForestryPluginUids; @@ -88,6 +90,9 @@ public class PluginLepidopterology extends BlankForestryPlugin { ButterflyBranchDefinition.createAlleles(); AlleleButterflyEffect.createAlleles(); + + GameRegistry.registerTileEntity(TileCocoon.class, "forestry.Cocoon"); + proxy.preInitializeRendering(); blocks.lepidopterology.addDefinitions(BlockTypeLepidopterologyTesr.VALUES); } @@ -108,7 +113,6 @@ public class PluginLepidopterology extends BlankForestryPlugin { PluginCore.rootCommand.addChildCommand(new CommandButterfly()); EntityUtil.registerEntity(EntityButterfly.class, "butterflyGE", 0, 0x000000, 0xffffff, 50, 1, true); - proxy.initializeRendering(); MothDefinition.initMoths(); ButterflyDefinition.initButterflies(); diff --git a/src/main/java/forestry/lepidopterology/blocks/BlockCocoon.java b/src/main/java/forestry/lepidopterology/blocks/BlockCocoon.java new file mode 100644 index 000000000..e66aa88fc --- /dev/null +++ b/src/main/java/forestry/lepidopterology/blocks/BlockCocoon.java @@ -0,0 +1,126 @@ +/******************************************************************************* + * Copyright (c) 2011-2014 SirSengir. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the GNU Lesser Public License v3 + * which accompanies this distribution, and is available at + * http://www.gnu.org/licenses/lgpl-3.0.txt + * + * Various Contributors including, but not limited to: + * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges + ******************************************************************************/ +package forestry.lepidopterology.blocks; + +import java.util.List; +import java.util.Random; + +import forestry.api.core.IStateMapperRegister; +import forestry.api.core.Tabs; +import forestry.core.proxy.Proxies; +import forestry.core.render.EmptyStateMapper; +import forestry.core.tiles.TileUtil; +import forestry.lepidopterology.tiles.TileCocoon; +import net.minecraft.block.Block; +import net.minecraft.block.ITileEntityProvider; +import net.minecraft.block.material.Material; +import net.minecraft.block.state.IBlockState; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.AxisAlignedBB; +import net.minecraft.util.BlockPos; +import net.minecraft.world.IBlockAccess; +import net.minecraft.world.World; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + +public class BlockCocoon extends Block implements ITileEntityProvider, IStateMapperRegister { + + public BlockCocoon() { + super(Material.leaves); + setTickRandomly(true); + setStepSound(soundTypeGrass); + setCreativeTab(Tabs.tabLepidopterology); + } + + @Override + public boolean isFullCube(){ + return false; + } + + @Override + public boolean isOpaqueCube(){ + return false; + } + + @Override + public void updateTick(World world, BlockPos pos, IBlockState state, Random rand) { + TileCocoon tileCocoon = TileUtil.getTile(world, pos, TileCocoon.class); + if (tileCocoon == null) { + return; + } + + if (tileCocoon.isInvalid()) { + return; + } + + if (world.rand.nextFloat() > 0.1) { + return; + } + tileCocoon.onBlockTick(); + } + + @Override + public TileEntity createNewTileEntity(World worldIn, int meta) { + return new TileCocoon(); + } + + @Override + public AxisAlignedBB getCollisionBoundingBox(World worldIn, BlockPos pos, IBlockState state){ + setBlockBoundsBasedOnState(worldIn, pos); + return super.getCollisionBoundingBox(worldIn, pos, state); + } + + @Override + @SideOnly(Side.CLIENT) + public AxisAlignedBB getSelectedBoundingBox(World worldIn, BlockPos pos){ + setBlockBoundsBasedOnState(worldIn, pos); + return super.getSelectedBoundingBox(worldIn, pos); + } + + @Override + public void setBlockBoundsBasedOnState(IBlockAccess worldIn, BlockPos pos){ + IBlockState iblockstate = worldIn.getBlockState(pos); + //int a = iblockstate.getValue(AGE); + //setBlockBounds((8.0F - f) / 16.0F, (12.0F - (float)k) / 16.0F, (15.0F - (float)j) / 16.0F, (8.0F + f) / 16.0F, 0.75F, 0.9375F); + } + + @Override + public int getMetaFromState(IBlockState state){ + return 0; + } + + @Override + public int damageDropped(IBlockState state) { + return getMetaFromState(state); + } + + @Override + public void getSubBlocks(Item itemIn, CreativeTabs tab, List list) { + super.getSubBlocks(itemIn, tab, list); + list.add(new ItemStack(itemIn, 1, 1)); + list.add(new ItemStack(itemIn, 1, 2)); + } + + @Override + public int getRenderType() { + return 2; + } + + @SideOnly(Side.CLIENT) + @Override + public void registerStateMapper() { + Proxies.render.registerStateMapper(this, EmptyStateMapper.instance); + } + +} diff --git a/src/main/java/forestry/lepidopterology/blocks/BlockRegistryLepidopterology.java b/src/main/java/forestry/lepidopterology/blocks/BlockRegistryLepidopterology.java index cddbeddda..c2b377906 100644 --- a/src/main/java/forestry/lepidopterology/blocks/BlockRegistryLepidopterology.java +++ b/src/main/java/forestry/lepidopterology/blocks/BlockRegistryLepidopterology.java @@ -15,8 +15,10 @@ import forestry.core.items.ItemBlockForestry; public class BlockRegistryLepidopterology extends BlockRegistry { public final BlockLepidopterology lepidopterology; + public final BlockCocoon cocoon; public BlockRegistryLepidopterology() { lepidopterology = registerBlock(new BlockLepidopterology(), ItemBlockForestry.class, "lepidopterology"); + cocoon = registerBlock(new BlockCocoon(), ItemBlockForestry.class, "cocoon"); } } diff --git a/src/main/java/forestry/lepidopterology/entities/AIButterflyMate.java b/src/main/java/forestry/lepidopterology/entities/AIButterflyMate.java index 98e7b7f7a..367aeb1a3 100644 --- a/src/main/java/forestry/lepidopterology/entities/AIButterflyMate.java +++ b/src/main/java/forestry/lepidopterology/entities/AIButterflyMate.java @@ -10,6 +10,7 @@ ******************************************************************************/ package forestry.lepidopterology.entities; +import java.util.List; import forestry.api.genetics.IPollinatable; import forestry.api.lepidopterology.IButterflyNursery; import forestry.core.utils.GeneticsUtil; @@ -17,6 +18,10 @@ import forestry.lepidopterology.PluginLepidopterology; public class AIButterflyMate extends AIButterflyInteract { + private EntityButterfly targetMate; + private double moveSpeed; + + public AIButterflyMate(EntityButterfly entity) { super(entity); } @@ -26,6 +31,9 @@ public class AIButterflyMate extends AIButterflyInteract { */ @Override protected boolean canInteract() { + if(entity.getButterfly().getMate() == null && entity.canMate()){ + return true; + } if (entity.cooldownEgg > 0) { return false; } @@ -44,20 +52,79 @@ public class AIButterflyMate extends AIButterflyInteract { @Override public void updateTask() { if (continueExecuting()) { - IPollinatable tile = GeneticsUtil.getOrCreatePollinatable(null, entity.worldObj, rest); - if (tile instanceof IButterflyNursery) { - IButterflyNursery nursery = (IButterflyNursery) tile; - if (nursery.canNurse(entity.getButterfly())) { - nursery.setCaterpillar(entity.getButterfly().spawnCaterpillar(nursery)); - // Log.finest("A butterfly '%s' laid an egg at %s/%s/%s.", entity.getButterfly().getIdent(), rest.posX, rest.posY, rest.posZ); - if (entity.getRNG().nextFloat() < 1.0f / entity.getButterfly().getGenome().getFertility()) { - entity.setHealth(0); + if(entity.getButterfly().getMate() == null){ + entity.getLookHelper().setLookPositionWithEntity(targetMate, 10.0F, entity.getVerticalFaceSpeed()); + entity.getNavigator().tryMoveToEntityLiving(targetMate, 0.7D); + + if (entity.cooldownMate <= 0 && entity.getDistanceSqToEntity(targetMate) < 9.0D){ + entity.getButterfly().mate(targetMate.getButterfly()); + entity.cooldownMate = EntityButterfly.COOLDOWNS; + } + }else{ + IPollinatable tile = GeneticsUtil.getOrCreatePollinatable(null, entity.worldObj, rest); + if (tile instanceof IButterflyNursery) { + IButterflyNursery nursery = (IButterflyNursery) tile; + if (nursery.canNurse(entity.getButterfly())) { + nursery.setCaterpillar(entity.getButterfly().spawnCaterpillar(nursery)); + // Log.finest("A butterfly '%s' laid an egg at %s/%s/%s.", entity.getButterfly().getIdent(), rest.posX, rest.posY, rest.posZ); + if (entity.getRNG().nextFloat() < 1.0f / entity.getButterfly().getGenome().getFertility()) { + entity.setHealth(0); + } } } + setHasInteracted(); + entity.cooldownEgg = EntityButterfly.COOLDOWNS; } - setHasInteracted(); - entity.cooldownEgg = EntityButterfly.COOLDOWNS; } } + + @Override + public boolean shouldExecute(){ + if(!super.shouldExecute()){ + return false; + } + if(entity.getButterfly().getMate() == null){ + if (!entity.canMate()){ + return false; + }else{ + targetMate = getNearbyMate(); + return targetMate != null; + } + } + return true; + } + @Override + public boolean continueExecuting(){ + if(!super.continueExecuting()){ + return false; + } + if(entity.getButterfly().getMate() == null){ + return targetMate.isEntityAlive() && targetMate.canMate(); + } + return true; + } + + @Override + public void resetTask(){ + super.resetTask(); + + targetMate = null; + } + + private EntityButterfly getNearbyMate(){ + float f = 8.0F; + List nextButterflys = entity.worldObj.getEntitiesWithinAABB(EntityButterfly.class, this.entity.getEntityBoundingBox().expand(f, f, f)); + double d0 = Double.MAX_VALUE; + EntityButterfly nextButterfly = null; + + for (EntityButterfly butterfly : nextButterflys){ + if (this.entity.canMateWith(butterfly) && this.entity.getDistanceSqToEntity(butterfly) < d0){ + nextButterfly = butterfly; + d0 = this.entity.getDistanceSqToEntity(butterfly); + } + } + + return nextButterfly; + } } diff --git a/src/main/java/forestry/lepidopterology/entities/AIButterflyRest.java b/src/main/java/forestry/lepidopterology/entities/AIButterflyRest.java index e9a9a2f5b..310992507 100755 --- a/src/main/java/forestry/lepidopterology/entities/AIButterflyRest.java +++ b/src/main/java/forestry/lepidopterology/entities/AIButterflyRest.java @@ -44,14 +44,14 @@ public class AIButterflyRest extends AIButterflyBase { return false; } - y--; + pos = pos.add(x, -1, z); if (entity.worldObj.isAirBlock(pos)) { return false; } if (entity.worldObj.getBlockState(pos).getBlock().getMaterial().isLiquid()) { return false; } - if (!entity.getButterfly().isAcceptedEnvironment(entity.worldObj, x, y, z)) { + if (!entity.getButterfly().isAcceptedEnvironment(entity.worldObj, x, pos.getY(), z)) { return false; } diff --git a/src/main/java/forestry/lepidopterology/entities/EntityButterfly.java b/src/main/java/forestry/lepidopterology/entities/EntityButterfly.java index 4d946f844..c3f3472f5 100755 --- a/src/main/java/forestry/lepidopterology/entities/EntityButterfly.java +++ b/src/main/java/forestry/lepidopterology/entities/EntityButterfly.java @@ -80,6 +80,7 @@ public class EntityButterfly extends EntityCreature implements IEntityButterfly public int cooldownPollination = 0; public int cooldownEgg = 0; + public int cooldownMate = 0; // Client Rendering private IAlleleButterflySpecies species; @@ -449,6 +450,9 @@ public class EntityButterfly extends EntityCreature implements IEntityButterfly if (cooldownPollination > 0) { cooldownPollination--; } + if (cooldownMate > 0) { + cooldownMate--; + } } @Override @@ -515,4 +519,20 @@ public class EntityButterfly extends EntityCreature implements IEntityButterfly IButterfly butterfly = root.templateAsIndividual(template); return root.getMemberStack(butterfly, EnumFlutterType.BUTTERFLY); } + + @Override + public boolean canMateWith(IEntityButterfly butterfly) { + if(butterfly == null || butterfly.getButterfly() == null || butterfly.getButterfly().getMate() != null){ + return false; + } + if (getButterfly() == null || getButterfly().getMate() != null) { + return false; + } + return !getButterfly().isGeneticEqual(butterfly.getButterfly()); + } + + @Override + public boolean canMate() { + return cooldownMate <= 0; + } } diff --git a/src/main/java/forestry/lepidopterology/genetics/ButterflyDefinition.java b/src/main/java/forestry/lepidopterology/genetics/ButterflyDefinition.java index 4f2ea790b..7f1ae0f0a 100644 --- a/src/main/java/forestry/lepidopterology/genetics/ButterflyDefinition.java +++ b/src/main/java/forestry/lepidopterology/genetics/ButterflyDefinition.java @@ -26,6 +26,7 @@ import forestry.api.lepidopterology.EnumFlutterType; import forestry.api.lepidopterology.IAlleleButterflySpecies; import forestry.api.lepidopterology.IAlleleButterflySpeciesBuilder; import forestry.api.lepidopterology.IButterfly; +import forestry.api.lepidopterology.IButterflyCocoonProvider; import forestry.api.lepidopterology.IButterflyGenome; import forestry.core.config.Constants; import forestry.core.genetics.alleles.AlleleHelper; @@ -314,8 +315,9 @@ public enum ButterflyDefinition implements IButterflyDefinition { String unlocalizedDescription = "for.description." + uid; String texture = "butterflies/" + uid; + IButterflyCocoonProvider cocoonProvider = new DefaultCocoonProvider(); - IAlleleButterflySpeciesBuilder speciesBuilder = ButterflyManager.butterflyFactory.createSpecies(Constants.MOD_ID + '.' + uid, unlocalizedName, "Sengir", unlocalizedDescription, Constants.RESOURCE_ID, texture, dominant, branchDefinition.getBranch(), binomial, serumColor); + IAlleleButterflySpeciesBuilder speciesBuilder = ButterflyManager.butterflyFactory.createSpecies(Constants.MOD_ID + '.' + uid, unlocalizedName, "Sengir", unlocalizedDescription, Constants.RESOURCE_ID, texture, dominant, branchDefinition.getBranch(), binomial, serumColor, cocoonProvider); speciesBuilder.setRarity(rarity); setSpeciesProperties(speciesBuilder); this.species = speciesBuilder.build(); diff --git a/src/main/java/forestry/lepidopterology/genetics/ButterflyFactory.java b/src/main/java/forestry/lepidopterology/genetics/ButterflyFactory.java index ecefa3bea..f8c553d83 100644 --- a/src/main/java/forestry/lepidopterology/genetics/ButterflyFactory.java +++ b/src/main/java/forestry/lepidopterology/genetics/ButterflyFactory.java @@ -14,12 +14,13 @@ import java.awt.Color; import forestry.api.genetics.IClassification; import forestry.api.lepidopterology.IAlleleButterflySpeciesBuilder; +import forestry.api.lepidopterology.IButterflyCocoonProvider; import forestry.api.lepidopterology.IButterflyFactory; import forestry.lepidopterology.genetics.alleles.AlleleButterflySpecies; public class ButterflyFactory implements IButterflyFactory { @Override - public IAlleleButterflySpeciesBuilder createSpecies(String uid, String unlocalizedName, String authority, String unlocalizedDescription, String modID, String texturePath, boolean isDominant, IClassification branch, String binomial, Color serumColour) { - return new AlleleButterflySpecies(uid, unlocalizedName, authority, unlocalizedDescription, modID, texturePath, isDominant, branch, binomial, serumColour); + public IAlleleButterflySpeciesBuilder createSpecies(String uid, String unlocalizedName, String authority, String unlocalizedDescription, String modID, String texturePath, boolean isDominant, IClassification branch, String binomial, Color serumColour, IButterflyCocoonProvider cocoonProvider) { + return new AlleleButterflySpecies(uid, unlocalizedName, authority, unlocalizedDescription, modID, texturePath, isDominant, branch, binomial, serumColour, cocoonProvider); } } diff --git a/src/main/java/forestry/lepidopterology/genetics/ButterflyGenome.java b/src/main/java/forestry/lepidopterology/genetics/ButterflyGenome.java index 4e134c7c9..22f2597de 100755 --- a/src/main/java/forestry/lepidopterology/genetics/ButterflyGenome.java +++ b/src/main/java/forestry/lepidopterology/genetics/ButterflyGenome.java @@ -12,7 +12,6 @@ package forestry.lepidopterology.genetics; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; - import forestry.api.genetics.EnumTolerance; import forestry.api.genetics.IAlleleFloat; import forestry.api.genetics.IAlleleFlowers; diff --git a/src/main/java/forestry/lepidopterology/genetics/ButterflyRoot.java b/src/main/java/forestry/lepidopterology/genetics/ButterflyRoot.java index 9eb82a231..408aca301 100644 --- a/src/main/java/forestry/lepidopterology/genetics/ButterflyRoot.java +++ b/src/main/java/forestry/lepidopterology/genetics/ButterflyRoot.java @@ -16,9 +16,14 @@ import java.util.Collection; import java.util.Collections; import java.util.Map.Entry; +import net.minecraft.block.Block; +import net.minecraft.block.material.Material; +import net.minecraft.block.state.IBlockState; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.BlockPos; import net.minecraft.world.World; import com.mojang.authlib.GameProfile; @@ -36,12 +41,16 @@ import forestry.api.lepidopterology.IAlleleButterflySpecies; import forestry.api.lepidopterology.IButterfly; import forestry.api.lepidopterology.IButterflyGenome; import forestry.api.lepidopterology.IButterflyMutation; +import forestry.api.lepidopterology.IButterflyNursery; import forestry.api.lepidopterology.IButterflyRoot; import forestry.api.lepidopterology.ILepidopteristTracker; +import forestry.core.config.Constants; import forestry.core.genetics.SpeciesRoot; +import forestry.core.utils.BlockUtil; import forestry.core.utils.EntityUtil; import forestry.lepidopterology.PluginLepidopterology; import forestry.lepidopterology.entities.EntityButterfly; +import forestry.lepidopterology.tiles.TileCocoon; public class ButterflyRoot extends SpeciesRoot implements IButterflyRoot { @@ -162,6 +171,52 @@ public class ButterflyRoot extends SpeciesRoot implements IButterflyRoot { public EntityButterfly spawnButterflyInWorld(World world, IButterfly butterfly, double x, double y, double z) { return EntityUtil.spawnEntity(world, new EntityButterfly(world, butterfly), x, y, z); } + + @Override + public boolean plantCocoon(World world, IButterflyNursery nursery, GameProfile owner) { + BlockPos pos = getNextPos(world, nursery.getCoordinates()); + IBlockState state = PluginLepidopterology.blocks.cocoon.getDefaultState(); + boolean placed = world.setBlockState(pos, state, Constants.FLAG_BLOCK_SYNCH_AND_UPDATE); + if (!placed) { + return false; + } + + Block block = BlockUtil.getBlock(world, pos); + if (PluginLepidopterology.blocks.cocoon != block) { + return false; + } + + TileEntity tile = world.getTileEntity(pos); + if (!(tile instanceof TileCocoon)) { + world.setBlockToAir(pos); + return false; + } + + TileCocoon cocoon = (TileCocoon) tile; + cocoon.setCaterpillar(nursery.getCaterpillar()); + cocoon.setOwner(owner); + cocoon.setNursery(nursery); + + return true; + } + + private BlockPos getNextPos(World world, BlockPos pos){ + int x = pos.getX(); + int y = pos.getY(); + int z = pos.getZ(); + + do { + y--; + } while (!canReplace(world, new BlockPos(x, y, z))); + + return new BlockPos(x, y, z); + } + + private boolean canReplace(World world, BlockPos pos) { + Block block = BlockUtil.getBlock(world, pos); + Material material = block.getMaterial(); + return block.isReplaceable(world, pos) && !material.isLiquid() || block.isAir(world, pos) || material == Material.plants; + } @Override public boolean isMated(ItemStack stack) { diff --git a/src/main/java/forestry/lepidopterology/genetics/DefaultCocoonProvider.java b/src/main/java/forestry/lepidopterology/genetics/DefaultCocoonProvider.java new file mode 100644 index 000000000..79996bd6f --- /dev/null +++ b/src/main/java/forestry/lepidopterology/genetics/DefaultCocoonProvider.java @@ -0,0 +1,22 @@ +/******************************************************************************* + * Copyright (c) 2011-2014 SirSengir. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the GNU Lesser Public License v3 + * which accompanies this distribution, and is available at + * http://www.gnu.org/licenses/lgpl-3.0.txt + * + * Various Contributors including, but not limited to: + * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges + ******************************************************************************/ +package forestry.lepidopterology.genetics; + +import forestry.api.lepidopterology.IButterflyCocoonProvider; + +public class DefaultCocoonProvider implements IButterflyCocoonProvider { + + @Override + public String getCocoonTexture(int age) { + return "textures/blocks/lepidopterology/cocoons/default_" + age + ".png"; + } + +} diff --git a/src/main/java/forestry/lepidopterology/genetics/MothDefinition.java b/src/main/java/forestry/lepidopterology/genetics/MothDefinition.java index 25ca380f5..af10d8307 100644 --- a/src/main/java/forestry/lepidopterology/genetics/MothDefinition.java +++ b/src/main/java/forestry/lepidopterology/genetics/MothDefinition.java @@ -24,6 +24,7 @@ import forestry.api.lepidopterology.EnumFlutterType; import forestry.api.lepidopterology.IAlleleButterflySpecies; import forestry.api.lepidopterology.IAlleleButterflySpeciesBuilder; import forestry.api.lepidopterology.IButterfly; +import forestry.api.lepidopterology.IButterflyCocoonProvider; import forestry.api.lepidopterology.IButterflyGenome; import forestry.core.config.Constants; import forestry.core.genetics.alleles.AlleleHelper; @@ -58,8 +59,10 @@ public enum MothDefinition implements IButterflyDefinition { String unlocalizedDescription = "for.description." + uid; String texture = "butterflies/" + uid; + + IButterflyCocoonProvider cocoonProvider = new DefaultCocoonProvider(); - IAlleleButterflySpeciesBuilder speciesBuilder = ButterflyManager.butterflyFactory.createSpecies("forestry." + uid, unlocalizedName, "Sengir", unlocalizedDescription, Constants.RESOURCE_ID, texture, dominant, branchDefinition.getBranch(), binomial, serumColor); + IAlleleButterflySpeciesBuilder speciesBuilder = ButterflyManager.butterflyFactory.createSpecies("forestry." + uid, unlocalizedName, "Sengir", unlocalizedDescription, Constants.RESOURCE_ID, texture, dominant, branchDefinition.getBranch(), binomial, serumColor, cocoonProvider); speciesBuilder.setRarity(rarity); speciesBuilder.setNocturnal(); setSpeciesProperties(speciesBuilder); diff --git a/src/main/java/forestry/lepidopterology/genetics/alleles/AlleleButterflySpecies.java b/src/main/java/forestry/lepidopterology/genetics/alleles/AlleleButterflySpecies.java index 7c4f1f714..21585ba8f 100644 --- a/src/main/java/forestry/lepidopterology/genetics/alleles/AlleleButterflySpecies.java +++ b/src/main/java/forestry/lepidopterology/genetics/alleles/AlleleButterflySpecies.java @@ -37,6 +37,7 @@ import forestry.api.lepidopterology.EnumButterflyChromosome; import forestry.api.lepidopterology.EnumFlutterType; import forestry.api.lepidopterology.IAlleleButterflySpecies; import forestry.api.lepidopterology.IAlleleButterflySpeciesBuilder; +import forestry.api.lepidopterology.IButterflyCocoonProvider; import forestry.api.lepidopterology.IButterflyRoot; import forestry.core.config.Constants; import forestry.core.genetics.alleles.AlleleSpecies; @@ -54,13 +55,16 @@ public class AlleleButterflySpecies extends AlleleSpecies implements IAlleleButt private final Map butterflyLoot = new HashMap<>(); private final Map caterpillarLoot = new HashMap<>(); + + private final IButterflyCocoonProvider cocoonProvider; - public AlleleButterflySpecies(String uid, String unlocalizedName, String authority, String unlocalizedDescription, String modID, String texturePath, boolean isDominant, IClassification branch, String binomial, Color serumColour) { + public AlleleButterflySpecies(String uid, String unlocalizedName, String authority, String unlocalizedDescription, String modID, String texturePath, boolean isDominant, IClassification branch, String binomial, Color serumColour, IButterflyCocoonProvider cocoonProvider) { super(uid, unlocalizedName, authority, unlocalizedDescription, isDominant, branch, binomial); this.serumColour = serumColour; this.modID = modID; this.texture = texturePath; + this.cocoonProvider = cocoonProvider; } @Override @@ -109,9 +113,9 @@ public class AlleleButterflySpecies extends AlleleSpecies implements IAlleleButt @Override public String getItemTexture() { - return getModID() + ":" + "items/" + texture; + return getModID() + ":items/" + texture; } - + @Override public EnumSet getSpawnBiomes() { return spawnBiomes; @@ -219,4 +223,9 @@ public class AlleleButterflySpecies extends AlleleSpecies implements IAlleleButt public String getModID() { return modID; } + + @Override + public IButterflyCocoonProvider getCocoonProvider() { + return cocoonProvider; + } } diff --git a/src/main/java/forestry/lepidopterology/proxy/ProxyLepidopterology.java b/src/main/java/forestry/lepidopterology/proxy/ProxyLepidopterology.java index e8014caf8..7ccc28af2 100755 --- a/src/main/java/forestry/lepidopterology/proxy/ProxyLepidopterology.java +++ b/src/main/java/forestry/lepidopterology/proxy/ProxyLepidopterology.java @@ -12,6 +12,6 @@ package forestry.lepidopterology.proxy; public class ProxyLepidopterology { - public void initializeRendering() { + public void preInitializeRendering() { } } diff --git a/src/main/java/forestry/lepidopterology/proxy/ProxyLepidopterologyClient.java b/src/main/java/forestry/lepidopterology/proxy/ProxyLepidopterologyClient.java index f1b422b76..c8e3a2813 100644 --- a/src/main/java/forestry/lepidopterology/proxy/ProxyLepidopterologyClient.java +++ b/src/main/java/forestry/lepidopterology/proxy/ProxyLepidopterologyClient.java @@ -10,6 +10,7 @@ ******************************************************************************/ package forestry.lepidopterology.proxy; +import net.minecraftforge.fml.client.registry.ClientRegistry; import net.minecraftforge.fml.client.registry.RenderingRegistry; import forestry.core.models.ModelIndex; import forestry.core.models.ModelManager; @@ -17,12 +18,15 @@ import forestry.core.proxy.Proxies; import forestry.lepidopterology.entities.EntityButterfly; import forestry.lepidopterology.render.ModelButterflyItem; import forestry.lepidopterology.render.RenderButterflyEntity; +import forestry.lepidopterology.render.RendererCocoon; +import forestry.lepidopterology.tiles.TileCocoon; public class ProxyLepidopterologyClient extends ProxyLepidopterology { @Override - public void initializeRendering() { - RenderingRegistry.registerEntityRenderingHandler(EntityButterfly.class, new RenderButterflyEntity()); + public void preInitializeRendering() { + RenderingRegistry.registerEntityRenderingHandler(EntityButterfly.class, new RenderButterflyEntity.Factory()); Proxies.render.registerModel(new ModelIndex(ModelManager.getInstance().getModelLocation("butterflyGE"), new ModelButterflyItem())); + ClientRegistry.bindTileEntitySpecialRenderer(TileCocoon.class, new RendererCocoon()); } } diff --git a/src/main/java/forestry/lepidopterology/render/ModelCocoon.java b/src/main/java/forestry/lepidopterology/render/ModelCocoon.java new file mode 100644 index 000000000..c0bb73273 --- /dev/null +++ b/src/main/java/forestry/lepidopterology/render/ModelCocoon.java @@ -0,0 +1,111 @@ +package forestry.lepidopterology.render; + +import net.minecraft.client.model.ModelBase; +import net.minecraft.client.model.ModelRenderer; + +public class ModelCocoon extends ModelBase { + public ModelRenderer cocoonbody_0_age_0; + public ModelRenderer cocoonbody_1_age_0; + public ModelRenderer cocoonbody_2_age_0; + public ModelRenderer cocoonbody_3_age_0; + public ModelRenderer cocoonbody_4_age_0; + public ModelRenderer cocoonbody_5_age_0; + public ModelRenderer cocoonbody_0_age_1; + public ModelRenderer cocoonbody_1_age_1; + public ModelRenderer cocoonbody_2_age_1; + public ModelRenderer cocoonbody_3_age_1; + public ModelRenderer cocoonbody_4_age_1; + public ModelRenderer cocoonbody_5_age_1; + public ModelRenderer cocoonbody_0_age_2; + public ModelRenderer cocoonbody_1_age_2; + public ModelRenderer cocoonbody_2_age_2; + public ModelRenderer cocoonbody_3_age_2; + public ModelRenderer cocoonbody_4_age_2; + public ModelRenderer cocoonbody_5_age_2; + + + public ModelCocoon() { + this.textureWidth = 64; + this.textureHeight = 32; + this.cocoonbody_1_age_0 = new ModelRenderer(this, 48, 0); + this.cocoonbody_1_age_0.setRotationPoint(-1.5F, 9.0F, -1.5F); + this.cocoonbody_1_age_0.addBox(0.0F, 0.0F, 0.0F, 4, 1, 4, 0.0F); + this.cocoonbody_0_age_0 = new ModelRenderer(this, 31, 0); + this.cocoonbody_0_age_0.setRotationPoint(-0.5F, 8.0F, -0.5F); + this.cocoonbody_0_age_0.addBox(0.0F, 0.0F, 0.0F, 2, 1, 2, 0.0F); + this.cocoonbody_2_age_0 = new ModelRenderer(this, 0, 18); + this.cocoonbody_2_age_0.setRotationPoint(-2.5F, 10.0F, -2.5F); + this.cocoonbody_2_age_0.addBox(0.0F, 0.0F, 0.0F, 6, 8, 6, 0.0F); + this.cocoonbody_4_age_0 = new ModelRenderer(this, 0, 7); + this.cocoonbody_4_age_0.setRotationPoint(-2.5F, 18.0F, -2.5F); + this.cocoonbody_4_age_0.addBox(0.0F, 0.0F, 0.0F, 6, 1, 5, 0.0F); + this.cocoonbody_3_age_0 = new ModelRenderer(this, 30, 24); + this.cocoonbody_3_age_0.setRotationPoint(-2.5F, 11.0F, -3.5F); + this.cocoonbody_3_age_0.addBox(0.0F, 0.0F, 0.0F, 6, 7, 1, 0.0F); + this.cocoonbody_5_age_0 = new ModelRenderer(this, 0, 0); + this.cocoonbody_5_age_0.setRotationPoint(-1.5F, 19.0F, -1.0F); + this.cocoonbody_5_age_0.addBox(0.0F, 0.0F, 0.0F, 4, 1, 2, 0.0F); + this.cocoonbody_2_age_1 = new ModelRenderer(this, 0, 18); + this.cocoonbody_2_age_1.setRotationPoint(-2.5F, 10.0F, -2.5F); + this.cocoonbody_2_age_1.addBox(0.0F, 0.0F, 0.0F, 4, 6, 4, 0.0F); + this.cocoonbody_0_age_1 = new ModelRenderer(this, 31, 0); + this.cocoonbody_0_age_1.setRotationPoint(-1.0F, 8.0F, -1.0F); + this.cocoonbody_0_age_1.addBox(0.0F, 0.0F, 0.0F, 1, 1, 1, 0.0F); + this.cocoonbody_3_age_1 = new ModelRenderer(this, 30, 24); + this.cocoonbody_3_age_1.setRotationPoint(-2.5F, 11.0F, -3.5F); + this.cocoonbody_3_age_1.addBox(0.0F, 0.0F, 0.0F, 4, 5, 1, 0.0F); + this.cocoonbody_1_age_1 = new ModelRenderer(this, 48, 0); + this.cocoonbody_1_age_1.setRotationPoint(-1.5F, 9.0F, -1.5F); + this.cocoonbody_1_age_1.addBox(0.0F, 0.0F, 0.0F, 2, 1, 2, 0.0F); + this.cocoonbody_5_age_1 = new ModelRenderer(this, 0, 0); + this.cocoonbody_5_age_1.setRotationPoint(-1.0F, 17.0F, -2.5F); + this.cocoonbody_5_age_1.addBox(0.0F, 0.0F, 0.0F, 2, 1, 3, 0.0F); + this.cocoonbody_4_age_1 = new ModelRenderer(this, 0, 7); + this.cocoonbody_4_age_1.setRotationPoint(-1.5F, 16.0F, -3.0F); + this.cocoonbody_4_age_1.addBox(0.0F, 0.0F, 0.0F, 3, 1, 4, 0.0F); + this.cocoonbody_3_age_2 = new ModelRenderer(this, 30, 24); + this.cocoonbody_3_age_2.setRotationPoint(-2.0F, 11.0F, -3.0F); + this.cocoonbody_3_age_2.addBox(0.0F, 0.0F, 0.0F, 3, 3, 1, 0.0F); + this.cocoonbody_2_age_2 = new ModelRenderer(this, 0, 18); + this.cocoonbody_2_age_2.setRotationPoint(-2.0F, 10.0F, -2.0F); + this.cocoonbody_2_age_2.addBox(0.0F, 0.0F, 0.0F, 3, 4, 3, 0.0F); + this.cocoonbody_4_age_2 = new ModelRenderer(this, 0, 7); + this.cocoonbody_4_age_2.setRotationPoint(-1.5F, 14.0F, -2.5F); + this.cocoonbody_4_age_2.addBox(0.0F, 0.0F, 0.0F, 2, 1, 3, 0.0F); + this.cocoonbody_1_age_2 = new ModelRenderer(this, 48, 0); + this.cocoonbody_1_age_2.setRotationPoint(-1.5F, 9.0F, -1.5F); + this.cocoonbody_1_age_2.addBox(0.0F, 0.0F, 0.0F, 2, 1, 2, 0.0F); + this.cocoonbody_5_age_2 = new ModelRenderer(this, 0, 0); + this.cocoonbody_5_age_2.setRotationPoint(-1.0F, 15.0F, -2.0F); + this.cocoonbody_5_age_2.addBox(0.0F, 0.0F, 0.0F, 1, 1, 2, 0.0F); + this.cocoonbody_0_age_2 = new ModelRenderer(this, 31, 0); + this.cocoonbody_0_age_2.setRotationPoint(-1.0F, 8.0F, -1.0F); + this.cocoonbody_0_age_2.addBox(0.0F, 0.0F, 0.0F, 1, 1, 1, 0.0F); + } + + public void renderCucoon(int age){ + float pixel = 0.0625F; + if(age == 0){ + this.cocoonbody_1_age_0.render(pixel); + this.cocoonbody_0_age_0.render(pixel); + this.cocoonbody_2_age_0.render(pixel); + this.cocoonbody_4_age_0.render(pixel); + this.cocoonbody_3_age_0.render(pixel); + this.cocoonbody_5_age_0.render(pixel); + }else if(age == 1){ + this.cocoonbody_2_age_1.render(pixel); + this.cocoonbody_0_age_1.render(pixel); + this.cocoonbody_3_age_1.render(pixel); + this.cocoonbody_1_age_1.render(pixel); + this.cocoonbody_5_age_1.render(pixel); + this.cocoonbody_4_age_1.render(pixel); + }else if(age == 2){ + this.cocoonbody_3_age_2.render(pixel); + this.cocoonbody_2_age_2.render(pixel); + this.cocoonbody_4_age_2.render(pixel); + this.cocoonbody_1_age_2.render(pixel); + this.cocoonbody_5_age_2.render(pixel); + this.cocoonbody_0_age_2.render(pixel); + } + } +} diff --git a/src/main/java/forestry/lepidopterology/render/RenderButterflyEntity.java b/src/main/java/forestry/lepidopterology/render/RenderButterflyEntity.java index b7822555a..3d0a01ead 100644 --- a/src/main/java/forestry/lepidopterology/render/RenderButterflyEntity.java +++ b/src/main/java/forestry/lepidopterology/render/RenderButterflyEntity.java @@ -10,18 +10,19 @@ ******************************************************************************/ package forestry.lepidopterology.render; -import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.entity.Render; import net.minecraft.client.renderer.entity.RenderLiving; +import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.util.ResourceLocation; - +import net.minecraftforge.fml.client.registry.IRenderFactory; import forestry.lepidopterology.entities.EntityButterfly; public class RenderButterflyEntity extends RenderLiving { private final ModelButterfly butterflyModel; - public RenderButterflyEntity() { - super(Minecraft.getMinecraft().getRenderManager(), new ModelButterfly(), 0.25f); + public RenderButterflyEntity(RenderManager manager) { + super(manager, new ModelButterfly(), 0.25f); butterflyModel = (ModelButterfly) mainModel; } @@ -49,4 +50,12 @@ public class RenderButterflyEntity extends RenderLiving { return entity.getWingFlap(partialTickTime); } + public static class Factory implements IRenderFactory{ + @Override + public Render createRenderFor(RenderManager manager) { + return new RenderButterflyEntity(manager); + } + + } + } diff --git a/src/main/java/forestry/lepidopterology/render/RendererCocoon.java b/src/main/java/forestry/lepidopterology/render/RendererCocoon.java new file mode 100644 index 000000000..30557e372 --- /dev/null +++ b/src/main/java/forestry/lepidopterology/render/RendererCocoon.java @@ -0,0 +1,57 @@ +/******************************************************************************* + * Copyright (c) 2011-2014 SirSengir. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the GNU Lesser Public License v3 + * which accompanies this distribution, and is available at + * http://www.gnu.org/licenses/lgpl-3.0.txt + * + * Various Contributors including, but not limited to: + * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges + ******************************************************************************/ +package forestry.lepidopterology.render; + +import org.lwjgl.opengl.GL11; + +import forestry.api.lepidopterology.IAlleleButterflySpecies; +import forestry.api.lepidopterology.IButterfly; +import forestry.core.proxy.Proxies; +import forestry.lepidopterology.blocks.BlockCocoon; +import forestry.lepidopterology.genetics.ButterflyDefinition; +import forestry.lepidopterology.tiles.TileCocoon; +import net.minecraft.block.state.IBlockState; +import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; +import net.minecraft.util.ResourceLocation; + +public class RendererCocoon extends TileEntitySpecialRenderer { + + private static ModelCocoon modelCocoon = new ModelCocoon(); + + public RendererCocoon() { + } + + @Override + public void renderTileEntityAt(TileCocoon te, double x, double y, double z, float partialTicks, int destroyStage) { + IBlockState state = te.getWorld().getBlockState(te.getPos()); + + if(state == null || !(state.getBlock() instanceof BlockCocoon)){ + return; + } + IButterfly butterfly = te.getCaterpillar(); + if(butterfly == null){ + butterfly = ButterflyDefinition.Brimstone.getIndividual(); + } + render(butterfly, te.getAge(), x, y, z); + } + + private static void render(IButterfly butterfly, int age, double x, double y, double z){ + IAlleleButterflySpecies species = butterfly.getGenome().getPrimary(); + GL11.glPushMatrix(); + GL11.glTranslated((float) x + 0.5F, (float) y + 1.5F, (float) z + 0.5F); + GL11.glRotated(180, 0F, 0F, 1F); + GL11.glRotatef(180.0F, 0.0F, 1.0F, 0.0F); + Proxies.render.bindTexture(new ResourceLocation(species.getModID(), species.getCocoonProvider().getCocoonTexture(age))); + modelCocoon.renderCucoon(age); + GL11.glPopMatrix(); + } + +} diff --git a/src/main/java/forestry/lepidopterology/tiles/TileCocoon.java b/src/main/java/forestry/lepidopterology/tiles/TileCocoon.java new file mode 100644 index 000000000..ed584b45c --- /dev/null +++ b/src/main/java/forestry/lepidopterology/tiles/TileCocoon.java @@ -0,0 +1,220 @@ +/******************************************************************************* + * Copyright (c) 2011-2014 SirSengir. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the GNU Lesser Public License v3 + * which accompanies this distribution, and is available at + * http://www.gnu.org/licenses/lgpl-3.0.txt + * + * Various Contributors including, but not limited to: + * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges + ******************************************************************************/ +package forestry.lepidopterology.tiles; + +import java.io.IOException; + +import com.mojang.authlib.GameProfile; + +import forestry.api.genetics.IAllele; +import forestry.api.lepidopterology.ButterflyManager; +import forestry.api.lepidopterology.IButterfly; +import forestry.api.lepidopterology.IButterflyCocoon; +import forestry.api.lepidopterology.IButterflyGenome; +import forestry.api.lepidopterology.IButterflyNursery; +import forestry.core.access.IOwnable; +import forestry.core.network.DataInputStreamForestry; +import forestry.core.network.DataOutputStreamForestry; +import forestry.core.network.IStreamable; +import forestry.core.network.packets.PacketTileStream; +import forestry.core.proxy.Proxies; +import forestry.core.utils.Log; +import forestry.core.utils.PlayerUtil; +import forestry.lepidopterology.genetics.Butterfly; +import net.minecraft.block.Block; +import net.minecraft.block.state.IBlockState; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.network.Packet; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.BlockPos; +import net.minecraft.world.World; + +public class TileCocoon extends TileEntity implements IStreamable, IOwnable, IButterflyCocoon { + + private int age; + private int maturationTime; + private IButterfly caterpillar; + private GameProfile owner; + private BlockPos nursery; + + /* SAVING & LOADING */ + @Override + public void readFromNBT(NBTTagCompound nbttagcompound) { + super.readFromNBT(nbttagcompound); + + if (nbttagcompound.hasKey("Caterpillar")) { + caterpillar = new Butterfly(nbttagcompound.getCompoundTag("Caterpillar")); + } + if (nbttagcompound.hasKey("owner")) { + owner = PlayerUtil.readGameProfileFromNBT(nbttagcompound.getCompoundTag("owner")); + } + if(nbttagcompound.hasKey("nursery")){ + NBTTagCompound nbt = nbttagcompound.getCompoundTag("nursery"); + int x = nbt.getInteger("x"); + int y = nbt.getInteger("y"); + int z = nbt.getInteger("z"); + nursery = new BlockPos(x, y, z); + } + age = nbttagcompound.getInteger("Age"); + maturationTime = nbttagcompound.getInteger("CATMAT"); + } + + @Override + public void writeToNBT(NBTTagCompound nbttagcompound) { + super.writeToNBT(nbttagcompound); + + if (caterpillar != null) { + NBTTagCompound subcompound = new NBTTagCompound(); + caterpillar.writeToNBT(subcompound); + nbttagcompound.setTag("Caterpillar", subcompound); + } + if (this.owner != null) { + NBTTagCompound nbt = new NBTTagCompound(); + PlayerUtil.writeGameProfile(nbt, owner); + nbttagcompound.setTag("owner", nbt); + } + if(nursery != null){ + BlockPos pos = nursery; + NBTTagCompound nbt = new NBTTagCompound(); + nbt.setInteger("x", pos.getX()); + nbt.setInteger("y", pos.getY()); + nbt.setInteger("z", pos.getZ()); + nbttagcompound.setTag("nursery", nbt); + } + nbttagcompound.setInteger("Age", age); + nbttagcompound.setInteger("CATMAT", maturationTime); + } + + @Override + public void writeData(DataOutputStreamForestry data) throws IOException { + String speciesUID = ""; + IButterfly caterpillar = getCaterpillar(); + if (caterpillar != null) { + speciesUID = caterpillar.getIdent(); + } + data.writeUTF(speciesUID); + data.writeInt(age); + } + + @Override + public void readData(DataInputStreamForestry data) throws IOException { + String speciesUID = data.readUTF(); + IButterfly caterpillar = getButterfly(speciesUID); + setCaterpillar(caterpillar); + age = data.readInt(); + } + + private static IButterfly getButterfly(String speciesUID) { + IAllele[] butterflyTemplate = ButterflyManager.butterflyRoot.getTemplate(speciesUID); + if (butterflyTemplate == null) { + return null; + } + return ButterflyManager.butterflyRoot.templateAsIndividual(butterflyTemplate); + } + + /* IOwnable */ + @Override + public GameProfile getOwner() { + return owner; + } + + @Override + public void setOwner(GameProfile owner) { + this.owner = owner; + } + + @Override + public boolean isOwned() { + return owner != null; + } + + @Override + public boolean isOwner(EntityPlayer player) { + return player != null && PlayerUtil.isSameGameProfile(player.getGameProfile(), owner); + } + + @Override + public boolean shouldRefresh(World world, BlockPos pos, IBlockState oldState, IBlockState newSate) { + return !Block.isEqualTo(oldState.getBlock(), newSate.getBlock()); + } + + /* INETWORKEDENTITY */ + @Override + public Packet getDescriptionPacket() { + return new PacketTileStream(this).getPacket(); + } + + public void onBlockTick() { + maturationTime++; + + IButterflyGenome caterpillarGenome = caterpillar.getGenome(); + int caterpillarMatureTime = Math.round((float) caterpillarGenome.getLifespan() / (caterpillarGenome.getFertility() * 2)); + + if (maturationTime >= caterpillarMatureTime) { + if(age < 2){ + age++; + maturationTime = 0; + }else if(caterpillar.canTakeFlight(worldObj, getPos().getX(), getPos().getY(), getPos().getZ())){ + worldObj.setBlockToAir(getPos()); + if (worldObj.isAirBlock(getPos())) { + attemptButterflySpawn(worldObj, caterpillar, getPos()); + } + return; + } + } + } + + private static void attemptButterflySpawn(World world, IButterfly butterfly, BlockPos pos) { + if (ButterflyManager.butterflyRoot.spawnButterflyInWorld(world, butterfly.copy(), pos.getX(), pos.getY() + 0.1f, pos.getZ()) != null) { + Log.trace("A caterpillar '%s' hatched at %s/%s/%s.", butterfly.getDisplayName(), pos.getX(), pos.getY(), pos.getZ()); + } + } + + @Override + public BlockPos getCoordinates() { + return getPos(); + } + + @Override + public IButterfly getCaterpillar() { + return caterpillar; + } + + @Override + public IButterflyNursery getNursery() { + TileEntity nursery = worldObj.getTileEntity(this.nursery); + if(nursery instanceof IButterflyNursery){ + return (IButterflyNursery) nursery; + } + return null; + } + + @Override + public void setNursery(IButterflyNursery nursery) { + this.nursery = nursery.getCoordinates(); + } + + @Override + public void setCaterpillar(IButterfly butterfly) { + this.caterpillar = butterfly; + sendNetworkUpdate(); + } + + private void sendNetworkUpdate() { + Proxies.net.sendNetworkPacket(new PacketTileStream(this), worldObj); + } + + public int getAge() { + return age; + } + +} diff --git a/src/main/resources/assets/forestry/blockstates/cocoon.json b/src/main/resources/assets/forestry/blockstates/cocoon.json new file mode 100644 index 000000000..e69de29bb diff --git a/src/main/resources/assets/forestry/models/item/cocoon.json b/src/main/resources/assets/forestry/models/item/cocoon.json new file mode 100644 index 000000000..43a272a60 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/cocoon.json @@ -0,0 +1,3 @@ +{ + "parent": "builtin/entity" +} diff --git a/src/main/resources/assets/forestry/textures/blocks/lepidopterology/cocoons/default_0.png b/src/main/resources/assets/forestry/textures/blocks/lepidopterology/cocoons/default_0.png new file mode 100644 index 0000000000000000000000000000000000000000..40f9c1515a6f33ff5b614cd2c62d0501dfdd5be9 GIT binary patch literal 15739 zcmeI3dsGu=7QhG5nu1k4NTpkpG^i_Rn8};O5I_PYE};~VBI09`nLvjhQs2!tT1T%VRfW~dWoTEY;HVuS_{w;4>-YzUG^*-WT*1x~Uxc(&dc$>}D;de**aHoIT>CPZ1_K!_E_M_}*oK;5UN{1e zWQ1u4ZA?~ko?~g47RK{%18yWOlpSwGJ5vrp5|$idl#qk!Q3F#sQL6`IkGNigVZ_iD zGHw-xz=d=~OG{dT35Qc~3t=^D@wipgRzgPFJ*n5ZlQYDVT{G(1ahrY=GrPuV<|qYc zhUC;(lpxRA@^;Ucbvhw-?WP9umw zMLbj>63JovnWbE~*X1e+*Ep5taEx-R(MW|@1S;f81X`3U)Ck2~R77V+NF-8J ztHVZi<{TZmd`~uXo41#eS}juKt3!x+PQ8ONsO`XO6r3X5_4mAVa z(;bST$r&iu;mMTSo4t%G1ZrKVBLO@)JZ#Jz**QPMp3pq2W4?rsP#>5&7WU5TF!fY} zri8C(DmdXd3J&j-*lxBwvZB7=*b51?gm0YKh=roIPLJI3946x?=6f78~~f3xR<9|gCwgYREDa;xh; zZ%%7}$L;JhhPS5YPOC88{p5Oc=?t&;k{+6qBuPj^H_x<4~TcO(4GgTc)hnsE$rN$^j z(BA{^ud4w@#{aDjLE80yygXO2+lvM% z`t~WlHoZXVle;&Obm^;(I)qmlx^cRxQuXgyg zoNMpzd^Bg*6>ISKf9mnNJtoW7)aFxb$Zs#08FyY8U0#V1#gleF=&YC#R{k(4@#^g; z#cykVDA|?%p9^bJqW$D`$0xpqMRfczYwm2${-?`XQv`mj@!ay<^-%}6uVq!t{#D67M=@7E={F==ma zYx6%B+56&9RPw@iw-q$AIQ$JIVXEbOPb_Qm-W+tMIOO-^t$`OSds~-V38O&=K{seZ9w*j{9om7gtQRzp3gu-7SA0 z@4GwWRF+{~)L+h8C;3h0R2}-@MzY{i^2WR=3)8Q^dnMX0vnw&xdrNLPd4hHJzPGr! z_F?FYGQMoweavy^?rPI(GZ)J*>11K5n6s)tWbPVKmTXYcdtefK^qehCuHnyXqJbMK`6^=MUGlCoj`^0og3{b#*^ literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/forestry/textures/blocks/lepidopterology/cocoons/default_1.png b/src/main/resources/assets/forestry/textures/blocks/lepidopterology/cocoons/default_1.png new file mode 100644 index 0000000000000000000000000000000000000000..2a35d613733a6fd06b5d3d56d4c68a03f32e16ea GIT binary patch literal 15503 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 DML6tI literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/forestry/textures/items/scentedPaneling.png b/src/main/resources/assets/forestry/textures/items/scentedPaneling.png index a6868422af8c6d60847ccac71082ad89b618ec9a..c44210d60e0e7b5cc41dba63d43345f708c98d46 100755 GIT binary patch delta 165 zcmX?5w3Ts!L_G^L0|Ud`yN`l^lu&?Ah-kM^Yc|MyLb+IiM2 z{bH;|k=a7Gn1&C}SX!j!h}f}nC9p1F=wjkvy%2m*E?1t*#{RPSIki7x{rpCU?}z&U P4QKFl^>bP0l+XkK&PzDw literal 14656 zcmeI3U5Fc16vwZ%)Vj7*)S?!O<5Z!d$$aFi87C<<*=<(Ly6mQO7eRM+=4LZ&GBcf- zZL;gjwtcWl5wXyU6bi)$^`RmbiuR!jR#5c8uLpflpIWO(1@%D@>YYh8Imsryt@QB* zk~w?t|D1E@ch0>#FZ1H~*zS!(TZRxq8%GQI339zN_^w|^ejoVbszxriJB4Wvp*!vl zzPF&)Puz#lj)%Z9BtGbqDDyF*>E&{9{b!Zo-?fsf92eHo->UM zzc*17i%t$#%)*k3Czr-b`qI3fHu#;{A+@2905$AuT%%UCJf)H0!?+5ugJFT^LWw`0 z;dccIxvAnfm$O~WC8EiQE+$i4Djk&)sZ>1m7$=KTLJ(s@OpM4eB`zv)nQMLc>=3b3 z*C;C!`H@yS@>hnh_`ahELcLy()?-oIofD*VIxUE@Aj=V=h{5kIM~pHs1Y+pE|EQnsfDCMGp07TdY|uD4d}o7(e-_Y(vyq6hXu!)Q-#hT zP`0~D$=OxgCCkFum@4!e23}#ODWjI>YnF~j^I0+wHBCbijRYp!FcwK_vpV4y7bEFd zIvz1ZP2M5NdU-Zo4j~qc(0x_tysa+;yQLM{xWUlCeO2hEU6Y)2S`}!5)!%4}K4Dg+ zDwrPW&qdI;q zst}z1RkOPg&C%}qtaR+^daA*prjTAB>(as+NUE@EtdqH^p9*SPT?q9lStK7p3VvIz zaJtuZ`r58=y4SVixyLg7tlY}hGYq_flec*+Op=ELoJ}SYv4kr04)=PDn+;r@%9~{W zdO=r8$(B#=L|@10L5^Ue<=8A0_;(&wvN=i~7RYmo(0)+qE^>P#++?G3M>jbz49Ai{ z8dRI%q9TF8Ps5ZkzMFa&57oQ4v7_!v$$jZH9}A2nrZ3NP}uKTvS9*z;HntRGZj3(}z43>Os<6fj(n z2GwS`sED9|;es@%Hp4|l1O*Hiq(QYAE-E4@V7MR+s?Bgw5kUdN1!+)ihKq^_3K%X( zgK9HeR76m~a6uYWo8h7&f&zvM(xBQ57Zni{FkFxZ)n>S;h@gPsf;6c1HE|7fUj4%s zdEc*2UhMl|xu%ns0y(`fQAB9zVT6_sA@uiEa=nbuf{4&BGYBcKA#|_(>T?%Hi1yfM zepjjS{fVRRZv2qju=etsmBQvHM}A*ZcuOAnXTwLwrY}t%Sf2Xi4d=jxAAhZh_0LA0 zxo7Lavz6yBj(w-z|MjV#ovn`_JiGpfQ-AJR<}Y%SX!wPr$s@1awR`QE8oLF<)mxs?ixXwO);bh|F eoyEy3=kG0%G&($%KmEka!T$hG6XlTr