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 40f9c1515..0bf150568 100644 Binary files a/src/main/resources/assets/forestry/textures/blocks/lepidopterology/cocoons/default_0.png and b/src/main/resources/assets/forestry/textures/blocks/lepidopterology/cocoons/default_0.png differ 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 2a35d6137..77c77409a 100644 Binary files a/src/main/resources/assets/forestry/textures/blocks/lepidopterology/cocoons/default_1.png and b/src/main/resources/assets/forestry/textures/blocks/lepidopterology/cocoons/default_1.png differ diff --git a/src/main/resources/assets/forestry/textures/blocks/lepidopterology/cocoons/default_2.png b/src/main/resources/assets/forestry/textures/blocks/lepidopterology/cocoons/default_2.png index 1b0876211..055e330c1 100644 Binary files a/src/main/resources/assets/forestry/textures/blocks/lepidopterology/cocoons/default_2.png and b/src/main/resources/assets/forestry/textures/blocks/lepidopterology/cocoons/default_2.png differ 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 000000000..fa5d8b86e Binary files /dev/null and b/src/main/resources/assets/forestry/textures/blocks/lepidopterology/cocoons/silk_0.png differ 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 000000000..01658add9 Binary files /dev/null and b/src/main/resources/assets/forestry/textures/blocks/lepidopterology/cocoons/silk_1.png differ 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 000000000..4ee2bea84 Binary files /dev/null and b/src/main/resources/assets/forestry/textures/blocks/lepidopterology/cocoons/silk_2.png differ diff --git a/src/main/resources/assets/forestry/textures/entity/butterflies/mothBombyxMori.png b/src/main/resources/assets/forestry/textures/entity/butterflies/mothBombyxMori.png new file mode 100644 index 000000000..c2d5cfc43 Binary files /dev/null and b/src/main/resources/assets/forestry/textures/entity/butterflies/mothBombyxMori.png differ diff --git a/src/main/resources/assets/forestry/textures/items/butterflies/mothBombyxMori.png b/src/main/resources/assets/forestry/textures/items/butterflies/mothBombyxMori.png new file mode 100644 index 000000000..57007c877 Binary files /dev/null and b/src/main/resources/assets/forestry/textures/items/butterflies/mothBombyxMori.png differ