Make SpeciesCustom classes into SpeciesBuilder

This commit is contained in:
mezz committed 2016-03-03 21:46:21 -08:00
1 parent efcab41e04
commit 5a901ffa36
20 files changed
+250 -191

No files matched your search

@@ -7,37 +7,40 @@ package forestry.api.apiculture;
import net.minecraft.item.ItemStack;
import forestry.api.genetics.IAlleleSpeciesCustom;
import forestry.api.genetics.IAlleleSpeciesBuilder;
public interface IAlleleBeeSpeciesCustom extends IAlleleBeeSpecies, IAlleleSpeciesCustom {
public interface IAlleleBeeSpeciesBuilder extends IAlleleSpeciesBuilder {
@Override
IAlleleBeeSpecies build();
/**
* Add a product for this bee species.
* Chance is between 0 and 1.
*/
IAlleleBeeSpeciesCustom addProduct(ItemStack product, Float chance);
IAlleleBeeSpeciesBuilder addProduct(ItemStack product, Float chance);
/**
* Add a specialty product for this bee species.
* Bees only produce their specialty when they are Jubilant (see IJubilanceProvider)
* Chance is between 0 and 1.
*/
IAlleleBeeSpeciesCustom addSpecialty(ItemStack specialty, Float chance);
IAlleleBeeSpeciesBuilder addSpecialty(ItemStack specialty, Float chance);
/**
* Set the Jubilance Provider for this bee species.
* Bees only produce their specialty when they are Jubilant (see IJubilanceProvider)
*/
IAlleleBeeSpeciesCustom setJubilanceProvider(IJubilanceProvider provider);
IAlleleBeeSpeciesBuilder setJubilanceProvider(IJubilanceProvider provider);
/**
* Make this species only active at night.
*/
IAlleleBeeSpeciesCustom setNocturnal();
IAlleleBeeSpeciesBuilder setNocturnal();
/** Use this if you have custom icons for bees. */
IAlleleBeeSpeciesCustom setCustomBeeModelProvider(IBeeModelProvider beeIconProvider);
IAlleleBeeSpeciesBuilder setCustomBeeModelProvider(IBeeModelProvider beeIconProvider);
/** Use this if you have custom icon colours for bees (other than the default static primary + secondary colours). */
IAlleleBeeSpeciesCustom setCustomBeeSpriteColourProvider(IBeeSpriteColourProvider beeIconColourProvider);
IAlleleBeeSpeciesBuilder setCustomBeeSpriteColourProvider(IBeeSpriteColourProvider beeIconColourProvider);
}
@@ -12,7 +12,7 @@ public interface IBeeFactory {
/**
* Creates a new bee species.
* Automatically registered with AlleleManager.alleleRegistry.registerAllele()
* See IAlleleBeeSpeciesCustom and IAlleleSpeciesCustom for adding additional properties to the returned species.
* See IAlleleBeeSpeciesBuilder and IAlleleSpeciesBuilder for adding additional properties to the returned species.
*
* @param uid Unique Identifier for this species
* @param dominant Whether this species is genetically dominant (false means it is recessive)
@@ -25,7 +25,7 @@ public interface IBeeFactory {
* @param secondaryColor The body color of this species
* @return a new bee species allele.
*/
IAlleleBeeSpeciesCustom createSpecies(String uid, boolean dominant, String authority, String unlocalizedName, String unlocalizedDescription, IClassification branch, String binomial, int primaryColor, int secondaryColor);
IAlleleBeeSpeciesBuilder createSpecies(String uid, boolean dominant, String authority, String unlocalizedName, String unlocalizedDescription, IClassification branch, String binomial, int primaryColor, int secondaryColor);
/**
* Creates a new bee branch.
@@ -7,15 +7,18 @@ package forestry.api.arboriculture;
import net.minecraftforge.common.EnumPlantType;
import forestry.api.genetics.IAlleleSpeciesCustom;
import forestry.api.genetics.IAlleleSpeciesBuilder;
import forestry.api.genetics.IFruitFamily;
public interface IAlleleTreeSpeciesCustom extends IAlleleSpeciesCustom, IAlleleTreeSpecies {
public interface IAlleleTreeSpeciesBuilder extends IAlleleSpeciesBuilder {
@Override
IAlleleTreeSpecies build();
/** Add a fruit family for this tree. Trees can have multiple fruit families. */
IAlleleTreeSpeciesCustom addFruitFamily(IFruitFamily family);
IAlleleTreeSpeciesBuilder addFruitFamily(IFruitFamily family);
/** Set the minecraft plant type for this tree. Default is Plains. */
IAlleleTreeSpeciesCustom setPlantType(EnumPlantType type);
IAlleleTreeSpeciesBuilder setPlantType(EnumPlantType type);
}
@@ -13,7 +13,7 @@ public interface ITreeFactory {
/**
* Creates a new tree species.
* Automatically registered with AlleleManager.alleleRegistry.registerAllele()
* See IAlleleTreeSpeciesCustom and IAlleleSpeciesCustom for adding additional properties to the returned species.
* See IAlleleTreeSpeciesBuilder and IAlleleSpeciesBuilder for adding additional properties to the returned species.
*
* @param uid Unique Identifier for this species
* @param unlocalizedName Unlocalized name for this species
@@ -28,7 +28,7 @@ public interface ITreeFactory {
* @param generator The tree generator
* @return a new tree species allele.
*/
IAlleleTreeSpeciesCustom createSpecies(String uid, String unlocalizedName, String authority, String unlocalizedDescription, boolean dominant, IClassification branch, String binomial, String mdoelName, ILeafSpriteProvider leafSpriteProvider, IGermlingModelProvider germlingModelProvider, ITreeGenerator generator);
IAlleleTreeSpeciesBuilder createSpecies(String uid, String unlocalizedName, String authority, String unlocalizedDescription, boolean dominant, IClassification branch, String binomial, String mdoelName, ILeafSpriteProvider leafSpriteProvider, IGermlingModelProvider germlingModelProvider, ITreeGenerator generator);
/** Get one of the built-in Forestry leaf types. Default type is deciduous. */
ILeafSpriteProvider getLeafIconProvider(EnumLeafType enumLeafType, Color color, Color colorPollinated);
@@ -8,17 +8,19 @@ package forestry.api.genetics;
import forestry.api.core.EnumHumidity;
import forestry.api.core.EnumTemperature;
public interface IAlleleSpeciesCustom extends IAlleleSpecies {
public interface IAlleleSpeciesBuilder {
IAlleleSpeciesCustom setTemperature(EnumTemperature temperature);
IAlleleSpecies build();
IAlleleSpeciesCustom setHumidity(EnumHumidity humidity);
IAlleleSpeciesBuilder setTemperature(EnumTemperature temperature);
IAlleleSpeciesCustom setHasEffect();
IAlleleSpeciesBuilder setHumidity(EnumHumidity humidity);
IAlleleSpeciesBuilder setHasEffect();
/** Secret species are not shown in creative mode. */
IAlleleSpeciesCustom setIsSecret();
IAlleleSpeciesBuilder setIsSecret();
/** Uncounted species do not count toward total species discovered. */
IAlleleSpeciesCustom setIsNotCounted();
IAlleleSpeciesBuilder setIsNotCounted();
}
@@ -10,12 +10,16 @@
******************************************************************************/
package forestry.api.lepidopterology;
import forestry.api.genetics.IAlleleSpeciesCustom;
import forestry.api.genetics.IAlleleSpeciesBuilder;
public interface IAlleleButterflySpeciesCustom extends IAlleleButterflySpecies, IAlleleSpeciesCustom {
IAlleleButterflySpeciesCustom setRarity(float rarity);
public interface IAlleleButterflySpeciesBuilder extends IAlleleSpeciesBuilder {
IAlleleButterflySpeciesCustom setFlightDistance(float flightDistance);
@Override
IAlleleButterflySpecies build();
IAlleleButterflySpeciesCustom setNocturnal();
IAlleleButterflySpeciesBuilder setRarity(float rarity);
IAlleleButterflySpeciesBuilder setFlightDistance(float flightDistance);
IAlleleButterflySpeciesBuilder setNocturnal();
}
@@ -18,7 +18,7 @@ public interface IButterflyFactory {
/**
* Creates a new butterfly species.
* Automatically registered with AlleleManager.alleleRegistry.registerAllele()
* See IAlleleButterflySpeciesCustom and IAlleleSpeciesCustom for adding additional properties to the returned species.
* See IAlleleButterflySpeciesBuilder and IAlleleSpeciesBuilder for adding additional properties to the returned species.
*
* @param uid Unique Identifier for this species
* @param unlocalizedName Unlocalized name for this species
@@ -31,5 +31,5 @@ public interface IButterflyFactory {
* @param serumColour The color of this butterfly's serum.
* @return a new butterfly species allele.
*/
IAlleleButterflySpeciesCustom createSpecies(String uid, String unlocalizedName, String authority, String unlocalizedDescription, String texturePath, boolean dominant, IClassification branch, String binomial, Color serumColour);
IAlleleButterflySpeciesBuilder createSpecies(String uid, String unlocalizedName, String authority, String unlocalizedDescription, String texturePath, boolean dominant, IClassification branch, String binomial, Color serumColour);
}
@@ -25,7 +25,8 @@ import net.minecraftforge.common.BiomeDictionary;
import forestry.api.apiculture.BeeManager;
import forestry.api.apiculture.EnumBeeChromosome;
import forestry.api.apiculture.EnumBeeType;
import forestry.api.apiculture.IAlleleBeeSpeciesCustom;
import forestry.api.apiculture.IAlleleBeeSpecies;
import forestry.api.apiculture.IAlleleBeeSpeciesBuilder;
import forestry.api.apiculture.IBee;
import forestry.api.apiculture.IBeeGenome;
import forestry.api.apiculture.IBeeMutationCustom;
@@ -44,7 +45,7 @@ public enum BeeDefinition implements IBeeDefinition {
/* HONEY BRANCH */
FOREST(BeeBranchDefinition.HONEY, "nigrocincta", true, new Color(0x19d0ec), new Color(0xffdc16)) {
@Override
protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
protected void setSpeciesProperties(IAlleleBeeSpeciesBuilder beeSpecies) {
beeSpecies.addProduct(PluginApiculture.items.beeComb.get(EnumHoneyComb.HONEY, 1), 0.30f);
}
@@ -61,7 +62,7 @@ public enum BeeDefinition implements IBeeDefinition {
},
MEADOWS(BeeBranchDefinition.HONEY, "florea", true, new Color(0xef131e), new Color(0xffdc16)) {
@Override
protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
protected void setSpeciesProperties(IAlleleBeeSpeciesBuilder beeSpecies) {
beeSpecies.addProduct(PluginApiculture.items.beeComb.get(EnumHoneyComb.HONEY, 1), 0.30f);
}
@@ -77,7 +78,7 @@ public enum BeeDefinition implements IBeeDefinition {
},
COMMON(BeeBranchDefinition.HONEY, "cerana", true, new Color(0xb2b2b2), new Color(0xffdc16)) {
@Override
protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
protected void setSpeciesProperties(IAlleleBeeSpeciesBuilder beeSpecies) {
beeSpecies.addProduct(PluginApiculture.items.beeComb.get(EnumHoneyComb.HONEY, 1), 0.35f);
}
@@ -99,7 +100,7 @@ public enum BeeDefinition implements IBeeDefinition {
},
CULTIVATED(BeeBranchDefinition.HONEY, "mellifera", true, new Color(0x5734ec), new Color(0xffdc16)) {
@Override
protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
protected void setSpeciesProperties(IAlleleBeeSpeciesBuilder beeSpecies) {
beeSpecies.addProduct(PluginApiculture.items.beeComb.get(EnumHoneyComb.HONEY, 1), 0.40f);
}
@@ -120,7 +121,7 @@ public enum BeeDefinition implements IBeeDefinition {
/* NOBLE BRANCH */
NOBLE(BeeBranchDefinition.NOBLE, "nobilis", false, new Color(0xec9a19), new Color(0xffdc16)) {
@Override
protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
protected void setSpeciesProperties(IAlleleBeeSpeciesBuilder beeSpecies) {
beeSpecies.addProduct(PluginApiculture.items.beeComb.get(EnumHoneyComb.DRIPPING, 1), 0.20f);
}
@@ -138,7 +139,7 @@ public enum BeeDefinition implements IBeeDefinition {
},
MAJESTIC(BeeBranchDefinition.NOBLE, "regalis", true, new Color(0x7f0000), new Color(0xffdc16)) {
@Override
protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
protected void setSpeciesProperties(IAlleleBeeSpeciesBuilder beeSpecies) {
beeSpecies.addProduct(PluginApiculture.items.beeComb.get(EnumHoneyComb.DRIPPING, 1), 0.30f);
}
@@ -156,7 +157,7 @@ public enum BeeDefinition implements IBeeDefinition {
},
IMPERIAL(BeeBranchDefinition.NOBLE, "imperatorius", false, new Color(0xa3e02f), new Color(0xffdc16)) {
@Override
protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
protected void setSpeciesProperties(IAlleleBeeSpeciesBuilder beeSpecies) {
beeSpecies.addProduct(PluginApiculture.items.beeComb.get(EnumHoneyComb.DRIPPING, 1), 0.20f)
.addProduct(PluginApiculture.items.royalJelly.getItemStack(), 0.15f)
.setHasEffect();
@@ -178,7 +179,7 @@ public enum BeeDefinition implements IBeeDefinition {
/* INDUSTRIOUS BRANCH */
DILIGENT(BeeBranchDefinition.INDUSTRIOUS, "sedulus", false, new Color(0xc219ec), new Color(0xffdc16)) {
@Override
protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
protected void setSpeciesProperties(IAlleleBeeSpeciesBuilder beeSpecies) {
beeSpecies.addProduct(PluginApiculture.items.beeComb.get(EnumHoneyComb.STRINGY, 1), 0.20f);
}
@@ -196,7 +197,7 @@ public enum BeeDefinition implements IBeeDefinition {
},
UNWEARY(BeeBranchDefinition.INDUSTRIOUS, "assiduus", true, new Color(0x19ec5a), new Color(0xffdc16)) {
@Override
protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
protected void setSpeciesProperties(IAlleleBeeSpeciesBuilder beeSpecies) {
beeSpecies.addProduct(PluginApiculture.items.beeComb.get(EnumHoneyComb.STRINGY, 1), 0.30f);
}
@@ -213,7 +214,7 @@ public enum BeeDefinition implements IBeeDefinition {
},
INDUSTRIOUS(BeeBranchDefinition.INDUSTRIOUS, "industria", false, new Color(0xffffff), new Color(0xffdc16)) {
@Override
protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
protected void setSpeciesProperties(IAlleleBeeSpeciesBuilder beeSpecies) {
beeSpecies.addProduct(PluginApiculture.items.beeComb.get(EnumHoneyComb.STRINGY, 1), 0.20f)
.addProduct(PluginApiculture.items.pollenCluster.get(EnumPollenCluster.NORMAL, 1), 0.15f)
.setHasEffect();
@@ -235,7 +236,7 @@ public enum BeeDefinition implements IBeeDefinition {
/* HEROIC BRANCH */
STEADFAST(BeeBranchDefinition.HEROIC, "legio", false, new Color(0x4d2b15), new Color(0xffdc16)) {
@Override
protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
protected void setSpeciesProperties(IAlleleBeeSpeciesBuilder beeSpecies) {
beeSpecies.addProduct(PluginApiculture.items.beeComb.get(EnumHoneyComb.COCOA, 1), 0.20f)
.setHasEffect();
}
@@ -255,7 +256,7 @@ public enum BeeDefinition implements IBeeDefinition {
},
VALIANT(BeeBranchDefinition.HEROIC, "centurio", true, new Color(0x626bdd), new Color(0xffdc16)) {
@Override
protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
protected void setSpeciesProperties(IAlleleBeeSpeciesBuilder beeSpecies) {
beeSpecies.addProduct(PluginApiculture.items.beeComb.get(EnumHoneyComb.COCOA, 1), 0.30f)
.addSpecialty(new ItemStack(Items.sugar), 0.15f);
}
@@ -275,7 +276,7 @@ public enum BeeDefinition implements IBeeDefinition {
},
HEROIC(BeeBranchDefinition.HEROIC, "kraphti", false, new Color(0xb3d5e4), new Color(0xffdc16)) {
@Override
protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
protected void setSpeciesProperties(IAlleleBeeSpeciesBuilder beeSpecies) {
beeSpecies.addProduct(PluginApiculture.items.beeComb.get(EnumHoneyComb.COCOA, 1), 0.40f)
.setHasEffect();
}
@@ -299,7 +300,7 @@ public enum BeeDefinition implements IBeeDefinition {
/* INFERNAL BRANCH */
SINISTER(BeeBranchDefinition.INFERNAL, "caecus", false, new Color(0xb3d5e4), new Color(0x9a2323)) {
@Override
protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
protected void setSpeciesProperties(IAlleleBeeSpeciesBuilder beeSpecies) {
beeSpecies.addProduct(PluginApiculture.items.beeComb.get(EnumHoneyComb.SIMMERING, 1), 0.45f)
.setTemperature(EnumTemperature.HELLISH)
.setHumidity(EnumHumidity.ARID);
@@ -322,7 +323,7 @@ public enum BeeDefinition implements IBeeDefinition {
},
FIENDISH(BeeBranchDefinition.INFERNAL, "diabolus", true, new Color(0xd7bee5), new Color(0x9a2323)) {
@Override
protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
protected void setSpeciesProperties(IAlleleBeeSpeciesBuilder beeSpecies) {
beeSpecies.addProduct(PluginApiculture.items.beeComb.get(EnumHoneyComb.SIMMERING, 1), 0.55f)
.addProduct(PluginCore.items.ash.getItemStack(), 0.15f)
.setTemperature(EnumTemperature.HELLISH)
@@ -346,7 +347,7 @@ public enum BeeDefinition implements IBeeDefinition {
},
DEMONIC(BeeBranchDefinition.INFERNAL, "draco", false, new Color(0xf4e400), new Color(0x9a2323)) {
@Override
protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
protected void setSpeciesProperties(IAlleleBeeSpeciesBuilder beeSpecies) {
beeSpecies.addProduct(PluginApiculture.items.beeComb.get(EnumHoneyComb.SIMMERING, 1), 0.45f)
.addProduct(new ItemStack(Items.glowstone_dust), 0.15f)
.setHasEffect()
@@ -371,7 +372,7 @@ public enum BeeDefinition implements IBeeDefinition {
/* AUSTERE BRANCH */
MODEST(BeeBranchDefinition.AUSTERE, "modicus", false, new Color(0xc5be86), new Color(0xffdc16)) {
@Override
protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
protected void setSpeciesProperties(IAlleleBeeSpeciesBuilder beeSpecies) {
beeSpecies.addProduct(PluginApiculture.items.beeComb.get(EnumHoneyComb.PARCHED, 1), 0.20f)
.setTemperature(EnumTemperature.HOT)
.setHumidity(EnumHumidity.ARID);
@@ -390,7 +391,7 @@ public enum BeeDefinition implements IBeeDefinition {
},
FRUGAL(BeeBranchDefinition.AUSTERE, "permodestus", true, new Color(0xe8dcb1), new Color(0xffdc16)) {
@Override
protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
protected void setSpeciesProperties(IAlleleBeeSpeciesBuilder beeSpecies) {
beeSpecies.addProduct(PluginApiculture.items.beeComb.get(EnumHoneyComb.PARCHED, 1), 0.30f)
.setTemperature(EnumTemperature.HOT)
.setHumidity(EnumHumidity.ARID);
@@ -414,7 +415,7 @@ public enum BeeDefinition implements IBeeDefinition {
},
AUSTERE(BeeBranchDefinition.AUSTERE, "correpere", false, new Color(0xfffac2), new Color(0xffdc16)) {
@Override
protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
protected void setSpeciesProperties(IAlleleBeeSpeciesBuilder beeSpecies) {
beeSpecies.addProduct(PluginApiculture.items.beeComb.get(EnumHoneyComb.PARCHED, 1), 0.20f)
.addSpecialty(PluginApiculture.items.beeComb.get(EnumHoneyComb.POWDERY, 1), 0.50f)
.setHasEffect()
@@ -441,7 +442,7 @@ public enum BeeDefinition implements IBeeDefinition {
/* TROPICAL BRANCH */
TROPICAL(BeeBranchDefinition.TROPICAL, "mendelia", false, new Color(0x378020), new Color(0xffdc16)) {
@Override
protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
protected void setSpeciesProperties(IAlleleBeeSpeciesBuilder beeSpecies) {
beeSpecies.addProduct(PluginApiculture.items.beeComb.get(EnumHoneyComb.SILKY, 1), 0.20f)
.setTemperature(EnumTemperature.WARM)
.setHumidity(EnumHumidity.DAMP);
@@ -460,7 +461,7 @@ public enum BeeDefinition implements IBeeDefinition {
},
EXOTIC(BeeBranchDefinition.TROPICAL, "darwini", true, new Color(0x304903), new Color(0xffdc16)) {
@Override
protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
protected void setSpeciesProperties(IAlleleBeeSpeciesBuilder beeSpecies) {
beeSpecies.addProduct(PluginApiculture.items.beeComb.get(EnumHoneyComb.SILKY, 1), 0.30f)
.setTemperature(EnumTemperature.WARM)
.setHumidity(EnumHumidity.DAMP);
@@ -479,7 +480,7 @@ public enum BeeDefinition implements IBeeDefinition {
},
EDENIC(BeeBranchDefinition.TROPICAL, "humboldti", false, new Color(0x393d0d), new Color(0xffdc16)) {
@Override
protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
protected void setSpeciesProperties(IAlleleBeeSpeciesBuilder beeSpecies) {
beeSpecies.addProduct(PluginApiculture.items.beeComb.get(EnumHoneyComb.SILKY, 1), 0.20f)
.setHasEffect()
.setTemperature(EnumTemperature.WARM)
@@ -503,7 +504,7 @@ public enum BeeDefinition implements IBeeDefinition {
/* END BRANCH */
ENDED(BeeBranchDefinition.END, "notchi", false, new Color(0xe079fa), new Color(0xd9de9e)) {
@Override
protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
protected void setSpeciesProperties(IAlleleBeeSpeciesBuilder beeSpecies) {
beeSpecies.addProduct(PluginApiculture.items.beeComb.get(EnumHoneyComb.MYSTERIOUS, 1), 0.30f)
.setTemperature(EnumTemperature.COLD);
}
@@ -520,7 +521,7 @@ public enum BeeDefinition implements IBeeDefinition {
},
SPECTRAL(BeeBranchDefinition.END, "idolum", true, new Color(0xa98bed), new Color(0xd9de9e)) {
@Override
protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
protected void setSpeciesProperties(IAlleleBeeSpeciesBuilder beeSpecies) {
beeSpecies.addProduct(PluginApiculture.items.beeComb.get(EnumHoneyComb.MYSTERIOUS, 1), 0.50f)
.setTemperature(EnumTemperature.COLD);
}
@@ -537,7 +538,7 @@ public enum BeeDefinition implements IBeeDefinition {
},
PHANTASMAL(BeeBranchDefinition.END, "lemur", false, new Color(0xcc00fa), new Color(0xd9de9e)) {
@Override
protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
protected void setSpeciesProperties(IAlleleBeeSpeciesBuilder beeSpecies) {
beeSpecies.addProduct(PluginApiculture.items.beeComb.get(EnumHoneyComb.MYSTERIOUS, 1), 0.40f)
.setHasEffect()
.setTemperature(EnumTemperature.COLD);
@@ -559,7 +560,7 @@ public enum BeeDefinition implements IBeeDefinition {
/* FROZEN BRANCH */
WINTRY(BeeBranchDefinition.FROZEN, "brumalis", false, new Color(0xa0ffc8), new Color(0xdaf5f3)) {
@Override
protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
protected void setSpeciesProperties(IAlleleBeeSpeciesBuilder beeSpecies) {
beeSpecies.addProduct(PluginApiculture.items.beeComb.get(EnumHoneyComb.FROZEN, 1), 0.30f)
.setTemperature(EnumTemperature.ICY);
}
@@ -578,7 +579,7 @@ public enum BeeDefinition implements IBeeDefinition {
},
ICY(BeeBranchDefinition.FROZEN, "coagulis", true, new Color(0xa0ffff), new Color(0xdaf5f3)) {
@Override
protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
protected void setSpeciesProperties(IAlleleBeeSpeciesBuilder beeSpecies) {
beeSpecies.addProduct(PluginApiculture.items.beeComb.get(EnumHoneyComb.FROZEN, 1), 0.20f)
.addProduct(PluginCore.items.craftingMaterial.getIceShard(1), 0.20f)
.setTemperature(EnumTemperature.ICY);
@@ -598,7 +599,7 @@ public enum BeeDefinition implements IBeeDefinition {
},
GLACIAL(BeeBranchDefinition.FROZEN, "glacialis", false, new Color(0xefffff), new Color(0xdaf5f3)) {
@Override
protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
protected void setSpeciesProperties(IAlleleBeeSpeciesBuilder beeSpecies) {
beeSpecies.addProduct(PluginApiculture.items.beeComb.get(EnumHoneyComb.FROZEN, 1), 0.20f)
.addProduct(PluginCore.items.craftingMaterial.getIceShard(1), 0.40f)
.setTemperature(EnumTemperature.ICY)
@@ -621,7 +622,7 @@ public enum BeeDefinition implements IBeeDefinition {
/* VENGEFUL BRANCH */
VINDICTIVE(BeeBranchDefinition.VENGEFUL, "ultio", false, new Color(0xeafff3), new Color(0xffdc16)) {
@Override
protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
protected void setSpeciesProperties(IAlleleBeeSpeciesBuilder beeSpecies) {
beeSpecies.addProduct(PluginApiculture.items.beeComb.get(EnumHoneyComb.IRRADIATED, 1), 0.25f)
.setIsNotCounted();
}
@@ -639,7 +640,7 @@ public enum BeeDefinition implements IBeeDefinition {
},
VENGEFUL(BeeBranchDefinition.VENGEFUL, "punire", false, new Color(0xc2de00), new Color(0xffdc16)) {
@Override
protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
protected void setSpeciesProperties(IAlleleBeeSpeciesBuilder beeSpecies) {
beeSpecies.addProduct(PluginApiculture.items.beeComb.get(EnumHoneyComb.IRRADIATED, 1), 0.40f)
.setIsNotCounted();
}
@@ -658,7 +659,7 @@ public enum BeeDefinition implements IBeeDefinition {
},
AVENGING(BeeBranchDefinition.VENGEFUL, "hostimentum", false, new Color(0xddff00), new Color(0xffdc16)) {
@Override
protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
protected void setSpeciesProperties(IAlleleBeeSpeciesBuilder beeSpecies) {
beeSpecies.addProduct(PluginApiculture.items.beeComb.get(EnumHoneyComb.IRRADIATED, 1), 0.40f)
.setHasEffect()
.setIsNotCounted();
@@ -680,7 +681,7 @@ public enum BeeDefinition implements IBeeDefinition {
// Easter
LEPORINE(BeeBranchDefinition.FESTIVE, "lepus", false, new Color(0xfeff8f), new Color(0x3cd757)) {
@Override
protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
protected void setSpeciesProperties(IAlleleBeeSpeciesBuilder beeSpecies) {
beeSpecies.addProduct(PluginApiculture.items.beeComb.get(EnumHoneyComb.SILKY, 1), 0.30f)
.addProduct(new ItemStack(Items.egg), 0.10f)
.setHasEffect()
@@ -698,11 +699,16 @@ public enum BeeDefinition implements IBeeDefinition {
.restrictDateRange(3, 29, 4, 15)
.setIsSecret();
}
@Override
protected boolean isSecret() {
return true;
}
},
// Christmas
MERRY(BeeBranchDefinition.FESTIVE, "feliciter", false, new Color(0xffffff), new Color(0xd40000)) {
@Override
protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
protected void setSpeciesProperties(IAlleleBeeSpeciesBuilder beeSpecies) {
beeSpecies.addProduct(PluginApiculture.items.beeComb.get(EnumHoneyComb.FROZEN, 1), 0.30f)
.addProduct(PluginCore.items.craftingMaterial.getIceShard(1), 0.20f)
.setTemperature(EnumTemperature.ICY)
@@ -722,11 +728,16 @@ public enum BeeDefinition implements IBeeDefinition {
.restrictDateRange(12, 21, 12, 27)
.setIsSecret();
}
@Override
protected boolean isSecret() {
return true;
}
},
// New Year
TIPSY(BeeBranchDefinition.FESTIVE, "ebrius", false, new Color(0xffffff), new Color(0xc219ec)) {
@Override
protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
protected void setSpeciesProperties(IAlleleBeeSpeciesBuilder beeSpecies) {
beeSpecies.addProduct(PluginApiculture.items.beeComb.get(EnumHoneyComb.FROZEN, 1), 0.30f)
.addProduct(PluginCore.items.craftingMaterial.getIceShard(1), 0.20f)
.setTemperature(EnumTemperature.ICY)
@@ -746,12 +757,17 @@ public enum BeeDefinition implements IBeeDefinition {
.restrictDateRange(12, 27, 1, 2)
.setIsSecret();
}
@Override
protected boolean isSecret() {
return true;
}
},
// (missing) Solstice
// Halloween
TRICKY(BeeBranchDefinition.FESTIVE, "libita", false, new Color(0x49413B), new Color(0xFF6A00)) {
@Override
protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
protected void setSpeciesProperties(IAlleleBeeSpeciesBuilder beeSpecies) {
beeSpecies.addProduct(PluginApiculture.items.beeComb.get(EnumHoneyComb.HONEY, 1), 0.40f)
.addProduct(new ItemStack(Items.cookie), 0.15f)
.addSpecialty(new ItemStack(Items.skull, 1, 0), 0.02f)
@@ -775,13 +791,18 @@ public enum BeeDefinition implements IBeeDefinition {
.restrictDateRange(10, 15, 11, 3)
.setIsSecret();
}
@Override
protected boolean isSecret() {
return true;
}
},
// (missing) Thanksgiving
/* AGRARIAN BRANCH */
RURAL(BeeBranchDefinition.AGRARIAN, "rustico", false, new Color(0xfeff8f), new Color(0xffdc16)) {
@Override
protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
protected void setSpeciesProperties(IAlleleBeeSpeciesBuilder beeSpecies) {
beeSpecies.addProduct(PluginApiculture.items.beeComb.get(EnumHoneyComb.WHEATEN, 1), 0.20f);
}
@@ -798,7 +819,7 @@ public enum BeeDefinition implements IBeeDefinition {
},
FARMERLY(BeeBranchDefinition.AGRARIAN, "arator", true, new Color(0xD39728), new Color(0xffdc16)) {
@Override
protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
protected void setSpeciesProperties(IAlleleBeeSpeciesBuilder beeSpecies) {
beeSpecies.addProduct(PluginApiculture.items.beeComb.get(EnumHoneyComb.WHEATEN, 1), 0.27f);
}
@@ -816,7 +837,7 @@ public enum BeeDefinition implements IBeeDefinition {
},
AGRARIAN(BeeBranchDefinition.AGRARIAN, "arator", true, new Color(0xFFCA75), new Color(0xFFE047)) {
@Override
protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
protected void setSpeciesProperties(IAlleleBeeSpeciesBuilder beeSpecies) {
beeSpecies.addProduct(PluginApiculture.items.beeComb.get(EnumHoneyComb.WHEATEN, 1), 0.35f)
.setHasEffect();
}
@@ -839,7 +860,7 @@ public enum BeeDefinition implements IBeeDefinition {
/* BOGGY BRANCH */
MARSHY(BeeBranchDefinition.BOGGY, "adorasti", true, new Color(0x546626), new Color(0xffdc16)) {
@Override
protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
protected void setSpeciesProperties(IAlleleBeeSpeciesBuilder beeSpecies) {
beeSpecies.addProduct(PluginApiculture.items.beeComb.get(EnumHoneyComb.MOSSY, 1), 0.30f)
.setHumidity(EnumHumidity.DAMP);
}
@@ -856,7 +877,7 @@ public enum BeeDefinition implements IBeeDefinition {
},
MIRY(BeeBranchDefinition.BOGGY, "humidium", true, new Color(0x92AF42), new Color(0xffdc16)) {
@Override
protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
protected void setSpeciesProperties(IAlleleBeeSpeciesBuilder beeSpecies) {
beeSpecies.addProduct(PluginApiculture.items.beeComb.get(EnumHoneyComb.MOSSY, 1), 0.36f)
.setHumidity(EnumHumidity.DAMP);
}
@@ -877,7 +898,7 @@ public enum BeeDefinition implements IBeeDefinition {
},
BOGGY(BeeBranchDefinition.BOGGY, "paluster", true, new Color(0x698948), new Color(0xffdc16)) {
@Override
protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
protected void setSpeciesProperties(IAlleleBeeSpeciesBuilder beeSpecies) {
beeSpecies.addProduct(PluginApiculture.items.beeComb.get(EnumHoneyComb.MOSSY, 1), 0.39f)
.addSpecialty(PluginCore.items.peat.getItemStack(), 0.08f)
.setHumidity(EnumHumidity.DAMP);
@@ -902,7 +923,7 @@ public enum BeeDefinition implements IBeeDefinition {
/* MONASTIC BRANCH */
MONASTIC(BeeBranchDefinition.MONASTIC, "monachus", false, new Color(0x42371c), new Color(0xfff7b6)) {
@Override
protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
protected void setSpeciesProperties(IAlleleBeeSpeciesBuilder beeSpecies) {
beeSpecies.addProduct(PluginApiculture.items.beeComb.get(EnumHoneyComb.WHEATEN, 1), 0.30f)
.addSpecialty(PluginApiculture.items.beeComb.get(EnumHoneyComb.MELLOW, 1), 0.10f)
.setJubilanceProvider(new JubilanceProviderHermit());
@@ -920,7 +941,7 @@ public enum BeeDefinition implements IBeeDefinition {
},
SECLUDED(BeeBranchDefinition.MONASTIC, "contractus", true, new Color(0x7b6634), new Color(0xfff7b6)) {
@Override
protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
protected void setSpeciesProperties(IAlleleBeeSpeciesBuilder beeSpecies) {
beeSpecies.addSpecialty(PluginApiculture.items.beeComb.get(EnumHoneyComb.MELLOW, 1), 0.20f)
.setJubilanceProvider(new JubilanceProviderHermit());
}
@@ -937,7 +958,7 @@ public enum BeeDefinition implements IBeeDefinition {
},
HERMITIC(BeeBranchDefinition.MONASTIC, "anachoreta", false, new Color(0xffd46c), new Color(0xfff7b6)) {
@Override
protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
protected void setSpeciesProperties(IAlleleBeeSpeciesBuilder beeSpecies) {
beeSpecies.addSpecialty(PluginApiculture.items.beeComb.get(EnumHoneyComb.MELLOW, 1), 0.20f)
.setJubilanceProvider(new JubilanceProviderHermit())
.setHasEffect();
@@ -958,7 +979,7 @@ public enum BeeDefinition implements IBeeDefinition {
private static final EnumSet<BeeDefinition> overworldHiveBees = EnumSet.of(FOREST, MARSHY, MEADOWS, MODEST, TROPICAL, WINTRY);
private final BeeBranchDefinition branch;
private final IAlleleBeeSpeciesCustom species;
private final IAlleleBeeSpecies species;
private IAllele[] template;
private IBeeGenome genome;
@@ -972,15 +993,24 @@ public enum BeeDefinition implements IBeeDefinition {
String name = "for.bees.species." + lowercaseName;
this.branch = branch;
this.species = BeeManager.beeFactory.createSpecies(uid, dominant, "Sengir", name, description, branch.getBranch(), binomial, primary.getRGB(), secondary.getRGB());
IAlleleBeeSpeciesBuilder speciesBuilder = BeeManager.beeFactory.createSpecies(uid, dominant, "Sengir", name, description, branch.getBranch(), binomial, primary.getRGB(), secondary.getRGB());
if (isSecret()) {
speciesBuilder.setIsSecret();
}
setSpeciesProperties(speciesBuilder);
this.species = speciesBuilder.build();
}
protected abstract void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies);
protected abstract void setSpeciesProperties(IAlleleBeeSpeciesBuilder beeSpecies);
protected abstract void setAlleles(IAllele[] template);
protected abstract void registerMutations();
protected boolean isSecret() {
return false;
}
public static void initBees() {
for (BeeDefinition bee : values()) {
bee.init();
@@ -995,11 +1025,6 @@ public enum BeeDefinition implements IBeeDefinition {
}
private void init() {
if (!overworldHiveBees.contains(this)) {
species.setIsSecret();
}
setSpeciesProperties(species);
template = branch.getTemplate();
AlleleHelper.instance.set(template, EnumBeeChromosome.SPECIES, species);
setAlleles(template);
@@ -10,19 +10,15 @@
******************************************************************************/
package forestry.apiculture.genetics;
import forestry.api.apiculture.EnumBeeChromosome;
import forestry.api.apiculture.IAlleleBeeSpeciesCustom;
import forestry.api.apiculture.IAlleleBeeSpeciesBuilder;
import forestry.api.apiculture.IBeeFactory;
import forestry.api.genetics.AlleleManager;
import forestry.api.genetics.IClassification;
import forestry.apiculture.genetics.alleles.AlleleBeeSpecies;
public class BeeFactory implements IBeeFactory {
@Override
public IAlleleBeeSpeciesCustom createSpecies(String uid, boolean dominant, String authority, String unlocalizedName, String unlocalizedDescription, IClassification branch, String binomial, int primaryColor, int secondaryColor) {
IAlleleBeeSpeciesCustom species = new AlleleBeeSpecies(uid, unlocalizedName, authority, unlocalizedDescription, dominant, branch, binomial, primaryColor, secondaryColor);
AlleleManager.alleleRegistry.registerAllele(species, EnumBeeChromosome.SPECIES);
return species;
public IAlleleBeeSpeciesBuilder createSpecies(String uid, boolean dominant, String authority, String unlocalizedName, String unlocalizedDescription, IClassification branch, String binomial, int primaryColor, int secondaryColor) {
return new AlleleBeeSpecies(uid, unlocalizedName, authority, unlocalizedDescription, dominant, branch, binomial, primaryColor, secondaryColor);
}
@Override
@@ -26,8 +26,10 @@ import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import forestry.api.apiculture.BeeManager;
import forestry.api.apiculture.EnumBeeChromosome;
import forestry.api.apiculture.EnumBeeType;
import forestry.api.apiculture.IAlleleBeeSpeciesCustom;
import forestry.api.apiculture.IAlleleBeeSpecies;
import forestry.api.apiculture.IAlleleBeeSpeciesBuilder;
import forestry.api.apiculture.IBeeGenome;
import forestry.api.apiculture.IBeeHousing;
import forestry.api.apiculture.IBeeModelProvider;
@@ -36,6 +38,7 @@ import forestry.api.apiculture.IBeeSpriteColourProvider;
import forestry.api.apiculture.IJubilanceProvider;
import forestry.api.core.IModelManager;
import forestry.api.core.IModelProvider;
import forestry.api.genetics.AlleleManager;
import forestry.api.genetics.IClassification;
import forestry.api.genetics.IIndividual;
import forestry.apiculture.genetics.DefaultBeeModelProvider;
@@ -44,7 +47,7 @@ import forestry.apiculture.genetics.JubilanceDefault;
import forestry.core.genetics.alleles.AlleleSpecies;
import forestry.core.utils.ItemStackUtil;
public class AlleleBeeSpecies extends AlleleSpecies implements IAlleleBeeSpeciesCustom {
public class AlleleBeeSpecies extends AlleleSpecies implements IAlleleBeeSpecies, IAlleleBeeSpeciesBuilder {
private final Map<ItemStack, Float> productChances = new HashMap<>();
private final Map<ItemStack, Float> specialtyChances = new HashMap<>();
@@ -61,13 +64,19 @@ public class AlleleBeeSpecies extends AlleleSpecies implements IAlleleBeeSpecies
jubilanceProvider = JubilanceDefault.instance;
}
@Override
public IAlleleBeeSpecies build() {
AlleleManager.alleleRegistry.registerAllele(this, EnumBeeChromosome.SPECIES);
return this;
}
@Override
public IBeeRoot getRoot() {
return BeeManager.beeRoot;
}
@Override
public IAlleleBeeSpeciesCustom addProduct(ItemStack product, Float chance) {
public IAlleleBeeSpeciesBuilder addProduct(ItemStack product, Float chance) {
if (product == null || product.getItem() == null) {
throw new IllegalArgumentException("Tried to add null product");
}
@@ -79,7 +88,7 @@ public class AlleleBeeSpecies extends AlleleSpecies implements IAlleleBeeSpecies
}
@Override
public IAlleleBeeSpeciesCustom addSpecialty(ItemStack specialty, Float chance) {
public IAlleleBeeSpeciesBuilder addSpecialty(ItemStack specialty, Float chance) {
if (specialty == null || specialty.getItem() == null) {
throw new IllegalArgumentException("Tried to add null specialty");
}
@@ -91,25 +100,25 @@ public class AlleleBeeSpecies extends AlleleSpecies implements IAlleleBeeSpecies
}
@Override
public IAlleleBeeSpeciesCustom setJubilanceProvider(IJubilanceProvider provider) {
public IAlleleBeeSpeciesBuilder setJubilanceProvider(IJubilanceProvider provider) {
this.jubilanceProvider = provider;
return this;
}
@Override
public IAlleleBeeSpeciesCustom setNocturnal() {
public IAlleleBeeSpeciesBuilder setNocturnal() {
nocturnal = true;
return this;
}
@Override
public IAlleleBeeSpeciesCustom setCustomBeeModelProvider(IBeeModelProvider beeIconProvider) {
public IAlleleBeeSpeciesBuilder setCustomBeeModelProvider(IBeeModelProvider beeIconProvider) {
this.beeModelProvider = beeIconProvider;
return this;
}
@Override
public IAlleleBeeSpeciesCustom setCustomBeeSpriteColourProvider(IBeeSpriteColourProvider beeIconColourProvider) {
public IAlleleBeeSpeciesBuilder setCustomBeeSpriteColourProvider(IBeeSpriteColourProvider beeIconColourProvider) {
this.beeSpriteColourProvider = beeIconColourProvider;
return this;
}
@@ -14,7 +14,6 @@ import net.minecraftforge.oredict.OreDictionary;
import forestry.api.apiculture.EnumBeeType;
import forestry.api.core.Tabs;
import forestry.apiculture.genetics.BeeDefinition;
import forestry.core.items.ItemForestry;
import forestry.core.items.ItemOverlay;
import forestry.core.items.ItemRegistry;
@@ -53,7 +52,6 @@ public class ItemRegistryApiculture extends ItemRegistry {
public ItemRegistryApiculture() {
// / BEES
BeeDefinition.preInit();
beeQueenGE = registerItem(new ItemBeeGE(EnumBeeType.QUEEN), "beeQueenGE");
beeDroneGE = registerItem(new ItemBeeGE(EnumBeeType.DRONE), "beeDroneGE");
beePrincessGE = registerItem(new ItemBeeGE(EnumBeeType.PRINCESS), "beePrincessGE");
@@ -28,7 +28,8 @@ import forestry.api.arboriculture.EnumGermlingType;
import forestry.api.arboriculture.EnumLeafType;
import forestry.api.arboriculture.EnumTreeChromosome;
import forestry.api.arboriculture.EnumWoodType;
import forestry.api.arboriculture.IAlleleTreeSpeciesCustom;
import forestry.api.arboriculture.IAlleleTreeSpecies;
import forestry.api.arboriculture.IAlleleTreeSpeciesBuilder;
import forestry.api.arboriculture.IGermlingModelProvider;
import forestry.api.arboriculture.ILeafSpriteProvider;
import forestry.api.arboriculture.ITree;
@@ -105,7 +106,7 @@ public enum TreeDefinition implements ITreeDefinition, ITreeGenerator {
}
@Override
protected void setSpeciesProperties(IAlleleTreeSpeciesCustom treeSpecies) {
protected void setSpeciesProperties(IAlleleTreeSpeciesBuilder treeSpecies) {
treeSpecies.addFruitFamily(EnumFruitFamily.POMES);
}
@@ -128,7 +129,7 @@ public enum TreeDefinition implements ITreeDefinition, ITreeGenerator {
}
@Override
protected void setSpeciesProperties(IAlleleTreeSpeciesCustom treeSpecies) {
protected void setSpeciesProperties(IAlleleTreeSpeciesBuilder treeSpecies) {
treeSpecies.addFruitFamily(EnumFruitFamily.POMES);
}
@@ -150,7 +151,7 @@ public enum TreeDefinition implements ITreeDefinition, ITreeGenerator {
}
@Override
protected void setSpeciesProperties(IAlleleTreeSpeciesCustom treeSpecies) {
protected void setSpeciesProperties(IAlleleTreeSpeciesBuilder treeSpecies) {
}
@@ -174,7 +175,7 @@ public enum TreeDefinition implements ITreeDefinition, ITreeGenerator {
}
@Override
protected void setSpeciesProperties(IAlleleTreeSpeciesCustom treeSpecies) {
protected void setSpeciesProperties(IAlleleTreeSpeciesBuilder treeSpecies) {
treeSpecies.addFruitFamily(EnumFruitFamily.NUX)
.addFruitFamily(EnumFruitFamily.PRUNES)
.addFruitFamily(EnumFruitFamily.POMES);
@@ -192,7 +193,7 @@ public enum TreeDefinition implements ITreeDefinition, ITreeGenerator {
}
@Override
protected void setSpeciesProperties(IAlleleTreeSpeciesCustom treeSpecies) {
protected void setSpeciesProperties(IAlleleTreeSpeciesBuilder treeSpecies) {
treeSpecies.addFruitFamily(EnumFruitFamily.NUX)
.addFruitFamily(EnumFruitFamily.PRUNES)
.addFruitFamily(EnumFruitFamily.POMES);
@@ -220,7 +221,7 @@ public enum TreeDefinition implements ITreeDefinition, ITreeGenerator {
}
@Override
protected void setSpeciesProperties(IAlleleTreeSpeciesCustom treeSpecies) {
protected void setSpeciesProperties(IAlleleTreeSpeciesBuilder treeSpecies) {
treeSpecies.addFruitFamily(EnumFruitFamily.NUX)
.addFruitFamily(EnumFruitFamily.PRUNES)
.addFruitFamily(EnumFruitFamily.POMES);
@@ -248,7 +249,7 @@ public enum TreeDefinition implements ITreeDefinition, ITreeGenerator {
}
@Override
protected void setSpeciesProperties(IAlleleTreeSpeciesCustom treeSpecies) {
protected void setSpeciesProperties(IAlleleTreeSpeciesBuilder treeSpecies) {
treeSpecies.addFruitFamily(EnumFruitFamily.PRUNES)
.addFruitFamily(EnumFruitFamily.POMES);
}
@@ -275,7 +276,7 @@ public enum TreeDefinition implements ITreeDefinition, ITreeGenerator {
}
@Override
protected void setSpeciesProperties(IAlleleTreeSpeciesCustom treeSpecies) {
protected void setSpeciesProperties(IAlleleTreeSpeciesBuilder treeSpecies) {
treeSpecies.addFruitFamily(EnumFruitFamily.PRUNES)
.addFruitFamily(EnumFruitFamily.POMES);
}
@@ -300,7 +301,7 @@ public enum TreeDefinition implements ITreeDefinition, ITreeGenerator {
}
@Override
protected void setSpeciesProperties(IAlleleTreeSpeciesCustom treeSpecies) {
protected void setSpeciesProperties(IAlleleTreeSpeciesBuilder treeSpecies) {
treeSpecies.addFruitFamily(EnumFruitFamily.PRUNES)
.addFruitFamily(EnumFruitFamily.POMES);
}
@@ -325,7 +326,7 @@ public enum TreeDefinition implements ITreeDefinition, ITreeGenerator {
}
@Override
protected void setSpeciesProperties(IAlleleTreeSpeciesCustom treeSpecies) {
protected void setSpeciesProperties(IAlleleTreeSpeciesBuilder treeSpecies) {
treeSpecies.addFruitFamily(EnumFruitFamily.PRUNES)
.addFruitFamily(EnumFruitFamily.POMES);
}
@@ -349,7 +350,7 @@ public enum TreeDefinition implements ITreeDefinition, ITreeGenerator {
}
@Override
protected void setSpeciesProperties(IAlleleTreeSpeciesCustom treeSpecies) {
protected void setSpeciesProperties(IAlleleTreeSpeciesBuilder treeSpecies) {
}
@@ -372,7 +373,7 @@ public enum TreeDefinition implements ITreeDefinition, ITreeGenerator {
}
@Override
protected void setSpeciesProperties(IAlleleTreeSpeciesCustom treeSpecies) {
protected void setSpeciesProperties(IAlleleTreeSpeciesBuilder treeSpecies) {
}
@@ -396,7 +397,7 @@ public enum TreeDefinition implements ITreeDefinition, ITreeGenerator {
}
@Override
protected void setSpeciesProperties(IAlleleTreeSpeciesCustom treeSpecies) {
protected void setSpeciesProperties(IAlleleTreeSpeciesBuilder treeSpecies) {
}
@@ -419,7 +420,7 @@ public enum TreeDefinition implements ITreeDefinition, ITreeGenerator {
}
@Override
protected void setSpeciesProperties(IAlleleTreeSpeciesCustom treeSpecies) {
protected void setSpeciesProperties(IAlleleTreeSpeciesBuilder treeSpecies) {
}
@@ -444,7 +445,7 @@ public enum TreeDefinition implements ITreeDefinition, ITreeGenerator {
}
@Override
protected void setSpeciesProperties(IAlleleTreeSpeciesCustom treeSpecies) {
protected void setSpeciesProperties(IAlleleTreeSpeciesBuilder treeSpecies) {
}
@@ -469,7 +470,7 @@ public enum TreeDefinition implements ITreeDefinition, ITreeGenerator {
}
@Override
protected void setSpeciesProperties(IAlleleTreeSpeciesCustom treeSpecies) {
protected void setSpeciesProperties(IAlleleTreeSpeciesBuilder treeSpecies) {
treeSpecies.addFruitFamily(EnumFruitFamily.JUNGLE);
}
@@ -492,7 +493,7 @@ public enum TreeDefinition implements ITreeDefinition, ITreeGenerator {
}
@Override
protected void setSpeciesProperties(IAlleleTreeSpeciesCustom treeSpecies) {
protected void setSpeciesProperties(IAlleleTreeSpeciesBuilder treeSpecies) {
treeSpecies.addFruitFamily(EnumFruitFamily.JUNGLE);
}
@@ -513,7 +514,7 @@ public enum TreeDefinition implements ITreeDefinition, ITreeGenerator {
}
@Override
protected void setSpeciesProperties(IAlleleTreeSpeciesCustom treeSpecies) {
protected void setSpeciesProperties(IAlleleTreeSpeciesBuilder treeSpecies) {
treeSpecies.addFruitFamily(EnumFruitFamily.JUNGLE);
}
@@ -536,7 +537,7 @@ public enum TreeDefinition implements ITreeDefinition, ITreeGenerator {
}
@Override
protected void setSpeciesProperties(IAlleleTreeSpeciesCustom treeSpecies) {
protected void setSpeciesProperties(IAlleleTreeSpeciesBuilder treeSpecies) {
treeSpecies.addFruitFamily(EnumFruitFamily.JUNGLE)
.addFruitFamily(EnumFruitFamily.PRUNES);
}
@@ -560,7 +561,7 @@ public enum TreeDefinition implements ITreeDefinition, ITreeGenerator {
}
@Override
protected void setSpeciesProperties(IAlleleTreeSpeciesCustom treeSpecies) {
protected void setSpeciesProperties(IAlleleTreeSpeciesBuilder treeSpecies) {
treeSpecies.addFruitFamily(EnumFruitFamily.JUNGLE)
.addFruitFamily(EnumFruitFamily.PRUNES);
}
@@ -585,7 +586,7 @@ public enum TreeDefinition implements ITreeDefinition, ITreeGenerator {
}
@Override
protected void setSpeciesProperties(IAlleleTreeSpeciesCustom treeSpecies) {
protected void setSpeciesProperties(IAlleleTreeSpeciesBuilder treeSpecies) {
treeSpecies.addFruitFamily(EnumFruitFamily.NUX);
}
@@ -607,7 +608,7 @@ public enum TreeDefinition implements ITreeDefinition, ITreeGenerator {
}
@Override
protected void setSpeciesProperties(IAlleleTreeSpeciesCustom treeSpecies) {
protected void setSpeciesProperties(IAlleleTreeSpeciesBuilder treeSpecies) {
treeSpecies.addFruitFamily(EnumFruitFamily.JUNGLE);
}
@@ -631,7 +632,7 @@ public enum TreeDefinition implements ITreeDefinition, ITreeGenerator {
}
@Override
protected void setSpeciesProperties(IAlleleTreeSpeciesCustom treeSpecies) {
protected void setSpeciesProperties(IAlleleTreeSpeciesBuilder treeSpecies) {
treeSpecies.addFruitFamily(EnumFruitFamily.JUNGLE)
.addFruitFamily(EnumFruitFamily.NUX);
}
@@ -653,7 +654,7 @@ public enum TreeDefinition implements ITreeDefinition, ITreeGenerator {
}
@Override
protected void setSpeciesProperties(IAlleleTreeSpeciesCustom treeSpecies) {
protected void setSpeciesProperties(IAlleleTreeSpeciesBuilder treeSpecies) {
treeSpecies.addFruitFamily(EnumFruitFamily.JUNGLE)
.addFruitFamily(EnumFruitFamily.NUX);
}
@@ -675,7 +676,7 @@ public enum TreeDefinition implements ITreeDefinition, ITreeGenerator {
}
@Override
protected void setSpeciesProperties(IAlleleTreeSpeciesCustom treeSpecies) {
protected void setSpeciesProperties(IAlleleTreeSpeciesBuilder treeSpecies) {
treeSpecies.addFruitFamily(EnumFruitFamily.JUNGLE);
}
@@ -697,7 +698,7 @@ public enum TreeDefinition implements ITreeDefinition, ITreeGenerator {
}
@Override
protected void setSpeciesProperties(IAlleleTreeSpeciesCustom treeSpecies) {
protected void setSpeciesProperties(IAlleleTreeSpeciesBuilder treeSpecies) {
treeSpecies.addFruitFamily(EnumFruitFamily.JUNGLE)
.addFruitFamily(EnumFruitFamily.NUX);
}
@@ -721,7 +722,7 @@ public enum TreeDefinition implements ITreeDefinition, ITreeGenerator {
}
@Override
protected void setSpeciesProperties(IAlleleTreeSpeciesCustom treeSpecies) {
protected void setSpeciesProperties(IAlleleTreeSpeciesBuilder treeSpecies) {
treeSpecies.addFruitFamily(EnumFruitFamily.JUNGLE);
}
@@ -742,7 +743,7 @@ public enum TreeDefinition implements ITreeDefinition, ITreeGenerator {
}
@Override
protected void setSpeciesProperties(IAlleleTreeSpeciesCustom treeSpecies) {
protected void setSpeciesProperties(IAlleleTreeSpeciesBuilder treeSpecies) {
treeSpecies.addFruitFamily(EnumFruitFamily.JUNGLE)
.addFruitFamily(EnumFruitFamily.NUX);
}
@@ -765,7 +766,7 @@ public enum TreeDefinition implements ITreeDefinition, ITreeGenerator {
}
@Override
protected void setSpeciesProperties(IAlleleTreeSpeciesCustom treeSpecies) {
protected void setSpeciesProperties(IAlleleTreeSpeciesBuilder treeSpecies) {
treeSpecies.addFruitFamily(EnumFruitFamily.JUNGLE)
.addFruitFamily(EnumFruitFamily.NUX);
}
@@ -791,7 +792,7 @@ public enum TreeDefinition implements ITreeDefinition, ITreeGenerator {
}
@Override
protected void setSpeciesProperties(IAlleleTreeSpeciesCustom treeSpecies) {
protected void setSpeciesProperties(IAlleleTreeSpeciesBuilder treeSpecies) {
treeSpecies.addFruitFamily(EnumFruitFamily.JUNGLE)
.addFruitFamily(EnumFruitFamily.POMES)
.addFruitFamily(EnumFruitFamily.PRUNES);
@@ -816,7 +817,7 @@ public enum TreeDefinition implements ITreeDefinition, ITreeGenerator {
}
@Override
protected void setSpeciesProperties(IAlleleTreeSpeciesCustom treeSpecies) {
protected void setSpeciesProperties(IAlleleTreeSpeciesBuilder treeSpecies) {
treeSpecies.addFruitFamily(EnumFruitFamily.NUX)
.addFruitFamily(EnumFruitFamily.PRUNES)
.addFruitFamily(EnumFruitFamily.POMES);
@@ -849,7 +850,7 @@ public enum TreeDefinition implements ITreeDefinition, ITreeGenerator {
}
@Override
protected void setSpeciesProperties(IAlleleTreeSpeciesCustom treeSpecies) {
protected void setSpeciesProperties(IAlleleTreeSpeciesBuilder treeSpecies) {
treeSpecies.addFruitFamily(EnumFruitFamily.JUNGLE);
}
@@ -875,7 +876,7 @@ public enum TreeDefinition implements ITreeDefinition, ITreeGenerator {
}
@Override
protected void setSpeciesProperties(IAlleleTreeSpeciesCustom treeSpecies) {
protected void setSpeciesProperties(IAlleleTreeSpeciesBuilder treeSpecies) {
treeSpecies.addFruitFamily(EnumFruitFamily.JUNGLE)
.addFruitFamily(EnumFruitFamily.NUX);
}
@@ -900,7 +901,7 @@ public enum TreeDefinition implements ITreeDefinition, ITreeGenerator {
}
@Override
protected void setSpeciesProperties(IAlleleTreeSpeciesCustom treeSpecies) {
protected void setSpeciesProperties(IAlleleTreeSpeciesBuilder treeSpecies) {
treeSpecies.addFruitFamily(EnumFruitFamily.JUNGLE)
.addFruitFamily(EnumFruitFamily.NUX);
}
@@ -926,7 +927,7 @@ public enum TreeDefinition implements ITreeDefinition, ITreeGenerator {
}
@Override
protected void setSpeciesProperties(IAlleleTreeSpeciesCustom treeSpecies) {
protected void setSpeciesProperties(IAlleleTreeSpeciesBuilder treeSpecies) {
treeSpecies.addFruitFamily(EnumFruitFamily.PRUNES)
.addFruitFamily(EnumFruitFamily.POMES);
}
@@ -947,7 +948,7 @@ public enum TreeDefinition implements ITreeDefinition, ITreeGenerator {
};
private final TreeBranchDefinition branch;
private final IAlleleTreeSpeciesCustom species;
private final IAlleleTreeSpecies species;
private final EnumWoodType woodType; // for forestry trees
private final ItemStack vanillaWood; // for vanilla trees
@@ -967,7 +968,10 @@ public enum TreeDefinition implements ITreeDefinition, ITreeGenerator {
ILeafSpriteProvider leafIconProvider = TreeManager.treeFactory.getLeafIconProvider(leafType, primary, secondary);
IGermlingModelProvider germlingIconProvider = new ModelProviderGermlingVanilla(vanillaMeta);
this.species = TreeManager.treeFactory.createSpecies(uid, unlocalizedName, "Sengir", unlocalizedDescription, dominant, branch.getBranch(), binomial, modelName, leafIconProvider, germlingIconProvider, this);
IAlleleTreeSpeciesBuilder speciesBuilder = TreeManager.treeFactory.createSpecies(uid, unlocalizedName, "Sengir", unlocalizedDescription, dominant, branch.getBranch(), binomial, modelName, leafIconProvider, germlingIconProvider, this);
setSpeciesProperties(speciesBuilder);
this.species = speciesBuilder.build();
this.woodType = null;
this.vanillaWood = vanillaWood;
}
@@ -984,12 +988,15 @@ public enum TreeDefinition implements ITreeDefinition, ITreeGenerator {
ILeafSpriteProvider leafIconProvider = TreeManager.treeFactory.getLeafIconProvider(leafType, primary, secondary);
IGermlingModelProvider germlingIconProvider = new ModelProviderGermling(uid);
this.species = TreeManager.treeFactory.createSpecies(uid, unlocalizedName, "Sengir", unlocalizedDescription, dominant, branch.getBranch(), binomial, modelName, leafIconProvider, germlingIconProvider, this);
IAlleleTreeSpeciesBuilder speciesBuilder = TreeManager.treeFactory.createSpecies(uid, unlocalizedName, "Sengir", unlocalizedDescription, dominant, branch.getBranch(), binomial, modelName, leafIconProvider, germlingIconProvider, this);
setSpeciesProperties(speciesBuilder);
this.species = speciesBuilder.build();
this.woodType = woodType;
this.vanillaWood = null;
}
protected abstract void setSpeciesProperties(IAlleleTreeSpeciesCustom treeSpecies);
protected abstract void setSpeciesProperties(IAlleleTreeSpeciesBuilder treeSpecies);
protected abstract void setAlleles(IAllele[] alleles);
@@ -1061,8 +1068,6 @@ public enum TreeDefinition implements ITreeDefinition, ITreeGenerator {
}
private void init() {
setSpeciesProperties(species);
template = branch.getTemplate();
AlleleHelper.instance.set(template, EnumTreeChromosome.SPECIES, species);
setAlleles(template);
@@ -13,23 +13,19 @@ package forestry.arboriculture.genetics;
import java.awt.Color;
import forestry.api.arboriculture.EnumLeafType;
import forestry.api.arboriculture.EnumTreeChromosome;
import forestry.api.arboriculture.IAlleleTreeSpeciesCustom;
import forestry.api.arboriculture.IAlleleTreeSpeciesBuilder;
import forestry.api.arboriculture.IGermlingModelProvider;
import forestry.api.arboriculture.ILeafSpriteProvider;
import forestry.api.arboriculture.ITreeFactory;
import forestry.api.arboriculture.ITreeGenerator;
import forestry.api.genetics.AlleleManager;
import forestry.api.genetics.IClassification;
import forestry.arboriculture.genetics.alleles.AlleleTreeSpecies;
import forestry.arboriculture.render.SpriteProviderLeaves;
public class TreeFactory implements ITreeFactory {
@Override
public IAlleleTreeSpeciesCustom createSpecies(String uid, String unlocalizedName, String authority, String unlocalizedDescription, boolean dominant, IClassification branch, String binomial, String modelName, ILeafSpriteProvider leafSpriteProvider, IGermlingModelProvider germlingModelProvider, ITreeGenerator generator) {
IAlleleTreeSpeciesCustom treeSpecies = new AlleleTreeSpecies(uid, unlocalizedName, authority, unlocalizedDescription, dominant, branch, binomial, modelName, leafSpriteProvider, germlingModelProvider, generator);
AlleleManager.alleleRegistry.registerAllele(treeSpecies, EnumTreeChromosome.SPECIES);
return treeSpecies;
public IAlleleTreeSpeciesBuilder createSpecies(String uid, String unlocalizedName, String authority, String unlocalizedDescription, boolean dominant, IClassification branch, String binomial, String modelName, ILeafSpriteProvider leafSpriteProvider, IGermlingModelProvider germlingModelProvider, ITreeGenerator generator) {
return new AlleleTreeSpecies(uid, unlocalizedName, authority, unlocalizedDescription, dominant, branch, binomial, modelName, leafSpriteProvider, germlingModelProvider, generator);
}
@Override
@@ -20,8 +20,9 @@ import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import forestry.api.arboriculture.EnumGermlingType;
import forestry.api.arboriculture.EnumTreeChromosome;
import forestry.api.arboriculture.IAlleleTreeSpecies;
import forestry.api.arboriculture.IAlleleTreeSpeciesCustom;
import forestry.api.arboriculture.IAlleleTreeSpeciesBuilder;
import forestry.api.arboriculture.IGermlingModelProvider;
import forestry.api.arboriculture.ILeafSpriteProvider;
import forestry.api.arboriculture.ITreeGenerator;
@@ -29,11 +30,12 @@ import forestry.api.arboriculture.ITreeRoot;
import forestry.api.arboriculture.TreeManager;
import forestry.api.core.IModelManager;
import forestry.api.core.IModelProvider;
import forestry.api.genetics.AlleleManager;
import forestry.api.genetics.IClassification;
import forestry.api.genetics.IFruitFamily;
import forestry.core.genetics.alleles.AlleleSpecies;
public class AlleleTreeSpecies extends AlleleSpecies implements IAlleleTreeSpeciesCustom {
public class AlleleTreeSpecies extends AlleleSpecies implements IAlleleTreeSpeciesBuilder, IAlleleTreeSpecies {
private final ITreeGenerator generator;
private final IGermlingModelProvider germlingModelProvider;
private final ILeafSpriteProvider leafSpriteProvider;
@@ -52,6 +54,12 @@ public class AlleleTreeSpecies extends AlleleSpecies implements IAlleleTreeSpeci
this.modelName = modelName;
}
@Override
public IAlleleTreeSpecies build() {
AlleleManager.alleleRegistry.registerAllele(this, EnumTreeChromosome.SPECIES);
return this;
}
@Override
public ITreeRoot getRoot() {
return TreeManager.treeRoot;
@@ -27,7 +27,8 @@ import forestry.api.core.EnumHumidity;
import forestry.api.core.EnumTemperature;
import forestry.api.core.IModelProvider;
import forestry.api.genetics.AlleleManager;
import forestry.api.genetics.IAlleleSpeciesCustom;
import forestry.api.genetics.IAlleleSpecies;
import forestry.api.genetics.IAlleleSpeciesBuilder;
import forestry.api.genetics.IClassification;
import forestry.api.genetics.IIndividual;
import forestry.api.genetics.IMutation;
@@ -36,7 +37,7 @@ import forestry.core.utils.GeneticsUtil;
import forestry.core.utils.ItemStackUtil;
import forestry.plugins.PluginApiculture;
public abstract class AlleleSpecies extends Allele implements IAlleleSpeciesCustom {
public abstract class AlleleSpecies extends Allele implements IAlleleSpeciesBuilder, IAlleleSpecies {
private final String binomial;
private final String authority;
private final String description;
@@ -157,31 +158,31 @@ public abstract class AlleleSpecies extends Allele implements IAlleleSpeciesCust
}
@Override
public IAlleleSpeciesCustom setTemperature(EnumTemperature temperature) {
public IAlleleSpeciesBuilder setTemperature(EnumTemperature temperature) {
climate = temperature;
return this;
}
@Override
public IAlleleSpeciesCustom setHumidity(EnumHumidity humidity) {
public IAlleleSpeciesBuilder setHumidity(EnumHumidity humidity) {
this.humidity = humidity;
return this;
}
@Override
public IAlleleSpeciesCustom setHasEffect() {
public IAlleleSpeciesBuilder setHasEffect() {
hasEffect = true;
return this;
}
@Override
public IAlleleSpeciesCustom setIsSecret() {
public IAlleleSpeciesBuilder setIsSecret() {
isSecret = true;
return this;
}
@Override
public IAlleleSpeciesCustom setIsNotCounted() {
public IAlleleSpeciesBuilder setIsNotCounted() {
isCounted = false;
return this;
}
@@ -27,16 +27,19 @@ import net.minecraftforge.common.BiomeDictionary;
import forestry.api.core.IModelProvider;
import forestry.api.core.ISpriteProvider;
import forestry.api.genetics.AlleleManager;
import forestry.api.genetics.IClassification;
import forestry.api.genetics.IIndividual;
import forestry.api.lepidopterology.ButterflyManager;
import forestry.api.lepidopterology.EnumButterflyChromosome;
import forestry.api.lepidopterology.EnumFlutterType;
import forestry.api.lepidopterology.IAlleleButterflySpeciesCustom;
import forestry.api.lepidopterology.IAlleleButterflySpecies;
import forestry.api.lepidopterology.IAlleleButterflySpeciesBuilder;
import forestry.api.lepidopterology.IButterflyRoot;
import forestry.core.genetics.alleles.AlleleSpecies;
import forestry.lepidopterology.render.TextureAtlasButterfly;
public class AlleleButterflySpecies extends AlleleSpecies implements IAlleleButterflySpeciesCustom, ISpriteProvider {
public class AlleleButterflySpecies extends AlleleSpecies implements IAlleleButterflySpecies, IAlleleButterflySpeciesBuilder, ISpriteProvider {
private final String texture;
private final Color serumColour;
private float rarity = 0.1f;
@@ -54,6 +57,12 @@ public class AlleleButterflySpecies extends AlleleSpecies implements IAlleleButt
this.texture = texturePath;
}
@Override
public IAlleleButterflySpecies build() {
AlleleManager.alleleRegistry.registerAllele(this, EnumButterflyChromosome.SPECIES);
return this;
}
@Override
public IButterflyRoot getRoot() {
return ButterflyManager.butterflyRoot;
@@ -23,7 +23,8 @@ import forestry.api.genetics.IClassification;
import forestry.api.lepidopterology.ButterflyManager;
import forestry.api.lepidopterology.EnumButterflyChromosome;
import forestry.api.lepidopterology.EnumFlutterType;
import forestry.api.lepidopterology.IAlleleButterflySpeciesCustom;
import forestry.api.lepidopterology.IAlleleButterflySpecies;
import forestry.api.lepidopterology.IAlleleButterflySpeciesBuilder;
import forestry.api.lepidopterology.IButterfly;
import forestry.api.lepidopterology.IButterflyGenome;
import forestry.core.config.Constants;
@@ -78,7 +79,7 @@ public enum ButterflyDefinition implements IButterflyDefinition {
},
CitrusSwallow(ButterflyBranchDefinition.Papilio, "swallowtailC", "demodocus", new Color(0xeae389), false, 1.0f) {
@Override
protected void setSpeciesProperties(IAlleleButterflySpeciesCustom species) {
protected void setSpeciesProperties(IAlleleButterflySpeciesBuilder species) {
species.setTemperature(EnumTemperature.WARM)
.setHumidity(EnumHumidity.DAMP);
}
@@ -96,7 +97,7 @@ public enum ButterflyDefinition implements IButterflyDefinition {
},
EmeraldPeacock(ButterflyBranchDefinition.Papilio, "emeraldPeacock", "palinurus", new Color(0x7cfe80), true, 0.1f) {
@Override
protected void setSpeciesProperties(IAlleleButterflySpeciesCustom species) {
protected void setSpeciesProperties(IAlleleButterflySpeciesBuilder species) {
species.setTemperature(EnumTemperature.WARM)
.setHumidity(EnumHumidity.DAMP);
}
@@ -112,7 +113,7 @@ public enum ButterflyDefinition implements IButterflyDefinition {
},
ThoasSwallow(ButterflyBranchDefinition.Papilio, "swallowtailT", "thoas", new Color(0xeac783), false, 0.2f) {
@Override
protected void setSpeciesProperties(IAlleleButterflySpeciesCustom species) {
protected void setSpeciesProperties(IAlleleButterflySpeciesBuilder species) {
species.setTemperature(EnumTemperature.WARM)
.setHumidity(EnumHumidity.DAMP);
}
@@ -149,7 +150,7 @@ public enum ButterflyDefinition implements IButterflyDefinition {
},
Glasswing(ButterflyBranchDefinition.Greta, "glasswing", "oto", new Color(0x583732), true, 0.1f) {
@Override
protected void setSpeciesProperties(IAlleleButterflySpeciesCustom species) {
protected void setSpeciesProperties(IAlleleButterflySpeciesBuilder species) {
species.setTemperature(EnumTemperature.WARM);
}
@@ -181,7 +182,7 @@ public enum ButterflyDefinition implements IButterflyDefinition {
},
MBlueMorpho(ButterflyBranchDefinition.Morpho, "blueMorphoM", "menelaus", new Color(0x72e1fd), true, 0.5f) {
@Override
protected void setSpeciesProperties(IAlleleButterflySpeciesCustom species) {
protected void setSpeciesProperties(IAlleleButterflySpeciesBuilder species) {
species.setTemperature(EnumTemperature.WARM)
.setHumidity(EnumHumidity.DAMP);
}
@@ -195,7 +196,7 @@ public enum ButterflyDefinition implements IButterflyDefinition {
},
PBlueMorpho(ButterflyBranchDefinition.Morpho, "blueMorphoP", "peleides", new Color(0x6ecce8), true, 0.25f) {
@Override
protected void setSpeciesProperties(IAlleleButterflySpeciesCustom species) {
protected void setSpeciesProperties(IAlleleButterflySpeciesBuilder species) {
species.setTemperature(EnumTemperature.WARM)
.setHumidity(EnumHumidity.DAMP);
}
@@ -209,7 +210,7 @@ public enum ButterflyDefinition implements IButterflyDefinition {
},
RBlueMorpho(ButterflyBranchDefinition.Morpho, "blueMorphoR", "rhetenor", new Color(0x00bef8), true, 0.1f) {
@Override
protected void setSpeciesProperties(IAlleleButterflySpeciesCustom species) {
protected void setSpeciesProperties(IAlleleButterflySpeciesBuilder species) {
species.setTemperature(EnumTemperature.WARM)
.setHumidity(EnumHumidity.DAMP);
}
@@ -229,7 +230,7 @@ public enum ButterflyDefinition implements IButterflyDefinition {
},
Batesia(ButterflyBranchDefinition.Batesia, "paintedBeauty", "hypochlora", new Color(0xfe7763), true, 0.3f) {
@Override
protected void setSpeciesProperties(IAlleleButterflySpeciesCustom species) {
protected void setSpeciesProperties(IAlleleButterflySpeciesBuilder species) {
species.setTemperature(EnumTemperature.WARM)
.setHumidity(EnumHumidity.DAMP);
}
@@ -254,7 +255,7 @@ public enum ButterflyDefinition implements IButterflyDefinition {
},
BlueDuke(ButterflyBranchDefinition.Bassarona, "blueDuke", "durga", new Color(0x304240), true, 0.5f) {
@Override
protected void setSpeciesProperties(IAlleleButterflySpeciesCustom species) {
protected void setSpeciesProperties(IAlleleButterflySpeciesBuilder species) {
species.setTemperature(EnumTemperature.COLD);
}
@@ -272,7 +273,7 @@ public enum ButterflyDefinition implements IButterflyDefinition {
Postman(ButterflyBranchDefinition.Heliconius, "postman", "melpomene", new Color(0xf7302d), true, 0.3f),
Malachite(ButterflyBranchDefinition.Siproeta, "malachite", "stelenes", new Color(0xbdff53), true, 0.5f) {
@Override
protected void setSpeciesProperties(IAlleleButterflySpeciesCustom species) {
protected void setSpeciesProperties(IAlleleButterflySpeciesBuilder species) {
species.setTemperature(EnumTemperature.WARM)
.setHumidity(EnumHumidity.DAMP);
}
@@ -299,7 +300,7 @@ public enum ButterflyDefinition implements IButterflyDefinition {
}
};
private final IAlleleButterflySpeciesCustom species;
private final IAlleleButterflySpecies species;
private final ButterflyBranchDefinition branch;
private IAllele[] template;
private IButterflyGenome genome;
@@ -314,8 +315,10 @@ public enum ButterflyDefinition implements IButterflyDefinition {
String texture = "forestry:" + Constants.TEXTURE_PATH_ENTITIES + "/butterflies/" + uid + ".png";
species = ButterflyManager.butterflyFactory.createSpecies("forestry." + uid, unlocalizedName, "Sengir", unlocalizedDescription, texture, dominant, branchDefinition.getBranch(), binomial, serumColor);
species.setRarity(rarity);
IAlleleButterflySpeciesBuilder speciesBuilder = ButterflyManager.butterflyFactory.createSpecies("forestry." + uid, unlocalizedName, "Sengir", unlocalizedDescription, texture, dominant, branchDefinition.getBranch(), binomial, serumColor);
speciesBuilder.setRarity(rarity);
setSpeciesProperties(speciesBuilder);
this.species = speciesBuilder.build();
}
public static void initButterflies() {
@@ -325,8 +328,6 @@ public enum ButterflyDefinition implements IButterflyDefinition {
}
private void init() {
setSpeciesProperties(species);
template = branch.getTemplate();
AlleleHelper.instance.set(template, EnumButterflyChromosome.SPECIES, species);
setAlleles(template);
@@ -336,7 +337,7 @@ public enum ButterflyDefinition implements IButterflyDefinition {
ButterflyManager.butterflyRoot.registerTemplate(template);
}
protected void setSpeciesProperties(IAlleleButterflySpeciesCustom species) {
protected void setSpeciesProperties(IAlleleButterflySpeciesBuilder species) {
}
@@ -12,17 +12,13 @@ package forestry.lepidopterology.genetics;
import java.awt.Color;
import forestry.api.genetics.AlleleManager;
import forestry.api.genetics.IClassification;
import forestry.api.lepidopterology.EnumButterflyChromosome;
import forestry.api.lepidopterology.IAlleleButterflySpeciesCustom;
import forestry.api.lepidopterology.IAlleleButterflySpeciesBuilder;
import forestry.api.lepidopterology.IButterflyFactory;
public class ButterflyFactory implements IButterflyFactory {
@Override
public IAlleleButterflySpeciesCustom createSpecies(String uid, String unlocalizedName, String authority, String unlocalizedDescription, String texturePath, boolean isDominant, IClassification branch, String binomial, Color serumColour) {
IAlleleButterflySpeciesCustom species = new AlleleButterflySpecies(uid, unlocalizedName, authority, unlocalizedDescription, texturePath, isDominant, branch, binomial, serumColour);
AlleleManager.alleleRegistry.registerAllele(species, EnumButterflyChromosome.SPECIES);
return species;
public IAlleleButterflySpeciesBuilder createSpecies(String uid, String unlocalizedName, String authority, String unlocalizedDescription, String texturePath, boolean isDominant, IClassification branch, String binomial, Color serumColour) {
return new AlleleButterflySpecies(uid, unlocalizedName, authority, unlocalizedDescription, texturePath, isDominant, branch, binomial, serumColour);
}
}
@@ -21,7 +21,8 @@ import forestry.api.genetics.IClassification;
import forestry.api.lepidopterology.ButterflyManager;
import forestry.api.lepidopterology.EnumButterflyChromosome;
import forestry.api.lepidopterology.EnumFlutterType;
import forestry.api.lepidopterology.IAlleleButterflySpeciesCustom;
import forestry.api.lepidopterology.IAlleleButterflySpecies;
import forestry.api.lepidopterology.IAlleleButterflySpeciesBuilder;
import forestry.api.lepidopterology.IButterfly;
import forestry.api.lepidopterology.IButterflyGenome;
import forestry.core.config.Constants;
@@ -43,7 +44,7 @@ public enum MothDefinition implements IButterflyDefinition {
}
};
private final IAlleleButterflySpeciesCustom species;
private final IAlleleButterflySpecies species;
private final ButterflyBranchDefinition branch;
private IAllele[] template;
private IButterflyGenome genome;
@@ -58,9 +59,11 @@ public enum MothDefinition implements IButterflyDefinition {
String texture = "forestry:" + Constants.TEXTURE_PATH_ENTITIES + "/butterflies/" + uid + ".png";
species = ButterflyManager.butterflyFactory.createSpecies("forestry." + uid, unlocalizedName, "Sengir", unlocalizedDescription, texture, dominant, branchDefinition.getBranch(), binomial, serumColor);
species.setRarity(rarity);
species.setNocturnal();
IAlleleButterflySpeciesBuilder speciesBuilder = ButterflyManager.butterflyFactory.createSpecies("forestry." + uid, unlocalizedName, "Sengir", unlocalizedDescription, texture, dominant, branchDefinition.getBranch(), binomial, serumColor);
speciesBuilder.setRarity(rarity);
speciesBuilder.setNocturnal();
setSpeciesProperties(speciesBuilder);
species = speciesBuilder.build();
}
public static void initMoths() {
@@ -70,8 +73,6 @@ public enum MothDefinition implements IButterflyDefinition {
}
private void init() {
setSpeciesProperties(species);
template = branch.getTemplate();
AlleleHelper.instance.set(template, EnumButterflyChromosome.SPECIES, species);
setAlleles(template);
@@ -81,7 +82,7 @@ public enum MothDefinition implements IButterflyDefinition {
ButterflyManager.butterflyRoot.registerTemplate(template);
}
protected void setSpeciesProperties(IAlleleButterflySpeciesCustom species) {
protected void setSpeciesProperties(IAlleleButterflySpeciesBuilder species) {
}
@@ -177,6 +177,8 @@ public class PluginApiculture extends BlankForestryPlugin {
public void preInit() {
super.preInit();
BeeDefinition.preInit();
MinecraftForge.EVENT_BUS.register(this);
blocks.apiculture.addDefinitions(BlockTypeApiculture.VALUES);