From b0b501a0ffd7bf329833b253cbc1f5093cb35b68 Mon Sep 17 00:00:00 2001 From: Nedelosk Date: Sat, 26 Mar 2016 11:27:52 +0100 Subject: [PATCH] Fix cocoons and add silk butterfly --- .../api/lepidopterology/EnumCocoonType.java | 17 +++ .../IButterflyMutationFactory.java | 6 +- .../lepidopterology/blocks/BlockCocoon.java | 9 +- .../genetics/ButterflyBranchDefinition.java | 6 +- .../genetics/ButterflyDefinition.java | 82 +++++++------ .../genetics/DefaultCocoonProvider.java | 8 +- .../genetics/MothDefinition.java | 40 ++++++- .../lepidopterology/render/ModelCocoon.java | 108 +++++++++--------- .../render/RendererCocoon.java | 3 +- .../lepidopterology/cocoons/default_0.png | Bin 15739 -> 671 bytes .../lepidopterology/cocoons/default_1.png | Bin 15503 -> 834 bytes .../lepidopterology/cocoons/default_2.png | Bin 15316 -> 1041 bytes .../blocks/lepidopterology/cocoons/silk_0.png | Bin 0 -> 635 bytes .../blocks/lepidopterology/cocoons/silk_1.png | Bin 0 -> 769 bytes .../blocks/lepidopterology/cocoons/silk_2.png | Bin 0 -> 961 bytes .../entity/butterflies/mothBombyxMori.png | Bin 0 -> 653 bytes .../items/butterflies/mothBombyxMori.png | Bin 0 -> 651 bytes 17 files changed, 178 insertions(+), 101 deletions(-) create mode 100644 src/main/java/forestry/api/lepidopterology/EnumCocoonType.java create mode 100644 src/main/resources/assets/forestry/textures/blocks/lepidopterology/cocoons/silk_0.png create mode 100644 src/main/resources/assets/forestry/textures/blocks/lepidopterology/cocoons/silk_1.png create mode 100644 src/main/resources/assets/forestry/textures/blocks/lepidopterology/cocoons/silk_2.png create mode 100644 src/main/resources/assets/forestry/textures/entity/butterflies/mothBombyxMori.png create mode 100644 src/main/resources/assets/forestry/textures/items/butterflies/mothBombyxMori.png diff --git a/src/main/java/forestry/api/lepidopterology/EnumCocoonType.java b/src/main/java/forestry/api/lepidopterology/EnumCocoonType.java new file mode 100644 index 000000000..7c90e6265 --- /dev/null +++ b/src/main/java/forestry/api/lepidopterology/EnumCocoonType.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 enum EnumCocoonType { + + DEFAULT, SILK + +} diff --git a/src/main/java/forestry/api/lepidopterology/IButterflyMutationFactory.java b/src/main/java/forestry/api/lepidopterology/IButterflyMutationFactory.java index 7488e61f5..6446b288b 100644 --- a/src/main/java/forestry/api/lepidopterology/IButterflyMutationFactory.java +++ b/src/main/java/forestry/api/lepidopterology/IButterflyMutationFactory.java @@ -13,11 +13,11 @@ public interface IButterflyMutationFactory { * Automatically registered with ButterflyManager.butterflyRoot.registerMutation() * See IButterflyMutationCustom and IMutationCustom for adding additional properties to the returned mutation. * - * @param parentTree0 A parent butterfly for this mutation - * @param parentTree1 A parent butterfly for this mutation + * @param parentButterfly0 A parent butterfly for this mutation + * @param parentButterfly1 A parent butterfly for this mutation * @param result The resulting alleles for this mutation * @param chance The chance that breeding the two parent butterfly's will result in this mutation - * @return a new tree mutation. + * @return a new butterfly mutation. */ IButterflyMutationCustom createMutation(IAlleleButterflySpecies parentButterfly0, IAlleleButterflySpecies parentButterfly1, IAllele[] result, int chance); } diff --git a/src/main/java/forestry/lepidopterology/blocks/BlockCocoon.java b/src/main/java/forestry/lepidopterology/blocks/BlockCocoon.java index e66aa88fc..4a044e6a1 100644 --- a/src/main/java/forestry/lepidopterology/blocks/BlockCocoon.java +++ b/src/main/java/forestry/lepidopterology/blocks/BlockCocoon.java @@ -122,5 +122,12 @@ public class BlockCocoon extends Block implements ITileEntityProvider, IStateMap public void registerStateMapper() { Proxies.render.registerStateMapper(this, EmptyStateMapper.instance); } - + + @Override + public void onNeighborBlockChange(World worldIn, BlockPos pos, IBlockState state, Block neighborBlock) { + IBlockState stateUp = worldIn.getBlockState(pos.up()); + if(stateUp.getBlock().isAir(worldIn, pos.up())){ + worldIn.setBlockToAir(pos); + } + } } diff --git a/src/main/java/forestry/lepidopterology/genetics/ButterflyBranchDefinition.java b/src/main/java/forestry/lepidopterology/genetics/ButterflyBranchDefinition.java index 839bbb323..44ea05fc6 100644 --- a/src/main/java/forestry/lepidopterology/genetics/ButterflyBranchDefinition.java +++ b/src/main/java/forestry/lepidopterology/genetics/ButterflyBranchDefinition.java @@ -27,6 +27,7 @@ public enum ButterflyBranchDefinition implements IBranchDefinition { Attacus, Bassarona, Batesia, + Bombyx, Celastrina, Cethosia, Chiasmia, @@ -122,7 +123,10 @@ public enum ButterflyBranchDefinition implements IBranchDefinition { Papilio.getBranch(), Protographium.getBranch() ), - alleleRegistry.createAndRegisterClassification(IClassification.EnumClassLevel.FAMILY, "notchidae", "Notchidae") + alleleRegistry.createAndRegisterClassification(IClassification.EnumClassLevel.FAMILY, "notchidae", "Notchidae"), + alleleRegistry.createAndRegisterClassification(IClassification.EnumClassLevel.FAMILY, "bombycidae", "Bombycidae", + Bombyx.getBranch() + ) ) ); } diff --git a/src/main/java/forestry/lepidopterology/genetics/ButterflyDefinition.java b/src/main/java/forestry/lepidopterology/genetics/ButterflyDefinition.java index 7f1ae0f0a..89e26c3d3 100644 --- a/src/main/java/forestry/lepidopterology/genetics/ButterflyDefinition.java +++ b/src/main/java/forestry/lepidopterology/genetics/ButterflyDefinition.java @@ -15,70 +15,74 @@ import java.util.Arrays; import java.util.Locale; import net.minecraft.item.ItemStack; - +import forestry.api.apiculture.BeeManager; +import forestry.api.apiculture.IBeeMutationCustom; import forestry.api.core.EnumHumidity; import forestry.api.core.EnumTemperature; import forestry.api.genetics.IAllele; import forestry.api.genetics.IClassification; import forestry.api.lepidopterology.ButterflyManager; import forestry.api.lepidopterology.EnumButterflyChromosome; +import forestry.api.lepidopterology.EnumCocoonType; 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.api.lepidopterology.IButterflyMutationCustom; +import forestry.apiculture.genetics.BeeDefinition; import forestry.core.config.Constants; import forestry.core.genetics.alleles.AlleleHelper; import forestry.core.genetics.alleles.EnumAllele; public enum ButterflyDefinition implements IButterflyDefinition { - CabbageWhite(ButterflyBranchDefinition.Pieris, "cabbageWhite", "rapae", new Color(0xccffee), true, 1.0f) { + CabbageWhite(ButterflyBranchDefinition.Pieris, "cabbageWhite", "rapae", new Color(0xccffee), true, 1.0f, EnumCocoonType.DEFAULT) { @Override protected void setAlleles(IAllele[] alleles) { AlleleHelper.instance.set(alleles, EnumButterflyChromosome.SIZE, EnumAllele.Size.AVERAGE); } }, - Brimstone(ButterflyBranchDefinition.Gonepteryx, "brimstone", "rhamni", new Color(0xf0ee38), true, 1.0f), - Aurora(ButterflyBranchDefinition.Anthocharis, "orangeTip", "cardamines", new Color(0xe34f05), true, 0.5f) { + Brimstone(ButterflyBranchDefinition.Gonepteryx, "brimstone", "rhamni", new Color(0xf0ee38), true, 1.0f, EnumCocoonType.DEFAULT), + Aurora(ButterflyBranchDefinition.Anthocharis, "orangeTip", "cardamines", new Color(0xe34f05), true, 0.5f, EnumCocoonType.DEFAULT) { @Override protected void setAlleles(IAllele[] alleles) { AlleleHelper.instance.set(alleles, EnumButterflyChromosome.SIZE, EnumAllele.Size.SMALLER); } }, - Postillion(ButterflyBranchDefinition.Colias, "postillion", "croceus", new Color(0xd77e04), true, 0.5f) { + Postillion(ButterflyBranchDefinition.Colias, "postillion", "croceus", new Color(0xd77e04), true, 0.5f, EnumCocoonType.DEFAULT) { @Override protected void setAlleles(IAllele[] alleles) { AlleleHelper.instance.set(alleles, EnumButterflyChromosome.SPEED, EnumAllele.Speed.SLOW); } }, - PalaenoSulphur(ButterflyBranchDefinition.Colias, "palaenoSulphur", "palaeno", new Color(0xf8fba3), true, 0.4f) { + PalaenoSulphur(ButterflyBranchDefinition.Colias, "palaenoSulphur", "palaeno", new Color(0xf8fba3), true, 0.4f, EnumCocoonType.DEFAULT) { @Override protected void setAlleles(IAllele[] alleles) { AlleleHelper.instance.set(alleles, EnumButterflyChromosome.SPEED, EnumAllele.Speed.SLOWER); } }, - Reseda(ButterflyBranchDefinition.Pontia, "reseda", "edusa", new Color(0x747d48), true, 0.3f) { + Reseda(ButterflyBranchDefinition.Pontia, "reseda", "edusa", new Color(0x747d48), true, 0.3f, EnumCocoonType.DEFAULT) { @Override protected void setAlleles(IAllele[] alleles) { AlleleHelper.instance.set(alleles, EnumButterflyChromosome.SPEED, EnumAllele.Speed.SLOWER); } }, - SpringAzure(ButterflyBranchDefinition.Celastrina, "springAzure", "argiolus", new Color(0xb8cae2), true, 0.3f) { + SpringAzure(ButterflyBranchDefinition.Celastrina, "springAzure", "argiolus", new Color(0xb8cae2), true, 0.3f, EnumCocoonType.DEFAULT) { @Override protected void setAlleles(IAllele[] alleles) { AlleleHelper.instance.set(alleles, EnumButterflyChromosome.SIZE, EnumAllele.Size.SMALLER); AlleleHelper.instance.set(alleles, EnumButterflyChromosome.LIFESPAN, EnumAllele.Lifespan.SHORT); } }, - GozoraAzure(ButterflyBranchDefinition.Celastrina, "gozoraAzure", "gozora", new Color(0x6870e7), true, 0.2f) { + GozoraAzure(ButterflyBranchDefinition.Celastrina, "gozoraAzure", "gozora", new Color(0x6870e7), true, 0.2f, EnumCocoonType.DEFAULT) { @Override protected void setAlleles(IAllele[] alleles) { AlleleHelper.instance.set(alleles, EnumButterflyChromosome.SIZE, EnumAllele.Size.SMALLER); AlleleHelper.instance.set(alleles, EnumButterflyChromosome.LIFESPAN, EnumAllele.Lifespan.SHORT); } }, - CitrusSwallow(ButterflyBranchDefinition.Papilio, "swallowtailC", "demodocus", new Color(0xeae389), false, 1.0f) { + CitrusSwallow(ButterflyBranchDefinition.Papilio, "swallowtailC", "demodocus", new Color(0xeae389), false, 1.0f, EnumCocoonType.DEFAULT) { @Override protected void setSpeciesProperties(IAlleleButterflySpeciesBuilder species) { species.setTemperature(EnumTemperature.WARM) @@ -96,7 +100,7 @@ public enum ButterflyDefinition implements IButterflyDefinition { AlleleHelper.instance.set(alleles, EnumButterflyChromosome.HUMIDITY_TOLERANCE, EnumAllele.Tolerance.DOWN_1); } }, - EmeraldPeacock(ButterflyBranchDefinition.Papilio, "emeraldPeacock", "palinurus", new Color(0x7cfe80), true, 0.1f) { + EmeraldPeacock(ButterflyBranchDefinition.Papilio, "emeraldPeacock", "palinurus", new Color(0x7cfe80), true, 0.1f, EnumCocoonType.DEFAULT) { @Override protected void setSpeciesProperties(IAlleleButterflySpeciesBuilder species) { species.setTemperature(EnumTemperature.WARM) @@ -112,7 +116,7 @@ public enum ButterflyDefinition implements IButterflyDefinition { AlleleHelper.instance.set(alleles, EnumButterflyChromosome.HUMIDITY_TOLERANCE, EnumAllele.Tolerance.DOWN_1); } }, - ThoasSwallow(ButterflyBranchDefinition.Papilio, "swallowtailT", "thoas", new Color(0xeac783), false, 0.2f) { + ThoasSwallow(ButterflyBranchDefinition.Papilio, "swallowtailT", "thoas", new Color(0xeac783), false, 0.2f, EnumCocoonType.DEFAULT) { @Override protected void setSpeciesProperties(IAlleleButterflySpeciesBuilder species) { species.setTemperature(EnumTemperature.WARM) @@ -126,13 +130,13 @@ public enum ButterflyDefinition implements IButterflyDefinition { AlleleHelper.instance.set(alleles, EnumButterflyChromosome.LIFESPAN, EnumAllele.Lifespan.SHORTEST); } }, - Spicebush(ButterflyBranchDefinition.Papilio, "swallowtailS", "troilus", new Color(0xeefeff), true, 0.5f) { + Spicebush(ButterflyBranchDefinition.Papilio, "swallowtailS", "troilus", new Color(0xeefeff), true, 0.5f, EnumCocoonType.DEFAULT) { @Override protected void setAlleles(IAllele[] alleles) { AlleleHelper.instance.set(alleles, EnumButterflyChromosome.SIZE, EnumAllele.Size.AVERAGE); } }, - BlackSwallow(ButterflyBranchDefinition.Papilio, "swallowtailB", "polyxenes", new Color(0xeac783), true, 1.0f) { + BlackSwallow(ButterflyBranchDefinition.Papilio, "swallowtailB", "polyxenes", new Color(0xeac783), true, 1.0f, EnumCocoonType.DEFAULT) { @Override protected void setAlleles(IAllele[] alleles) { AlleleHelper.instance.set(alleles, EnumButterflyChromosome.SPEED, EnumAllele.Speed.SLOW); @@ -142,14 +146,14 @@ public enum ButterflyDefinition implements IButterflyDefinition { AlleleHelper.instance.set(alleles, EnumButterflyChromosome.HUMIDITY_TOLERANCE, EnumAllele.Tolerance.DOWN_1); } }, - ZebraSwallow(ButterflyBranchDefinition.Protographium, "swallowtailZ", "marcellus", new Color(0xeafeff), true, 0.5f) { + ZebraSwallow(ButterflyBranchDefinition.Protographium, "swallowtailZ", "marcellus", new Color(0xeafeff), true, 0.5f, EnumCocoonType.DEFAULT) { @Override protected void setAlleles(IAllele[] alleles) { AlleleHelper.instance.set(alleles, EnumButterflyChromosome.SPEED, EnumAllele.Speed.SLOWER); AlleleHelper.instance.set(alleles, EnumButterflyChromosome.SIZE, EnumAllele.Size.AVERAGE); } }, - Glasswing(ButterflyBranchDefinition.Greta, "glasswing", "oto", new Color(0x583732), true, 0.1f) { + Glasswing(ButterflyBranchDefinition.Greta, "glasswing", "oto", new Color(0x583732), true, 0.1f, EnumCocoonType.DEFAULT) { @Override protected void setSpeciesProperties(IAlleleButterflySpeciesBuilder species) { species.setTemperature(EnumTemperature.WARM); @@ -163,25 +167,25 @@ public enum ButterflyDefinition implements IButterflyDefinition { AlleleHelper.instance.set(alleles, EnumButterflyChromosome.TEMPERATURE_TOLERANCE, EnumAllele.Tolerance.DOWN_1); } }, - SpeckledWood(ButterflyBranchDefinition.Pararge, "speckledWood", "aegeria", new Color(0x947245), true, 1.0f) { + SpeckledWood(ButterflyBranchDefinition.Pararge, "speckledWood", "aegeria", new Color(0x947245), true, 1.0f, EnumCocoonType.DEFAULT) { @Override protected void setAlleles(IAllele[] alleles) { AlleleHelper.instance.set(alleles, EnumButterflyChromosome.FERTILITY, 2); } }, - MSpeckledWood(ButterflyBranchDefinition.Pararge, "speckledWoodM", "xiphia", new Color(0x402919), true, 0.5f) { + MSpeckledWood(ButterflyBranchDefinition.Pararge, "speckledWoodM", "xiphia", new Color(0x402919), true, 0.5f, EnumCocoonType.DEFAULT) { @Override protected void setAlleles(IAllele[] alleles) { AlleleHelper.instance.set(alleles, EnumButterflyChromosome.FERTILITY, 2); } }, - CSpeckledWood(ButterflyBranchDefinition.Pararge, "speckledWoodC", "xiphioides", new Color(0x51372a), true, 0.5f) { + CSpeckledWood(ButterflyBranchDefinition.Pararge, "speckledWoodC", "xiphioides", new Color(0x51372a), true, 0.5f, EnumCocoonType.DEFAULT) { @Override protected void setAlleles(IAllele[] alleles) { AlleleHelper.instance.set(alleles, EnumButterflyChromosome.FERTILITY, 2); } }, - MBlueMorpho(ButterflyBranchDefinition.Morpho, "blueMorphoM", "menelaus", new Color(0x72e1fd), true, 0.5f) { + MBlueMorpho(ButterflyBranchDefinition.Morpho, "blueMorphoM", "menelaus", new Color(0x72e1fd), true, 0.5f, EnumCocoonType.DEFAULT) { @Override protected void setSpeciesProperties(IAlleleButterflySpeciesBuilder species) { species.setTemperature(EnumTemperature.WARM) @@ -195,7 +199,7 @@ public enum ButterflyDefinition implements IButterflyDefinition { AlleleHelper.instance.set(alleles, EnumButterflyChromosome.FERTILITY, 2); } }, - PBlueMorpho(ButterflyBranchDefinition.Morpho, "blueMorphoP", "peleides", new Color(0x6ecce8), true, 0.25f) { + PBlueMorpho(ButterflyBranchDefinition.Morpho, "blueMorphoP", "peleides", new Color(0x6ecce8), true, 0.25f, EnumCocoonType.DEFAULT) { @Override protected void setSpeciesProperties(IAlleleButterflySpeciesBuilder species) { species.setTemperature(EnumTemperature.WARM) @@ -209,7 +213,7 @@ public enum ButterflyDefinition implements IButterflyDefinition { AlleleHelper.instance.set(alleles, EnumButterflyChromosome.FERTILITY, 2); } }, - RBlueMorpho(ButterflyBranchDefinition.Morpho, "blueMorphoR", "rhetenor", new Color(0x00bef8), true, 0.1f) { + RBlueMorpho(ButterflyBranchDefinition.Morpho, "blueMorphoR", "rhetenor", new Color(0x00bef8), true, 0.1f, EnumCocoonType.DEFAULT) { @Override protected void setSpeciesProperties(IAlleleButterflySpeciesBuilder species) { species.setTemperature(EnumTemperature.WARM) @@ -223,13 +227,13 @@ public enum ButterflyDefinition implements IButterflyDefinition { AlleleHelper.instance.set(alleles, EnumButterflyChromosome.FERTILITY, 2); } }, - Comma(ButterflyBranchDefinition.Polygonia, "comma", "c-album", new Color(0xf89505), true, 0.3f) { + Comma(ButterflyBranchDefinition.Polygonia, "comma", "c-album", new Color(0xf89505), true, 0.3f, EnumCocoonType.DEFAULT) { @Override protected void setAlleles(IAllele[] alleles) { AlleleHelper.instance.set(alleles, EnumButterflyChromosome.SPEED, EnumAllele.Speed.SLOWER); } }, - Batesia(ButterflyBranchDefinition.Batesia, "paintedBeauty", "hypochlora", new Color(0xfe7763), true, 0.3f) { + Batesia(ButterflyBranchDefinition.Batesia, "paintedBeauty", "hypochlora", new Color(0xfe7763), true, 0.3f, EnumCocoonType.DEFAULT) { @Override protected void setSpeciesProperties(IAlleleButterflySpeciesBuilder species) { species.setTemperature(EnumTemperature.WARM) @@ -241,20 +245,20 @@ public enum ButterflyDefinition implements IButterflyDefinition { AlleleHelper.instance.set(alleles, EnumButterflyChromosome.SIZE, EnumAllele.Size.LARGE); } }, - BlueWing(ButterflyBranchDefinition.Myscelia, "blueWing", "ethusa", new Color(0x3a93cc), true, 0.3f) { + BlueWing(ButterflyBranchDefinition.Myscelia, "blueWing", "ethusa", new Color(0x3a93cc), true, 0.3f, EnumCocoonType.DEFAULT) { @Override protected void setAlleles(IAllele[] alleles) { AlleleHelper.instance.set(alleles, EnumButterflyChromosome.SIZE, EnumAllele.Size.AVERAGE); AlleleHelper.instance.set(alleles, EnumButterflyChromosome.METABOLISM, 5); } }, - Monarch(ButterflyBranchDefinition.Danaus, "monarch", "plexippus", new Color(0xffa722), true, 0.2f) { + Monarch(ButterflyBranchDefinition.Danaus, "monarch", "plexippus", new Color(0xffa722), true, 0.2f, EnumCocoonType.DEFAULT) { @Override protected void setAlleles(IAllele[] alleles) { AlleleHelper.instance.set(alleles, EnumButterflyChromosome.SIZE, EnumAllele.Size.AVERAGE); } }, - BlueDuke(ButterflyBranchDefinition.Bassarona, "blueDuke", "durga", new Color(0x304240), true, 0.5f) { + BlueDuke(ButterflyBranchDefinition.Bassarona, "blueDuke", "durga", new Color(0x304240), true, 0.5f, EnumCocoonType.DEFAULT) { @Override protected void setSpeciesProperties(IAlleleButterflySpeciesBuilder species) { species.setTemperature(EnumTemperature.COLD); @@ -265,14 +269,14 @@ public enum ButterflyDefinition implements IButterflyDefinition { AlleleHelper.instance.set(alleles, EnumButterflyChromosome.TEMPERATURE_TOLERANCE, EnumAllele.Tolerance.BOTH_1); } }, - GlassyTiger(ButterflyBranchDefinition.Parantica, "glassyTiger", "aglea", new Color(0x5b3935), true, 0.3f) { + GlassyTiger(ButterflyBranchDefinition.Parantica, "glassyTiger", "aglea", new Color(0x5b3935), true, 0.3f, EnumCocoonType.DEFAULT) { @Override protected void setAlleles(IAllele[] alleles) { AlleleHelper.instance.set(alleles, EnumButterflyChromosome.SIZE, EnumAllele.Size.AVERAGE); } }, - Postman(ButterflyBranchDefinition.Heliconius, "postman", "melpomene", new Color(0xf7302d), true, 0.3f), - Malachite(ButterflyBranchDefinition.Siproeta, "malachite", "stelenes", new Color(0xbdff53), true, 0.5f) { + Postman(ButterflyBranchDefinition.Heliconius, "postman", "melpomene", new Color(0xf7302d), true, 0.3f, EnumCocoonType.DEFAULT), + Malachite(ButterflyBranchDefinition.Siproeta, "malachite", "stelenes", new Color(0xbdff53), true, 0.5f, EnumCocoonType.DEFAULT) { @Override protected void setSpeciesProperties(IAlleleButterflySpeciesBuilder species) { species.setTemperature(EnumTemperature.WARM) @@ -286,14 +290,14 @@ public enum ButterflyDefinition implements IButterflyDefinition { AlleleHelper.instance.set(alleles, EnumButterflyChromosome.HUMIDITY_TOLERANCE, EnumAllele.Tolerance.DOWN_1); } }, - LLacewing(ButterflyBranchDefinition.Cethosia, "leopardLacewing", "cyane", new Color(0xfb8a06), true, 0.7f) { + LLacewing(ButterflyBranchDefinition.Cethosia, "leopardLacewing", "cyane", new Color(0xfb8a06), true, 0.7f, EnumCocoonType.DEFAULT) { @Override protected void setAlleles(IAllele[] alleles) { AlleleHelper.instance.set(alleles, EnumButterflyChromosome.TEMPERATURE_TOLERANCE, EnumAllele.Tolerance.UP_1); AlleleHelper.instance.set(alleles, EnumButterflyChromosome.HUMIDITY_TOLERANCE, EnumAllele.Tolerance.UP_1); } }, - DianaFrit(ButterflyBranchDefinition.Speyeria, "dianaFritillary", "diana", new Color(0xffac05), true, 0.6f) { + DianaFrit(ButterflyBranchDefinition.Speyeria, "dianaFritillary", "diana", new Color(0xffac05), true, 0.6f, EnumCocoonType.DEFAULT) { @Override protected void setAlleles(IAllele[] alleles) { AlleleHelper.instance.set(alleles, EnumButterflyChromosome.SPEED, EnumAllele.Speed.SLOWER); @@ -306,7 +310,7 @@ public enum ButterflyDefinition implements IButterflyDefinition { private IAllele[] template; private IButterflyGenome genome; - ButterflyDefinition(ButterflyBranchDefinition branchDefinition, String speciesName, String binomial, Color serumColor, boolean dominant, float rarity) { + ButterflyDefinition(ButterflyBranchDefinition branchDefinition, String speciesName, String binomial, Color serumColor, boolean dominant, float rarity, EnumCocoonType cocoonType) { this.branch = branchDefinition; String uid = "lepi" + name(); @@ -315,7 +319,7 @@ public enum ButterflyDefinition implements IButterflyDefinition { String unlocalizedDescription = "for.description." + uid; String texture = "butterflies/" + uid; - IButterflyCocoonProvider cocoonProvider = new DefaultCocoonProvider(); + IButterflyCocoonProvider cocoonProvider = new DefaultCocoonProvider(cocoonType.name().toLowerCase(Locale.ENGLISH)); 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); @@ -327,6 +331,9 @@ public enum ButterflyDefinition implements IButterflyDefinition { for (ButterflyDefinition butterfly : values()) { butterfly.init(); } + for (ButterflyDefinition butterfly : values()) { + butterfly.registerMutations(); + } } private void init() { @@ -346,6 +353,13 @@ public enum ButterflyDefinition implements IButterflyDefinition { protected void setAlleles(IAllele[] alleles) { } + protected void registerMutations(){ + + } + + protected final IButterflyMutationCustom registerMutation(ButterflyDefinition parent1, ButterflyDefinition parent2, int chance) { + return ButterflyManager.butterflyMutationFactory.createMutation(parent1.species, parent2.species, getTemplate(), chance); + } @Override public final IAllele[] getTemplate() { diff --git a/src/main/java/forestry/lepidopterology/genetics/DefaultCocoonProvider.java b/src/main/java/forestry/lepidopterology/genetics/DefaultCocoonProvider.java index 79996bd6f..c4f6ad9ae 100644 --- a/src/main/java/forestry/lepidopterology/genetics/DefaultCocoonProvider.java +++ b/src/main/java/forestry/lepidopterology/genetics/DefaultCocoonProvider.java @@ -14,9 +14,15 @@ import forestry.api.lepidopterology.IButterflyCocoonProvider; public class DefaultCocoonProvider implements IButterflyCocoonProvider { + private String cocoonType; + + public DefaultCocoonProvider(String cocoonType) { + this.cocoonType = cocoonType; + } + @Override public String getCocoonTexture(int age) { - return "textures/blocks/lepidopterology/cocoons/default_" + age + ".png"; + return "textures/blocks/lepidopterology/cocoons/" + cocoonType + "_" + age + ".png"; } } diff --git a/src/main/java/forestry/lepidopterology/genetics/MothDefinition.java b/src/main/java/forestry/lepidopterology/genetics/MothDefinition.java index af10d8307..191042ec2 100644 --- a/src/main/java/forestry/lepidopterology/genetics/MothDefinition.java +++ b/src/main/java/forestry/lepidopterology/genetics/MothDefinition.java @@ -15,34 +15,51 @@ import java.util.Arrays; import java.util.Locale; import net.minecraft.item.ItemStack; - +import forestry.api.core.EnumHumidity; +import forestry.api.core.EnumTemperature; import forestry.api.genetics.IAllele; import forestry.api.genetics.IClassification; import forestry.api.lepidopterology.ButterflyManager; import forestry.api.lepidopterology.EnumButterflyChromosome; +import forestry.api.lepidopterology.EnumCocoonType; 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.api.lepidopterology.IButterflyMutationCustom; +import forestry.apiculture.genetics.BeeDefinition; import forestry.core.config.Constants; import forestry.core.genetics.alleles.AlleleHelper; import forestry.core.genetics.alleles.EnumAllele; public enum MothDefinition implements IButterflyDefinition { - Brimstone(ButterflyBranchDefinition.Opisthograptis, "brimstone", "luteolata", new Color(0xffea40), true, 1.0f), - LatticedHeath(ButterflyBranchDefinition.Chiasmia, "latticeHeath", "clathrata", new Color(0xf2f0be), true, 0.5f) { + Brimstone(ButterflyBranchDefinition.Opisthograptis, "brimstone", "luteolata", new Color(0xffea40), true, 1.0f, EnumCocoonType.DEFAULT), + LatticedHeath(ButterflyBranchDefinition.Chiasmia, "latticeHeath", "clathrata", new Color(0xf2f0be), true, 0.5f, EnumCocoonType.DEFAULT) { @Override protected void setAlleles(IAllele[] alleles) { AlleleHelper.instance.set(alleles, EnumButterflyChromosome.SIZE, EnumAllele.Size.SMALLEST); } }, - Atlas(ButterflyBranchDefinition.Attacus, "atlas", "atlas", new Color(0xd96e3d), false, 0.1f) { + Atlas(ButterflyBranchDefinition.Attacus, "atlas", "atlas", new Color(0xd96e3d), false, 0.1f, EnumCocoonType.DEFAULT) { @Override protected void setAlleles(IAllele[] alleles) { AlleleHelper.instance.set(alleles, EnumButterflyChromosome.SIZE, EnumAllele.Size.LARGEST); } + }, + BombyxMori(ButterflyBranchDefinition.Bombyx, "bombyxMori", "bombyxMori", new Color(0xDADADA), false, 0.05f, EnumCocoonType.SILK){ + + @Override + protected void setSpeciesProperties(IAlleleButterflySpeciesBuilder species) { + } + + @Override + protected void setAlleles(IAllele[] alleles) { + AlleleHelper.instance.set(alleles, EnumButterflyChromosome.SIZE, EnumAllele.Size.SMALLEST); + AlleleHelper.instance.set(alleles, EnumButterflyChromosome.SPEED, EnumAllele.Speed.SLOWER); + AlleleHelper.instance.set(alleles, EnumButterflyChromosome.METABOLISM, 4); + } }; private final IAlleleButterflySpecies species; @@ -50,7 +67,7 @@ public enum MothDefinition implements IButterflyDefinition { private IAllele[] template; private IButterflyGenome genome; - MothDefinition(ButterflyBranchDefinition branchDefinition, String speciesName, String binomial, Color serumColor, boolean dominant, float rarity) { + MothDefinition(ButterflyBranchDefinition branchDefinition, String speciesName, String binomial, Color serumColor, boolean dominant, float rarity, EnumCocoonType cocoonType) { branch = branchDefinition; String uid = "moth" + name(); @@ -60,7 +77,7 @@ public enum MothDefinition implements IButterflyDefinition { String texture = "butterflies/" + uid; - IButterflyCocoonProvider cocoonProvider = new DefaultCocoonProvider(); + IButterflyCocoonProvider cocoonProvider = new DefaultCocoonProvider(cocoonType.name().toLowerCase(Locale.ENGLISH)); IAlleleButterflySpeciesBuilder speciesBuilder = ButterflyManager.butterflyFactory.createSpecies("forestry." + uid, unlocalizedName, "Sengir", unlocalizedDescription, Constants.RESOURCE_ID, texture, dominant, branchDefinition.getBranch(), binomial, serumColor, cocoonProvider); speciesBuilder.setRarity(rarity); @@ -73,6 +90,9 @@ public enum MothDefinition implements IButterflyDefinition { for (MothDefinition butterfly : values()) { butterfly.init(); } + for (MothDefinition butterfly : values()) { + butterfly.registerMutations(); + } } private void init() { @@ -92,6 +112,14 @@ public enum MothDefinition implements IButterflyDefinition { protected void setAlleles(IAllele[] alleles) { } + + protected void registerMutations(){ + + } + + protected final IButterflyMutationCustom registerMutation(MothDefinition parent1, MothDefinition parent2, int chance) { + return ButterflyManager.butterflyMutationFactory.createMutation(parent1.species, parent2.species, getTemplate(), chance); + } @Override public final IAllele[] getTemplate() { diff --git a/src/main/java/forestry/lepidopterology/render/ModelCocoon.java b/src/main/java/forestry/lepidopterology/render/ModelCocoon.java index c0bb73273..5f93975c3 100644 --- a/src/main/java/forestry/lepidopterology/render/ModelCocoon.java +++ b/src/main/java/forestry/lepidopterology/render/ModelCocoon.java @@ -4,47 +4,47 @@ 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 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_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 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_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, 4, 1, 4, 0.0F); + this.cocoonbody_0_age_2 = new ModelRenderer(this, 31, 0); + this.cocoonbody_0_age_2.setRotationPoint(-0.5F, 8.0F, -0.5F); + this.cocoonbody_0_age_2.addBox(0.0F, 0.0F, 0.0F, 2, 1, 2, 0.0F); + this.cocoonbody_2_age_2 = new ModelRenderer(this, 0, 18); + this.cocoonbody_2_age_2.setRotationPoint(-2.5F, 10.0F, -2.5F); + this.cocoonbody_2_age_2.addBox(0.0F, 0.0F, 0.0F, 6, 8, 6, 0.0F); + this.cocoonbody_4_age_2 = new ModelRenderer(this, 0, 7); + this.cocoonbody_4_age_2.setRotationPoint(-2.5F, 18.0F, -2.5F); + this.cocoonbody_4_age_2.addBox(0.0F, 0.0F, 0.0F, 6, 1, 5, 0.0F); + this.cocoonbody_3_age_2 = new ModelRenderer(this, 30, 24); + this.cocoonbody_3_age_2.setRotationPoint(-2.5F, 11.0F, -3.5F); + this.cocoonbody_3_age_2.addBox(0.0F, 0.0F, 0.0F, 6, 7, 1, 0.0F); + this.cocoonbody_5_age_2 = new ModelRenderer(this, 0, 0); + this.cocoonbody_5_age_2.setRotationPoint(-1.5F, 19.0F, -1.0F); + this.cocoonbody_5_age_2.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); @@ -63,35 +63,35 @@ public class ModelCocoon extends ModelBase { 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); + this.cocoonbody_3_age_0 = new ModelRenderer(this, 30, 24); + this.cocoonbody_3_age_0.setRotationPoint(-2.0F, 11.0F, -3.0F); + this.cocoonbody_3_age_0.addBox(0.0F, 0.0F, 0.0F, 3, 3, 1, 0.0F); + this.cocoonbody_2_age_0 = new ModelRenderer(this, 0, 18); + this.cocoonbody_2_age_0.setRotationPoint(-2.0F, 10.0F, -2.0F); + this.cocoonbody_2_age_0.addBox(0.0F, 0.0F, 0.0F, 3, 4, 3, 0.0F); + this.cocoonbody_4_age_0 = new ModelRenderer(this, 0, 7); + this.cocoonbody_4_age_0.setRotationPoint(-1.5F, 14.0F, -2.5F); + this.cocoonbody_4_age_0.addBox(0.0F, 0.0F, 0.0F, 2, 1, 3, 0.0F); + 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, 2, 1, 2, 0.0F); + this.cocoonbody_5_age_0 = new ModelRenderer(this, 0, 0); + this.cocoonbody_5_age_0.setRotationPoint(-1.0F, 15.0F, -2.0F); + this.cocoonbody_5_age_0.addBox(0.0F, 0.0F, 0.0F, 1, 1, 2, 0.0F); + this.cocoonbody_0_age_0 = new ModelRenderer(this, 31, 0); + this.cocoonbody_0_age_0.setRotationPoint(-1.0F, 8.0F, -1.0F); + this.cocoonbody_0_age_0.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_3_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_1_age_0.render(pixel); this.cocoonbody_5_age_0.render(pixel); + this.cocoonbody_0_age_0.render(pixel); }else if(age == 1){ this.cocoonbody_2_age_1.render(pixel); this.cocoonbody_0_age_1.render(pixel); @@ -100,12 +100,12 @@ public class ModelCocoon extends ModelBase { 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_1_age_2.render(pixel); + this.cocoonbody_0_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_3_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/RendererCocoon.java b/src/main/java/forestry/lepidopterology/render/RendererCocoon.java index 30557e372..8e8bafe45 100644 --- a/src/main/java/forestry/lepidopterology/render/RendererCocoon.java +++ b/src/main/java/forestry/lepidopterology/render/RendererCocoon.java @@ -17,6 +17,7 @@ import forestry.api.lepidopterology.IButterfly; import forestry.core.proxy.Proxies; import forestry.lepidopterology.blocks.BlockCocoon; import forestry.lepidopterology.genetics.ButterflyDefinition; +import forestry.lepidopterology.genetics.MothDefinition; import forestry.lepidopterology.tiles.TileCocoon; import net.minecraft.block.state.IBlockState; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; @@ -38,7 +39,7 @@ public class RendererCocoon extends TileEntitySpecialRenderer { } IButterfly butterfly = te.getCaterpillar(); if(butterfly == null){ - butterfly = ButterflyDefinition.Brimstone.getIndividual(); + butterfly = MothDefinition.BombyxMori.getIndividual(); } render(butterfly, te.getAge(), x, y, z); } 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 index 40f9c1515a6f33ff5b614cd2c62d0501dfdd5be9..0bf1505682ea0bc830df0342c19df1a3aeb3e755 100644 GIT binary patch delta 607 zcmexeHJ^2Y%H&2%?Ro~z0*}aI1_o{+5N5n|x9$%E1A|0~YeY$Kep*R+Vo@qXL1JcJ ziC$i6iGqoqfu7l)p5*%s3`~rkE{-7?&QE8&&TDcIXsxst4P2rYw;(PnON2G-irLG} z{^!?hoOpJ|l?ac-`kF>t>zJ}l(`OcTcuaPaOI>e!C+=2gVO%}$%Pm|5+TZ_Ad;MSj zK2uP!{G^=pPsPPC`z}0eWdGlE{%c3kzjsOs|MuPd&vE^~|6#eK!s0+Bk5)W&u%Ghy zlw8kpz1+skAMrcC|G!-*{XKWaiSx07uCoPTNWm-v<}Diqc<;rnd2 zQu17ojONczKkGN|o$DqdBCFSoR@$9MRoUnFCV`_`4{F_Y3w|Zs`h00u&XMVV+mi(@@6&O)s0KrF cCw{Wc;mv#yalB?eFwro0y85}Sb4q9e0P-#u4gdfE 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#*^ 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 index 2a35d613733a6fd06b5d3d56d4c68a03f32e16ea..77c77409a508cec9dee278d3bcc068aa885183c7 100644 GIT binary patch delta 771 zcmV+e1N{7tdBO&eB$JIfD}Mk9a7bBm000XT000XT0n*)m`~Uy|7<5HgbW?9;ba!EL zWdLwtX>N2bZe?^JG%heMHvEiZ-v9stq)9|URA@uxndx@gFc5|PdOgHo_BMc7Lqo&n z4QNmM?9+S2A&q6ZPy#eYKfYu8YO`c%G$T7A@=7?U%I2vl(WowKzkdShPujKEP1~}a zHgRiCKb4^G$=mnW)AL9@#3&f}Ratb)z=f2~d})5n9wnKyBpx?qgR7qYFR=XE_t(?& zNIh@_7rnB~N#_AlI`c;)nlx0W6I}K8U-XXm!P!rlszhTjs>!-vRu!q~G-=}5#rsZNezpgnv=AiHxAf(}C||8!XEj z*WK6mpWJ*jGD6;Y0Aqs~j**_f=wyUI4FJ8rrgDRq>^Phs4oHAFLC;@wGQ!JaNmhOt z-eFsQ&3(AUJRtQXgon6>C#dHyI+*f%_ck6k(7_7aTu%)Em%{g12hVjiBN!lsSON!k zm{DRpYM>5t#eYQs(I5POHRbDSo#&kg>@WZfkGT{WF;c&Wn7|2#6qke2-X)_9fObNi%o_dE{ekF~FtyEJE? z2heWtUxHrYsT|55YhN#SX^i46*ub#98dNSR+8SQ*WT^ literal 15503 zcmeI3eNavq@H*N9fSCND3aBuxTH(7uAkQ1wQJa*jmx?FKX z`}mwHfFOc2uBETI+QSfqjE}4I+L@dxu$5);cF(hpXmTca5;Rk;oe8j0ma)EJ#dF?bj&qvARaP*D5YNsIRTaLngmu%L-q*Ve<)mINk8u*73Hh*cH0!92<3pj=lgd~hF*9Kw;QY`OPkkpZv2$bm z(009p^SUVB#JZ?5hVZz{3`BG=X6ATR>9aW}=LO4ROiBY0Z#b@%nX^|4Wu4`=Gd_?E zUrdrfszL{MHB~lobWGu7P2sjdb9R>2M}uk=N{vD#S4kO$QAtUXQA=$kO-gBpO_@%q zNlK|!8wla>0vFMBMQS554)QIdfm@qRr=rs-l~k*=Q&N>prIAu<&}uYxnoQSfb(Gyf z$9EPUow)p1HmJ=DHD$HxbKO3k0&H^4CSg4+SWh~mRXH@YP0H9*q*SL>F<^5JN-8Wz zL29+ibfqp-XcNt&+l;s#iym<;Z1wxNjxnF)`bjSf{tYN+%$zZr-zP*IHPjFdALf zxTPUHf&HNgoMb+A41YP}Mm3$VtI({eo%lEh@29*>Rv9>s-=!ahy-qZP-J{OM#Qcm^ z?BskJgvPH2wE)&dg>pa|h)HA7$l>{=LQb8Pq4`>c9DE2;_>Gvxs$tXhXwz6VY#OzE z%FXg7MI;(D9AhQ?JB3?k5qOYdOd7RX30f083|kbi0mfNsWF3qu_xGJj)T|4|9`F+xS`dF>j(f`Z2vizQiC95VR=b zLi2&NA}$CBS`=}i`9N9`7X$TDXL5m_TG#^MS;(~yn zMG+U852O`wK|s)=hzrdJ(u%ksAZSsdq!n>NK+vLy3(W`8 zint&kXi>z4<^yR(To4enDB?o%fwUqn2nbpfaiRG@S`iln1TBiV(0m}RhzkOO7LmA; zqOV6XZtzZ|AH4i{{M?pf;KfPYZYi{4Sj}<_`*j0`-5CYfZ!xS=j$!?qFihWyVT-xu z=gzFbu*8$O=B(nt=L4-hO%LbHfBD4Q`(Hnobi8d-%GRW&_HN0nCc5F#ZxSS=z7YODXBDz3X0avL(Zi-m>q;(v5k^S8v@L9$I?*)7l#68+jY5cJH~GymzSMi_W7h zk8FM7%P(smyWlI?cj~XhCsuw#PgD6*@cQ8M)kkm7N+;X{&z@^t^0TDgjz0w#zr?*@ z`fBDK+i>3B{PXeY!>{Hgbbs9XdE%mLH+Q+7w7xkomuzpob`8wP7IoC2~-MX3Dlt(R@ zSyR#ahl9&AhxTvGSDreSu?$a6IB>r6H*XgI@xbX*X|{z$imSaNT*bNthibbI&HGo% zyUREIqWjPyQ~d=~K>6EGF0M#?oK9U_CG+(CZ{~ZKr!8bI-bu7Oj6>?`m+Ov z-)cU+w=*$0zb2FX@Qvm>!J5qfKC}3p*K~^v*Zcl4d;fDsS`*Fl`sK|J9q1^`Z9Xzw zGWt0>^@lgV*t2V=WAx(imD1{-p2qIHEY}0U zzHbvYztqr>(Rg!PWmmi6V3p(4D}AGXA30yNY029B{)F0g`QBA63odQzeRy8kyE_^` zIk{^=^8MMy16Qxvbe&J?E{&X@9a#UtnuDu@bq_w8qL`kSCG9hE3pdujIr5pK?(FH! xXPUB7lk1wWTrQV;<;FhA`yDe%ww{=QT`|6sIXLjyknqZIZce^=|LRTk{|6H4?Ro~z0*}aI1_o{+5N5n|x9$%E1A|0~YeY$Kep*R+Vo@qXL1JcJ ziC$i6iGqoqfu7l)p5*%s49vxzE{-7?&QBvVi)R~%JbAuV_O z?n%1;o8!&2Sj#Ev>(4h8-+%8fCG;?E|9`KTFDfh-DJHXVd7^Ka%l@X{Ty?9Rs!cPtXnl;e zd!2El{Cbh+zB+r}O?Ce-95G zmEBfyrC*!6hI`|kEj`tlbrT=Rqj5S9K~r#CogemQmz4 z_y5`=mnPruXYPEz-goZONhbR}3ixhG-EvkhOYa^vE;_AW;I*RI_O{#h^>zP~W^vxzynE5<%f{P0dj1P7YF^L!cYOihG|qDe zjSgByKs=Z*^MQ=Yxwp%cOBw}dEq=SH`T6y~d!C82o^yP3r|wps`cC#24w_s43f@u= zak%xjWRv{$KZ_1ndc3*7_dl}tg3#v%LGGh`h0UzDzs-rDI;+v+vqKi_ATGdIu9D-$?v6R@Oo^E~#LN7;>>mp*N+vGtEza4+65;&9aD zCV|V5=b80BZau(~`7>(YJav7WtXb=Fg{12rOWwTqjo~G#q}>}Eg@*`JDn8!3TT|oH z^1Gp4#qT0x-;2Hu?~M8XS4+P3$*ir>5Ehvy$(N60_MW%7?1sms&fj?bkgNN_sbA-U zcE}l-1^(|nz37{=+)nm{OqF|3M|y%>S+PIj+6Trf2GzA?H9h+aE*)~ez;w-b<=-Fg xj_ufAda>{4g6%(|5}LNu=*FL)%>U>w>#J<3X?=|M=K*sngQu&X%Q~loCIDo{*FpdQ literal 15316 zcmeI3eQ*=U6~K>_58L1t2X}Cs8F~@MF*v8w>01{`##nak45E%Lib<2=)7{EG^l_^0 zjAWBCiD?>WniOJ4fq_yoon)F2H_0@UCYgo+P23M?X9E35nA)9?v=|sDc&14pG~JVA zNnXo4Nhg1R>>wwpl@I#l(h2Kve*z!Gi zDUG+TS1D@#BKe3Jw*$942^m~y35~AHz^4~+l+QbG}#@r!)4@b4u{oo2W>WSHr8ZeEhffn z;jJd#YNoR2o@JBCq%mnRDv2JJbGcls$;_I~44lEJ z{V`2QF)?*%#>u1~A5g`F9M@zeM(cispwg##3qFG@c6-Q?u+KMK&eGS&Kz|&t9Y9t35+Z2c1h=xZ*zPqsluynSPr7EtwS$yAgPE?$n59c0lOZ?U zE8mm=f~F(_iW2c=s;qqyA>GuJt}422og9;tq`KVAq9*x#=e+@+paCzeM>}J(FlH{m zIe0V2TP*b^jyIVKoMdJqKKzO#hx&{8u<<5Gp^t)@s1JC4Bta8Clb6D|1%4!v4=IVL zpn2t}&;!_btjEpf2McEAs)}z?B1!@-3wSMVw%Bk{E1x3v>1Ev*6M+hop%x?wrYe1K zR|!2+M<*2#*_&w_k|N3ypAYIVTkK}5$;to#tPIBi8x!Otj*&t^i&L<1g2iTYv-;tM zF7oTj)<$+5=G!Pix51#xDmeu!n)8TLlVn{0PEHgTF`Gst7 zo7Zc~@8{cMswO}-Z9cEQ9vQAjvIHF=n@eD990)O1Us$Rit_#ekx&B5%hW`daq+re@&Ce5}h?{AlT4lX#`ln_wT{fNIJ5xvV zWs~mPaUr1sy(@VPlWi&2=rfg&t%r1X;{{Rg_+C+O8UQAI%4mLBIZJnDg8cs`aGLqd zF_OI?hHE+*SLsgN z=^SuwcG_4za%O&)p3_KQdcMPKf-jcSzq6)=YSeT+-n3ASn&vIn#$?TF&PGFq3#{~i zr%dbYgf~*aYq!}f@bsd?s71S+0+BAC3|ptFSEb#WwLuj{4cF%lEpUnHU}?hwMbLww3a{f7)n}rp^W7B1@1dy0%Htc}Y@w)|=C=771F3f}?)_G{ zvT@-J~CE) z-1E2otJm5uj9+|Gz9-Q4lULO1=kFP)xfEB=-n#@mxBinGKYP3H#-W2l&;8+P3qSJi z;JT-iw?Fvs=F9(jbYCd+ds~*i zz4fa0)fGMuhnT|2LrGcc}wF{Lm$6n{G>VZZGPuXzVdyWe4!nCFS-wmz4M!f z3v*v~{IT}#@#{aRTR6C)GF;dEqx;*hj@^3btzE;Hx0f8QJUzSO=(9uWf(r*v{<`*T zY4ps>ve5Uh|MHCi|Hi+Te`)8T#Z@I$C41(-zJPl6@ehaDnj!u9U8=2ljc<5W_u&5k DML6tI diff --git a/src/main/resources/assets/forestry/textures/blocks/lepidopterology/cocoons/silk_0.png b/src/main/resources/assets/forestry/textures/blocks/lepidopterology/cocoons/silk_0.png new file mode 100644 index 0000000000000000000000000000000000000000..fa5d8b86e614ab498327f08e0820f5ddce03749e GIT binary patch literal 635 zcmV->0)+jEP)004R= z004l4008;_004mL004C`008P>0026e000+nl3&F}00009a7bBm000XT000XT0n*)m z`~Uy|7<5HgbW?9;ba!ELWdLwtX>N2bZe?^JG%heMHvEiZ-v9ss-AP12RA@uxnQyBB zK@`U4`+p%yN|8ilLqtS~i15Y>aqc|l-jSJ(a_?<7=4|~k=h-uM_spN2IctcBsaC60 zuh(ty+s=wcqd}cc#}?)Duj1~1JRZ|_yS0++7jiFLE*Ja5hv$$c!{Lx7lL;*r3;Maf z==Tcl{`dPmt=DT5MZXY(3diG-`u#qQMk6|(&uoW|@5;0LpUq~hh5jL;s0mTjgeYo4 z6g3eFJcBNm%a57}|AS{FNkWIifdkNNHm&44$B1X(m6FfrsaP!1U@)+f?;IlrEq*$k zxa))4?Z(~T4F#M-V8V*AAc~q0MNNpJCPYyaqNoW`)PyK%!ZW1(^ly?2pNMC;#6q{* z<n0WcAJ9(4V7ZT;DJ}G z6=5iZ`2b9Y(9rb}gi@(w>&Sof7b=ws2Ryuf=$9sr8sh)} literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/forestry/textures/blocks/lepidopterology/cocoons/silk_1.png b/src/main/resources/assets/forestry/textures/blocks/lepidopterology/cocoons/silk_1.png new file mode 100644 index 0000000000000000000000000000000000000000..01658add9d684368a0f8aec42ce00ddeeef5fc09 GIT binary patch literal 769 zcmV+c1OEJpP)004R= z004l4008;_004mL004C`008P>0026e000+nl3&F}00009a7bBm000XT000XT0n*)m z`~Uy|7<5HgbW?9;ba!ELWdLwtX>N2bZe?^JG%heMHvEiZ-v9stV@X6oRA@uxm~pEy zK@^Ag`+p%KrAQ)0h=>Rg5&ogXdG|S4_nMtW_u{^5ww~Jk&6(YunKNf*jwd1)N~MzY zdOcYz7E-BHeCey~Rg}wRsn_fNt-btF3Wb7v|9`VQ3R95PY9+JTOxo=>k7oH(>2x~M z@AqXq9?Riy@Flz5Bb@7B{vYiTt{%GGuIzR@*=#m491eZy+W3Ej2J^qIR!hwPM>FkB zJVpQ)oX_W%7d09UbtRse3h(fSzrrfIgjIA2tLPFTfe1R8OmzOQ*K1u`s@1ArbZz%3 zgajH*2N3)ShP7Jlp=cUcLP9c`luRb0k$*HAX-BY5n|7Zi)r0*lxGFxiIZM z1+Q2v>L@eXz@7ltXFEBaPBjKl&Q!n?(&@CMQYpW#{e^MED!PPKbP22I5?0YAtfEU; zMVAN(=6Ra^0M9ImVA{u>kPwv*;2uo-xDyiC0FfMFJDf-)bOSUP4D>*h&*y!UYx}qp z5*TqB9waM+XYN1oP~;ttM`8cJTrPFwaeW|R$;fjKpqz8TIW?viu^}#b!&`WaEYJ~L zQTc!%XGj@m0uD)(^O88D2@s-tE|=5!9+eNE6SCQ?dIz3B9{#s6f%><;Z`!{CkB`!z zX0xg8ej^{C7pdp-a`@X^zSh6@{crX!K{G(OGa~^}`2f6tm_TRX1stPEshcl+l%W2- z@0<0W&5!c|jM&*TtS`PtQ2*Zd&3ezqD!v06PfVe)G&*p7Jc8XQ@qy*ntoLlJ;yb|2 zS$P;`Tz$Xa`?6>U;QmavckDZ?qDxpscM$I%?tzZmCEyNp00000NkvXXu0mjfQ=(aj literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/forestry/textures/blocks/lepidopterology/cocoons/silk_2.png b/src/main/resources/assets/forestry/textures/blocks/lepidopterology/cocoons/silk_2.png new file mode 100644 index 0000000000000000000000000000000000000000..4ee2bea84cfd3194198496b2b6c8307d84601622 GIT binary patch literal 961 zcmV;y13vtTP)004R= z004l4008;_004mL004C`008P>0026e000+nl3&F}00009a7bBm000XT000XT0n*)m z`~Uy|7<5HgbW?9;ba!ELWdLwtX>N2bZe?^JG%heMHvEiZ-v9suBS}O-RA@uxnGdTm zK@`UK`+p%KMI@0TL_~z#D4|4&dG~kTJ8w*fJBwTP-Ki(LXXlwSGw0vz3XCy=a=C1( z)v6f|hi0`}nR>l$8jXgT&*$dr>nrT?x8HA|)oPh*{qFN9xHtb?E@vv0O4#ML|G$gV z=@kALvtF--(ChU~x7(FT6$%9&-4Nf2*=%O6^&@*0_vX)LaPRgP!gjlrhl9bu91aJ$ zpG+nqV=(R)i-o`);1#g&NBZ6VK8QO1o16auEV|upODM5$LIH2!8o2#$ZsG{MsNe6) zLPw*K#Q$=+l$cMYQl{B#n(=rnAy6unHUlppi;{H-1D78ss6t$yQh}w(0eAtH zX7Sl<)?_jn)9G~NUOQgK39?ucSvsATx`;(NO%dPJQG2$=`quSnES{Wjj~_Nw;io|r zCJCxANl=AJf+|cBRAG{!3cErQe&gZkpsRZ_Y-sQ&ysu0|JpXTuMeg2n{cXh9h z^XX89!1sL`FW`OL<;Ml85Y%clu`C|IMsQ6?aQI;}I3aQxEEbD$I&}GQfhq)870VOj zm&--o3kU_<$N}UD@&V7orjGOJP=$baC&qog2gEuDU`et&u1vhMsHooq9`Rj;*YM$A z>v#F@K!5@kL_Fi}_N6Au_kc(Iu&Ihec=28RVbjKX8UZ_wJ7WnzJmczIV+o({0gw2u zLJMEMtKS{xRmeoxWp*17&$wQc?*Whau0ji6zN_CI=T-dL_W;Weo2uBCujp6DdlmtM z;%XdmX-ok3Lm_U*#BAK-nv_TGxuyjE#1EUQ*q86>hx<;*e`)*uUgD9&gA$ZuAxa;O z7$ghhhSYv0gXM5f55B560{=!o+;<}2pHpItoo8`Oipen%tb)aHQLIEC8004R= z004l4008;_004mL004C`008P>0026e000+nl3&F}00009a7bBm000XT000XT0n*)m z`~Uy|7<5HgbW?9;ba!ELWdLwtX>N2bZe?^JG%heMHvEiZ-v9ss?@2^KRA@u(m`QHJ zKoCXQCJSa7K?@Gr5hX$2RR;(PK!p3HRx2d{20_x0<+yQ2=%4t~!k{Bb^? zmqMZ7*4y`h@cDdJr0*|31W2V)l1wHgm&-{yoeqWwc>Z#^DAI@lajJk{IRFug#bR(G zpw((A(uhD3L4?Qj4Q zy4|jd1QMct93ev3Kp)^&{SQ3o#UW2wblR7@0K{p7sRWckN}}F+e~|S}|4$!)5U0~A zJOVIynAX<}LpDcY=jiwQ%JaM3P6@$XZ-oP#d%TYbbb&?;T4epodjkQ?@H3muR1`2B zI{ijx69~W*2ze6)d?Q2%{mOfzTrNM9Kn5bb-)J<#lM85k$o`N=1kdxNR;z_88Ja4< nXk4$?!$m$qga{E{AF004R= z004l4008;_004mL004C`008P>0026e000+nl3&F}00009a7bBm000id000id0mpBs zWB>pF7<5HgbW?9;ba!ELWdLwtX>N2bZe?^JG%heMHvEiZ-v9ss?MXyIR9HvNmP>BJ zFcd|ZwgbA5s$D_%#E=09gg^|K!VW-85kHCl|0fWzq*tBSIHH0I2Z-sFOk~IAo?JV2 zB4O(5Ju1`bRJ`h$L{4rUk4M>Vw|{oNMVJHORnO!DU`*%LY9+hf?qLv^k4B^G06abB z-ELRb>$On-xpSZT{k~lS7%rDfr6q~YX7iBgz_&=gAzuLHdzP(DL(a?JeKu0qLl;Low06`PTX0wvZ zU#r z>h-#so~8gmsZ_H5vs5Z2g+f8n>9oXRG3#*(P%f9H*=*_}GW!9Eczr^Z0w5q-t(GS7 zs7=U5KESi|{{V=e#pqQ-*DnC`7VuiSS_eJ=<{Uu02|&0?K>^G*jPX+vFi*`cIG@iI z#wh@&9sqoZxQrk939tcS&MwFY1Q0e4FF;fFsmPkcDpT=O2r)jV%{<5Xs%YPp_?NG;OCj;Vx!A) lvC(C@*yyrcY;;#7@(t8