Merge pull request #71 from KorDum/feature/issue-30

Partial fix for issue #30
This commit is contained in:
mezz authored and GitHub committed 2017-05-11 13:45:17 -07:00
commit a12ad2eae3
76 files changed
+4800 -4361

No files matched your search

@@ -1,8 +1,5 @@
package binnie.botany.api;
import binnie.botany.Botany;
import binnie.core.util.I18N;
public enum EnumAcidity {
ACID,
NEUTRAL,
@@ -11,8 +8,4 @@ public enum EnumAcidity {
public String getID() {
return name().toLowerCase();
}
public String getLocalisedName() {
return I18N.localise(Botany.instance, "ph." + getID());
}
}
@@ -1,8 +1,5 @@
package binnie.botany.api;
import binnie.botany.Botany;
import binnie.core.util.I18N;
public enum EnumMoisture {
DRY,
NORMAL,
@@ -11,8 +8,4 @@ public enum EnumMoisture {
public String getID() {
return name().toLowerCase();
}
public String getLocalisedName() {
return I18N.localise(Botany.instance, "moisture." + getID());
}
}
@@ -1,8 +1,5 @@
package binnie.botany.api;
import binnie.botany.Botany;
import binnie.core.util.I18N;
public enum EnumSoilType {
SOIL,
LOAM,
@@ -11,8 +8,4 @@ public enum EnumSoilType {
public String getID() {
return name().toLowerCase();
}
public String getLocalisedName() {
return I18N.localise(Botany.instance, "soil." + getID());
}
}
@@ -107,13 +107,13 @@ public class BlockCeramicBrick extends Block implements IBlockMetadata, IMultipa
for (TileType type2 : TileType.values()) {
if (type2.canDouble()) {
itemList.add(new BlockType(EnumFlowerColor.Brown, EnumFlowerColor.Gold, type2).getStack(1));
itemList.add(new BlockType(EnumFlowerColor.BROWN, EnumFlowerColor.GOLD, type2).getStack(1));
}
}
itemList.add(new BlockType(EnumFlowerColor.Gold, EnumFlowerColor.Gold, TileType.Split).getStack(1));
itemList.add(new BlockType(EnumFlowerColor.Brown, EnumFlowerColor.Brown, TileType.Chequered).getStack(1));
itemList.add(new BlockType(EnumFlowerColor.Gold, EnumFlowerColor.Brown, TileType.LargeBrick).getStack(1));
itemList.add(new BlockType(EnumFlowerColor.GOLD, EnumFlowerColor.GOLD, TileType.Split).getStack(1));
itemList.add(new BlockType(EnumFlowerColor.BROWN, EnumFlowerColor.BROWN, TileType.Chequered).getStack(1));
itemList.add(new BlockType(EnumFlowerColor.GOLD, EnumFlowerColor.BROWN, TileType.LargeBrick).getStack(1));
}
@Override
@@ -26,7 +26,7 @@ public class BlockCeramicPatterned extends BlockDesign {
@Override
public ItemStack getCreativeStack(IDesign design) {
return ModuleCarpentry.getItemStack(this, CeramicColor.get(EnumFlowerColor.White), CeramicColor.get(EnumFlowerColor.Black), design);
return ModuleCarpentry.getItemStack(this, CeramicColor.get(EnumFlowerColor.WHITE), CeramicColor.get(EnumFlowerColor.BLACK), design);
}
@Override
@@ -32,12 +32,12 @@ public class CeramicDesignSystem implements IDesignSystem {
@Override
public IDesignMaterial getDefaultMaterial() {
return CeramicColor.get(EnumFlowerColor.White);
return CeramicColor.get(EnumFlowerColor.WHITE);
}
@Override
public IDesignMaterial getDefaultMaterial2() {
return CeramicColor.get(EnumFlowerColor.Black);
return CeramicColor.get(EnumFlowerColor.BLACK);
}
@Override
@@ -18,6 +18,7 @@ import binnie.core.craftgui.geometry.IArea;
import binnie.core.craftgui.geometry.IPoint;
import binnie.core.craftgui.geometry.TextJustification;
import binnie.core.craftgui.minecraft.control.ControlItemDisplay;
import binnie.genetics.genetics.AlleleHelper;
import binnie.core.util.I18N;
import forestry.api.genetics.IAllele;
import forestry.api.genetics.IAlleleSpecies;
@@ -58,16 +59,15 @@ public class PageSpeciesFlowerGenome extends PageSpecies {
int th = 14;
int valueX = w2 + 4;
new ControlText(contents, new IArea(0.0f, y, w2, th), I18N.localise(Botany.instance, "gui.database.tab.genome.temp"), TextJustification.MiddleRight);
// TODO localized temperature
new ControlText(contents, new IArea(valueX, y, w3, th), treeSpecies.getTemperature().getName(), TextJustification.MiddleLeft);
new ControlText(contents, new IArea(valueX, y, w3, th), AlleleHelper.toDisplay(treeSpecies.getTemperature()), TextJustification.MiddleLeft);
y += th;
new ControlText(contents, new IArea(0.0f, y, w2, th), I18N.localise(Botany.instance, "gui.database.tab.genome.moist"), TextJustification.MiddleRight);
new ControlText(contents, new IArea(valueX, y, w3, th), treeSpecies.getMoisture().getLocalisedName(), TextJustification.MiddleLeft);
new ControlText(contents, new IArea(valueX, y, w3, th), AlleleHelper.toDisplay(treeSpecies.getMoisture()), TextJustification.MiddleLeft);
y += th;
new ControlText(contents, new IArea(0.0f, y, w2, th), I18N.localise(Botany.instance, "gui.database.tab.genome.ph"), TextJustification.MiddleRight);
new ControlText(contents, new IArea(valueX, y, w3, th), treeSpecies.getPH().getLocalisedName(), TextJustification.MiddleLeft);
new ControlText(contents, new IArea(valueX, y, w3, th), AlleleHelper.toDisplay(treeSpecies.getPH()), TextJustification.MiddleLeft);
y += th;
new ControlText(contents, new IArea(0.0f, y, w2, th), I18N.localise(Botany.instance, "gui.database.tab.genome.fertility"), TextJustification.MiddleRight);
@@ -3,9 +3,7 @@ package binnie.botany.flower;
import binnie.Binnie;
import binnie.botany.Botany;
import binnie.botany.CreativeTabBotany;
import binnie.botany.api.EnumFlowerChromosome;
import binnie.botany.api.EnumFlowerStage;
import binnie.botany.api.IAlleleFlowerSpecies;
import binnie.botany.api.IFlower;
import binnie.botany.api.IFlowerColor;
import binnie.botany.api.IFlowerGenome;
@@ -89,7 +87,12 @@ public abstract class ItemBotany extends Item {
IFlowerColor primaryColor = genome.getPrimaryColor();
IFlowerColor secondColor = genome.getSecondaryColor();
IFlowerColor stemColor = genome.getStemColor();
tooltip.add(EnumChatFormatting.YELLOW + primaryColor.getName() + ((primaryColor == secondColor) ? "" : (" and " + secondColor.getName())) + ", " + stemColor.getName() + " Stem");
if (primaryColor == secondColor) {
tooltip.add(EnumChatFormatting.YELLOW + I18N.localise(Botany.instance, "item.tooltip.flowerColor1", primaryColor.getName(), stemColor.getName()));
} else {
tooltip.add(EnumChatFormatting.YELLOW + I18N.localise(Botany.instance, "item.tooltip.flowerColor2", primaryColor.getName(), secondColor.getName(), stemColor.getName()));
}
if (individual.isAnalyzed()) {
if (BinnieCore.proxy.isShiftDown()) {
@@ -111,14 +114,6 @@ public abstract class ItemBotany extends Item {
return new Flower(itemstack.getTagCompound());
}
private IAlleleFlowerSpecies getPrimarySpecies(ItemStack itemstack) {
IFlower tree = BotanyCore.speciesRoot.getMember(itemstack);
if (tree == null) {
return (IAlleleFlowerSpecies) BotanyCore.speciesRoot.getDefaultTemplate()[EnumFlowerChromosome.SPECIES.ordinal()];
}
return tree.getGenome().getPrimary();
}
@Override
public String getItemStackDisplayName(ItemStack itemstack) {
if (!itemstack.hasTagCompound()) {
@@ -180,7 +175,7 @@ public abstract class ItemBotany extends Item {
public IIcon getIcon(ItemStack itemstack, int renderPass) {
IFlower flower = BotanyCore.speciesRoot.getMember(itemstack);
if (flower == null || flower.getGenome() == null || flower.getGenome().getPrimary() == null) {
return EnumFlowerType.Allium.getBlank();
return EnumFlowerType.ALLIUM.getBlank();
}
IFlowerType type = flower.getGenome().getPrimary().getType();
@@ -559,25 +559,25 @@ public class TileEntityFlower extends TileEntity implements IPollinatable, IButt
public int getPrimaryColor() {
return (renderInfo == null) ?
EnumFlowerColor.Red.getColor(false) :
EnumFlowerColor.RED.getColor(false) :
renderInfo.primary.getColor(isWilted());
}
public int getSecondaryColor() {
return (renderInfo == null) ?
EnumFlowerColor.Red.getColor(false) :
EnumFlowerColor.RED.getColor(false) :
renderInfo.secondary.getColor(isWilted());
}
public int getStemColour() {
return (renderInfo == null) ?
EnumFlowerColor.Green.getColor(false) :
EnumFlowerColor.GREEN.getColor(false) :
renderInfo.stem.getColor(isWilted());
}
public IFlowerType getType() {
return (renderInfo == null) ?
EnumFlowerType.Poppy :
EnumFlowerType.POPPY :
renderInfo.type;
}
@@ -7,6 +7,8 @@ import binnie.botany.api.EnumMoisture;
import binnie.botany.api.EnumSoilType;
import binnie.botany.api.gardening.IBlockSoil;
import binnie.core.BinnieCore;
import binnie.core.util.I18N;
import binnie.genetics.genetics.AlleleHelper;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.block.Block;
@@ -47,7 +49,7 @@ public class ItemSoilMeter extends Item {
EnumChatFormatting.LIGHT_PURPLE,
};
String info = "Type: ";
info += colors[type.ordinal()] + type.getLocalisedName() + EnumChatFormatting.RESET;
info += colors[type.ordinal()] + AlleleHelper.toDisplay(type) + EnumChatFormatting.RESET;
colors = new EnumChatFormatting[]{
EnumChatFormatting.YELLOW,
@@ -55,7 +57,7 @@ public class ItemSoilMeter extends Item {
EnumChatFormatting.BLUE,
};
info += ", Moisture: ";
info += colors[moisture.ordinal()] + moisture.getLocalisedName() + EnumChatFormatting.RESET;
info += colors[moisture.ordinal()] + AlleleHelper.toDisplay(moisture) + EnumChatFormatting.RESET;
colors = new EnumChatFormatting[]{
EnumChatFormatting.RED,
@@ -63,7 +65,7 @@ public class ItemSoilMeter extends Item {
EnumChatFormatting.AQUA,
};
info += ", pH: ";
info += colors[pH.ordinal()] + pH.getLocalisedName() + EnumChatFormatting.RESET;
info += colors[pH.ordinal()] + AlleleHelper.toDisplay(pH) + EnumChatFormatting.RESET;
IChatComponent chat = new ChatComponentText(info);
player.addChatMessage(chat);
}
@@ -77,7 +79,7 @@ public class ItemSoilMeter extends Item {
}
@Override
public String getItemStackDisplayName(ItemStack i) {
return "Soil Meter";
public String getItemStackDisplayName(ItemStack stack) {
return I18N.localise(Botany.instance, "item.soilMeter.name");
}
}
@@ -203,7 +203,7 @@ public class ModuleGardening implements IInitializable {
new Object[]{"dustSulphur"}
));
GameRegistry.addRecipe(new ShapelessOreRecipe(
new ItemStack(Botany.pigment, 2, EnumFlowerColor.Black.ordinal()),
new ItemStack(Botany.pigment, 2, EnumFlowerColor.BLACK.ordinal()),
new Object[]{
"pigment",
"pigment",
@@ -3,11 +3,11 @@ package binnie.botany.genetics;
import forestry.api.genetics.IAlleleInteger;
public class AlleleColor implements IAlleleInteger {
protected String uid;
protected boolean dominant;
protected String name;
protected int value;
protected EnumFlowerColor color;
private String uid;
private String name;
private int value;
private EnumFlowerColor color;
private boolean dominant = true;
public AlleleColor(EnumFlowerColor color, String uid, String name, int value) {
this.color = color;
@@ -23,7 +23,7 @@ public class AlleleColor implements IAlleleInteger {
@Override
public boolean isDominant() {
return true;
return dominant;
}
@Override
@@ -2,6 +2,8 @@ package binnie.botany.genetics;
import binnie.botany.api.IAlleleFlowerEffect;
import binnie.botany.api.IFlowerGenome;
import binnie.core.BinnieCore;
import binnie.core.util.I18N;
import forestry.api.genetics.IEffectData;
import net.minecraft.world.World;
@@ -28,7 +30,7 @@ public class AlleleEffectNone implements IAlleleFlowerEffect {
@Override
public String getName() {
return "None";
return I18N.localise(BinnieCore.instance, "allele.none");
}
@Override
@@ -14,6 +14,7 @@ public class BotanistTracker extends BreedingTracker implements IBotanistTracker
@Override
public void registerPickup(IIndividual individual) {
// ignored
}
@Override
File diff suppressed because it is too large. Load diff
@@ -7,53 +7,53 @@ import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.util.IIcon;
public enum EnumFlowerType implements IFlowerType {
Dandelion,
Poppy,
Orchid,
Allium,
Bluet,
Tulip,
Daisy,
Cornflower,
Pansy,
Iris,
Lavender(2),
Viola,
Daffodil,
Dahlia,
Peony(2),
Rose(2),
Lilac(2),
Hydrangea(2),
Foxglove(2),
Zinnia,
Mums,
Marigold,
Geranium,
Azalea,
Primrose,
Aster,
Carnation,
Lily,
Yarrow,
Petunia,
Agapanthus,
Fuchsia,
Dianthus,
Forget,
Anemone,
Aquilegia,
Edelweiss,
Scabious,
Coneflower,
Gaillardia,
Auricula,
Camellia(2),
Goldenrod(2),
Althea(2),
Penstemon(2),
Delphinium(2),
Hollyhock(2);
DANDELION,
POPPY,
ORCHID,
ALLIUM,
BLUET,
TULIP,
DAISY,
CORNFLOWER,
PANSY,
IRIS,
LAVENDER(2),
VIOLA,
DAFFODIL,
DAHLIA,
PEONY(2),
ROSE(2),
LILAC(2),
HYDRANGEA(2),
FOXGLOVE(2),
ZINNIA,
MUMS,
MARIGOLD,
GERANIUM,
AZALEA,
PRIMROSE,
ASTER,
CARNATION,
LILY,
YARROW,
PETUNIA,
AGAPANTHUS,
FUCHSIA,
DIANTHUS,
FORGET,
ANEMONE,
AQUILEGIA,
EDELWEISS,
SCABIOUS,
CONEFLOWER,
GAILLARDIA,
AURICULA,
CAMELLIA(2),
GOLDENROD(2),
ALTHEA(2),
PENSTEMON(2),
DELPHINIUM(2),
HOLLYHOCK(2);
protected int sections;
protected IIcon[] stem;
@@ -107,7 +107,13 @@ public enum EnumFlowerType implements IFlowerType {
@Override
public IIcon getVariantIcon(EnumFlowerStage stage, boolean flowered, int section) {
return (stage == EnumFlowerStage.SEED) ? seedVariant : ((stage == EnumFlowerStage.POLLEN) ? pollenVariant : (flowered ? variant[section % sections] : blank));
if (stage == EnumFlowerStage.SEED) {
return seedVariant;
}
if (stage == EnumFlowerStage.POLLEN) {
return pollenVariant;
}
return flowered ? variant[section % sections] : blank;
}
public void registerIcons(IIconRegister register) {
@@ -1,5 +1,6 @@
package binnie.botany.genetics;
import binnie.botany.Botany;
import binnie.botany.api.EnumFlowerChromosome;
import binnie.botany.api.IAlleleFlowerSpecies;
import binnie.botany.api.IColourMix;
@@ -8,6 +9,8 @@ import binnie.botany.api.IFlowerColor;
import binnie.botany.api.IFlowerGenome;
import binnie.botany.api.IFlowerMutation;
import binnie.botany.core.BotanyCore;
import binnie.core.util.I18N;
import binnie.genetics.genetics.AlleleHelper;
import forestry.api.arboriculture.EnumTreeChromosome;
import forestry.api.genetics.IAllele;
import forestry.api.genetics.IChromosome;
@@ -18,7 +21,6 @@ import net.minecraft.util.EnumChatFormatting;
import net.minecraft.world.World;
import java.util.List;
import java.util.Random;
public class Flower extends Individual implements IFlower {
public IFlowerGenome genome;
@@ -35,10 +37,9 @@ public class Flower extends Individual implements IFlower {
}
public Flower(IFlowerGenome genome, int age) {
this.age = 0;
wilting = false;
this.genome = genome;
this.age = age;
wilting = false;
flowered = age > 0;
}
@@ -49,9 +50,6 @@ public class Flower extends Individual implements IFlower {
if (species != null) {
name += species.getName();
}
if (age == 0) {
name += "";
}
return name;
}
@@ -60,15 +58,14 @@ public class Flower extends Individual implements IFlower {
IAlleleFlowerSpecies primary = genome.getPrimary();
IAlleleFlowerSpecies secondary = genome.getSecondary();
if (!isPureBred(EnumFlowerChromosome.SPECIES)) {
list.add(EnumChatFormatting.BLUE + primary.getName() + "-" + secondary.getName() + " Hybrid");
list.add(EnumChatFormatting.BLUE + I18N.localise(Botany.instance, "item.tooltip.hybrid", primary.getName(), secondary.getName()));
}
// TODO remove hardcode strings and localize
list.add(EnumChatFormatting.GRAY + "Age: " + getAge());
list.add(EnumChatFormatting.GREEN + "T: " + primary.getTemperature() + " / " + genome.getToleranceTemperature());
list.add(EnumChatFormatting.GREEN + "M: " + primary.getMoisture() + " / " + genome.getToleranceMoisture());
list.add(EnumChatFormatting.GREEN + "pH: " + primary.getHumidity() + " / " + genome.getTolerancePH());
list.add(EnumChatFormatting.GRAY + "Fert: " + genome.getFertility() + "x");
list.add(EnumChatFormatting.GRAY + I18N.localise(Botany.instance, "item.tooltip.age", getAge()));
list.add(EnumChatFormatting.GREEN + I18N.localise(Botany.instance, "item.tooltip.temperature", AlleleHelper.toDisplay(primary.getTemperature()), AlleleHelper.toDisplay(genome.getToleranceTemperature())));
list.add(EnumChatFormatting.GREEN + I18N.localise(Botany.instance, "item.tooltip.moisture", AlleleHelper.toDisplay(primary.getMoisture()), AlleleHelper.toDisplay(genome.getToleranceMoisture())));
list.add(EnumChatFormatting.GREEN + I18N.localise(Botany.instance, "item.tooltip.pH", AlleleHelper.toDisplay(primary.getHumidity()), AlleleHelper.toDisplay(genome.getTolerancePH())));
list.add(EnumChatFormatting.GRAY + I18N.localise(Botany.instance, "item.tooltip.fertility", genome.getFertility()));
}
@Override
@@ -124,27 +121,6 @@ public class Flower extends Individual implements IFlower {
return genome;
}
private IChromosome inheritChromosome(Random rand, IChromosome parent1, IChromosome parent2) {
IAllele choice1;
if (rand.nextBoolean()) {
choice1 = parent1.getPrimaryAllele();
} else {
choice1 = parent1.getSecondaryAllele();
}
IAllele choice2;
if (rand.nextBoolean()) {
choice2 = parent2.getPrimaryAllele();
} else {
choice2 = parent2.getSecondaryAllele();
}
if (rand.nextBoolean()) {
return new Chromosome(choice1, choice2);
}
return new Chromosome(choice2, choice1);
}
@Override
public void mate(IFlower other) {
mate = new FlowerGenome(other.getGenome().getChromosomes());
@@ -1,13 +1,15 @@
package binnie.botany.genetics;
import binnie.Binnie;
import binnie.botany.Botany;
import binnie.botany.api.EnumAcidity;
import binnie.botany.api.EnumFlowerChromosome;
import binnie.botany.api.EnumMoisture;
import binnie.botany.api.IAlleleFlowerSpecies;
import binnie.botany.api.IFlowerRoot;
import binnie.botany.api.IFlowerType;
import binnie.botany.core.BotanyCore;
import binnie.core.genetics.ForestryAllele;
import binnie.core.util.I18N;
import binnie.genetics.genetics.AlleleHelper;
import com.mojang.authlib.GameProfile;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
@@ -20,6 +22,7 @@ import forestry.api.genetics.IAllele;
import forestry.api.genetics.IClassification;
import forestry.api.genetics.IIndividual;
import forestry.api.genetics.ISpeciesRoot;
import forestry.core.genetics.alleles.EnumAllele;
import net.minecraft.init.Blocks;
import net.minecraft.item.ItemStack;
import net.minecraft.world.World;
@@ -28,58 +31,58 @@ import java.util.ArrayList;
import java.util.List;
public enum FlowerSpecies implements IAlleleFlowerSpecies {
Dandelion("Dandelion", "taraxacum", "officinale", EnumFlowerType.Dandelion, EnumFlowerColor.Yellow),
Poppy("Poppy", "papaver", "rhoeas", EnumFlowerType.Poppy, EnumFlowerColor.Red),
Orchid("Orchid", "vanda", "coerulea", EnumFlowerType.Orchid, EnumFlowerColor.DeepSkyBlue),
Allium("Allium", "allium", "giganteum", EnumFlowerType.Allium, EnumFlowerColor.MediumPurple),
Bluet("Bluet", "houstonia", "caerulea", EnumFlowerType.Bluet, EnumFlowerColor.Lavender, EnumFlowerColor.Khaki),
Tulip("Tulip", "tulipa", "agenensis", EnumFlowerType.Tulip, EnumFlowerColor.Violet),
Daisy("Daisy", "leucanthemum", "vulgare", EnumFlowerType.Daisy, EnumFlowerColor.White, EnumFlowerColor.Yellow),
Cornflower("Cornflower", "centaurea", "cyanus", EnumFlowerType.Cornflower, EnumFlowerColor.SkyBlue),
Pansy("Pansy", "viola", "tricolor", EnumFlowerType.Pansy, EnumFlowerColor.Pink, EnumFlowerColor.Purple),
Iris("Iris", "iris", "germanica", EnumFlowerType.Iris, EnumFlowerColor.LightGray, EnumFlowerColor.Purple),
Lavender("Lavender", "Lavandula", "angustifolia", EnumFlowerType.Lavender, EnumFlowerColor.MediumOrchid),
Viola("Viola", "viola", "odorata", EnumFlowerType.Viola, EnumFlowerColor.MediumPurple, EnumFlowerColor.SlateBlue),
Daffodil("Daffodil", "narcissus", "pseudonarcissus", EnumFlowerType.Daffodil, EnumFlowerColor.Yellow, EnumFlowerColor.Gold),
Dahlia("Dahlia", "dahlia", "variabilis", EnumFlowerType.Dahlia, EnumFlowerColor.HotPink, EnumFlowerColor.DeepPink),
Peony("Peony", "paeonia", "suffruticosa", EnumFlowerType.Peony, EnumFlowerColor.Thistle),
Rose("Rose", "rosa", "rubiginosa", EnumFlowerType.Rose, EnumFlowerColor.Red),
Lilac("Lilac", "syringa", "vulgaris", EnumFlowerType.Lilac, EnumFlowerColor.Plum),
Hydrangea("Hydrangea", "hydrangea", "macrophylla", EnumFlowerType.Hydrangea, EnumFlowerColor.DeepSkyBlue),
Foxglove("Foxglove", "digitalis", "purpurea", EnumFlowerType.Foxglove, EnumFlowerColor.HotPink),
Zinnia("Zinnia", "zinnia", "elegans", EnumFlowerType.Zinnia, EnumFlowerColor.MediumVioletRed, EnumFlowerColor.Yellow),
Chrysanthemum("Chrysanthemum", "chrysanthemum", "\u00ef?? grandiflorum", EnumFlowerType.Mums, EnumFlowerColor.Violet),
Marigold("Marigold", "calendula", "officinalis", EnumFlowerType.Marigold, EnumFlowerColor.Gold, EnumFlowerColor.DarkOrange),
Geranium("Geranium", "geranium", "maderense", EnumFlowerType.Geranium, EnumFlowerColor.DeepPink),
Azalea("Azalea", "rhododendrons", "aurigeranum", EnumFlowerType.Azalea, EnumFlowerColor.HotPink),
Primrose("Primrose", "primula", "vulgaris", EnumFlowerType.Primrose, EnumFlowerColor.Red, EnumFlowerColor.Gold),
Aster("Aster", "aster", "amellus", EnumFlowerType.Aster, EnumFlowerColor.MediumPurple, EnumFlowerColor.Goldenrod),
Carnation("Carnation", "dianthus", "caryophyllus", EnumFlowerType.Carnation, EnumFlowerColor.Crimson, EnumFlowerColor.White),
Lily("Lily", "lilium", "auratum", EnumFlowerType.Lily, EnumFlowerColor.Pink, EnumFlowerColor.Gold),
Yarrow("Yarrow", "achillea", "millefolium", EnumFlowerType.Yarrow, EnumFlowerColor.Yellow),
Petunia("Petunia", "petunia", "\u00ef?? atkinsiana", EnumFlowerType.Petunia, EnumFlowerColor.MediumVioletRed, EnumFlowerColor.Thistle),
Agapanthus("Agapanthus", "agapanthus", "praecox", EnumFlowerType.Agapanthus, EnumFlowerColor.DeepSkyBlue),
Fuchsia("Fuchsia", "fuchsia", "magellanica", EnumFlowerType.Fuchsia, EnumFlowerColor.DeepPink, EnumFlowerColor.MediumOrchid),
Dianthus("Dianthus", "dianthus", "barbatus", EnumFlowerType.Dianthus, EnumFlowerColor.Crimson, EnumFlowerColor.HotPink),
Forget("Forget-me-nots", "myosotis", "arvensis", EnumFlowerType.Forget, EnumFlowerColor.LightSteelBlue),
Anemone("Anemone", "anemone", "coronaria", EnumFlowerType.Anemone, EnumFlowerColor.Red, EnumFlowerColor.MistyRose),
Aquilegia("Aquilegia", "aquilegia", "vulgaris", EnumFlowerType.Aquilegia, EnumFlowerColor.SlateBlue, EnumFlowerColor.Thistle),
Edelweiss("Edelweiss", "leontopodium", "alpinum", EnumFlowerType.Edelweiss, EnumFlowerColor.White, EnumFlowerColor.Khaki),
Scabious("Scabious", "scabiosa", "columbaria", EnumFlowerType.Scabious, EnumFlowerColor.RoyalBlue),
Coneflower("Coneflower", "echinacea", "purpurea", EnumFlowerType.Coneflower, EnumFlowerColor.Violet, EnumFlowerColor.DarkOrange),
Gaillardia("Gaillardia", "gaillardia", "aristata", EnumFlowerType.Gaillardia, EnumFlowerColor.DarkOrange, EnumFlowerColor.Yellow),
Auricula("Auricula", "primula", "auricula", EnumFlowerType.Auricula, EnumFlowerColor.Red, EnumFlowerColor.Yellow),
Camellia("Camellia", "camellia", "japonica", EnumFlowerType.Camellia, EnumFlowerColor.Crimson),
Goldenrod("Goldenrod", "solidago", "canadensis", EnumFlowerType.Goldenrod, EnumFlowerColor.Gold),
Althea("Althea", "althaea", "officinalis", EnumFlowerType.Althea, EnumFlowerColor.Thistle, EnumFlowerColor.MediumOrchid),
Penstemon("Penstemon", "penstemon", "digitalis", EnumFlowerType.Penstemon, EnumFlowerColor.MediumOrchid, EnumFlowerColor.Thistle),
Delphinium("Delphinium", "delphinium", "staphisagria", EnumFlowerType.Delphinium, EnumFlowerColor.DarkSlateBlue),
Hollyhock("Hollyhock", "Alcea", "rosea", EnumFlowerType.Hollyhock, EnumFlowerColor.Black, EnumFlowerColor.Gold);
DANDELION("dandelion", "taraxacum", "officinale", EnumFlowerType.DANDELION, EnumFlowerColor.YELLOW),
POPPY("poppy", "papaver", "rhoeas", EnumFlowerType.POPPY, EnumFlowerColor.RED),
ORCHID("orchid", "vanda", "coerulea", EnumFlowerType.ORCHID, EnumFlowerColor.DEEP_SKY_BLUE),
ALLIUM("allium", "allium", "giganteum", EnumFlowerType.ALLIUM, EnumFlowerColor.MEDIUM_PURPLE),
BLUET("bluet", "houstonia", "caerulea", EnumFlowerType.BLUET, EnumFlowerColor.LAVENDER, EnumFlowerColor.KHAKI),
TULIP("tulip", "tulipa", "agenensis", EnumFlowerType.TULIP, EnumFlowerColor.VIOLET),
DAISY("daisy", "leucanthemum", "vulgare", EnumFlowerType.DAISY, EnumFlowerColor.WHITE, EnumFlowerColor.YELLOW),
CORNFLOWER("cornflower", "centaurea", "cyanus", EnumFlowerType.CORNFLOWER, EnumFlowerColor.SKY_BLUE),
PANSY("pansy", "viola", "tricolor", EnumFlowerType.PANSY, EnumFlowerColor.PINK, EnumFlowerColor.PURPLE),
IRIS("iris", "iris", "germanica", EnumFlowerType.IRIS, EnumFlowerColor.LIGHT_GRAY, EnumFlowerColor.PURPLE),
LAVENDER("lavender", "Lavandula", "angustifolia", EnumFlowerType.LAVENDER, EnumFlowerColor.MEDIUM_ORCHID),
VIOLA("viola", "viola", "odorata", EnumFlowerType.VIOLA, EnumFlowerColor.MEDIUM_PURPLE, EnumFlowerColor.SLATE_BLUE),
DAFFODIL("daffodil", "narcissus", "pseudonarcissus", EnumFlowerType.DAFFODIL, EnumFlowerColor.YELLOW, EnumFlowerColor.GOLD),
DAHLIA("dahlia", "dahlia", "variabilis", EnumFlowerType.DAHLIA, EnumFlowerColor.HOT_PINK, EnumFlowerColor.DEEP_PINK),
PEONY("peony", "paeonia", "suffruticosa", EnumFlowerType.PEONY, EnumFlowerColor.THISTLE),
ROSE("rose", "rosa", "rubiginosa", EnumFlowerType.ROSE, EnumFlowerColor.RED),
LILAC("lilac", "syringa", "vulgaris", EnumFlowerType.LILAC, EnumFlowerColor.PLUM),
HYDRANGEA("hydrangea", "hydrangea", "macrophylla", EnumFlowerType.HYDRANGEA, EnumFlowerColor.DEEP_SKY_BLUE),
FOXGLOVE("foxglove", "digitalis", "purpurea", EnumFlowerType.FOXGLOVE, EnumFlowerColor.HOT_PINK),
ZINNIA("zinnia", "zinnia", "elegans", EnumFlowerType.ZINNIA, EnumFlowerColor.MEDIUM_VIOLET_RED, EnumFlowerColor.YELLOW),
CHRYSANTHEMUM("chrysanthemum", "chrysanthemum", "\u00ef?? grandiflorum", EnumFlowerType.MUMS, EnumFlowerColor.VIOLET),
MARIGOLD("marigold", "calendula", "officinalis", EnumFlowerType.MARIGOLD, EnumFlowerColor.GOLD, EnumFlowerColor.DARK_ORANGE),
GERANIUM("geranium", "geranium", "maderense", EnumFlowerType.GERANIUM, EnumFlowerColor.DEEP_PINK),
AZALEA("azalea", "rhododendrons", "aurigeranum", EnumFlowerType.AZALEA, EnumFlowerColor.HOT_PINK),
PRIMROSE("primrose", "primula", "vulgaris", EnumFlowerType.PRIMROSE, EnumFlowerColor.RED, EnumFlowerColor.GOLD),
ASTER("aster", "aster", "amellus", EnumFlowerType.ASTER, EnumFlowerColor.MEDIUM_PURPLE, EnumFlowerColor.GOLDENROD),
CARNATION("carnation", "dianthus", "caryophyllus", EnumFlowerType.CARNATION, EnumFlowerColor.CRIMSON, EnumFlowerColor.WHITE),
LILY("lily", "lilium", "auratum", EnumFlowerType.LILY, EnumFlowerColor.PINK, EnumFlowerColor.GOLD),
YARROW("yarrow", "achillea", "millefolium", EnumFlowerType.YARROW, EnumFlowerColor.YELLOW),
PETUNIA("petunia", "petunia", "\u00ef?? atkinsiana", EnumFlowerType.PETUNIA, EnumFlowerColor.MEDIUM_VIOLET_RED, EnumFlowerColor.THISTLE),
AGAPANTHUS("agapanthus", "agapanthus", "praecox", EnumFlowerType.AGAPANTHUS, EnumFlowerColor.DEEP_SKY_BLUE),
FUCHSIA("fuchsia", "fuchsia", "magellanica", EnumFlowerType.FUCHSIA, EnumFlowerColor.DEEP_PINK, EnumFlowerColor.MEDIUM_ORCHID),
DIANTHUS("dianthus", "dianthus", "barbatus", EnumFlowerType.DIANTHUS, EnumFlowerColor.CRIMSON, EnumFlowerColor.HOT_PINK),
FORGET("forget-me-nots", "myosotis", "arvensis", EnumFlowerType.FORGET, EnumFlowerColor.LIGHT_STEEL_BLUE),
ANEMONE("anemone", "anemone", "coronaria", EnumFlowerType.ANEMONE, EnumFlowerColor.RED, EnumFlowerColor.MISTY_ROSE),
AQUILEGIA("aquilegia", "aquilegia", "vulgaris", EnumFlowerType.AQUILEGIA, EnumFlowerColor.SLATE_BLUE, EnumFlowerColor.THISTLE),
EDELWEISS("edelweiss", "leontopodium", "alpinum", EnumFlowerType.EDELWEISS, EnumFlowerColor.WHITE, EnumFlowerColor.KHAKI),
SCABIOUS("scabious", "scabiosa", "columbaria", EnumFlowerType.SCABIOUS, EnumFlowerColor.ROYAL_BLUE),
CONEFLOWER("coneflower", "echinacea", "purpurea", EnumFlowerType.CONEFLOWER, EnumFlowerColor.VIOLET, EnumFlowerColor.DARK_ORANGE),
GAILLARDIA("gaillardia", "gaillardia", "aristata", EnumFlowerType.GAILLARDIA, EnumFlowerColor.DARK_ORANGE, EnumFlowerColor.YELLOW),
AURICULA("auricula", "primula", "auricula", EnumFlowerType.AURICULA, EnumFlowerColor.RED, EnumFlowerColor.YELLOW),
CAMELLIA("camellia", "camellia", "japonica", EnumFlowerType.CAMELLIA, EnumFlowerColor.CRIMSON),
GOLDENROD("goldenrod", "solidago", "canadensis", EnumFlowerType.GOLDENROD, EnumFlowerColor.GOLD),
ALTHEA("althea", "althaea", "officinalis", EnumFlowerType.ALTHEA, EnumFlowerColor.THISTLE, EnumFlowerColor.MEDIUM_ORCHID),
PENSTEMON("penstemon", "penstemon", "digitalis", EnumFlowerType.PENSTEMON, EnumFlowerColor.MEDIUM_ORCHID, EnumFlowerColor.THISTLE),
DELPHINIUM("delphinium", "delphinium", "staphisagria", EnumFlowerType.DELPHINIUM, EnumFlowerColor.DARK_SLATE_BLUE),
HOLLYHOCK("hollyhock", "Alcea", "rosea", EnumFlowerType.HOLLYHOCK, EnumFlowerColor.BLACK, EnumFlowerColor.GOLD);
protected EnumFlowerColor stemColor;
protected ForestryAllele.Fertility fert;
protected ForestryAllele.Lifespan life;
protected ForestryAllele.Sappiness sap;
protected EnumAllele.Fertility fert;
protected EnumAllele.Lifespan life;
protected EnumAllele.Sappiness sap;
protected IFlowerType type;
protected String name;
protected String binomial;
@@ -100,7 +103,12 @@ public enum FlowerSpecies implements IAlleleFlowerSpecies {
}
FlowerSpecies(String name, String branch, String binomial, IFlowerType type, EnumFlowerColor primaryColor, EnumFlowerColor secondaryColor) {
stemColor = EnumFlowerColor.Green;
this.name = name;
this.binomial = binomial;
this.type = type;
this.primaryColor = primaryColor;
this.secondaryColor = secondaryColor;
stemColor = EnumFlowerColor.GREEN;
temperature = EnumTemperature.NORMAL;
pH = EnumAcidity.NEUTRAL;
moisture = EnumMoisture.NORMAL;
@@ -108,255 +116,344 @@ public enum FlowerSpecies implements IAlleleFlowerSpecies {
pHTolerance = EnumTolerance.NONE;
moistureTolerance = EnumTolerance.NONE;
variantTemplates = new ArrayList<>();
this.name = name;
this.binomial = binomial;
branchName = branch;
this.type = type;
this.primaryColor = primaryColor;
this.secondaryColor = secondaryColor;
}
public static void setupVariants() {
FlowerSpecies.Dandelion.setTraits(ForestryAllele.Fertility.High, ForestryAllele.Lifespan.Shortened, ForestryAllele.Sappiness.Lower);
FlowerSpecies.Poppy.setTraits(ForestryAllele.Fertility.High, ForestryAllele.Lifespan.Shorter, ForestryAllele.Sappiness.Average);
FlowerSpecies.Orchid.setTraits(ForestryAllele.Fertility.Normal, ForestryAllele.Lifespan.Long, ForestryAllele.Sappiness.Low);
FlowerSpecies.Allium.setTraits(ForestryAllele.Fertility.Normal, ForestryAllele.Lifespan.Normal, ForestryAllele.Sappiness.Low);
FlowerSpecies.Bluet.setTraits(ForestryAllele.Fertility.Low, ForestryAllele.Lifespan.Normal, ForestryAllele.Sappiness.Lower);
FlowerSpecies.Tulip.setTraits(ForestryAllele.Fertility.Normal, ForestryAllele.Lifespan.Long, ForestryAllele.Sappiness.Average);
FlowerSpecies.Daisy.setTraits(ForestryAllele.Fertility.Normal, ForestryAllele.Lifespan.Normal, ForestryAllele.Sappiness.Low);
FlowerSpecies.Cornflower.setTraits(ForestryAllele.Fertility.High, ForestryAllele.Lifespan.Shorter, ForestryAllele.Sappiness.Low);
FlowerSpecies.Pansy.setTraits(ForestryAllele.Fertility.Normal, ForestryAllele.Lifespan.Shortened, ForestryAllele.Sappiness.Average);
FlowerSpecies.Iris.setTraits(ForestryAllele.Fertility.High, ForestryAllele.Lifespan.Normal, ForestryAllele.Sappiness.Average);
FlowerSpecies.Lavender.setTraits(ForestryAllele.Fertility.High, ForestryAllele.Lifespan.Normal, ForestryAllele.Sappiness.Low);
FlowerSpecies.Viola.setTraits(ForestryAllele.Fertility.Normal, ForestryAllele.Lifespan.Shortened, ForestryAllele.Sappiness.Average);
FlowerSpecies.Daffodil.setTraits(ForestryAllele.Fertility.High, ForestryAllele.Lifespan.Elongated, ForestryAllele.Sappiness.Average);
FlowerSpecies.Aster.setTraits(ForestryAllele.Fertility.Normal, ForestryAllele.Lifespan.Normal, ForestryAllele.Sappiness.Higher);
FlowerSpecies.Lilac.setTraits(ForestryAllele.Fertility.Low, ForestryAllele.Lifespan.Longer, ForestryAllele.Sappiness.Average);
FlowerSpecies.Rose.setTraits(ForestryAllele.Fertility.Low, ForestryAllele.Lifespan.Longer, ForestryAllele.Sappiness.High);
FlowerSpecies.Peony.setTraits(ForestryAllele.Fertility.Low, ForestryAllele.Lifespan.Long, ForestryAllele.Sappiness.Average);
FlowerSpecies.Marigold.setTraits(ForestryAllele.Fertility.High, ForestryAllele.Lifespan.Shorter, ForestryAllele.Sappiness.Average);
FlowerSpecies.Hydrangea.setTraits(ForestryAllele.Fertility.Low, ForestryAllele.Lifespan.Longer, ForestryAllele.Sappiness.High);
FlowerSpecies.Foxglove.setTraits(ForestryAllele.Fertility.Low, ForestryAllele.Lifespan.Shortened, ForestryAllele.Sappiness.Low);
FlowerSpecies.Dahlia.setTraits(ForestryAllele.Fertility.Normal, ForestryAllele.Lifespan.Normal, ForestryAllele.Sappiness.Average);
FlowerSpecies.Chrysanthemum.setTraits(ForestryAllele.Fertility.High, ForestryAllele.Lifespan.Long, ForestryAllele.Sappiness.High);
FlowerSpecies.Carnation.setTraits(ForestryAllele.Fertility.Normal, ForestryAllele.Lifespan.Normal, ForestryAllele.Sappiness.High);
FlowerSpecies.Zinnia.setTraits(ForestryAllele.Fertility.Normal, ForestryAllele.Lifespan.Shorter, ForestryAllele.Sappiness.Average);
FlowerSpecies.Primrose.setTraits(ForestryAllele.Fertility.Normal, ForestryAllele.Lifespan.Long, ForestryAllele.Sappiness.Average);
FlowerSpecies.Azalea.setTraits(ForestryAllele.Fertility.Normal, ForestryAllele.Lifespan.Normal, ForestryAllele.Sappiness.Average);
FlowerSpecies.Geranium.setTraits(ForestryAllele.Fertility.Low, ForestryAllele.Lifespan.Long, ForestryAllele.Sappiness.Low);
FlowerSpecies.Lily.setTraits(ForestryAllele.Fertility.Low, ForestryAllele.Lifespan.Long, ForestryAllele.Sappiness.Low);
FlowerSpecies.Yarrow.setTraits(ForestryAllele.Fertility.High, ForestryAllele.Lifespan.Normal, ForestryAllele.Sappiness.Low);
FlowerSpecies.Petunia.setTraits(ForestryAllele.Fertility.Normal, ForestryAllele.Lifespan.Shorter, ForestryAllele.Sappiness.Average);
FlowerSpecies.Agapanthus.setTraits(ForestryAllele.Fertility.Normal, ForestryAllele.Lifespan.Normal, ForestryAllele.Sappiness.Low);
FlowerSpecies.Fuchsia.setTraits(ForestryAllele.Fertility.Normal, ForestryAllele.Lifespan.Shortened, ForestryAllele.Sappiness.Average);
FlowerSpecies.Dianthus.setTraits(ForestryAllele.Fertility.Normal, ForestryAllele.Lifespan.Short, ForestryAllele.Sappiness.High);
FlowerSpecies.Forget.setTraits(ForestryAllele.Fertility.Normal, ForestryAllele.Lifespan.Short, ForestryAllele.Sappiness.Lower);
FlowerSpecies.Anemone.setTraits(ForestryAllele.Fertility.High, ForestryAllele.Lifespan.Normal, ForestryAllele.Sappiness.Low);
FlowerSpecies.Aquilegia.setTraits(ForestryAllele.Fertility.Normal, ForestryAllele.Lifespan.Normal, ForestryAllele.Sappiness.Average);
FlowerSpecies.Edelweiss.setTraits(ForestryAllele.Fertility.Low, ForestryAllele.Lifespan.Normal, ForestryAllele.Sappiness.Lowest);
FlowerSpecies.Scabious.setTraits(ForestryAllele.Fertility.Normal, ForestryAllele.Lifespan.Shortened, ForestryAllele.Sappiness.Low);
FlowerSpecies.Coneflower.setTraits(ForestryAllele.Fertility.Normal, ForestryAllele.Lifespan.Normal, ForestryAllele.Sappiness.Higher);
FlowerSpecies.Gaillardia.setTraits(ForestryAllele.Fertility.High, ForestryAllele.Lifespan.Long, ForestryAllele.Sappiness.Higher);
FlowerSpecies.Auricula.setTraits(ForestryAllele.Fertility.Normal, ForestryAllele.Lifespan.Elongated, ForestryAllele.Sappiness.High);
FlowerSpecies.Camellia.setTraits(ForestryAllele.Fertility.Normal, ForestryAllele.Lifespan.Normal, ForestryAllele.Sappiness.High);
FlowerSpecies.Goldenrod.setTraits(ForestryAllele.Fertility.High, ForestryAllele.Lifespan.Normal, ForestryAllele.Sappiness.Higher);
FlowerSpecies.Althea.setTraits(ForestryAllele.Fertility.Low, ForestryAllele.Lifespan.Elongated, ForestryAllele.Sappiness.High);
FlowerSpecies.Penstemon.setTraits(ForestryAllele.Fertility.Low, ForestryAllele.Lifespan.Long, ForestryAllele.Sappiness.Low);
FlowerSpecies.Delphinium.setTraits(ForestryAllele.Fertility.Low, ForestryAllele.Lifespan.Longer, ForestryAllele.Sappiness.Low);
FlowerSpecies.Hollyhock.setTraits(ForestryAllele.Fertility.Low, ForestryAllele.Lifespan.Long, ForestryAllele.Sappiness.High);
FlowerSpecies.Dandelion.setPH(EnumAcidity.NEUTRAL, EnumTolerance.BOTH_1);
FlowerSpecies.Dandelion.setMoisture(EnumMoisture.NORMAL, EnumTolerance.BOTH_1);
FlowerSpecies.Poppy.setPH(EnumAcidity.NEUTRAL, EnumTolerance.DOWN_1);
FlowerSpecies.Poppy.setMoisture(EnumMoisture.NORMAL, EnumTolerance.DOWN_1);
FlowerSpecies.Poppy.setTemperature(EnumTemperature.WARM, EnumTolerance.BOTH_2);
FlowerSpecies.Orchid.setPH(EnumAcidity.ACID, EnumTolerance.NONE);
FlowerSpecies.Orchid.setMoisture(EnumMoisture.NORMAL, EnumTolerance.BOTH_1);
FlowerSpecies.Allium.setPH(EnumAcidity.ALKALINE, EnumTolerance.DOWN_1);
FlowerSpecies.Allium.setMoisture(EnumMoisture.NORMAL, EnumTolerance.DOWN_1);
FlowerSpecies.Bluet.setPH(EnumAcidity.NEUTRAL, EnumTolerance.DOWN_1);
FlowerSpecies.Bluet.setMoisture(EnumMoisture.DAMP, EnumTolerance.NONE);
FlowerSpecies.Tulip.setMoisture(EnumMoisture.NORMAL, EnumTolerance.BOTH_1);
FlowerSpecies.Daisy.setPH(EnumAcidity.NEUTRAL, EnumTolerance.DOWN_1);
FlowerSpecies.Daisy.setMoisture(EnumMoisture.NORMAL, EnumTolerance.DOWN_1);
FlowerSpecies.Daisy.setTemperature(EnumTemperature.WARM, EnumTolerance.BOTH_2);
FlowerSpecies.Cornflower.setMutation(FlowerSpecies.Dandelion, FlowerSpecies.Tulip, 10);
FlowerSpecies.Cornflower.setPH(EnumAcidity.NEUTRAL, EnumTolerance.BOTH_1);
FlowerSpecies.Pansy.setMutation(FlowerSpecies.Tulip, FlowerSpecies.Viola, 5);
FlowerSpecies.Pansy.setPH(EnumAcidity.ACID, EnumTolerance.NONE);
FlowerSpecies.Pansy.setTemperature(EnumTemperature.WARM, EnumTolerance.DOWN_1);
FlowerSpecies.Iris.setMutation(FlowerSpecies.Orchid, FlowerSpecies.Viola, 10);
FlowerSpecies.Iris.setPH(EnumAcidity.ACID, EnumTolerance.NONE);
FlowerSpecies.Iris.setTemperature(EnumTemperature.WARM, EnumTolerance.DOWN_1);
FlowerSpecies.Lavender.setMutation(FlowerSpecies.Allium, FlowerSpecies.Viola, 10);
FlowerSpecies.Lavender.setPH(EnumAcidity.NEUTRAL, EnumTolerance.UP_1);
FlowerSpecies.Lavender.setMoisture(EnumMoisture.NORMAL, EnumTolerance.DOWN_1);
FlowerSpecies.Lavender.setTemperature(EnumTemperature.WARM, EnumTolerance.DOWN_1);
FlowerSpecies.Viola.setMutation(FlowerSpecies.Orchid, FlowerSpecies.Poppy, 15);
FlowerSpecies.Viola.setPH(EnumAcidity.ACID, EnumTolerance.NONE);
FlowerSpecies.Viola.setMoisture(EnumMoisture.NORMAL, EnumTolerance.DOWN_1);
FlowerSpecies.Daffodil.setMutation(FlowerSpecies.Dandelion, FlowerSpecies.Poppy, 10);
FlowerSpecies.Daffodil.setPH(EnumAcidity.NEUTRAL, EnumTolerance.DOWN_1);
FlowerSpecies.Aster.setMutation(FlowerSpecies.Daisy, FlowerSpecies.Tulip, 10);
FlowerSpecies.Aster.setPH(EnumAcidity.NEUTRAL, EnumTolerance.BOTH_1);
FlowerSpecies.Lilac.setPH(EnumAcidity.ALKALINE, EnumTolerance.DOWN_1);
FlowerSpecies.Rose.setPH(EnumAcidity.ACID, EnumTolerance.UP_1);
FlowerSpecies.Peony.setPH(EnumAcidity.ALKALINE, EnumTolerance.DOWN_1);
FlowerSpecies.Peony.setMoisture(EnumMoisture.NORMAL, EnumTolerance.UP_1);
FlowerSpecies.Marigold.setMutation(FlowerSpecies.Daisy, FlowerSpecies.Dandelion, 10);
FlowerSpecies.Marigold.setPH(EnumAcidity.NEUTRAL, EnumTolerance.DOWN_1);
FlowerSpecies.Marigold.setMoisture(EnumMoisture.NORMAL, EnumTolerance.UP_1);
FlowerSpecies.Marigold.setTemperature(EnumTemperature.WARM, EnumTolerance.BOTH_2);
FlowerSpecies.Hydrangea.setMutation(FlowerSpecies.Peony, FlowerSpecies.Bluet, 10);
FlowerSpecies.Hydrangea.setPH(EnumAcidity.NEUTRAL, EnumTolerance.BOTH_1);
FlowerSpecies.Hydrangea.setMoisture(EnumMoisture.DAMP, EnumTolerance.NONE);
FlowerSpecies.Foxglove.setMutation(FlowerSpecies.Lilac, FlowerSpecies.Zinnia, 5);
FlowerSpecies.Foxglove.setPH(EnumAcidity.NEUTRAL, EnumTolerance.DOWN_1);
FlowerSpecies.Foxglove.setMoisture(EnumMoisture.NORMAL, EnumTolerance.UP_1);
FlowerSpecies.Dahlia.setMutation(FlowerSpecies.Daisy, FlowerSpecies.Allium, 15);
FlowerSpecies.Dahlia.setPH(EnumAcidity.NEUTRAL, EnumTolerance.DOWN_1);
FlowerSpecies.Dahlia.setMoisture(EnumMoisture.NORMAL, EnumTolerance.UP_1);
FlowerSpecies.Dahlia.setTemperature(EnumTemperature.NORMAL, EnumTolerance.BOTH_2);
FlowerSpecies.Chrysanthemum.setMutation(FlowerSpecies.Geranium, FlowerSpecies.Rose, 10);
FlowerSpecies.Chrysanthemum.setPH(EnumAcidity.NEUTRAL, EnumTolerance.DOWN_1);
FlowerSpecies.Chrysanthemum.setMoisture(EnumMoisture.NORMAL, EnumTolerance.DOWN_1);
FlowerSpecies.Carnation.setMutation(FlowerSpecies.Dianthus, FlowerSpecies.Rose, 5);
FlowerSpecies.Carnation.setPH(EnumAcidity.ALKALINE, EnumTolerance.DOWN_1);
FlowerSpecies.Zinnia.setMutation(FlowerSpecies.Dahlia, FlowerSpecies.Marigold, 5);
FlowerSpecies.Zinnia.setPH(EnumAcidity.NEUTRAL, EnumTolerance.BOTH_1);
FlowerSpecies.Zinnia.setMoisture(EnumMoisture.NORMAL, EnumTolerance.DOWN_1);
FlowerSpecies.Zinnia.setTemperature(EnumTemperature.NORMAL, EnumTolerance.BOTH_2);
FlowerSpecies.Primrose.setMutation(FlowerSpecies.Chrysanthemum, FlowerSpecies.Auricula, 5);
FlowerSpecies.Primrose.setPH(EnumAcidity.ACID, EnumTolerance.UP_1);
FlowerSpecies.Primrose.setMoisture(EnumMoisture.NORMAL, EnumTolerance.UP_1);
FlowerSpecies.Azalea.setMutation(FlowerSpecies.Orchid, FlowerSpecies.Geranium, 5);
FlowerSpecies.Azalea.setPH(EnumAcidity.ACID, EnumTolerance.NONE);
FlowerSpecies.Geranium.setMutation(FlowerSpecies.Tulip, FlowerSpecies.Orchid, 15);
FlowerSpecies.Geranium.setPH(EnumAcidity.NEUTRAL, EnumTolerance.BOTH_1);
FlowerSpecies.Geranium.setTemperature(EnumTemperature.WARM, EnumTolerance.BOTH_1);
FlowerSpecies.Lily.setMutation(FlowerSpecies.Tulip, FlowerSpecies.Chrysanthemum, 5);
FlowerSpecies.Lily.setPH(EnumAcidity.NEUTRAL, EnumTolerance.DOWN_1);
FlowerSpecies.Lily.setTemperature(EnumTemperature.WARM, EnumTolerance.BOTH_1);
FlowerSpecies.Yarrow.setMutation(FlowerSpecies.Dandelion, FlowerSpecies.Orchid, 10);
FlowerSpecies.Yarrow.setPH(EnumAcidity.ACID, EnumTolerance.UP_1);
FlowerSpecies.Yarrow.setMoisture(EnumMoisture.NORMAL, EnumTolerance.DOWN_1);
FlowerSpecies.Petunia.setMutation(FlowerSpecies.Tulip, FlowerSpecies.Dahlia, 5);
FlowerSpecies.Petunia.setPH(EnumAcidity.NEUTRAL, EnumTolerance.DOWN_1);
FlowerSpecies.Petunia.setMoisture(EnumMoisture.NORMAL, EnumTolerance.UP_1);
FlowerSpecies.Petunia.setTemperature(EnumTemperature.WARM, EnumTolerance.UP_1);
FlowerSpecies.Agapanthus.setMutation(FlowerSpecies.Allium, FlowerSpecies.Geranium, 5);
FlowerSpecies.Agapanthus.setPH(EnumAcidity.NEUTRAL, EnumTolerance.BOTH_1);
FlowerSpecies.Agapanthus.setMoisture(EnumMoisture.NORMAL, EnumTolerance.DOWN_1);
FlowerSpecies.Agapanthus.setTemperature(EnumTemperature.WARM, EnumTolerance.BOTH_1);
FlowerSpecies.Fuchsia.setMutation(FlowerSpecies.Foxglove, FlowerSpecies.Dahlia, 5);
FlowerSpecies.Fuchsia.setPH(EnumAcidity.NEUTRAL, EnumTolerance.BOTH_1);
FlowerSpecies.Fuchsia.setMoisture(EnumMoisture.NORMAL, EnumTolerance.UP_1);
FlowerSpecies.Fuchsia.setTemperature(EnumTemperature.WARM, EnumTolerance.BOTH_1);
FlowerSpecies.Dianthus.setMutation(FlowerSpecies.Tulip, FlowerSpecies.Poppy, 15);
FlowerSpecies.Dianthus.setPH(EnumAcidity.ALKALINE, EnumTolerance.DOWN_1);
FlowerSpecies.Dianthus.setMoisture(EnumMoisture.NORMAL, EnumTolerance.DOWN_1);
FlowerSpecies.Dianthus.setTemperature(EnumTemperature.NORMAL, EnumTolerance.BOTH_2);
FlowerSpecies.Forget.setMutation(FlowerSpecies.Orchid, FlowerSpecies.Bluet, 10);
FlowerSpecies.Forget.setPH(EnumAcidity.ACID, EnumTolerance.NONE);
FlowerSpecies.Forget.setMoisture(EnumMoisture.NORMAL, EnumTolerance.UP_1);
FlowerSpecies.Forget.setTemperature(EnumTemperature.NORMAL, EnumTolerance.UP_1);
FlowerSpecies.Anemone.setMutation(FlowerSpecies.Aquilegia, FlowerSpecies.Rose, 5);
FlowerSpecies.Anemone.setPH(EnumAcidity.NEUTRAL, EnumTolerance.BOTH_1);
FlowerSpecies.Anemone.setMoisture(EnumMoisture.NORMAL, EnumTolerance.UP_1);
FlowerSpecies.Aquilegia.setMutation(FlowerSpecies.Iris, FlowerSpecies.Poppy, 5);
FlowerSpecies.Aquilegia.setMoisture(EnumMoisture.NORMAL, EnumTolerance.UP_1);
FlowerSpecies.Edelweiss.setMutation(FlowerSpecies.Peony, FlowerSpecies.Bluet, 5);
FlowerSpecies.Edelweiss.setPH(EnumAcidity.ALKALINE, EnumTolerance.DOWN_1);
FlowerSpecies.Edelweiss.setMoisture(EnumMoisture.NORMAL, EnumTolerance.DOWN_1);
FlowerSpecies.Edelweiss.setTemperature(EnumTemperature.NORMAL, EnumTolerance.DOWN_1);
FlowerSpecies.Scabious.setMutation(FlowerSpecies.Allium, FlowerSpecies.Cornflower, 5);
FlowerSpecies.Scabious.setPH(EnumAcidity.NEUTRAL, EnumTolerance.UP_1);
FlowerSpecies.Scabious.setTemperature(EnumTemperature.NORMAL, EnumTolerance.DOWN_1);
FlowerSpecies.Coneflower.setMutation(FlowerSpecies.Tulip, FlowerSpecies.Cornflower, 5);
FlowerSpecies.Coneflower.setPH(EnumAcidity.NEUTRAL, EnumTolerance.BOTH_1);
FlowerSpecies.Gaillardia.setMutation(FlowerSpecies.Dandelion, FlowerSpecies.Marigold, 5);
FlowerSpecies.Gaillardia.setPH(EnumAcidity.NEUTRAL, EnumTolerance.BOTH_1);
FlowerSpecies.Gaillardia.setMoisture(EnumMoisture.DAMP, EnumTolerance.DOWN_1);
FlowerSpecies.Gaillardia.setTemperature(EnumTemperature.NORMAL, EnumTolerance.BOTH_2);
FlowerSpecies.Auricula.setMutation(FlowerSpecies.Poppy, FlowerSpecies.Geranium, 10);
FlowerSpecies.Auricula.setPH(EnumAcidity.ACID, EnumTolerance.UP_1);
FlowerSpecies.Auricula.setMoisture(EnumMoisture.NORMAL, EnumTolerance.UP_1);
FlowerSpecies.Camellia.setMutation(FlowerSpecies.Hydrangea, FlowerSpecies.Rose, 5);
FlowerSpecies.Camellia.setPH(EnumAcidity.ACID, EnumTolerance.NONE);
FlowerSpecies.Camellia.setMoisture(EnumMoisture.DAMP, EnumTolerance.NONE);
FlowerSpecies.Camellia.setTemperature(EnumTemperature.WARM, EnumTolerance.UP_1);
FlowerSpecies.Goldenrod.setMutation(FlowerSpecies.Lilac, FlowerSpecies.Marigold, 10);
FlowerSpecies.Goldenrod.setPH(EnumAcidity.NEUTRAL, EnumTolerance.BOTH_1);
FlowerSpecies.Althea.setMutation(FlowerSpecies.Hydrangea, FlowerSpecies.Iris, 5);
FlowerSpecies.Althea.setPH(EnumAcidity.NEUTRAL, EnumTolerance.DOWN_1);
FlowerSpecies.Althea.setTemperature(EnumTemperature.WARM, EnumTolerance.BOTH_1);
FlowerSpecies.Penstemon.setMutation(FlowerSpecies.Peony, FlowerSpecies.Lilac, 5);
FlowerSpecies.Penstemon.setMoisture(EnumMoisture.DRY, EnumTolerance.UP_1);
FlowerSpecies.Penstemon.setTemperature(EnumTemperature.WARM, EnumTolerance.UP_1);
FlowerSpecies.Delphinium.setMutation(FlowerSpecies.Lilac, FlowerSpecies.Bluet, 5);
FlowerSpecies.Delphinium.setMoisture(EnumMoisture.DAMP, EnumTolerance.DOWN_1);
FlowerSpecies.Delphinium.setTemperature(EnumTemperature.NORMAL, EnumTolerance.DOWN_1);
FlowerSpecies.Hollyhock.setMutation(FlowerSpecies.Delphinium, FlowerSpecies.Lavender, 5);
FlowerSpecies.Hollyhock.setPH(EnumAcidity.NEUTRAL, EnumTolerance.UP_1);
FlowerSpecies.Dandelion.setStemColor(EnumFlowerColor.Green);
FlowerSpecies.Poppy.setStemColor(EnumFlowerColor.Green);
FlowerSpecies.Orchid.setStemColor(EnumFlowerColor.Green);
FlowerSpecies.Allium.setStemColor(EnumFlowerColor.Green);
FlowerSpecies.Bluet.setStemColor(EnumFlowerColor.OliveDrab);
FlowerSpecies.Tulip.setStemColor(EnumFlowerColor.OliveDrab);
FlowerSpecies.Daisy.setStemColor(EnumFlowerColor.OliveDrab);
FlowerSpecies.Cornflower.setStemColor(EnumFlowerColor.OliveDrab);
FlowerSpecies.Pansy.setStemColor(EnumFlowerColor.SeaGreen);
FlowerSpecies.Iris.setStemColor(EnumFlowerColor.SeaGreen);
FlowerSpecies.Lavender.setStemColor(EnumFlowerColor.Green);
FlowerSpecies.Viola.setStemColor(EnumFlowerColor.OliveDrab);
FlowerSpecies.Daffodil.setStemColor(EnumFlowerColor.Green);
FlowerSpecies.Dahlia.setStemColor(EnumFlowerColor.OliveDrab);
FlowerSpecies.Peony.setStemColor(EnumFlowerColor.DarkGreen);
FlowerSpecies.Rose.setStemColor(EnumFlowerColor.Green);
FlowerSpecies.Lilac.setStemColor(EnumFlowerColor.OliveDrab);
FlowerSpecies.Hydrangea.setStemColor(EnumFlowerColor.DarkGreen);
FlowerSpecies.Foxglove.setStemColor(EnumFlowerColor.DarkGreen);
FlowerSpecies.Zinnia.setStemColor(EnumFlowerColor.MediumSeaGreen);
FlowerSpecies.Chrysanthemum.setStemColor(EnumFlowerColor.MediumSeaGreen);
FlowerSpecies.Marigold.setStemColor(EnumFlowerColor.Green);
FlowerSpecies.Geranium.setStemColor(EnumFlowerColor.MediumSeaGreen);
FlowerSpecies.Azalea.setStemColor(EnumFlowerColor.Green);
FlowerSpecies.Primrose.setStemColor(EnumFlowerColor.Green);
FlowerSpecies.Aster.setStemColor(EnumFlowerColor.Green);
FlowerSpecies.Carnation.setStemColor(EnumFlowerColor.SeaGreen);
FlowerSpecies.Lily.setStemColor(EnumFlowerColor.Green);
FlowerSpecies.Yarrow.setStemColor(EnumFlowerColor.DarkOliveGreen);
FlowerSpecies.Petunia.setStemColor(EnumFlowerColor.Green);
FlowerSpecies.Agapanthus.setStemColor(EnumFlowerColor.DarkOliveGreen);
FlowerSpecies.Fuchsia.setStemColor(EnumFlowerColor.SeaGreen);
FlowerSpecies.Dianthus.setStemColor(EnumFlowerColor.OliveDrab);
FlowerSpecies.Forget.setStemColor(EnumFlowerColor.Green);
FlowerSpecies.Anemone.setStemColor(EnumFlowerColor.DarkOliveGreen);
FlowerSpecies.Aquilegia.setStemColor(EnumFlowerColor.MediumSeaGreen);
FlowerSpecies.Edelweiss.setStemColor(EnumFlowerColor.DarkOliveGreen);
FlowerSpecies.Scabious.setStemColor(EnumFlowerColor.OliveDrab);
FlowerSpecies.Coneflower.setStemColor(EnumFlowerColor.DarkOliveGreen);
FlowerSpecies.Gaillardia.setStemColor(EnumFlowerColor.OliveDrab);
FlowerSpecies.Auricula.setStemColor(EnumFlowerColor.DarkOliveGreen);
FlowerSpecies.Camellia.setStemColor(EnumFlowerColor.DarkOliveGreen);
FlowerSpecies.Goldenrod.setStemColor(EnumFlowerColor.MediumSeaGreen);
FlowerSpecies.Althea.setStemColor(EnumFlowerColor.DarkGreen);
FlowerSpecies.Penstemon.setStemColor(EnumFlowerColor.OliveDrab);
FlowerSpecies.Delphinium.setStemColor(EnumFlowerColor.DarkSeaGreen);
FlowerSpecies.Hollyhock.setStemColor(EnumFlowerColor.Green);
BotanyCore.getFlowerRoot().addConversion(new ItemStack(Blocks.yellow_flower, 1, 0), FlowerSpecies.Dandelion.getTemplate());
BotanyCore.getFlowerRoot().addConversion(new ItemStack(Blocks.red_flower, 1, 0), FlowerSpecies.Poppy.getTemplate());
BotanyCore.getFlowerRoot().addConversion(new ItemStack(Blocks.red_flower, 1, 1), FlowerSpecies.Orchid.getTemplate());
BotanyCore.getFlowerRoot().addConversion(new ItemStack(Blocks.red_flower, 1, 2), FlowerSpecies.Allium.getTemplate());
BotanyCore.getFlowerRoot().addConversion(new ItemStack(Blocks.red_flower, 1, 3), FlowerSpecies.Bluet.getTemplate());
BotanyCore.getFlowerRoot().addConversion(new ItemStack(Blocks.red_flower, 1, 7), FlowerSpecies.Tulip.getTemplate());
BotanyCore.getFlowerRoot().addConversion(new ItemStack(Blocks.red_flower, 1, 8), FlowerSpecies.Daisy.getTemplate());
BotanyCore.getFlowerRoot().addConversion(new ItemStack(Blocks.double_plant, 1, 1), FlowerSpecies.Lilac.getTemplate());
BotanyCore.getFlowerRoot().addConversion(new ItemStack(Blocks.double_plant, 1, 4), FlowerSpecies.Rose.getTemplate());
BotanyCore.getFlowerRoot().addConversion(new ItemStack(Blocks.double_plant, 1, 5), FlowerSpecies.Peony.getTemplate());
BotanyCore.getFlowerRoot().addConversion(new ItemStack(Blocks.red_flower, 1, 6), FlowerSpecies.Tulip.AddVariant(EnumFlowerColor.White));
BotanyCore.getFlowerRoot().addConversion(new ItemStack(Blocks.red_flower, 1, 4), FlowerSpecies.Tulip.AddVariant(EnumFlowerColor.Crimson));
BotanyCore.getFlowerRoot().addConversion(new ItemStack(Blocks.red_flower, 1, 5), FlowerSpecies.Tulip.AddVariant(EnumFlowerColor.DarkOrange));
FlowerSpecies.DANDELION
.setTraits(EnumAllele.Fertility.HIGH, EnumAllele.Lifespan.SHORTENED, EnumAllele.Sappiness.LOWER)
.setPH(EnumAcidity.NEUTRAL, EnumTolerance.BOTH_1)
.setMoisture(EnumMoisture.NORMAL, EnumTolerance.BOTH_1)
.setStemColor(EnumFlowerColor.GREEN);
FlowerSpecies.POPPY
.setTraits(EnumAllele.Fertility.HIGH, EnumAllele.Lifespan.SHORTER, EnumAllele.Sappiness.AVERAGE)
.setPH(EnumAcidity.NEUTRAL, EnumTolerance.DOWN_1)
.setMoisture(EnumMoisture.NORMAL, EnumTolerance.DOWN_1)
.setTemperature(EnumTemperature.WARM, EnumTolerance.BOTH_2)
.setStemColor(EnumFlowerColor.GREEN);
FlowerSpecies.ORCHID
.setTraits(EnumAllele.Fertility.NORMAL, EnumAllele.Lifespan.LONG, EnumAllele.Sappiness.LOW)
.setPH(EnumAcidity.ACID, EnumTolerance.NONE)
.setMoisture(EnumMoisture.NORMAL, EnumTolerance.BOTH_1)
.setStemColor(EnumFlowerColor.GREEN);
FlowerSpecies.ALLIUM
.setTraits(EnumAllele.Fertility.NORMAL, EnumAllele.Lifespan.NORMAL, EnumAllele.Sappiness.LOW)
.setPH(EnumAcidity.ALKALINE, EnumTolerance.DOWN_1)
.setMoisture(EnumMoisture.NORMAL, EnumTolerance.DOWN_1);
FlowerSpecies.BLUET
.setTraits(EnumAllele.Fertility.LOW, EnumAllele.Lifespan.NORMAL, EnumAllele.Sappiness.LOWER)
.setPH(EnumAcidity.NEUTRAL, EnumTolerance.DOWN_1)
.setMoisture(EnumMoisture.DAMP, EnumTolerance.NONE)
.setStemColor(EnumFlowerColor.OLIVE_DRAB);
FlowerSpecies.TULIP
.setTraits(EnumAllele.Fertility.NORMAL, EnumAllele.Lifespan.LONG, EnumAllele.Sappiness.AVERAGE)
.setMoisture(EnumMoisture.NORMAL, EnumTolerance.BOTH_1)
.setStemColor(EnumFlowerColor.OLIVE_DRAB);
FlowerSpecies.DAISY
.setTraits(EnumAllele.Fertility.NORMAL, EnumAllele.Lifespan.NORMAL, EnumAllele.Sappiness.LOW)
.setPH(EnumAcidity.NEUTRAL, EnumTolerance.DOWN_1)
.setMoisture(EnumMoisture.NORMAL, EnumTolerance.DOWN_1)
.setTemperature(EnumTemperature.WARM, EnumTolerance.BOTH_2)
.setStemColor(EnumFlowerColor.OLIVE_DRAB);
FlowerSpecies.CORNFLOWER
.setTraits(EnumAllele.Fertility.HIGH, EnumAllele.Lifespan.SHORTER, EnumAllele.Sappiness.LOW)
.setMutation(FlowerSpecies.DANDELION, FlowerSpecies.TULIP, 10)
.setPH(EnumAcidity.NEUTRAL, EnumTolerance.BOTH_1)
.setStemColor(EnumFlowerColor.OLIVE_DRAB);
FlowerSpecies.PANSY
.setTraits(EnumAllele.Fertility.NORMAL, EnumAllele.Lifespan.SHORTENED, EnumAllele.Sappiness.AVERAGE)
.setMutation(FlowerSpecies.TULIP, FlowerSpecies.VIOLA, 5)
.setPH(EnumAcidity.ACID, EnumTolerance.NONE)
.setTemperature(EnumTemperature.WARM, EnumTolerance.DOWN_1)
.setStemColor(EnumFlowerColor.SEA_GREEN);
FlowerSpecies.IRIS
.setTraits(EnumAllele.Fertility.HIGH, EnumAllele.Lifespan.NORMAL, EnumAllele.Sappiness.AVERAGE)
.setMutation(FlowerSpecies.ORCHID, FlowerSpecies.VIOLA, 10)
.setPH(EnumAcidity.ACID, EnumTolerance.NONE)
.setTemperature(EnumTemperature.WARM, EnumTolerance.DOWN_1)
.setStemColor(EnumFlowerColor.SEA_GREEN);
FlowerSpecies.LAVENDER
.setTraits(EnumAllele.Fertility.HIGH, EnumAllele.Lifespan.NORMAL, EnumAllele.Sappiness.LOW)
.setMutation(FlowerSpecies.ALLIUM, FlowerSpecies.VIOLA, 10)
.setPH(EnumAcidity.NEUTRAL, EnumTolerance.UP_1)
.setMoisture(EnumMoisture.NORMAL, EnumTolerance.DOWN_1)
.setTemperature(EnumTemperature.WARM, EnumTolerance.DOWN_1)
.setStemColor(EnumFlowerColor.GREEN);
FlowerSpecies.VIOLA
.setTraits(EnumAllele.Fertility.NORMAL, EnumAllele.Lifespan.SHORTENED, EnumAllele.Sappiness.AVERAGE)
.setMutation(FlowerSpecies.ORCHID, FlowerSpecies.POPPY, 15)
.setPH(EnumAcidity.ACID, EnumTolerance.NONE)
.setMoisture(EnumMoisture.NORMAL, EnumTolerance.DOWN_1)
.setStemColor(EnumFlowerColor.OLIVE_DRAB);
FlowerSpecies.DAFFODIL
.setTraits(EnumAllele.Fertility.HIGH, EnumAllele.Lifespan.ELONGATED, EnumAllele.Sappiness.AVERAGE)
.setMutation(FlowerSpecies.DANDELION, FlowerSpecies.POPPY, 10)
.setPH(EnumAcidity.NEUTRAL, EnumTolerance.DOWN_1)
.setStemColor(EnumFlowerColor.GREEN);
FlowerSpecies.ASTER
.setTraits(EnumAllele.Fertility.NORMAL, EnumAllele.Lifespan.NORMAL, EnumAllele.Sappiness.HIGHER)
.setMutation(FlowerSpecies.DAISY, FlowerSpecies.TULIP, 10)
.setPH(EnumAcidity.NEUTRAL, EnumTolerance.BOTH_1)
.setStemColor(EnumFlowerColor.GREEN);
FlowerSpecies.LILAC
.setTraits(EnumAllele.Fertility.LOW, EnumAllele.Lifespan.LONGER, EnumAllele.Sappiness.AVERAGE)
.setPH(EnumAcidity.ALKALINE, EnumTolerance.DOWN_1)
.setStemColor(EnumFlowerColor.OLIVE_DRAB);
FlowerSpecies.ROSE
.setTraits(EnumAllele.Fertility.LOW, EnumAllele.Lifespan.LONGER, EnumAllele.Sappiness.HIGH)
.setPH(EnumAcidity.ACID, EnumTolerance.UP_1)
.setStemColor(EnumFlowerColor.GREEN);
FlowerSpecies.PEONY
.setTraits(EnumAllele.Fertility.LOW, EnumAllele.Lifespan.LONG, EnumAllele.Sappiness.AVERAGE)
.setPH(EnumAcidity.ALKALINE, EnumTolerance.DOWN_1)
.setMoisture(EnumMoisture.NORMAL, EnumTolerance.UP_1)
.setStemColor(EnumFlowerColor.DARK_GREEN);
FlowerSpecies.MARIGOLD
.setTraits(EnumAllele.Fertility.HIGH, EnumAllele.Lifespan.SHORTER, EnumAllele.Sappiness.AVERAGE)
.setMutation(FlowerSpecies.DAISY, FlowerSpecies.DANDELION, 10)
.setPH(EnumAcidity.NEUTRAL, EnumTolerance.DOWN_1)
.setMoisture(EnumMoisture.NORMAL, EnumTolerance.UP_1)
.setTemperature(EnumTemperature.WARM, EnumTolerance.BOTH_2)
.setStemColor(EnumFlowerColor.GREEN);
FlowerSpecies.HYDRANGEA
.setTraits(EnumAllele.Fertility.LOW, EnumAllele.Lifespan.LONGER, EnumAllele.Sappiness.HIGH)
.setMutation(FlowerSpecies.PEONY, FlowerSpecies.BLUET, 10)
.setPH(EnumAcidity.NEUTRAL, EnumTolerance.BOTH_1)
.setMoisture(EnumMoisture.DAMP, EnumTolerance.NONE)
.setStemColor(EnumFlowerColor.DARK_GREEN);
FlowerSpecies.FOXGLOVE
.setTraits(EnumAllele.Fertility.LOW, EnumAllele.Lifespan.SHORTENED, EnumAllele.Sappiness.LOW)
.setMutation(FlowerSpecies.LILAC, FlowerSpecies.ZINNIA, 5)
.setPH(EnumAcidity.NEUTRAL, EnumTolerance.DOWN_1)
.setMoisture(EnumMoisture.NORMAL, EnumTolerance.UP_1)
.setStemColor(EnumFlowerColor.DARK_GREEN);
FlowerSpecies.DAHLIA
.setTraits(EnumAllele.Fertility.NORMAL, EnumAllele.Lifespan.NORMAL, EnumAllele.Sappiness.AVERAGE)
.setMutation(FlowerSpecies.DAISY, FlowerSpecies.ALLIUM, 15)
.setPH(EnumAcidity.NEUTRAL, EnumTolerance.DOWN_1)
.setMoisture(EnumMoisture.NORMAL, EnumTolerance.UP_1)
.setTemperature(EnumTemperature.NORMAL, EnumTolerance.BOTH_2)
.setStemColor(EnumFlowerColor.OLIVE_DRAB);
FlowerSpecies.CHRYSANTHEMUM
.setTraits(EnumAllele.Fertility.HIGH, EnumAllele.Lifespan.LONG, EnumAllele.Sappiness.HIGH)
.setMutation(FlowerSpecies.GERANIUM, FlowerSpecies.ROSE, 10)
.setPH(EnumAcidity.NEUTRAL, EnumTolerance.DOWN_1)
.setMoisture(EnumMoisture.NORMAL, EnumTolerance.DOWN_1)
.setStemColor(EnumFlowerColor.MEDIUM_SEA_GREEN);
FlowerSpecies.CARNATION
.setTraits(EnumAllele.Fertility.NORMAL, EnumAllele.Lifespan.NORMAL, EnumAllele.Sappiness.HIGH)
.setMutation(FlowerSpecies.DIANTHUS, FlowerSpecies.ROSE, 5)
.setPH(EnumAcidity.ALKALINE, EnumTolerance.DOWN_1)
.setStemColor(EnumFlowerColor.SEA_GREEN);
FlowerSpecies.ZINNIA
.setTraits(EnumAllele.Fertility.NORMAL, EnumAllele.Lifespan.SHORTER, EnumAllele.Sappiness.AVERAGE)
.setMutation(FlowerSpecies.DAHLIA, FlowerSpecies.MARIGOLD, 5)
.setPH(EnumAcidity.NEUTRAL, EnumTolerance.BOTH_1)
.setMoisture(EnumMoisture.NORMAL, EnumTolerance.DOWN_1)
.setTemperature(EnumTemperature.NORMAL, EnumTolerance.BOTH_2)
.setStemColor(EnumFlowerColor.MEDIUM_SEA_GREEN);
FlowerSpecies.PRIMROSE
.setTraits(EnumAllele.Fertility.NORMAL, EnumAllele.Lifespan.LONG, EnumAllele.Sappiness.AVERAGE)
.setMutation(FlowerSpecies.CHRYSANTHEMUM, FlowerSpecies.AURICULA, 5)
.setPH(EnumAcidity.ACID, EnumTolerance.UP_1)
.setMoisture(EnumMoisture.NORMAL, EnumTolerance.UP_1)
.setStemColor(EnumFlowerColor.GREEN);
FlowerSpecies.AZALEA
.setTraits(EnumAllele.Fertility.NORMAL, EnumAllele.Lifespan.NORMAL, EnumAllele.Sappiness.AVERAGE)
.setMutation(FlowerSpecies.ORCHID, FlowerSpecies.GERANIUM, 5)
.setPH(EnumAcidity.ACID, EnumTolerance.NONE)
.setStemColor(EnumFlowerColor.GREEN);
FlowerSpecies.GERANIUM
.setTraits(EnumAllele.Fertility.LOW, EnumAllele.Lifespan.LONG, EnumAllele.Sappiness.LOW)
.setMutation(FlowerSpecies.TULIP, FlowerSpecies.ORCHID, 15)
.setPH(EnumAcidity.NEUTRAL, EnumTolerance.BOTH_1)
.setTemperature(EnumTemperature.WARM, EnumTolerance.BOTH_1)
.setStemColor(EnumFlowerColor.MEDIUM_SEA_GREEN);
FlowerSpecies.LILY
.setTraits(EnumAllele.Fertility.LOW, EnumAllele.Lifespan.LONG, EnumAllele.Sappiness.LOW)
.setMutation(FlowerSpecies.TULIP, FlowerSpecies.CHRYSANTHEMUM, 5)
.setPH(EnumAcidity.NEUTRAL, EnumTolerance.DOWN_1)
.setTemperature(EnumTemperature.WARM, EnumTolerance.BOTH_1)
.setStemColor(EnumFlowerColor.GREEN);
FlowerSpecies.YARROW
.setTraits(EnumAllele.Fertility.HIGH, EnumAllele.Lifespan.NORMAL, EnumAllele.Sappiness.LOW)
.setMutation(FlowerSpecies.DANDELION, FlowerSpecies.ORCHID, 10)
.setPH(EnumAcidity.ACID, EnumTolerance.UP_1)
.setMoisture(EnumMoisture.NORMAL, EnumTolerance.DOWN_1)
.setStemColor(EnumFlowerColor.DARK_OLIVE_GREEN);
FlowerSpecies.PETUNIA
.setTraits(EnumAllele.Fertility.NORMAL, EnumAllele.Lifespan.SHORTER, EnumAllele.Sappiness.AVERAGE)
.setMutation(FlowerSpecies.TULIP, FlowerSpecies.DAHLIA, 5)
.setPH(EnumAcidity.NEUTRAL, EnumTolerance.DOWN_1)
.setMoisture(EnumMoisture.NORMAL, EnumTolerance.UP_1)
.setTemperature(EnumTemperature.WARM, EnumTolerance.UP_1)
.setStemColor(EnumFlowerColor.GREEN);
FlowerSpecies.AGAPANTHUS
.setTraits(EnumAllele.Fertility.NORMAL, EnumAllele.Lifespan.NORMAL, EnumAllele.Sappiness.LOW)
.setMutation(FlowerSpecies.ALLIUM, FlowerSpecies.GERANIUM, 5)
.setPH(EnumAcidity.NEUTRAL, EnumTolerance.BOTH_1)
.setMoisture(EnumMoisture.NORMAL, EnumTolerance.DOWN_1)
.setTemperature(EnumTemperature.WARM, EnumTolerance.BOTH_1)
.setStemColor(EnumFlowerColor.DARK_OLIVE_GREEN);
FlowerSpecies.FUCHSIA
.setTraits(EnumAllele.Fertility.NORMAL, EnumAllele.Lifespan.SHORTENED, EnumAllele.Sappiness.AVERAGE)
.setMutation(FlowerSpecies.FOXGLOVE, FlowerSpecies.DAHLIA, 5)
.setPH(EnumAcidity.NEUTRAL, EnumTolerance.BOTH_1)
.setMoisture(EnumMoisture.NORMAL, EnumTolerance.UP_1)
.setTemperature(EnumTemperature.WARM, EnumTolerance.BOTH_1)
.setStemColor(EnumFlowerColor.SEA_GREEN);
FlowerSpecies.DIANTHUS
.setTraits(EnumAllele.Fertility.NORMAL, EnumAllele.Lifespan.SHORT, EnumAllele.Sappiness.HIGH)
.setMutation(FlowerSpecies.TULIP, FlowerSpecies.POPPY, 15)
.setPH(EnumAcidity.ALKALINE, EnumTolerance.DOWN_1)
.setMoisture(EnumMoisture.NORMAL, EnumTolerance.DOWN_1)
.setTemperature(EnumTemperature.NORMAL, EnumTolerance.BOTH_2)
.setStemColor(EnumFlowerColor.OLIVE_DRAB);
FlowerSpecies.FORGET
.setTraits(EnumAllele.Fertility.NORMAL, EnumAllele.Lifespan.SHORT, EnumAllele.Sappiness.LOWER)
.setMutation(FlowerSpecies.ORCHID, FlowerSpecies.BLUET, 10)
.setPH(EnumAcidity.ACID, EnumTolerance.NONE)
.setMoisture(EnumMoisture.NORMAL, EnumTolerance.UP_1)
.setTemperature(EnumTemperature.NORMAL, EnumTolerance.UP_1)
.setStemColor(EnumFlowerColor.GREEN);
FlowerSpecies.ANEMONE
.setTraits(EnumAllele.Fertility.HIGH, EnumAllele.Lifespan.NORMAL, EnumAllele.Sappiness.LOW)
.setMutation(FlowerSpecies.AQUILEGIA, FlowerSpecies.ROSE, 5)
.setPH(EnumAcidity.NEUTRAL, EnumTolerance.BOTH_1)
.setMoisture(EnumMoisture.NORMAL, EnumTolerance.UP_1)
.setStemColor(EnumFlowerColor.DARK_OLIVE_GREEN);
FlowerSpecies.AQUILEGIA
.setTraits(EnumAllele.Fertility.NORMAL, EnumAllele.Lifespan.NORMAL, EnumAllele.Sappiness.AVERAGE)
.setMutation(FlowerSpecies.IRIS, FlowerSpecies.POPPY, 5)
.setMoisture(EnumMoisture.NORMAL, EnumTolerance.UP_1)
.setStemColor(EnumFlowerColor.MEDIUM_SEA_GREEN);
FlowerSpecies.EDELWEISS
.setTraits(EnumAllele.Fertility.LOW, EnumAllele.Lifespan.NORMAL, EnumAllele.Sappiness.LOWEST)
.setMutation(FlowerSpecies.PEONY, FlowerSpecies.BLUET, 5)
.setPH(EnumAcidity.ALKALINE, EnumTolerance.DOWN_1)
.setMoisture(EnumMoisture.NORMAL, EnumTolerance.DOWN_1)
.setTemperature(EnumTemperature.NORMAL, EnumTolerance.DOWN_1)
.setStemColor(EnumFlowerColor.DARK_OLIVE_GREEN);
FlowerSpecies.SCABIOUS
.setTraits(EnumAllele.Fertility.NORMAL, EnumAllele.Lifespan.SHORTENED, EnumAllele.Sappiness.LOW)
.setMutation(FlowerSpecies.ALLIUM, FlowerSpecies.CORNFLOWER, 5)
.setPH(EnumAcidity.NEUTRAL, EnumTolerance.UP_1)
.setTemperature(EnumTemperature.NORMAL, EnumTolerance.DOWN_1)
.setStemColor(EnumFlowerColor.OLIVE_DRAB);
FlowerSpecies.CONEFLOWER
.setTraits(EnumAllele.Fertility.NORMAL, EnumAllele.Lifespan.NORMAL, EnumAllele.Sappiness.HIGHER)
.setMutation(FlowerSpecies.TULIP, FlowerSpecies.CORNFLOWER, 5)
.setPH(EnumAcidity.NEUTRAL, EnumTolerance.BOTH_1)
.setStemColor(EnumFlowerColor.DARK_OLIVE_GREEN);
FlowerSpecies.GAILLARDIA
.setTraits(EnumAllele.Fertility.HIGH, EnumAllele.Lifespan.LONG, EnumAllele.Sappiness.HIGHER)
.setMutation(FlowerSpecies.DANDELION, FlowerSpecies.MARIGOLD, 5)
.setPH(EnumAcidity.NEUTRAL, EnumTolerance.BOTH_1)
.setMoisture(EnumMoisture.DAMP, EnumTolerance.DOWN_1)
.setTemperature(EnumTemperature.NORMAL, EnumTolerance.BOTH_2)
.setStemColor(EnumFlowerColor.OLIVE_DRAB);
FlowerSpecies.AURICULA
.setTraits(EnumAllele.Fertility.NORMAL, EnumAllele.Lifespan.ELONGATED, EnumAllele.Sappiness.HIGH)
.setMutation(FlowerSpecies.POPPY, FlowerSpecies.GERANIUM, 10)
.setPH(EnumAcidity.ACID, EnumTolerance.UP_1)
.setMoisture(EnumMoisture.NORMAL, EnumTolerance.UP_1)
.setStemColor(EnumFlowerColor.DARK_OLIVE_GREEN);
FlowerSpecies.CAMELLIA
.setTraits(EnumAllele.Fertility.NORMAL, EnumAllele.Lifespan.NORMAL, EnumAllele.Sappiness.HIGH)
.setMutation(FlowerSpecies.HYDRANGEA, FlowerSpecies.ROSE, 5)
.setPH(EnumAcidity.ACID, EnumTolerance.NONE)
.setMoisture(EnumMoisture.DAMP, EnumTolerance.NONE)
.setTemperature(EnumTemperature.WARM, EnumTolerance.UP_1)
.setStemColor(EnumFlowerColor.DARK_OLIVE_GREEN);
FlowerSpecies.GOLDENROD
.setTraits(EnumAllele.Fertility.HIGH, EnumAllele.Lifespan.NORMAL, EnumAllele.Sappiness.HIGHER)
.setMutation(FlowerSpecies.LILAC, FlowerSpecies.MARIGOLD, 10)
.setPH(EnumAcidity.NEUTRAL, EnumTolerance.BOTH_1)
.setStemColor(EnumFlowerColor.MEDIUM_SEA_GREEN);
FlowerSpecies.ALTHEA
.setTraits(EnumAllele.Fertility.LOW, EnumAllele.Lifespan.ELONGATED, EnumAllele.Sappiness.HIGH)
.setMutation(FlowerSpecies.HYDRANGEA, FlowerSpecies.IRIS, 5)
.setPH(EnumAcidity.NEUTRAL, EnumTolerance.DOWN_1)
.setTemperature(EnumTemperature.WARM, EnumTolerance.BOTH_1)
.setStemColor(EnumFlowerColor.DARK_GREEN);
FlowerSpecies.PENSTEMON
.setTraits(EnumAllele.Fertility.LOW, EnumAllele.Lifespan.LONG, EnumAllele.Sappiness.LOW)
.setMutation(FlowerSpecies.PEONY, FlowerSpecies.LILAC, 5)
.setMoisture(EnumMoisture.DRY, EnumTolerance.UP_1)
.setTemperature(EnumTemperature.WARM, EnumTolerance.UP_1)
.setStemColor(EnumFlowerColor.OLIVE_DRAB);
FlowerSpecies.DELPHINIUM
.setTraits(EnumAllele.Fertility.LOW, EnumAllele.Lifespan.LONGER, EnumAllele.Sappiness.LOW)
.setMutation(FlowerSpecies.LILAC, FlowerSpecies.BLUET, 5)
.setMoisture(EnumMoisture.DAMP, EnumTolerance.DOWN_1)
.setTemperature(EnumTemperature.NORMAL, EnumTolerance.DOWN_1)
.setStemColor(EnumFlowerColor.DARK_SEA_GREEN);
FlowerSpecies.HOLLYHOCK
.setTraits(EnumAllele.Fertility.LOW, EnumAllele.Lifespan.LONG, EnumAllele.Sappiness.HIGH)
.setMutation(FlowerSpecies.DELPHINIUM, FlowerSpecies.LAVENDER, 5)
.setPH(EnumAcidity.NEUTRAL, EnumTolerance.UP_1)
.setStemColor(EnumFlowerColor.GREEN);
IFlowerRoot flowerRoot = BotanyCore.getFlowerRoot();
flowerRoot.addConversion(new ItemStack(Blocks.yellow_flower, 1, 0), FlowerSpecies.DANDELION.getTemplate());
flowerRoot.addConversion(new ItemStack(Blocks.red_flower, 1, 0), FlowerSpecies.POPPY.getTemplate());
flowerRoot.addConversion(new ItemStack(Blocks.red_flower, 1, 1), FlowerSpecies.ORCHID.getTemplate());
flowerRoot.addConversion(new ItemStack(Blocks.red_flower, 1, 2), FlowerSpecies.ALLIUM.getTemplate());
flowerRoot.addConversion(new ItemStack(Blocks.red_flower, 1, 3), FlowerSpecies.BLUET.getTemplate());
flowerRoot.addConversion(new ItemStack(Blocks.red_flower, 1, 7), FlowerSpecies.TULIP.getTemplate());
flowerRoot.addConversion(new ItemStack(Blocks.red_flower, 1, 8), FlowerSpecies.DAISY.getTemplate());
flowerRoot.addConversion(new ItemStack(Blocks.double_plant, 1, 1), FlowerSpecies.LILAC.getTemplate());
flowerRoot.addConversion(new ItemStack(Blocks.double_plant, 1, 4), FlowerSpecies.ROSE.getTemplate());
flowerRoot.addConversion(new ItemStack(Blocks.double_plant, 1, 5), FlowerSpecies.PEONY.getTemplate());
flowerRoot.addConversion(new ItemStack(Blocks.red_flower, 1, 6), FlowerSpecies.TULIP.addVariant(EnumFlowerColor.WHITE));
flowerRoot.addConversion(new ItemStack(Blocks.red_flower, 1, 4), FlowerSpecies.TULIP.addVariant(EnumFlowerColor.CRIMSON));
flowerRoot.addConversion(new ItemStack(Blocks.red_flower, 1, 5), FlowerSpecies.TULIP.addVariant(EnumFlowerColor.DARK_ORANGE));
for (FlowerSpecies species : values()) {
String scientific = species.branchName.substring(0, 1).toUpperCase() + species.branchName.substring(1).toLowerCase();
@@ -371,24 +468,24 @@ public enum FlowerSpecies implements IAlleleFlowerSpecies {
}
}
public static void init() {
}
private void setStemColor(EnumFlowerColor green) {
private FlowerSpecies setStemColor(EnumFlowerColor green) {
stemColor = green;
return this;
}
private void setTraits(ForestryAllele.Fertility high, ForestryAllele.Lifespan shortened, ForestryAllele.Sappiness lower) {
fert = high;
private FlowerSpecies setTraits(EnumAllele.Fertility fertility, EnumAllele.Lifespan shortened, EnumAllele.Sappiness lower) {
fert = fertility;
life = shortened;
sap = lower;
return this;
}
private void setMutation(FlowerSpecies dandelion2, FlowerSpecies tulip2, int i) {
BotanyCore.getFlowerRoot().registerMutation(new FlowerMutation(dandelion2, tulip2, getTemplate(), i));
private FlowerSpecies setMutation(FlowerSpecies dandelion2, FlowerSpecies tulip2, int chance) {
BotanyCore.getFlowerRoot().registerMutation(new FlowerMutation(dandelion2, tulip2, getTemplate(), chance));
return this;
}
private IAllele[] AddVariant(EnumFlowerColor a, EnumFlowerColor b) {
private IAllele[] addVariant(EnumFlowerColor a, EnumFlowerColor b) {
IAllele[] template = getTemplate();
template[EnumFlowerChromosome.PRIMARY.ordinal()] = a.getAllele();
template[EnumFlowerChromosome.SECONDARY.ordinal()] = b.getAllele();
@@ -396,23 +493,26 @@ public enum FlowerSpecies implements IAlleleFlowerSpecies {
return template;
}
private void setTemperature(EnumTemperature temperature, EnumTolerance tolerance) {
private FlowerSpecies setTemperature(EnumTemperature temperature, EnumTolerance tolerance) {
this.temperature = temperature;
tempTolerance = tolerance;
return this;
}
private void setPH(EnumAcidity temperature, EnumTolerance tolerance) {
private FlowerSpecies setPH(EnumAcidity temperature, EnumTolerance tolerance) {
pH = temperature;
pHTolerance = tolerance;
return this;
}
private void setMoisture(EnumMoisture temperature, EnumTolerance tolerance) {
private FlowerSpecies setMoisture(EnumMoisture temperature, EnumTolerance tolerance) {
moisture = temperature;
moistureTolerance = tolerance;
return this;
}
private IAllele[] AddVariant(EnumFlowerColor a) {
return AddVariant(a, a);
private IAllele[] addVariant(EnumFlowerColor a) {
return addVariant(a, a);
}
public List<IAllele[]> getVariants() {
@@ -421,7 +521,7 @@ public enum FlowerSpecies implements IAlleleFlowerSpecies {
@Override
public String getName() {
return name;
return I18N.localise(Botany.instance, "flower." + name);
}
@Override
@@ -494,17 +594,18 @@ public enum FlowerSpecies implements IAlleleFlowerSpecies {
}
public IAllele[] getTemplate() {
forestry.core.genetics.alleles.AlleleHelper alleleHelper = forestry.core.genetics.alleles.AlleleHelper.instance;
IAllele[] template = FlowerTemplates.getDefaultTemplate();
template[0] = this;
template[EnumFlowerChromosome.PRIMARY.ordinal()] = primaryColor.getAllele();
template[EnumFlowerChromosome.SECONDARY.ordinal()] = secondaryColor.getAllele();
template[EnumFlowerChromosome.TEMPERATURE_TOLERANCE.ordinal()] = Binnie.Genetics.getToleranceAllele(tempTolerance);
template[EnumFlowerChromosome.PH_TOLERANCE.ordinal()] = Binnie.Genetics.getToleranceAllele(pHTolerance);
template[EnumFlowerChromosome.HUMIDITY_TOLERANCE.ordinal()] = Binnie.Genetics.getToleranceAllele(moistureTolerance);
template[EnumFlowerChromosome.FERTILITY.ordinal()] = fert.getAllele();
template[EnumFlowerChromosome.LIFESPAN.ordinal()] = life.getAllele();
template[EnumFlowerChromosome.SAPPINESS.ordinal()] = sap.getAllele();
template[EnumFlowerChromosome.STEM.ordinal()] = stemColor.getAllele();
alleleHelper.set(template, EnumFlowerChromosome.PRIMARY, AlleleHelper.getAllele(primaryColor));
alleleHelper.set(template, EnumFlowerChromosome.SECONDARY, AlleleHelper.getAllele(secondaryColor));
alleleHelper.set(template, EnumFlowerChromosome.TEMPERATURE_TOLERANCE, AlleleHelper.getAllele(tempTolerance));
alleleHelper.set(template, EnumFlowerChromosome.PH_TOLERANCE, AlleleHelper.getAllele(pHTolerance));
alleleHelper.set(template, EnumFlowerChromosome.HUMIDITY_TOLERANCE, AlleleHelper.getAllele(moistureTolerance));
alleleHelper.set(template, EnumFlowerChromosome.FERTILITY, AlleleHelper.getAllele(fert));
alleleHelper.set(template, EnumFlowerChromosome.LIFESPAN, AlleleHelper.getAllele(life));
alleleHelper.set(template, EnumFlowerChromosome.SAPPINESS, AlleleHelper.getAllele(sap));
alleleHelper.set(template, EnumFlowerChromosome.STEM, AlleleHelper.getAllele(stemColor));
return template;
}
@@ -1,24 +1,26 @@
package binnie.botany.genetics;
import binnie.botany.api.EnumFlowerChromosome;
import forestry.api.genetics.AlleleManager;
import binnie.genetics.genetics.AlleleHelper;
import forestry.api.genetics.EnumTolerance;
import forestry.api.genetics.IAllele;
import forestry.core.genetics.alleles.EnumAllele;
public class FlowerTemplates {
public static IAllele[] getDefaultTemplate() {
IAllele[] alleles = new IAllele[EnumFlowerChromosome.values().length];
alleles[EnumFlowerChromosome.SPECIES.ordinal()] = FlowerSpecies.Poppy;
alleles[EnumFlowerChromosome.PRIMARY.ordinal()] = EnumFlowerColor.Red.getAllele();
alleles[EnumFlowerChromosome.SECONDARY.ordinal()] = EnumFlowerColor.Red.getAllele();
alleles[EnumFlowerChromosome.FERTILITY.ordinal()] = AlleleManager.alleleRegistry.getAllele("forestry.fertilityNormal");
alleles[EnumFlowerChromosome.TERRITORY.ordinal()] = AlleleManager.alleleRegistry.getAllele("forestry.territoryDefault");
alleles[EnumFlowerChromosome.SPECIES.ordinal()] = FlowerSpecies.POPPY;
alleles[EnumFlowerChromosome.PRIMARY.ordinal()] = AlleleHelper.getAllele(EnumFlowerColor.RED);
alleles[EnumFlowerChromosome.SECONDARY.ordinal()] = AlleleHelper.getAllele(EnumFlowerColor.RED);
alleles[EnumFlowerChromosome.FERTILITY.ordinal()] = AlleleHelper.getAllele(EnumAllele.Fertility.NORMAL);
alleles[EnumFlowerChromosome.TERRITORY.ordinal()] = AlleleHelper.getAllele(EnumAllele.Territory.AVERAGE);
alleles[EnumFlowerChromosome.EFFECT.ordinal()] = ModuleGenetics.alleleEffectNone;
alleles[EnumFlowerChromosome.LIFESPAN.ordinal()] = AlleleManager.alleleRegistry.getAllele("forestry.lifespanNormal");
alleles[EnumFlowerChromosome.TEMPERATURE_TOLERANCE.ordinal()] = AlleleManager.alleleRegistry.getAllele("forestry.toleranceNone");
alleles[EnumFlowerChromosome.HUMIDITY_TOLERANCE.ordinal()] = AlleleManager.alleleRegistry.getAllele("forestry.toleranceNone");
alleles[EnumFlowerChromosome.PH_TOLERANCE.ordinal()] = AlleleManager.alleleRegistry.getAllele("forestry.toleranceNone");
alleles[EnumFlowerChromosome.SAPPINESS.ordinal()] = AlleleManager.alleleRegistry.getAllele("forestry.sappinessAverage");
alleles[EnumFlowerChromosome.STEM.ordinal()] = EnumFlowerColor.Green.getAllele();
alleles[EnumFlowerChromosome.LIFESPAN.ordinal()] = AlleleHelper.getAllele(EnumAllele.Lifespan.NORMAL);
alleles[EnumFlowerChromosome.TEMPERATURE_TOLERANCE.ordinal()] = AlleleHelper.getAllele(EnumTolerance.NONE);
alleles[EnumFlowerChromosome.HUMIDITY_TOLERANCE.ordinal()] = AlleleHelper.getAllele(EnumTolerance.NONE);
alleles[EnumFlowerChromosome.PH_TOLERANCE.ordinal()] = AlleleHelper.getAllele(EnumTolerance.NONE);
alleles[EnumFlowerChromosome.SAPPINESS.ordinal()] = AlleleHelper.getAllele(EnumAllele.Sappiness.AVERAGE);
alleles[EnumFlowerChromosome.STEM.ordinal()] = AlleleHelper.getAllele(EnumFlowerColor.GREEN);
return alleles;
}
}
@@ -3,6 +3,7 @@ package binnie.botany.genetics;
import binnie.botany.Botany;
import binnie.botany.CreativeTabBotany;
import binnie.botany.core.BotanyGUI;
import binnie.core.util.I18N;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.client.renderer.texture.IIconRegister;
@@ -52,18 +53,15 @@ public class ItemDictionary extends Item {
@Override
public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer player) {
if (stack.getItemDamage() == 0) {
Botany.proxy.openGui(BotanyGUI.Database, player, (int) player.posX, (int) player.posY, (int) player.posZ);
} else {
Botany.proxy.openGui(BotanyGUI.DatabaseNEI, player, (int) player.posX, (int) player.posY, (int) player.posZ);
}
BotanyGUI guiId = (stack.getItemDamage() == 0) ? BotanyGUI.Database : BotanyGUI.DatabaseNEI;
Botany.proxy.openGui(guiId, player, (int) player.posX, (int) player.posY, (int) player.posZ);
return stack;
}
@Override
public String getItemStackDisplayName(ItemStack stack) {
return (stack.getItemDamage() == 0) ?
"Botanist Database" :
"Master Botanist Database";
return (stack.getItemDamage() == 0)
? I18N.localise(Botany.instance, "item.botanistDatabase.0.name")
: I18N.localise(Botany.instance, "item.botanistDatabase.1.name");
}
}
@@ -22,11 +22,7 @@ import net.minecraft.init.Items;
import net.minecraft.item.ItemStack;
public class ModuleGenetics implements IInitializable {
static AlleleEffectNone alleleEffectNone;
static {
ModuleGenetics.alleleEffectNone = new AlleleEffectNone();
}
static AlleleEffectNone alleleEffectNone = new AlleleEffectNone();
@Override
public void preInit() {
@@ -47,6 +43,7 @@ public class ModuleGenetics implements IInitializable {
for (EnumFlowerColor color : EnumFlowerColor.values()) {
AlleleManager.alleleRegistry.registerAllele(color.getAllele());
}
FlowerSpecies.setupVariants();
for (FlowerSpecies species : FlowerSpecies.values()) {
AlleleManager.alleleRegistry.registerAllele(species);
@@ -55,6 +52,7 @@ public class ModuleGenetics implements IInitializable {
BotanyCore.getFlowerRoot().registerTemplate(variant);
}
}
RendererBotany.renderID = RenderingRegistry.getNextAvailableRenderId();
BinnieCore.proxy.registerBlockRenderer(new RendererBotany());
}
@@ -80,7 +80,7 @@ public class WindowGenesis extends Window {
@Override
public int getOutlineColour() {
return value.getColour();
return value.getColor();
}
@Override
@@ -20,7 +20,7 @@ class ControlBreedingProgress extends Control {
public ControlBreedingProgress(IWidget parent, int x, int y, int width, int height, BreedingSystem system, float percentage) {
super(parent, x, y, width, height);
this.percentage = percentage;
colour = system.getColour();
colour = system.getColor();
}
@Override
@@ -4,6 +4,7 @@ import binnie.Binnie;
import binnie.core.BinnieCore;
import binnie.core.util.I18N;
import binnie.extrabees.ExtraBees;
import binnie.genetics.genetics.AlleleHelper;
import forestry.api.apiculture.EnumBeeChromosome;
import forestry.api.apiculture.EnumBeeType;
import forestry.api.apiculture.IAlleleBeeSpecies;
@@ -11,11 +12,13 @@ import forestry.api.apiculture.IApiaristTracker;
import forestry.api.apiculture.IBeeGenome;
import forestry.api.apiculture.IBeeMutation;
import forestry.api.apiculture.IBeeRoot;
import forestry.api.genetics.EnumTolerance;
import forestry.api.genetics.IAllele;
import forestry.api.genetics.IBreedingTracker;
import forestry.api.genetics.IChromosomeType;
import forestry.api.genetics.IMutation;
import forestry.api.genetics.ISpeciesRoot;
import forestry.core.genetics.alleles.EnumAllele;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
@@ -44,7 +47,7 @@ class BeeBreedingSystem extends BreedingSystem {
}
@Override
public int getColour() {
public int getColor() {
return 0xffd900;
}
@@ -91,47 +94,47 @@ class BeeBreedingSystem extends BreedingSystem {
public void addExtraAlleles(IChromosomeType chromosome, TreeSet<IAllele> alleles) {
switch ((EnumBeeChromosome) chromosome) {
case FERTILITY:
for (ForestryAllele.Fertility a : ForestryAllele.Fertility.values()) {
alleles.add(a.getAllele());
for (EnumAllele.Fertility fertility : EnumAllele.Fertility.values()) {
alleles.add(AlleleHelper.getAllele(fertility));
}
break;
case FLOWERING:
for (ForestryAllele.Flowering a2 : ForestryAllele.Flowering.values()) {
alleles.add(a2.getAllele());
for (EnumAllele.Flowering flowering : EnumAllele.Flowering.values()) {
alleles.add(AlleleHelper.getAllele(flowering));
}
break;
case HUMIDITY_TOLERANCE:
case TEMPERATURE_TOLERANCE:
for (Tolerance a3 : Tolerance.values()) {
alleles.add(a3.getAllele());
for (EnumTolerance tolerance : EnumTolerance.values()) {
alleles.add(AlleleHelper.getAllele(tolerance));
}
break;
case LIFESPAN:
for (ForestryAllele.Lifespan a4 : ForestryAllele.Lifespan.values()) {
alleles.add(a4.getAllele());
for (EnumAllele.Lifespan lifespan : EnumAllele.Lifespan.values()) {
alleles.add(AlleleHelper.getAllele(lifespan));
}
break;
case SPEED:
for (ForestryAllele.Speed a5 : ForestryAllele.Speed.values()) {
alleles.add(a5.getAllele());
for (EnumAllele.Speed speed : EnumAllele.Speed.values()) {
alleles.add(AlleleHelper.getAllele(speed));
}
break;
case TERRITORY:
for (ForestryAllele.Territory a6 : ForestryAllele.Territory.values()) {
alleles.add(a6.getAllele());
for (EnumAllele.Territory territory : EnumAllele.Territory.values()) {
alleles.add(AlleleHelper.getAllele(territory));
}
break;
case NOCTURNAL:
case CAVE_DWELLING:
case TOLERANT_FLYER:
for (ForestryAllele.Bool a7 : ForestryAllele.Bool.values()) {
alleles.add(a7.getAllele());
for (ForestryAllele.Bool bool : ForestryAllele.Bool.values()) {
alleles.add(bool.getAllele());
}
break;
}
@@ -417,7 +417,7 @@ public abstract class BreedingSystem implements IItemStackRepresentative {
return null;
}
public abstract int getColour();
public abstract int getColor();
public String getAlleleName(IChromosomeType chromosome, IAllele allele) {
if (allele instanceof IAlleleBoolean) {
@@ -10,12 +10,16 @@ import binnie.botany.genetics.EnumFlowerColor;
import binnie.core.BinnieCore;
import binnie.core.util.I18N;
import binnie.extrabees.ExtraBees;
import binnie.genetics.genetics.AlleleHelper;
import forestry.api.genetics.AlleleManager;
import forestry.api.genetics.EnumTolerance;
import forestry.api.genetics.IAllele;
import forestry.api.genetics.IBreedingTracker;
import forestry.api.genetics.IChromosomeType;
import forestry.api.genetics.IIndividual;
import forestry.api.genetics.IMutation;
import forestry.api.genetics.ISpeciesRoot;
import forestry.core.genetics.alleles.EnumAllele;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
@@ -38,7 +42,7 @@ class FlowerBreedingSystem extends BreedingSystem {
}
@Override
public int getColour() {
public int getColor() {
return 0xde3737;
}
@@ -79,9 +83,9 @@ class FlowerBreedingSystem extends BreedingSystem {
@Override
public int[] getActiveTypes() {
return new int[]{
EnumFlowerStage.FLOWER.ordinal(),
EnumFlowerStage.POLLEN.ordinal(),
EnumFlowerStage.SEED.ordinal()
EnumFlowerStage.FLOWER.ordinal(),
EnumFlowerStage.POLLEN.ordinal(),
EnumFlowerStage.SEED.ordinal()
};
}
@@ -89,42 +93,42 @@ class FlowerBreedingSystem extends BreedingSystem {
public void addExtraAlleles(IChromosomeType chromosome, TreeSet<IAllele> alleles) {
switch ((EnumFlowerChromosome) chromosome) {
case FERTILITY:
for (ForestryAllele.Fertility a : ForestryAllele.Fertility.values()) {
alleles.add(a.getAllele());
for (EnumAllele.Fertility fertility : EnumAllele.Fertility.values()) {
alleles.add(AlleleManager.alleleRegistry.getAllele(AlleleHelper.getUid(fertility)));
}
break;
case LIFESPAN:
for (ForestryAllele.Lifespan a2 : ForestryAllele.Lifespan.values()) {
alleles.add(a2.getAllele());
for (EnumAllele.Lifespan lifespan : EnumAllele.Lifespan.values()) {
alleles.add(AlleleManager.alleleRegistry.getAllele(AlleleHelper.getUid(lifespan)));
}
break;
case HUMIDITY_TOLERANCE:
case PH_TOLERANCE:
case TEMPERATURE_TOLERANCE:
for (Tolerance a3 : Tolerance.values()) {
alleles.add(a3.getAllele());
for (EnumTolerance a3 : EnumTolerance.values()) {
alleles.add(AlleleManager.alleleRegistry.getAllele(AlleleHelper.getUid(a3)));
}
break;
case PRIMARY:
case SECONDARY:
case STEM:
for (EnumFlowerColor a4 : EnumFlowerColor.values()) {
alleles.add(a4.getAllele());
for (EnumFlowerColor color : EnumFlowerColor.values()) {
alleles.add(color.getAllele());
}
break;
case SAPPINESS:
for (ForestryAllele.Sappiness a5 : ForestryAllele.Sappiness.values()) {
alleles.add(a5.getAllele());
for (EnumAllele.Sappiness sappiness : EnumAllele.Sappiness.values()) {
alleles.add(AlleleManager.alleleRegistry.getAllele(AlleleHelper.getUid(sappiness)));
}
break;
case TERRITORY:
for (ForestryAllele.Territory a6 : ForestryAllele.Territory.values()) {
alleles.add(a6.getAllele());
for (EnumAllele.Territory territory : EnumAllele.Territory.values()) {
alleles.add(AlleleManager.alleleRegistry.getAllele(AlleleHelper.getUid(territory)));
}
break;
}
@@ -110,10 +110,6 @@ public class ManagerGenetics extends ManagerBase {
return null;
}
public IAllele getToleranceAllele(EnumTolerance tol) {
return AlleleManager.alleleRegistry.getAllele(Tolerance.values()[tol.ordinal()].getUID());
}
public int[] getTolerance(EnumTolerance tol) {
return Tolerance.values()[tol.ordinal()].getBounds();
}
@@ -36,7 +36,7 @@ class MothBreedingSystem extends BreedingSystem {
}
@Override
public int getColour() {
public int getColor() {
return 0x00f2f2;
}
@@ -7,6 +7,7 @@ import binnie.core.util.UniqueItemStackSet;
import binnie.extratrees.ExtraTrees;
import binnie.extratrees.FakeWorld;
import binnie.extratrees.machines.Lumbermill;
import binnie.genetics.genetics.AlleleHelper;
import com.mojang.authlib.GameProfile;
import forestry.api.arboriculture.EnumGermlingType;
import forestry.api.arboriculture.EnumTreeChromosome;
@@ -29,6 +30,7 @@ import forestry.api.genetics.IFruitFamily;
import forestry.api.genetics.IIndividual;
import forestry.api.genetics.IMutation;
import forestry.api.genetics.ISpeciesRoot;
import forestry.core.genetics.alleles.EnumAllele;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.world.World;
@@ -71,7 +73,7 @@ public class TreeBreedingSystem extends BreedingSystem {
}
@Override
public int getColour() {
public int getColor() {
return 53006;
}
@@ -269,8 +271,8 @@ public class TreeBreedingSystem extends BreedingSystem {
public void addExtraAlleles(IChromosomeType chromosome, TreeSet<IAllele> alleles) {
switch ((EnumTreeChromosome) chromosome) {
case FERTILITY:
for (ForestryAllele.Saplings a : ForestryAllele.Saplings.values()) {
alleles.add(a.getAllele());
for (EnumAllele.Saplings saplings : EnumAllele.Saplings.values()) {
alleles.add(AlleleManager.alleleRegistry.getAllele(AlleleHelper.getUid(saplings)));
}
break;
@@ -281,38 +283,38 @@ public class TreeBreedingSystem extends BreedingSystem {
break;
case HEIGHT:
for (ForestryAllele.TreeHeight a3 : ForestryAllele.TreeHeight.values()) {
alleles.add(a3.getAllele());
for (EnumAllele.Height height : EnumAllele.Height.values()) {
alleles.add(AlleleManager.alleleRegistry.getAllele(AlleleHelper.getUid(height)));
}
break;
case MATURATION:
for (ForestryAllele.Maturation a4 : ForestryAllele.Maturation.values()) {
alleles.add(a4.getAllele());
for (EnumAllele.Maturation maturation : EnumAllele.Maturation.values()) {
alleles.add(AlleleManager.alleleRegistry.getAllele(AlleleHelper.getUid(maturation)));
}
break;
case SAPPINESS:
for (ForestryAllele.Sappiness a5 : ForestryAllele.Sappiness.values()) {
alleles.add(a5.getAllele());
for (EnumAllele.Sappiness sappiness : EnumAllele.Sappiness.values()) {
alleles.add(AlleleManager.alleleRegistry.getAllele(AlleleHelper.getUid(sappiness)));
}
break;
case TERRITORY:
for (ForestryAllele.Territory a6 : ForestryAllele.Territory.values()) {
alleles.add(a6.getAllele());
for (EnumAllele.Territory territory : EnumAllele.Territory.values()) {
alleles.add(AlleleManager.alleleRegistry.getAllele(AlleleHelper.getUid(territory)));
}
break;
case YIELD:
for (ForestryAllele.Yield a7 : ForestryAllele.Yield.values()) {
alleles.add(a7.getAllele());
for (EnumAllele.Yield yield : EnumAllele.Yield.values()) {
alleles.add(AlleleManager.alleleRegistry.getAllele(AlleleHelper.getUid(yield)));
}
break;
case FIREPROOF:
for (ForestryAllele.Bool a8 : ForestryAllele.Bool.values()) {
alleles.add(a8.getAllele());
for (ForestryAllele.Bool bool : ForestryAllele.Bool.values()) {
alleles.add(bool.getAllele());
}
break;
}
@@ -0,0 +1,7 @@
package binnie.extrabees.genetics;
public enum EnumBeeSpeciesState {
ACTIVE,
INACTIVE,
DEPRECATED
}
@@ -4,12 +4,12 @@ import binnie.Binnie;
import binnie.core.BinnieCore;
import binnie.core.Mods;
import binnie.core.genetics.ForestryAllele;
import binnie.core.genetics.Tolerance;
import binnie.core.item.IItemEnum;
import binnie.extrabees.ExtraBees;
import binnie.extrabees.genetics.effect.ExtraBeesEffect;
import binnie.extrabees.products.EnumHoneyComb;
import binnie.extrabees.products.ItemHoneyComb;
import binnie.genetics.genetics.AlleleHelper;
import com.mojang.authlib.GameProfile;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
@@ -24,12 +24,14 @@ import forestry.api.core.EnumHumidity;
import forestry.api.core.EnumTemperature;
import forestry.api.core.IIconProvider;
import forestry.api.genetics.AlleleManager;
import forestry.api.genetics.EnumTolerance;
import forestry.api.genetics.IAllele;
import forestry.api.genetics.IAlleleFlowers;
import forestry.api.genetics.IAlleleSpecies;
import forestry.api.genetics.IClassification;
import forestry.api.genetics.IIndividual;
import forestry.api.genetics.IMutation;
import forestry.core.genetics.alleles.EnumAllele;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.init.Items;
import net.minecraft.item.ItemStack;
@@ -44,25 +46,26 @@ import java.util.LinkedHashMap;
import java.util.Locale;
import java.util.Map;
// TODO drop this and replace for ExtraBeeDefinition
public enum ExtraBeesSpecies implements IAlleleBeeSpecies, IIconProvider {
ARID("aridus", 12511316),
BARREN("infelix", 14733923),
DESOLATE("desolo", 13744272),
GNAWING("apica", 15234224),
ROTTEN("caries", 12574902),
BONE("os", 15330792),
CREEPER("erepo", 2942485),
DECOMPOSING("aegrus", 5388049),
ROCK("saxum", 11053224),
STONE("lapis", 7697781),
GRANITE("granum", 6903125),
MINERAL("minerale", 7239037),
COPPER("cuprous", 13722376),
TIN("stannus", 12431805),
IRON("ferrous", 11038808),
LEAD("plumbous", 11373483),
ZINC("spelta", 15592447),
TITANIUM("titania", 11578083),
ARID("aridus", 0xbee854),
BARREN("infelix", 0xe0d263),
DESOLATE("desolo", 0xd1b890),
GNAWING("apica", 0xe874b0),
ROTTEN("caries", 0xbfe0b6),
BONE("os", 0xe9ede8),
CREEPER("erepo", 0x2ce615),
DECOMPOSING("aegrus", 0x523711),
ROCK("saxum", 0xa8a8a8),
STONE("lapis", 0x757575),
GRANITE("granum", 0x695555),
MINERAL("minerale", 0x6e757d),
COPPER("cuprous", 0xd16308),
TIN("stannus", 0xbdb1bd),
IRON("ferrous", 0xa87058),
LEAD("plumbous", 0xad8bab),
ZINC("spelta", 0xedebff),
TITANIUM("titania", 0xb0aae3),
BRONZE,
BRASS,
STEEL,
@@ -172,26 +175,26 @@ public enum ExtraBeesSpecies implements IAlleleBeeSpecies, IIconProvider {
BLUTONIUM("caruthus", 1769702),
MYSTICAL("mystica", 4630306);
public HashMap<ItemStack, Float> allProducts;
public HashMap<ItemStack, Float> allSpecialties;
public State state;
public HashMap<ItemStack, Float> allProducts = new LinkedHashMap<>();
public HashMap<ItemStack, Float> allSpecialties = new LinkedHashMap<>();
public EnumBeeSpeciesState state;
protected boolean nocturnal;
protected boolean nocturnal = false;
private int primaryColor;
private int secondaryColor;
private EnumTemperature temperature;
private EnumHumidity humidity;
private boolean hasEffect;
private boolean isSecret;
private boolean isCounted;
private int secondaryColor = 0xffdc16;
private EnumTemperature temperature = EnumTemperature.NORMAL;
private EnumHumidity humidity = EnumHumidity.NORMAL;
private boolean hasEffect = false;
private boolean isSecret = true;
private boolean isCounted = true;
private String binomial;
private IClassification branch;
private IClassification branch = null;
private String uid;
private Achievement achievement;
private boolean dominant;
private HashMap<ItemStack, Float> products;
private HashMap<ItemStack, Float> specialties;
private Achievement achievement = null;
private boolean dominant = true;
private HashMap<ItemStack, Float> products = new LinkedHashMap<>();
private HashMap<ItemStack, Float> specialties = new LinkedHashMap<>();
private IAllele[] template;
@SideOnly(Side.CLIENT)
@@ -200,43 +203,15 @@ public enum ExtraBeesSpecies implements IAlleleBeeSpecies, IIconProvider {
ExtraBeesSpecies(String binomial, int color) {
this.binomial = binomial;
primaryColor = color;
secondaryColor = 0xffdc16;
temperature = EnumTemperature.NORMAL;
humidity = EnumHumidity.NORMAL;
hasEffect = false;
isSecret = true;
isCounted = true;
branch = null;
achievement = null;
dominant = true;
products = new LinkedHashMap<>();
specialties = new LinkedHashMap<>();
allProducts = new LinkedHashMap<>();
allSpecialties = new LinkedHashMap<>();
state = State.Active;
nocturnal = false;
state = EnumBeeSpeciesState.ACTIVE;
uid = toString().toLowerCase();
}
ExtraBeesSpecies() {
primaryColor = 0xffffff;
secondaryColor = 0xffdc16;
temperature = EnumTemperature.NORMAL;
humidity = EnumHumidity.NORMAL;
hasEffect = false;
isSecret = true;
isCounted = true;
binomial = "";
branch = null;
primaryColor = 0xffffff;
state = EnumBeeSpeciesState.DEPRECATED;
uid = "";
achievement = null;
dominant = true;
products = new LinkedHashMap<>();
specialties = new LinkedHashMap<>();
allProducts = new LinkedHashMap<>();
allSpecialties = new LinkedHashMap<>();
nocturnal = false;
state = State.Deprecated;
}
public static IAllele[] getDefaultTemplate() {
@@ -251,83 +226,96 @@ public enum ExtraBeesSpecies implements IAlleleBeeSpecies, IIconProvider {
int aridBody = 0xcbe374;
int rockBody = 0x999999;
ExtraBeesSpecies.ARID.importTemplate(ForestryAllele.BeeSpecies.Modest);
ExtraBeesSpecies.ARID.addProduct(EnumHoneyComb.BARREN, 0.30f);
ExtraBeesSpecies.ARID.setHumidity(EnumHumidity.ARID);
ExtraBeesSpecies.ARID.setFlowerProvider(ExtraBeesFlowers.DEAD.getUID());
ExtraBeesSpecies.ARID.setTemperatureTolerance(Tolerance.Up1);
ExtraBeesSpecies.ARID.setSecondaryColor(aridBody);
ExtraBeesSpecies.ARID
.importTemplate(ForestryAllele.BeeSpecies.Modest)
.addProduct(EnumHoneyComb.BARREN, 0.30f)
.setHumidity(EnumHumidity.ARID)
.setFlowerProvider(ExtraBeesFlowers.DEAD.getUID())
.setTemperatureTolerance(EnumTolerance.UP_1)
.setSecondaryColor(aridBody);
ExtraBeesSpecies.BARREN.importTemplate(ExtraBeesSpecies.ARID);
ExtraBeesSpecies.BARREN.setFertility(ForestryAllele.Fertility.Low);
ExtraBeesSpecies.BARREN.addProduct(EnumHoneyComb.BARREN, 0.30f);
ExtraBeesSpecies.BARREN
.importTemplate(ExtraBeesSpecies.ARID)
.setFertility(EnumAllele.Fertility.LOW)
.addProduct(EnumHoneyComb.BARREN, 0.30f);
ExtraBeesSpecies.DESOLATE.addProduct(EnumHoneyComb.BARREN, 0.30f);
ExtraBeesSpecies.DESOLATE.importTemplate(ExtraBeesSpecies.BARREN);
ExtraBeesSpecies.DESOLATE.setEffect(ExtraBeesEffect.HUNGER.getUID());
ExtraBeesSpecies.DESOLATE.recessive();
ExtraBeesSpecies.DESOLATE.setNocturnal();
ExtraBeesSpecies.DESOLATE.setHasEffect(true);
ExtraBeesSpecies.DESOLATE
.addProduct(EnumHoneyComb.BARREN, 0.30f)
.importTemplate(ExtraBeesSpecies.BARREN)
.setEffect(ExtraBeesEffect.HUNGER.getUID())
.recessive()
.setNocturnal()
.setHasEffect(true);
ExtraBeesSpecies.GNAWING.importTemplate(ExtraBeesSpecies.BARREN);
ExtraBeesSpecies.GNAWING.setFlowerProvider(ExtraBeesFlowers.WOOD.getUID());
ExtraBeesSpecies.GNAWING.addProduct(EnumHoneyComb.BARREN, 0.25f);
ExtraBeesSpecies.GNAWING.addSpecialty(EnumHoneyComb.SAWDUST, 0.25f);
ExtraBeesSpecies.GNAWING
.importTemplate(ExtraBeesSpecies.BARREN)
.setFlowerProvider(ExtraBeesFlowers.WOOD.getUID())
.addProduct(EnumHoneyComb.BARREN, 0.25f)
.addSpecialty(EnumHoneyComb.SAWDUST, 0.25f);
ExtraBeesSpecies.ROTTEN.importTemplate(ExtraBeesSpecies.DESOLATE);
ExtraBeesSpecies.ROTTEN.setNocturnal();
ExtraBeesSpecies.ROTTEN.setCaveDwelling();
ExtraBeesSpecies.ROTTEN.setTolerantFlyer();
ExtraBeesSpecies.ROTTEN.setEffect(ExtraBeesEffect.SPAWN_ZOMBIE.getUID());
ExtraBeesSpecies.ROTTEN.addProduct(EnumHoneyComb.BARREN, 0.30f);
ExtraBeesSpecies.ROTTEN.addSpecialty(EnumHoneyComb.ROTTEN, 0.10f);
ExtraBeesSpecies.ROTTEN
.importTemplate(ExtraBeesSpecies.DESOLATE)
.setNocturnal()
.setCaveDwelling()
.setTolerantFlyer()
.setEffect(ExtraBeesEffect.SPAWN_ZOMBIE.getUID())
.addProduct(EnumHoneyComb.BARREN, 0.30f)
.addSpecialty(EnumHoneyComb.ROTTEN, 0.10f);
ExtraBeesSpecies.BONE.importTemplate(ExtraBeesSpecies.ROTTEN);
ExtraBeesSpecies.BONE.addProduct(EnumHoneyComb.BARREN, 0.30f);
ExtraBeesSpecies.BONE.addSpecialty(EnumHoneyComb.BONE, 0.10f);
ExtraBeesSpecies.BONE.setEffect(ExtraBeesEffect.SPAWN_SKELETON.getUID());
ExtraBeesSpecies.BONE
.importTemplate(ExtraBeesSpecies.ROTTEN)
.addProduct(EnumHoneyComb.BARREN, 0.30f)
.addSpecialty(EnumHoneyComb.BONE, 0.10f)
.setEffect(ExtraBeesEffect.SPAWN_SKELETON.getUID());
ExtraBeesSpecies.CREEPER.importTemplate(ExtraBeesSpecies.ROTTEN);
ExtraBeesSpecies.CREEPER.setAllDay();
ExtraBeesSpecies.CREEPER.addProduct(EnumHoneyComb.BARREN, 0.30f);
ExtraBeesSpecies.CREEPER.addSpecialty(ItemHoneyComb.VanillaComb.POWDERY.get(), 0.08f);
ExtraBeesSpecies.CREEPER.setEffect(ExtraBeesEffect.SPAWN_CREEPER.getUID());
ExtraBeesSpecies.CREEPER
.importTemplate(ExtraBeesSpecies.ROTTEN)
.setAllDay()
.addProduct(EnumHoneyComb.BARREN, 0.30f)
.addSpecialty(ItemHoneyComb.VanillaComb.POWDERY.get(), 0.08f)
.setEffect(ExtraBeesEffect.SPAWN_CREEPER.getUID());
ExtraBeesSpecies.DECOMPOSING.importTemplate(ExtraBeesSpecies.BARREN);
ExtraBeesSpecies.DECOMPOSING.addProduct(EnumHoneyComb.BARREN, 0.30f);
ExtraBeesSpecies.DECOMPOSING.addSpecialty(EnumHoneyComb.COMPOST, 0.08f);
ExtraBeesSpecies.DECOMPOSING
.importTemplate(ExtraBeesSpecies.BARREN)
.addProduct(EnumHoneyComb.BARREN, 0.30f)
.addSpecialty(EnumHoneyComb.COMPOST, 0.08f);
ExtraBeesSpecies.ROCK.addProduct(EnumHoneyComb.STONE, 0.30f);
ExtraBeesSpecies.ROCK.setIsSecret(false);
ExtraBeesSpecies.ROCK.setAllDay();
ExtraBeesSpecies.ROCK.setCaveDwelling();
ExtraBeesSpecies.ROCK.setTolerantFlyer();
ExtraBeesSpecies.ROCK.setTemperatureTolerance(Tolerance.Both1);
ExtraBeesSpecies.ROCK.setHumidityTolerance(Tolerance.Both1);
ExtraBeesSpecies.ROCK.setFlowerProvider(ExtraBeesFlowers.ROCK.getUID());
ExtraBeesSpecies.ROCK.setFertility(ForestryAllele.Fertility.Low);
ExtraBeesSpecies.ROCK.setLifespan(ForestryAllele.Lifespan.Short);
ExtraBeesSpecies.ROCK.setSecondaryColor(rockBody);
ExtraBeesSpecies.ROCK
.addProduct(EnumHoneyComb.STONE, 0.30f)
.setIsSecret(false)
.setAllDay()
.setCaveDwelling()
.setTolerantFlyer()
.setTemperatureTolerance(EnumTolerance.BOTH_1)
.setHumidityTolerance(EnumTolerance.BOTH_1)
.setFlowerProvider(ExtraBeesFlowers.ROCK.getUID())
.setFertility(EnumAllele.Fertility.LOW)
.setLifespan(EnumAllele.Lifespan.SHORT)
.setSecondaryColor(rockBody);
ExtraBeesSpecies.STONE.addProduct(EnumHoneyComb.STONE, 0.30f);
ExtraBeesSpecies.STONE.importTemplate(ExtraBeesSpecies.ROCK);
ExtraBeesSpecies.STONE.recessive();
ExtraBeesSpecies.STONE.setSecondaryColor(rockBody);
ExtraBeesSpecies.STONE
.addProduct(EnumHoneyComb.STONE, 0.30f)
.importTemplate(ExtraBeesSpecies.ROCK)
.recessive()
.setSecondaryColor(rockBody);
ExtraBeesSpecies.GRANITE.addProduct(EnumHoneyComb.STONE, 0.30f);
ExtraBeesSpecies.GRANITE.importTemplate(ExtraBeesSpecies.STONE);
ExtraBeesSpecies.GRANITE.setTemperatureTolerance(Tolerance.Both2);
ExtraBeesSpecies.GRANITE.setHumidityTolerance(Tolerance.Both2);
ExtraBeesSpecies.GRANITE.setSecondaryColor(rockBody);
ExtraBeesSpecies.GRANITE
.addProduct(EnumHoneyComb.STONE, 0.30f)
.importTemplate(ExtraBeesSpecies.STONE)
.setTemperatureTolerance(EnumTolerance.BOTH_2)
.setHumidityTolerance(EnumTolerance.BOTH_2)
.setSecondaryColor(rockBody);
ExtraBeesSpecies.MINERAL.addProduct(EnumHoneyComb.STONE, 0.30f);
ExtraBeesSpecies.MINERAL.importTemplate(ExtraBeesSpecies.GRANITE);
ExtraBeesSpecies.MINERAL.setSecondaryColor(rockBody);
ExtraBeesSpecies.MINERAL
.addProduct(EnumHoneyComb.STONE, 0.30f)
.importTemplate(ExtraBeesSpecies.GRANITE)
.setSecondaryColor(rockBody);
ExtraBeesSpecies.COPPER.addProduct(EnumHoneyComb.STONE, 0.20f);
ExtraBeesSpecies.COPPER.addSpecialty(EnumHoneyComb.COPPER, 0.06f);
ExtraBeesSpecies.COPPER.importTemplate(ExtraBeesSpecies.MINERAL);
ExtraBeesSpecies.COPPER.setSecondaryColor(rockBody);
ExtraBeesSpecies.COPPER
.addProduct(EnumHoneyComb.STONE, 0.20f)
.addSpecialty(EnumHoneyComb.COPPER, 0.06f)
.importTemplate(ExtraBeesSpecies.MINERAL)
.setSecondaryColor(rockBody);
ExtraBeesSpecies.TIN.addProduct(EnumHoneyComb.STONE, 0.20f);
ExtraBeesSpecies.TIN.addSpecialty(EnumHoneyComb.TIN, 0.06f);
@@ -411,8 +399,8 @@ public enum ExtraBeesSpecies implements IAlleleBeeSpecies, IIconProvider {
ExtraBeesSpecies.UNSTABLE.importTemplate(ExtraBeesSpecies.MINERAL);
ExtraBeesSpecies.UNSTABLE.addProduct(EnumHoneyComb.BARREN, 0.20f);
ExtraBeesSpecies.UNSTABLE.setEffect(ExtraBeesEffect.RADIOACTIVE.getUID());
ExtraBeesSpecies.UNSTABLE.setFertility(ForestryAllele.Fertility.Low);
ExtraBeesSpecies.UNSTABLE.setLifespan(ForestryAllele.Lifespan.Shortest);
ExtraBeesSpecies.UNSTABLE.setFertility(EnumAllele.Fertility.LOW);
ExtraBeesSpecies.UNSTABLE.setLifespan(EnumAllele.Lifespan.SHORTEST);
ExtraBeesSpecies.UNSTABLE.recessive();
ExtraBeesSpecies.NUCLEAR.importTemplate(ExtraBeesSpecies.UNSTABLE);
@@ -427,25 +415,25 @@ public enum ExtraBeesSpecies implements IAlleleBeeSpecies, IIconProvider {
ExtraBeesSpecies.ANCIENT.importTemplate(ForestryAllele.BeeSpecies.Noble);
ExtraBeesSpecies.ANCIENT.addProduct(EnumHoneyComb.OLD, 0.30f);
ExtraBeesSpecies.ANCIENT.setLifespan(ForestryAllele.Lifespan.Elongated);
ExtraBeesSpecies.ANCIENT.setLifespan(EnumAllele.Lifespan.ELONGATED);
ExtraBeesSpecies.PRIMEVAL.importTemplate(ExtraBeesSpecies.ANCIENT);
ExtraBeesSpecies.PRIMEVAL.addProduct(EnumHoneyComb.OLD, 0.30f);
ExtraBeesSpecies.PRIMEVAL.setLifespan(ForestryAllele.Lifespan.Long);
ExtraBeesSpecies.PRIMEVAL.setLifespan(EnumAllele.Lifespan.LONG);
ExtraBeesSpecies.PREHISTORIC.importTemplate(ExtraBeesSpecies.ANCIENT);
ExtraBeesSpecies.PREHISTORIC.addProduct(EnumHoneyComb.OLD, 0.30f);
ExtraBeesSpecies.PREHISTORIC.setLifespan(ForestryAllele.Lifespan.Longer);
ExtraBeesSpecies.PREHISTORIC.setFertility(ForestryAllele.Fertility.Low);
ExtraBeesSpecies.PREHISTORIC.setLifespan(EnumAllele.Lifespan.LONGER);
ExtraBeesSpecies.PREHISTORIC.setFertility(EnumAllele.Fertility.LOW);
ExtraBeesSpecies.PREHISTORIC.recessive();
ExtraBeesSpecies.RELIC.importTemplate(ExtraBeesSpecies.ANCIENT);
ExtraBeesSpecies.RELIC.addProduct(EnumHoneyComb.OLD, 0.30f);
ExtraBeesSpecies.RELIC.setHasEffect(true);
ExtraBeesSpecies.RELIC.setLifespan(ForestryAllele.Lifespan.Longest);
ExtraBeesSpecies.RELIC.setLifespan(EnumAllele.Lifespan.LONGEST);
ExtraBeesSpecies.COAL.importTemplate(ExtraBeesSpecies.ANCIENT);
ExtraBeesSpecies.COAL.setLifespan(ForestryAllele.Lifespan.Normal);
ExtraBeesSpecies.COAL.setLifespan(EnumAllele.Lifespan.NORMAL);
ExtraBeesSpecies.COAL.addProduct(EnumHoneyComb.OLD, 0.20f);
ExtraBeesSpecies.COAL.addSpecialty(EnumHoneyComb.COAL, 0.08f);
@@ -480,9 +468,9 @@ public enum ExtraBeesSpecies implements IAlleleBeeSpecies, IIconProvider {
ExtraBeesSpecies.WATER.addProduct(EnumHoneyComb.WATER, 0.30f);
ExtraBeesSpecies.WATER.setIsSecret(false);
ExtraBeesSpecies.WATER.setTolerantFlyer();
ExtraBeesSpecies.WATER.setHumidityTolerance(Tolerance.Both1);
ExtraBeesSpecies.WATER.setHumidityTolerance(EnumTolerance.BOTH_1);
ExtraBeesSpecies.WATER.setFlowerProvider(ExtraBeesFlowers.WATER.getUID());
ExtraBeesSpecies.WATER.setFlowering(ForestryAllele.Flowering.Slow);
ExtraBeesSpecies.WATER.setFlowering(EnumAllele.Flowering.SLOW);
ExtraBeesSpecies.WATER.setEffect(ExtraBeesEffect.WATER.getUID());
ExtraBeesSpecies.WATER.setHumidity(EnumHumidity.DAMP);
@@ -502,15 +490,15 @@ public enum ExtraBeesSpecies implements IAlleleBeeSpecies, IIconProvider {
ExtraBeesSpecies.GROWING.importTemplate(ForestryAllele.BeeSpecies.Forest);
ExtraBeesSpecies.GROWING.addProduct(ItemHoneyComb.VanillaComb.HONEY.get(), 0.35f);
ExtraBeesSpecies.GROWING.setFlowering(ForestryAllele.Flowering.Average);
ExtraBeesSpecies.GROWING.setFlowering(EnumAllele.Flowering.AVERAGE);
ExtraBeesSpecies.GROWING.setFlowerProvider(ExtraBeesFlowers.LEAVES.getUID());
ExtraBeesSpecies.THRIVING.importTemplate(ExtraBeesSpecies.GROWING);
ExtraBeesSpecies.THRIVING.addProduct(ItemHoneyComb.VanillaComb.HONEY.get(), 0.35f);
ExtraBeesSpecies.THRIVING.setFlowering(ForestryAllele.Flowering.Fast);
ExtraBeesSpecies.THRIVING.setFlowering(EnumAllele.Flowering.FAST);
ExtraBeesSpecies.BLOOMING.importTemplate(ExtraBeesSpecies.THRIVING);
ExtraBeesSpecies.BLOOMING.setFlowering(ForestryAllele.Flowering.Fastest);
ExtraBeesSpecies.BLOOMING.setFlowering(EnumAllele.Flowering.FASTEST);
ExtraBeesSpecies.BLOOMING.addProduct(ItemHoneyComb.VanillaComb.HONEY.get(), 0.35f);
ExtraBeesSpecies.BLOOMING.setFlowerProvider(ExtraBeesFlowers.SAPLING.getUID());
ExtraBeesSpecies.BLOOMING.setEffect(ExtraBeesEffect.BONEMEAL_SAPLING.getUID());
@@ -599,13 +587,13 @@ public enum ExtraBeesSpecies implements IAlleleBeeSpecies, IIconProvider {
ExtraBeesSpecies.INFECTIOUS.importTemplate(ExtraBeesSpecies.MALICIOUS);
ExtraBeesSpecies.INFECTIOUS.addProduct(ItemHoneyComb.VanillaComb.SILKY.get(), 0.25f);
ExtraBeesSpecies.INFECTIOUS.setFlowering(ForestryAllele.Flowering.Slow);
ExtraBeesSpecies.INFECTIOUS.setFlowering(EnumAllele.Flowering.SLOW);
ExtraBeesSpecies.INFECTIOUS.setSecondaryColor(0x069764);
ExtraBeesSpecies.VIRULENT.importTemplate(ExtraBeesSpecies.INFECTIOUS);
ExtraBeesSpecies.VIRULENT.addProduct(ItemHoneyComb.VanillaComb.SILKY.get(), 0.25f);
ExtraBeesSpecies.VIRULENT.addSpecialty(EnumHoneyComb.VENOMOUS, 0.12f);
ExtraBeesSpecies.VIRULENT.setFlowering(ForestryAllele.Flowering.Average);
ExtraBeesSpecies.VIRULENT.setFlowering(EnumAllele.Flowering.AVERAGE);
ExtraBeesSpecies.VIRULENT.recessive();
ExtraBeesSpecies.VIRULENT.setHasEffect(true);
ExtraBeesSpecies.VIRULENT.setSecondaryColor(0x069764);
@@ -615,18 +603,18 @@ public enum ExtraBeesSpecies implements IAlleleBeeSpecies, IIconProvider {
ExtraBeesSpecies.VISCOUS.addProduct(ItemHoneyComb.VanillaComb.SILKY.get(), 0.25f);
ExtraBeesSpecies.VISCOUS.setSecondaryColor(0x069764);
ExtraBeesSpecies.VISCOUS.setHumidity(EnumHumidity.DAMP);
ExtraBeesSpecies.VISCOUS.setSpeed(ForestryAllele.Speed.Slow);
ExtraBeesSpecies.VISCOUS.setSpeed(EnumAllele.Speed.SLOW);
ExtraBeesSpecies.VISCOUS.setTemperature(EnumTemperature.WARM);
ExtraBeesSpecies.GLUTINOUS.importTemplate(ExtraBeesSpecies.VISCOUS);
ExtraBeesSpecies.GLUTINOUS.addProduct(ItemHoneyComb.VanillaComb.SILKY.get(), 0.25f);
ExtraBeesSpecies.GLUTINOUS.setSpeed(ForestryAllele.Speed.Norm);
ExtraBeesSpecies.GLUTINOUS.setSpeed(EnumAllele.Speed.NORMAL);
ExtraBeesSpecies.GLUTINOUS.setSecondaryColor(0x069764);
ExtraBeesSpecies.STICKY.importTemplate(ExtraBeesSpecies.GLUTINOUS);
ExtraBeesSpecies.STICKY.addProduct(ItemHoneyComb.VanillaComb.SILKY.get(), 0.25f);
ExtraBeesSpecies.STICKY.addSpecialty(EnumHoneyComb.SLIME, 0.12f);
ExtraBeesSpecies.STICKY.setSpeed(ForestryAllele.Speed.Fast);
ExtraBeesSpecies.STICKY.setSpeed(EnumAllele.Speed.FAST);
ExtraBeesSpecies.STICKY.setHasEffect(true);
ExtraBeesSpecies.STICKY.setSecondaryColor(0x069764);
@@ -634,7 +622,7 @@ public enum ExtraBeesSpecies implements IAlleleBeeSpecies, IIconProvider {
ExtraBeesSpecies.CORROSIVE.setHumidity(EnumHumidity.DAMP);
ExtraBeesSpecies.CORROSIVE.setTemperature(EnumTemperature.WARM);
ExtraBeesSpecies.CORROSIVE.setEffect(ExtraBeesEffect.ACID.getUID());
ExtraBeesSpecies.CORROSIVE.setFlowering(ForestryAllele.Flowering.Average);
ExtraBeesSpecies.CORROSIVE.setFlowering(EnumAllele.Flowering.AVERAGE);
ExtraBeesSpecies.CORROSIVE.addProduct(ItemHoneyComb.VanillaComb.SILKY.get(), 20f);
ExtraBeesSpecies.CORROSIVE.recessive();
ExtraBeesSpecies.CORROSIVE.setSecondaryColor(0x069764);
@@ -707,9 +695,9 @@ public enum ExtraBeesSpecies implements IAlleleBeeSpecies, IIconProvider {
ExtraBeesSpecies.HAZARDOUS.addProduct(EnumHoneyComb.SALTPETER, 0.12f);
ExtraBeesSpecies.JADED.importTemplate(ForestryAllele.BeeSpecies.Imperial);
ExtraBeesSpecies.JADED.setFertility(ForestryAllele.Fertility.Maximum);
ExtraBeesSpecies.JADED.setFlowering(ForestryAllele.Flowering.Maximum);
ExtraBeesSpecies.JADED.setTerritory(ForestryAllele.Territory.Largest);
ExtraBeesSpecies.JADED.setFertility(EnumAllele.Fertility.MAXIMUM);
ExtraBeesSpecies.JADED.setFlowering(EnumAllele.Flowering.MAXIMUM);
ExtraBeesSpecies.JADED.setTerritory(EnumAllele.Territory.LARGEST);
ExtraBeesSpecies.JADED.addProduct(ItemHoneyComb.VanillaComb.HONEY.get(), 0.30f);
ExtraBeesSpecies.JADED.addSpecialty(Mods.Forestry.stack("pollen"), 0.20f);
ExtraBeesSpecies.JADED.setHasEffect(true);
@@ -735,20 +723,23 @@ public enum ExtraBeesSpecies implements IAlleleBeeSpecies, IIconProvider {
ExtraBeesSpecies.QUANTUM.addSpecialty(EnumHoneyComb.CERTUS, 0.15f);
ExtraBeesSpecies.QUANTUM.addSpecialty(EnumHoneyComb.ENDERPEARL, 0.15f);
ExtraBeesSpecies.YELLORIUM.importTemplate(ExtraBeesSpecies.NUCLEAR);
ExtraBeesSpecies.YELLORIUM.addProduct(EnumHoneyComb.BARREN, 0.20f);
ExtraBeesSpecies.YELLORIUM.addSpecialty(EnumHoneyComb.YELLORIUM, 0.02f);
ExtraBeesSpecies.YELLORIUM.setEffect(ExtraBeesEffect.RADIOACTIVE.getUID());
ExtraBeesSpecies.YELLORIUM.setFertility(ForestryAllele.Fertility.Low);
ExtraBeesSpecies.YELLORIUM.setLifespan(ForestryAllele.Lifespan.Shortest);
ExtraBeesSpecies.YELLORIUM
.importTemplate(ExtraBeesSpecies.NUCLEAR)
.addProduct(EnumHoneyComb.BARREN, 0.20f)
.addSpecialty(EnumHoneyComb.YELLORIUM, 0.02f)
.setEffect(ExtraBeesEffect.RADIOACTIVE.getUID())
.setFertility(EnumAllele.Fertility.LOW)
.setLifespan(EnumAllele.Lifespan.SHORTEST);
ExtraBeesSpecies.CYANITE.importTemplate(ExtraBeesSpecies.YELLORIUM);
ExtraBeesSpecies.CYANITE.addProduct(EnumHoneyComb.BARREN, 0.20f);
ExtraBeesSpecies.CYANITE.addSpecialty(EnumHoneyComb.CYANITE, 0.01f);
ExtraBeesSpecies.CYANITE
.importTemplate(ExtraBeesSpecies.YELLORIUM)
.addProduct(EnumHoneyComb.BARREN, 0.20f)
.addSpecialty(EnumHoneyComb.CYANITE, 0.01f);
ExtraBeesSpecies.BLUTONIUM.importTemplate(ExtraBeesSpecies.CYANITE);
ExtraBeesSpecies.BLUTONIUM.addProduct(EnumHoneyComb.BARREN, 0.20f);
ExtraBeesSpecies.BLUTONIUM.addSpecialty(EnumHoneyComb.BLUTONIUM, 0.01f);
ExtraBeesSpecies.BLUTONIUM
.importTemplate(ExtraBeesSpecies.CYANITE)
.addProduct(EnumHoneyComb.BARREN, 0.20f)
.addSpecialty(EnumHoneyComb.BLUTONIUM, 0.01f);
ExtraBeesSpecies.MYSTICAL.importTemplate(ForestryAllele.BeeSpecies.Noble);
for (Map.Entry<ItemStack, Float> entry : ForestryAllele.BeeSpecies.Noble.getAllele().getProductChances().entrySet()) {
@@ -757,7 +748,7 @@ public enum ExtraBeesSpecies implements IAlleleBeeSpecies, IIconProvider {
ExtraBeesSpecies.MYSTICAL.setFlowerProvider(ExtraBeesFlowers.MYSTICAL.getUID());
for (ExtraBeesSpecies species2 : values()) {
if (species2.state != State.Active) {
if (species2.state != EnumBeeSpeciesState.ACTIVE) {
AlleleManager.alleleRegistry.blacklistAllele(species2.getUID());
}
@@ -776,7 +767,7 @@ public enum ExtraBeesSpecies implements IAlleleBeeSpecies, IIconProvider {
EnumHoneyComb comb = EnumHoneyComb.values()[EnumHoneyComb.RED.ordinal() + i];
species3.addProduct(ItemHoneyComb.VanillaComb.HONEY.get(), 0.75f);
species3.addSpecialty(comb, 0.25f);
species3.setSecondaryColor(9240320);
species3.setSecondaryColor(0x8cff00);
}
for (ExtraBeesSpecies species2 : values()) {
@@ -808,8 +799,9 @@ public enum ExtraBeesSpecies implements IAlleleBeeSpecies, IIconProvider {
return humidity;
}
private void setHumidity(EnumHumidity humidity) {
private ExtraBeesSpecies setHumidity(EnumHumidity humidity) {
this.humidity = humidity;
return this;
}
@Override
@@ -864,51 +856,54 @@ public enum ExtraBeesSpecies implements IAlleleBeeSpecies, IIconProvider {
return specialties;
}
private void setState(State state) {
private void setState(EnumBeeSpeciesState state) {
this.state = state;
}
public void registerTemplate() {
Binnie.Genetics.getBeeRoot().registerTemplate(getTemplate());
if (state != State.Active) {
if (state != EnumBeeSpeciesState.ACTIVE) {
AlleleManager.alleleRegistry.blacklistAllele(getUID());
}
}
public void addProduct(ItemStack product, Float chance) {
if (product == null) {
setState(State.Inactive);
setState(EnumBeeSpeciesState.INACTIVE);
} else {
products.put(product, chance);
allProducts.put(product, chance);
}
}
public void addProduct(IItemEnum product, Float chance) {
public ExtraBeesSpecies addProduct(IItemEnum product, Float chance) {
if (product.isActive()) {
addProduct(product.get(1), chance);
} else {
allProducts.put(product.get(1), chance);
setState(State.Inactive);
setState(EnumBeeSpeciesState.INACTIVE);
}
return this;
}
public void addSpecialty(ItemStack product, Float chance) {
public ExtraBeesSpecies addSpecialty(ItemStack product, Float chance) {
if (product == null) {
setState(State.Inactive);
setState(EnumBeeSpeciesState.INACTIVE);
} else {
specialties.put(product, chance);
allSpecialties.put(product, chance);
}
return this;
}
private void addSpecialty(IItemEnum product, Float chance) {
private ExtraBeesSpecies addSpecialty(IItemEnum product, Float chance) {
if (product.isActive()) {
addSpecialty(product.get(1), chance);
} else {
setState(State.Inactive);
setState(EnumBeeSpeciesState.INACTIVE);
allSpecialties.put(product.get(1), chance);
}
return this;
}
public IAllele[] getTemplate() {
@@ -916,12 +911,14 @@ public enum ExtraBeesSpecies implements IAlleleBeeSpecies, IIconProvider {
return template;
}
public void importTemplate(ForestryAllele.BeeSpecies species) {
public ExtraBeesSpecies importTemplate(ForestryAllele.BeeSpecies species) {
importTemplate(species.getTemplate());
return this;
}
public void importTemplate(ExtraBeesSpecies species) {
public ExtraBeesSpecies importTemplate(ExtraBeesSpecies species) {
importTemplate(species.getTemplate());
return this;
}
public void importTemplate(IAllele[] template) {
@@ -932,24 +929,24 @@ public enum ExtraBeesSpecies implements IAlleleBeeSpecies, IIconProvider {
this.template[EnumBeeChromosome.SPECIES.ordinal()] = this;
}
public void recessive() {
public ExtraBeesSpecies recessive() {
dominant = false;
return this;
}
public void setIsSecret(boolean secret) {
public ExtraBeesSpecies setIsSecret(boolean secret) {
isSecret = secret;
return this;
}
public void setHasEffect(boolean effect) {
public ExtraBeesSpecies setHasEffect(boolean effect) {
hasEffect = effect;
return this;
}
public void setSecondaryColor(int colour) {
public ExtraBeesSpecies setSecondaryColor(int colour) {
secondaryColor = colour;
}
public boolean isJubilant(World world, int biomeid, int x, int y, int z) {
return true;
return this;
}
@Override
@@ -959,7 +956,13 @@ public enum ExtraBeesSpecies implements IAlleleBeeSpecies, IIconProvider {
@Override
public int getIconColour(int renderPass) {
return (renderPass == 0) ? primaryColor : ((renderPass == 1) ? secondaryColor : 16777215);
if (renderPass == 0) {
return primaryColor;
}
if (renderPass == 1) {
return secondaryColor;
}
return 0xffffff;
}
@Override
@@ -1012,70 +1015,79 @@ public enum ExtraBeesSpecies implements IAlleleBeeSpecies, IIconProvider {
return nocturnal;
}
public void setNocturnal() {
public ExtraBeesSpecies setNocturnal() {
nocturnal = true;
return this;
}
public void setAllDay() {
setAllDay(true);
public ExtraBeesSpecies setAllDay() {
return setAllDay(true);
}
public void setAllDay(boolean allDay) {
if (allDay) {
template[EnumBeeChromosome.NOCTURNAL.ordinal()] = AlleleManager.alleleRegistry.getAllele("forestry.boolTrue");
} else {
template[EnumBeeChromosome.NOCTURNAL.ordinal()] = AlleleManager.alleleRegistry.getAllele("forestry.boolFalse");
}
public ExtraBeesSpecies setAllDay(boolean allDay) {
template[EnumBeeChromosome.NOCTURNAL.ordinal()] = AlleleHelper.getAllele(allDay);
return this;
}
public void setCaveDwelling() {
template[EnumBeeChromosome.CAVE_DWELLING.ordinal()] = AlleleManager.alleleRegistry.getAllele("forestry.boolTrue");
public ExtraBeesSpecies setCaveDwelling() {
template[EnumBeeChromosome.CAVE_DWELLING.ordinal()] = AlleleHelper.getAllele(true);
return this;
}
public void setTolerantFlyer() {
template[EnumBeeChromosome.TOLERANT_FLYER.ordinal()] = AlleleManager.alleleRegistry.getAllele("forestry.boolTrue");
public ExtraBeesSpecies setTolerantFlyer() {
template[EnumBeeChromosome.TOLERANT_FLYER.ordinal()] = AlleleHelper.getAllele(true);
return this;
}
public void setFlowerProvider(String uid) {
public ExtraBeesSpecies setFlowerProvider(String uid) {
IAllele allele = AlleleManager.alleleRegistry.getAllele(uid);
if (allele instanceof IAlleleFlowers) {
template[EnumBeeChromosome.FLOWER_PROVIDER.ordinal()] = allele;
}
return this;
}
public void setEffect(String uid) {
public ExtraBeesSpecies setEffect(String uid) {
IAllele allele = AlleleManager.alleleRegistry.getAllele(uid);
if (allele instanceof IAlleleBeeEffect) {
template[EnumBeeChromosome.EFFECT.ordinal()] = AlleleManager.alleleRegistry.getAllele(uid);
template[EnumBeeChromosome.EFFECT.ordinal()] = allele;
}
return this;
}
private void setFertility(ForestryAllele.Fertility fert) {
template[EnumBeeChromosome.FERTILITY.ordinal()] = fert.getAllele();
private ExtraBeesSpecies setFertility(EnumAllele.Fertility fertility) {
template[EnumBeeChromosome.FERTILITY.ordinal()] = AlleleHelper.getAllele(fertility);
return this;
}
private void setLifespan(ForestryAllele.Lifespan fert) {
template[EnumBeeChromosome.LIFESPAN.ordinal()] = fert.getAllele();
private ExtraBeesSpecies setLifespan(EnumAllele.Lifespan lifespan) {
template[EnumBeeChromosome.LIFESPAN.ordinal()] = AlleleHelper.getAllele(lifespan);
return this;
}
private void setSpeed(ForestryAllele.Speed fert) {
template[EnumBeeChromosome.SPEED.ordinal()] = fert.getAllele();
private ExtraBeesSpecies setSpeed(EnumAllele.Speed speed) {
template[EnumBeeChromosome.SPEED.ordinal()] = AlleleHelper.getAllele(speed);
return this;
}
private void setTerritory(ForestryAllele.Territory fert) {
template[EnumBeeChromosome.TERRITORY.ordinal()] = fert.getAllele();
private ExtraBeesSpecies setTerritory(EnumAllele.Territory territory) {
template[EnumBeeChromosome.TERRITORY.ordinal()] = AlleleHelper.getAllele(territory);
return this;
}
private void setFlowering(ForestryAllele.Flowering fert) {
template[EnumBeeChromosome.FLOWERING.ordinal()] = fert.getAllele();
private ExtraBeesSpecies setFlowering(EnumAllele.Flowering flowering) {
template[EnumBeeChromosome.FLOWERING.ordinal()] = AlleleHelper.getAllele(flowering);
return this;
}
private void setHumidityTolerance(Tolerance fert) {
template[EnumBeeChromosome.HUMIDITY_TOLERANCE.ordinal()] = fert.getAllele();
private ExtraBeesSpecies setHumidityTolerance(EnumTolerance humidityTolerance) {
template[EnumBeeChromosome.HUMIDITY_TOLERANCE.ordinal()] = AlleleHelper.getAllele(humidityTolerance);
return this;
}
private void setTemperatureTolerance(Tolerance both1) {
template[EnumBeeChromosome.TEMPERATURE_TOLERANCE.ordinal()] = both1.getAllele();
private ExtraBeesSpecies setTemperatureTolerance(EnumTolerance temperatureTolerance) {
template[EnumBeeChromosome.TEMPERATURE_TOLERANCE.ordinal()] = AlleleHelper.getAllele(temperatureTolerance);
return this;
}
@Override
@@ -1199,10 +1211,4 @@ public enum ExtraBeesSpecies implements IAlleleBeeSpecies, IIconProvider {
public Map<ItemStack, Float> getSpecialtyChances() {
return getSpecialty();
}
public enum State {
Active,
Inactive,
Deprecated
}
}
@@ -69,6 +69,18 @@ public class ModuleGenetics implements IInitializable {
++ebSpeciesCount;
}
}*/
RecipeManagers.carpenterManager.addRecipe(100, Binnie.Liquid.getLiquidStack("water", 2000), null, new ItemStack(ExtraBees.dictionary), "X#X", "YEY", "RDR", '#', Blocks.glass_pane, 'X', Items.gold_ingot, 'Y', "ingotTin", 'R', Items.redstone, 'D', Items.diamond, 'E', Items.emerald);
RecipeManagers.carpenterManager.addRecipe(
100,
Binnie.Liquid.getLiquidStack("water", 2000),
null,
new ItemStack(ExtraBees.dictionary),
"X#X", "YEY", "RDR",
'#', Blocks.glass_pane,
'X', Items.gold_ingot,
'Y', "ingotTin",
'R', Items.redstone,
'D', Items.diamond,
'E', Items.emerald
);
}
}
@@ -1,7 +1,7 @@
package binnie.extratrees.block.decor;
import binnie.extratrees.block.ModuleBlocks;
import binnie.extratrees.genetics.ExtraTreeSpecies;
import binnie.extratrees.genetics.LeafType;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import forestry.api.core.ForestryAPI;
@@ -34,8 +34,8 @@ public class BlockHedge extends Block implements IBlockFence {
}
public static int getColor(int meta) {
ExtraTreeSpecies.LeafType type = ExtraTreeSpecies.LeafType.values()[meta % 6];
if (type == ExtraTreeSpecies.LeafType.Conifer) {
LeafType type = LeafType.values()[meta % 6];
if (type == LeafType.CONIFER) {
return ColorizerFoliage.getFoliageColorPine();
}
double d0 = 0.5;
@@ -151,8 +151,8 @@ public class BlockHedge extends Block implements IBlockFence {
// ignored
}
private ExtraTreeSpecies.LeafType getType(int meta) {
return ExtraTreeSpecies.LeafType.values()[meta % 8];
private LeafType getType(int meta) {
return LeafType.values()[meta % 8];
}
private boolean isFull(int meta) {
@@ -162,7 +162,7 @@ public class BlockHedge extends Block implements IBlockFence {
@Override
@SideOnly(Side.CLIENT)
public IIcon getIcon(int side, int meta) {
ExtraTreeSpecies.LeafType type = getType(meta);
LeafType type = getType(meta);
return ForestryAPI.textureManager.getIcon(isFull(meta) ? type.plainUID : type.fancyUID);
}
@@ -1,6 +1,6 @@
package binnie.extratrees.block.decor;
import binnie.extratrees.genetics.ExtraTreeSpecies;
import binnie.extratrees.genetics.LeafType;
import net.minecraft.block.Block;
import net.minecraft.item.ItemBlockWithMetadata;
import net.minecraft.item.ItemStack;
@@ -14,6 +14,6 @@ public class ItemHedge extends ItemBlockWithMetadata {
@Override
public String getItemStackDisplayName(ItemStack item) {
int meta = item.getItemDamage();
return ExtraTreeSpecies.LeafType.values()[meta % 6].descript + ((meta >= 8) ? " Full" : "") + " Hedge";
return LeafType.values()[meta % 6].description + ((meta >= 8) ? " Full" : "") + " Hedge";
}
}
@@ -28,28 +28,28 @@ import java.util.HashMap;
import java.util.Map;
public enum ButterflySpecies implements IAlleleButterflySpecies {
WhiteAdmiral("White Admiral", "Limenitis camilla", 16448250),
PurpleEmperor("Purple Emperor", "Apatura iris", 4338374),
RedAdmiral("Red Admiral", "Vanessa atalanta", 15101764),
PaintedLady("Painted Lady", "Vanessa cardui", 15573064),
SmallTortoiseshell("Small Tortoiseshell", "Aglais urticae", 15365387),
CamberwellBeauty("Camberwell Beauty", "Aglais antiopa", 9806540),
Peacock("Peacock", "Inachis io", 13842434),
Wall("Wall", "Lasiommata megera", 15707678),
CrimsonRose("Crimson Rose", "Atrophaneura hector", 16736891),
KaiserIHind("Kaiser-i-Hind", "Teinopalpus imperialis", 7839808),
GoldenBirdwing("Golden Birdwing", "Troides aeacus", 16374814),
MarshFritillary("Marsh Fritillary", "Euphydryas aurinia", 16747520),
PearlBorderedFritillary("Pearl-bordered Fritillary", "Boloria euphrosyne", 16747267),
QueenOfSpainFritillary("Queen of Spain Fritillary", "Issoria lathonia", 16765247),
SpeckledWood("Speckled Wood", "Pararge aegeria", 16119949),
ScotchAngus("Scotch Angus", "Erebia aethiops", 12735523),
Gatekeeper("Gatekeeper", "Pyronia tithonus", 16433962),
MeadowBrown("Meadow Brown", "Maniola jurtina", 14914841),
SmallHeath("Small Heath", "Coenonympha pamphilus", 16754226),
Ringlet("Ringlet", "Aphantopus hyperantus", 9919799),
Monarch("Monarch", "Danaus plexippus", 16757254),
MarbledWhite("Marbled White", "Melanargia galathea", 15527148);
WhiteAdmiral("White Admiral", "Limenitis camilla", 0xfafafa),
PurpleEmperor("Purple Emperor", "Apatura iris", 0x4232c6),
RedAdmiral("Red Admiral", "Vanessa atalanta", 0xe66f44),
PaintedLady("Painted Lady", "Vanessa cardui", 0xeda048),
SmallTortoiseshell("Small Tortoiseshell", "Aglais urticae", 0xea750b),
CamberwellBeauty("Camberwell Beauty", "Aglais antiopa", 0x95a2cc),
Peacock("Peacock", "Inachis io", 0xd33802),
Wall("Wall", "Lasiommata megera", 0xefae1e),
CrimsonRose("Crimson Rose", "Atrophaneura hector", 0xff627b),
KaiserIHind("Kaiser-i-Hind", "Teinopalpus imperialis", 0x77a040),
GoldenBirdwing("Golden Birdwing", "Troides aeacus", 0xf9dc1e),
MarshFritillary("Marsh Fritillary", "Euphydryas aurinia", 0xff8c00),
PearlBorderedFritillary("Pearl-bordered Fritillary", "Boloria euphrosyne", 0xff8b03),
QueenOfSpainFritillary("Queen of Spain Fritillary", "Issoria lathonia", 0xffd13f),
SpeckledWood("Speckled Wood", "Pararge aegeria", 0xf5f88d),
ScotchAngus("Scotch Angus", "Erebia aethiops", 0xc25423),
Gatekeeper("Gatekeeper", "Pyronia tithonus", 0xfac32a),
MeadowBrown("Meadow Brown", "Maniola jurtina", 0xe39519),
SmallHeath("Small Heath", "Coenonympha pamphilus", 0xffa632),
Ringlet("Ringlet", "Aphantopus hyperantus", 0x975d37),
Monarch("Monarch", "Danaus plexippus", 0xffb206),
MarbledWhite("Marbled White", "Melanargia galathea", 0xececec);
public IClassification branch;
File diff suppressed because it is too large. Load diff
@@ -0,0 +1,22 @@
package binnie.extratrees.genetics;
public enum LeafType {
NORMAL((short) 10, (short) 11, (short) 12, "Deciduous"),
CONIFER((short) 15, (short) 16, (short) 17, "Conifers"),
JUNGLE((short) 20, (short) 21, (short) 22, "Jungle"),
WILLOW((short) 25, (short) 26, (short) 27, "Willow"),
MAPLE((short) 30, (short) 31, (short) 32, "Maple"),
PALM((short) 35, (short) 36, (short) 37, "Palm");
public short fancyUID;
public short plainUID;
public short changedUID;
public String description;
LeafType(short fancyUID, short plainUID, short changedUID, String description) {
this.fancyUID = fancyUID;
this.plainUID = plainUID;
this.changedUID = changedUID;
this.description = description;
}
}
@@ -0,0 +1,15 @@
package binnie.extratrees.genetics;
import net.minecraft.util.IIcon;
public enum SaplingType {
DEFAULT,
JUNGLE,
CONIFER,
FRUIT,
POPLAR,
PALM,
SHRUB;
public IIcon[] icon;
}
@@ -0,0 +1,73 @@
package binnie.extratrees.worldgen;
import binnie.extratrees.genetics.ExtraTreeSpecies;
import com.mojang.authlib.GameProfile;
import forestry.api.arboriculture.ITreeGenerator;
import forestry.api.arboriculture.ITreeGenome;
import forestry.api.world.ITreeGenData;
import forestry.arboriculture.blocks.BlockForestryLeaves;
import forestry.arboriculture.genetics.Tree;
import forestry.arboriculture.tiles.TileLeaves;
import forestry.core.config.Constants;
import forestry.plugins.PluginArboriculture;
import net.minecraft.block.Block;
import net.minecraft.world.World;
import net.minecraft.world.gen.feature.WorldGenerator;
import net.minecraftforge.common.util.ForgeDirection;
public class DefaultTreeGenerator implements ITreeGenerator {
private ExtraTreeSpecies extraTreeSpecies;
public DefaultTreeGenerator(ExtraTreeSpecies extraTreeSpecies) {
this.extraTreeSpecies = extraTreeSpecies;
}
@Override
public void setLogBlock(ITreeGenome genome, World world, int x, int y, int z, ForgeDirection direction) {
if (extraTreeSpecies.wood != null)
extraTreeSpecies.wood.placeBlock(world, x, y, z);
}
@Override
public void setLeaves(ITreeGenome genome, World world, GameProfile owner, int x, int y, int z, boolean decorative) {
boolean placed = world.setBlock(x, y, z, PluginArboriculture.blocks.leaves, 0, Constants.FLAG_BLOCK_SYNCH_AND_UPDATE);
if (!placed) {
return;
}
Block block = world.getBlock(x, y, z);
if (PluginArboriculture.blocks.leaves != block) {
world.setBlockToAir(x, y, z);
return;
}
TileLeaves tileLeaves = BlockForestryLeaves.getLeafTile(world, x, y, z);
if (tileLeaves == null) {
world.setBlockToAir(x, y, z);
return;
}
tileLeaves.setOwner(owner);
if (decorative) {
tileLeaves.setDecorative();
}
tileLeaves.setTree(new Tree(genome));
world.markBlockForUpdate(x, y, z);
}
@Override
public void setLogBlock(World world, int x, int y, int z, ForgeDirection direction) {
extraTreeSpecies.wood.placeBlock(world, x, y, z);
}
@Override
public void setLeaves(World world, GameProfile player, int x, int y, int z, boolean arg5) {
// ignored
}
@Override
public WorldGenerator getWorldGenerator(ITreeGenData tree) {
return extraTreeSpecies.getGenerator(tree);
}
}
@@ -1,4 +1,4 @@
package binnie.extratrees.gen;
package binnie.extratrees.worldgen;
import forestry.api.arboriculture.ITree;
import forestry.api.world.ITreeGenData;
@@ -1,4 +1,4 @@
package binnie.extratrees.gen;
package binnie.extratrees.worldgen;
import forestry.api.world.ITreeGenData;
@@ -1,4 +1,4 @@
package binnie.extratrees.gen;
package binnie.extratrees.worldgen;
import forestry.api.arboriculture.ITree;
import forestry.api.world.ITreeGenData;
@@ -1,4 +1,4 @@
package binnie.extratrees.gen;
package binnie.extratrees.worldgen;
import forestry.api.world.ITreeGenData;
@@ -1,4 +1,4 @@
package binnie.extratrees.gen;
package binnie.extratrees.worldgen;
import forestry.api.world.ITreeGenData;
@@ -1,4 +1,4 @@
package binnie.extratrees.gen;
package binnie.extratrees.worldgen;
import forestry.api.arboriculture.ITree;
@@ -1,4 +1,4 @@
package binnie.extratrees.gen;
package binnie.extratrees.worldgen;
import forestry.api.world.ITreeGenData;
@@ -1,4 +1,4 @@
package binnie.extratrees.gen;
package binnie.extratrees.worldgen;
import forestry.api.arboriculture.ITree;
import forestry.api.world.ITreeGenData;
@@ -1,9 +1,6 @@
package binnie.extratrees.gen;
package binnie.extratrees.worldgen;
import binnie.extratrees.genetics.ExtraTreeSpecies;
import binnie.extratrees.worldgen.BlockType;
import binnie.extratrees.worldgen.BlockTypeLeaf;
import binnie.extratrees.worldgen.BlockTypeLog;
import forestry.api.world.ITreeGenData;
public class WorldGenDefault extends WorldGenTree {
@@ -1,7 +1,6 @@
package binnie.extratrees.gen;
package binnie.extratrees.worldgen;
import binnie.extratrees.block.ILogType;
import binnie.extratrees.worldgen.BlockTypeLog;
import forestry.api.arboriculture.ITree;
import forestry.api.world.ITreeGenData;
@@ -1,4 +1,4 @@
package binnie.extratrees.gen;
package binnie.extratrees.worldgen;
import forestry.api.arboriculture.ITree;
import forestry.api.world.ITreeGenData;
@@ -1,4 +1,4 @@
package binnie.extratrees.gen;
package binnie.extratrees.worldgen;
import forestry.api.world.ITreeGenData;
@@ -1,4 +1,4 @@
package binnie.extratrees.gen;
package binnie.extratrees.worldgen;
import forestry.api.arboriculture.ITree;
import forestry.api.world.ITreeGenData;
@@ -1,4 +1,4 @@
package binnie.extratrees.gen;
package binnie.extratrees.worldgen;
import forestry.api.world.ITreeGenData;
@@ -1,4 +1,4 @@
package binnie.extratrees.gen;
package binnie.extratrees.worldgen;
import forestry.api.world.ITreeGenData;
@@ -1,4 +1,4 @@
package binnie.extratrees.gen;
package binnie.extratrees.worldgen;
import forestry.api.world.ITreeGenData;
@@ -1,4 +1,4 @@
package binnie.extratrees.gen;
package binnie.extratrees.worldgen;
import forestry.api.world.ITreeGenData;
@@ -1,4 +1,4 @@
package binnie.extratrees.gen;
package binnie.extratrees.worldgen;
import forestry.api.world.ITreeGenData;
@@ -1,4 +1,4 @@
package binnie.extratrees.gen;
package binnie.extratrees.worldgen;
import forestry.api.arboriculture.ITree;
@@ -1,4 +1,4 @@
package binnie.extratrees.gen;
package binnie.extratrees.worldgen;
import forestry.api.arboriculture.ITree;
import forestry.api.world.ITreeGenData;
@@ -1,4 +1,4 @@
package binnie.extratrees.gen;
package binnie.extratrees.worldgen;
import forestry.api.arboriculture.ITree;
import forestry.api.world.ITreeGenData;
@@ -1,4 +1,4 @@
package binnie.extratrees.gen;
package binnie.extratrees.worldgen;
import forestry.api.arboriculture.ITree;
import forestry.api.world.ITreeGenData;
@@ -1,4 +1,4 @@
package binnie.extratrees.gen;
package binnie.extratrees.worldgen;
import binnie.extratrees.genetics.ExtraTreeSpecies;
import binnie.extratrees.worldgen.BlockType;
@@ -1,4 +1,4 @@
package binnie.extratrees.gen;
package binnie.extratrees.worldgen;
import forestry.api.arboriculture.ITree;
import forestry.api.world.ITreeGenData;
@@ -1,4 +1,4 @@
package binnie.extratrees.gen;
package binnie.extratrees.worldgen;
import forestry.api.arboriculture.ITree;
import forestry.api.world.ITreeGenData;
@@ -1,4 +1,4 @@
package binnie.extratrees.gen;
package binnie.extratrees.worldgen;
import forestry.api.world.ITreeGenData;
@@ -1,4 +1,4 @@
package binnie.extratrees.gen;
package binnie.extratrees.worldgen;
import forestry.api.arboriculture.ITree;
@@ -0,0 +1,198 @@
package binnie.genetics.genetics;
import binnie.botany.Botany;
import binnie.botany.api.EnumAcidity;
import binnie.botany.api.EnumMoisture;
import binnie.botany.api.EnumSoilType;
import binnie.botany.genetics.EnumFlowerColor;
import binnie.core.util.I18N;
import forestry.api.core.EnumHumidity;
import forestry.api.core.EnumTemperature;
import forestry.api.genetics.AlleleManager;
import forestry.api.genetics.EnumTolerance;
import forestry.api.genetics.IAllele;
import forestry.core.genetics.alleles.EnumAllele;
import org.apache.commons.lang3.text.WordUtils;
import java.util.Locale;
public class AlleleHelper {
public static IAllele getAllele(EnumTemperature temperature) {
return AlleleManager.alleleRegistry.getAllele(getUid(temperature));
}
public static IAllele getAllele(EnumHumidity humidity) {
return AlleleManager.alleleRegistry.getAllele(getUid(humidity));
}
public static IAllele getAllele(EnumTolerance tolerance) {
return AlleleManager.alleleRegistry.getAllele(getUid(tolerance));
}
public static IAllele getAllele(EnumAllele.Fertility fertility) {
return AlleleManager.alleleRegistry.getAllele(getUid(fertility));
}
public static IAllele getAllele(EnumAllele.Territory territory) {
return AlleleManager.alleleRegistry.getAllele(getUid(territory));
}
public static IAllele getAllele(EnumAllele.Lifespan lifespan) {
return AlleleManager.alleleRegistry.getAllele(getUid(lifespan));
}
public static IAllele getAllele(EnumAllele.Sappiness sappiness) {
return AlleleManager.alleleRegistry.getAllele(getUid(sappiness));
}
public static IAllele getAllele(EnumAllele.Speed speed) {
return AlleleManager.alleleRegistry.getAllele(getUid(speed));
}
public static IAllele getAllele(EnumAllele.Flowering flowering) {
return AlleleManager.alleleRegistry.getAllele(getUid(flowering));
}
public static IAllele getAllele(EnumAllele.Height height) {
return AlleleManager.alleleRegistry.getAllele(getUid(height));
}
public static IAllele getAllele(EnumAllele.Maturation maturation) {
return AlleleManager.alleleRegistry.getAllele(getUid(maturation));
}
public static IAllele getAllele(EnumAllele.Yield yield) {
return AlleleManager.alleleRegistry.getAllele(getUid(yield));
}
public static IAllele getAllele(EnumAllele.Saplings saplings) {
return AlleleManager.alleleRegistry.getAllele(getUid(saplings));
}
public static IAllele getAllele(EnumFlowerColor color) {
return color.getAllele();
}
public static IAllele getAllele(int number) {
return AlleleManager.alleleRegistry.getAllele("forestry.i" + number + "d");
}
public static IAllele getAllele(boolean bool) {
if (bool) {
return AlleleManager.alleleRegistry.getAllele("forestry.boolTrue");
}
return AlleleManager.alleleRegistry.getAllele("forestry.boolFalse");
}
public static String toDisplay(EnumTemperature temperature) {
return AlleleManager.climateHelper.toDisplay(temperature);
}
public static String toDisplay(EnumHumidity humidity) {
return AlleleManager.climateHelper.toDisplay(humidity);
}
public static String toDisplay(EnumMoisture moisture) {
return I18N.localise(Botany.instance, "moisture." + moisture.getID());
}
public static String toDisplay(EnumAcidity acidity) {
return I18N.localise(Botany.instance, "ph." + acidity.getID());
}
public static String toDisplay(EnumSoilType soilType) {
return I18N.localise(Botany.instance, "soil." + soilType.getID());
}
public static String toDisplay(EnumTolerance tolerance) {
return toAlleleDisplay("tolerance", tolerance.name());
}
public static String getUid(EnumAllele.Fertility fertility) {
return getUid("fertility", fertility.name());
}
public static String getUid(EnumAllele.Lifespan lifespan) {
return getUid("lifespan", lifespan.name());
}
public static String getUid(EnumAllele.Sappiness sappiness) {
return getUid("sappiness", sappiness.name());
}
private static String getUid(EnumTemperature temperature) {
return getUid("temperature", temperature.name());
}
private static String getUid(EnumHumidity humidity) {
return getUid("humidity", humidity.name());
}
public static String getUid(EnumAllele.Saplings saplings) {
if (saplings == EnumAllele.Saplings.AVERAGE) {
return getUid("saplings", "Default");
}
if (saplings == EnumAllele.Saplings.HIGH) {
return getUid("saplings", "Double");
}
if (saplings == EnumAllele.Saplings.HIGHER) {
return getUid("saplings", "Triple");
}
return getUid("saplings", saplings.name());
}
public static String getUid(EnumAllele.Height height) {
if (height == EnumAllele.Height.AVERAGE) {
return getUid("height", "Max10", false);
}
return getUid("height", height.name());
}
public static String getUid(EnumAllele.Maturation maturation) {
return getUid("maturation", maturation.name());
}
public static String getUid(EnumAllele.Territory territory) {
return getUid("territory", territory.name());
}
public static String getUid(EnumAllele.Yield yield) {
if (yield == EnumAllele.Yield.AVERAGE) {
return getUid("yield", "Default", false);
}
return getUid("yield", yield.name());
}
public static String getUid(EnumAllele.Fireproof fireproof) {
return getUid("bool", fireproof.name());
}
public static String getUid(EnumAllele.Flowering flowering) {
return getUid("flowering", flowering.name());
}
public static String getUid(EnumTolerance tolerance) {
return getUid("tolerance", tolerance.name());
}
public static String getUid(EnumAllele.Speed speed) {
return getUid("speed", speed.name());
}
protected static String getUid(String key, String valueName) {
return getUid(key, valueName, true);
}
private static String getUid(String key, String valueName, boolean needCapitalize) {
if (needCapitalize) {
valueName = WordUtils.capitalize(valueName.toLowerCase(Locale.ENGLISH));
}
valueName = valueName.replace("_", "");
return "forestry." + key + valueName;
}
private static String toAlleleDisplay(String key, String valueName) {
String name = valueName.toLowerCase().replace("_", "");
return I18N.localise("forestry.allele." + key + "." + name);
}
}
@@ -38,7 +38,7 @@ public class GeneArrayItem implements INBTTagable, IGeneItem {
@Override
public int getColour(int color) {
if (color == 2) {
return getBreedingSystem().getColour();
return getBreedingSystem().getColor();
}
return 0xffffff;
}
@@ -44,7 +44,7 @@ public class GeneItem implements INBTTagable, IGeneItem {
@Override
public int getColour(int color) {
if (color == 2 && getBreedingSystem() != null) {
return getBreedingSystem().getColour();
return getBreedingSystem().getColor();
}
return 0xffffff;
}
@@ -32,7 +32,7 @@ public class AnalystPageDatabase extends ControlAnalystPage {
super(parent, area);
scroll = null;
this.isMaster = isMaster;
int cOfSystem = system.getColour();
int cOfSystem = system.getColor();
int cr = (0xFF0000 & cOfSystem) >> 16;
int cg = (0xFF00 & cOfSystem) >> 8;
int cb = 0xFF & cOfSystem;
@@ -12,6 +12,7 @@ import binnie.core.craftgui.geometry.IArea;
import binnie.core.craftgui.geometry.TextJustification;
import binnie.core.craftgui.minecraft.control.ControlItemDisplay;
import binnie.core.genetics.Tolerance;
import binnie.genetics.genetics.AlleleHelper;
import forestry.api.genetics.EnumTolerance;
import net.minecraft.item.ItemStack;
import net.minecraft.util.EnumChatFormatting;
@@ -52,11 +53,10 @@ public class AnalystPageSoil extends ControlAnalystPage {
recomMoisture = EnumMoisture.DRY;
}
} else {
if (canTolDamp) {
recomMoisture = EnumMoisture.DAMP;
}
if (canTolDry) {
recomMoisture = EnumMoisture.DRY;
} else if (canTolDamp) {
recomMoisture = EnumMoisture.DAMP;
}
}
EnumAcidity recomPH = EnumAcidity.NEUTRAL;
@@ -84,7 +84,7 @@ public class AnalystPageSoil extends ControlAnalystPage {
y += 32;
new ControlText(this, new IArea(4.0f, y, w() - 8.0f, 14.0f), "Other Soils", TextJustification.MiddleCenter).setColor(getColor());
y += 12;
List<ItemStack> stacks = new ArrayList<ItemStack>();
List<ItemStack> stacks = new ArrayList<>();
for (EnumAcidity a : EnumSet.range(EnumAcidity.ACID, EnumAcidity.ALKALINE)) {
for (EnumMoisture b : EnumSet.range(EnumMoisture.DRY, EnumMoisture.DAMP)) {
if (Tolerance.canTolerate(pH, a, pHTol) && Tolerance.canTolerate(moisture, b, moistureTol) && (a != recomPH || b != recomMoisture)) {
@@ -106,12 +106,12 @@ public class AnalystPageSoil extends ControlAnalystPage {
new ControlToleranceBar<EnumMoisture>(parent, x, y, w, h, EnumMoisture.class) {
@Override
protected String getName(EnumMoisture value) {
return value.getLocalisedName();
return AlleleHelper.toDisplay(value);
}
@Override
protected int getColour(EnumMoisture value) {
return (new int[]{13434828, 6737151, 3368703})[value.ordinal()];
return (new int[]{0xccffcc, 0x66ccff, 0x3366ff})[value.ordinal()];
}
}.setValues(value, tol);
}
@@ -120,7 +120,7 @@ public class AnalystPageSoil extends ControlAnalystPage {
new ControlToleranceBar<EnumAcidity>(parent, x, y, w, h, EnumAcidity.class) {
@Override
protected String getName(EnumAcidity value) {
return value.getLocalisedName();
return AlleleHelper.toDisplay(value);
}
@Override
@@ -142,11 +142,11 @@ public class WindowAnalyst extends Window {
@Override
public void onRenderBackground() {
CraftGUI.Render.colour(syst.getColour());
CraftGUI.Render.colour(syst.getColor());
int outset = (getSystem() == syst) ? 1 : 0;
CraftGUI.Render.texture(CraftGUITexture.TabOutline, getArea().outset(outset));
if (getSystem() == syst) {
CraftGUI.Render.colour(1140850688 + syst.getColour());
CraftGUI.Render.colour(1140850688 + syst.getColor());
CraftGUI.Render.texture(CraftGUITexture.TabSolid, getArea().outset(outset));
}
CraftGUI.Render.item(new IPoint(2.0f, 2.0f), syst.getItemStackRepresentative());
@@ -153,7 +153,7 @@ binniecore.rootFlowers.chromosome.effect.short=Эффект
binniecore.rootFlowers.chromosome.lifespan.short=Срок жизни
binniecore.rootFlowers.chromosome.temperature_tolerance.short=Допустимая температура
binniecore.rootFlowers.chromosome.humidity_tolerance.short=Допустимая влажность
binniecore.rootFlowers.chromosome.ph_tolerance.short=Допустимая кислотность(pH)
binniecore.rootFlowers.chromosome.ph_tolerance.short=Допустимая кислотность (pH)
binniecore.rootFlowers.chromosome.sappiness.short=Нектар
binniecore.rootFlowers.chromosome.stem.short=Расцветка ствола
@@ -29,19 +29,79 @@ botany.item.tooltip.holdMore=<Hold shift for details>
botany.item.tooltip.bugged=This item is bugged. Destroy it!
botany.item.tooltip.unknownGenome=<Unknown>
botany.item.tooltip.unknown=Unknown
botany.item.tooltip.hybrid=%s-%s Hybrid
botany.item.tooltip.age=Age: %d
botany.item.tooltip.temperature=Temperature: %s / %s
botany.item.tooltip.moisture=Moisture: %s / %s
botany.item.tooltip.pH=pH: %s / %s
botany.item.tooltip.fertility=Fertility: %dx
botany.item.tooltip.flowerColor1=%1$s, %2$s Stem
botany.item.tooltip.flowerColor2=%1$s and %2$s, %3$s Stem
botany.item.soilMeter.name=Soil Meter
botany.item.pigment.name=Pigment
botany.item.clay.name=Clay
botany.item.botany.name=%1$s %2$s
botany.item.pollen.tag.name=Pollen
botany.item.germling.tag.name=Germling
botany.item.flowerCorrupted.name=Corrupted Flower
botany.item.botanistDatabase.0.name=Botanist Database
botany.item.botanistDatabase.1.name=Master Botanist Database
item.trowelWood.name=Wooden Trowel
item.trowelStone.name=Stone Trowel
item.trowelIron.name=Iron Trowel
item.trowelGold.name=Gold Trowel
item.trowelDiamond.name=Diamond Trowel
botany.flower.dandelion=Dandelion
botany.flower.poppy=Poppy
botany.flower.orchid=Orchid
botany.flower.allium=Allium
botany.flower.bluet=Bluet
botany.flower.tulip=Tulip
botany.flower.daisy=Daisy
botany.flower.cornflower=Cornflower
botany.flower.pansy=Pansy
botany.flower.iris=Iris
botany.flower.lavender=Lavender
botany.flower.viola=Viola
botany.flower.daffodil=Daffodil
botany.flower.dahlia=Dahlia
botany.flower.peony=Peony
botany.flower.rose=Rose
botany.flower.lilac=Lilac
botany.flower.hydrangea=Hydrangea
botany.flower.foxglove=Foxglove
botany.flower.zinnia=Zinnia
botany.flower.chrysanthemum=Chrysanthemum
botany.flower.marigold=Marigold
botany.flower.geranium=Geranium
botany.flower.azalea=Azalea
botany.flower.primrose=Primrose
botany.flower.aster=Aster
botany.flower.carnation=Carnation
botany.flower.lily=Lily
botany.flower.yarrow=Yarrow
botany.flower.petunia=Petunia
botany.flower.agapanthus=Agapanthus
botany.flower.fuchsia=Fuchsia
botany.flower.dianthus=Dianthus
botany.flower.forget-me-nots=Forget-me-nots
botany.flower.anemone=Anemone
botany.flower.aquilegia=Aquilegia
botany.flower.edelweiss=Edelweiss
botany.flower.scabious=Scabious
botany.flower.coneflower=Coneflower
botany.flower.gaillardia=Gaillardia
botany.flower.auricula=Auricula
botany.flower.camellia=Camellia
botany.flower.goldenrod=Goldenrod
botany.flower.althea=Althea
botany.flower.penstemon=Penstemon
botany.flower.delphinium=Delphinium
botany.flower.hollyhock=Hollyhock
botany.colour.double=%s & %s
botany.colour.aquamarine=Aquamarine
botany.colour.black=Black
@@ -124,6 +184,8 @@ botany.colour.white=White
botany.colour.yellow=Yellow
botany.colour.yellowgreen=Yellow-Green
botany.effect.none=None
for.binnie.circuit.garden.dry.manual.fert=Fert. Garden (Dry)
for.binnie.circuit.garden.dry.acid.manual.fert=Fert. Garden (Dry, Acidic)
for.binnie.circuit.garden.dry.neutral.manual.fert=Fert. Garden (Dry, Neutral)
@@ -29,19 +29,79 @@ botany.item.tooltip.holdMore=<Hold shift for details>
botany.item.tooltip.bugged=This item is bugged. Destroy it!
botany.item.tooltip.unknownGenome=<Unknown>
botany.item.tooltip.unknown=Unknown
botany.item.tooltip.hybrid=%s-%s Hybrid
botany.item.tooltip.age=Age: %d
botany.item.tooltip.temperature=Temperature: %s / %s
botany.item.tooltip.moisture=Moisture: %s / %s
botany.item.tooltip.pH=pH: %s / %s
botany.item.tooltip.fertility=Fertility: %dx
botany.item.tooltip.flowerColor1=%1$s, %2$s Stem
botany.item.tooltip.flowerColor2=%1$s and %2$s, %3$s Stem
botany.item.soilMeter.name=Soil Meter
botany.item.pigment.name=Pigment
botany.item.clay.name=Clay
botany.item.botany.name=%1$s %2$s
botany.item.pollen.tag.name=Pollen
botany.item.germling.tag.name=Germling
botany.item.flowerCorrupted.name=Corrupted Flower
botany.item.botanistDatabase.0.name=Botanist Database
botany.item.botanistDatabase.1.name=Master Botanist Database
item.trowelWood.name=Wooden Trowel
item.trowelStone.name=Stone Trowel
item.trowelIron.name=Iron Trowel
item.trowelGold.name=Gold Trowel
item.trowelDiamond.name=Diamond Trowel
botany.flower.dandelion=Dandelion
botany.flower.poppy=Poppy
botany.flower.orchid=Orchid
botany.flower.allium=Allium
botany.flower.bluet=Bluet
botany.flower.tulip=Tulip
botany.flower.daisy=Daisy
botany.flower.cornflower=Cornflower
botany.flower.pansy=Pansy
botany.flower.iris=Iris
botany.flower.lavender=Lavender
botany.flower.viola=Viola
botany.flower.daffodil=Daffodil
botany.flower.dahlia=Dahlia
botany.flower.peony=Peony
botany.flower.rose=Rose
botany.flower.lilac=Lilac
botany.flower.hydrangea=Hydrangea
botany.flower.foxglove=Foxglove
botany.flower.zinnia=Zinnia
botany.flower.chrysanthemum=Chrysanthemum
botany.flower.marigold=Marigold
botany.flower.geranium=Geranium
botany.flower.azalea=Azalea
botany.flower.primrose=Primrose
botany.flower.aster=Aster
botany.flower.carnation=Carnation
botany.flower.lily=Lily
botany.flower.yarrow=Yarrow
botany.flower.petunia=Petunia
botany.flower.agapanthus=Agapanthus
botany.flower.fuchsia=Fuchsia
botany.flower.dianthus=Dianthus
botany.flower.forget-me-nots=Forget-me-nots
botany.flower.anemone=Anemone
botany.flower.aquilegia=Aquilegia
botany.flower.edelweiss=Edelweiss
botany.flower.scabious=Scabious
botany.flower.coneflower=Coneflower
botany.flower.gaillardia=Gaillardia
botany.flower.auricula=Auricula
botany.flower.camellia=Camellia
botany.flower.goldenrod=Goldenrod
botany.flower.althea=Althea
botany.flower.penstemon=Penstemon
botany.flower.delphinium=Delphinium
botany.flower.hollyhock=Hollyhock
botany.colour.double=%s & %s
botany.colour.aquamarine=Aquamarine
botany.colour.aquamarine=Aquamarine
@@ -125,6 +185,8 @@ botany.colour.white=White
botany.colour.yellow=Yellow
botany.colour.yellowgreen=Yellow-Green
botany.effect.none=None
for.binnie.circuit.garden.dry.manual.fert=Fert. Garden (Dry)
for.binnie.circuit.garden.dry.acid.manual.fert=Fert. Garden (Dry, Acidic)
for.binnie.circuit.garden.dry.neutral.manual.fert=Fert. Garden (Dry, Neutral)
@@ -29,19 +29,79 @@ botany.item.tooltip.holdMore=<Зажмите SHIFT для подробносте
botany.item.tooltip.bugged=Предмет содержит ошибки. Уничтожь его!
botany.item.tooltip.unknownGenome=<Неизвестный геном>
botany.item.tooltip.unknown=Неизвестно
botany.item.tooltip.hybrid=Гибрид %s-%s
botany.item.tooltip.age=Возраст: %d
botany.item.tooltip.temperature=Температура: %s / %s
botany.item.tooltip.moisture=Влажность: %s / %s
botany.item.tooltip.pH=pH: %s / %s
botany.item.tooltip.fertility=Плодовитость: %dx
botany.item.tooltip.flowerColor1=%1$s, %2$s стебель
botany.item.tooltip.flowerColor2=%1$s и %2$s, %3$s стебель
botany.item.soilMeter.name=Измеритель почвы
botany.item.pigment.name=Краситель
botany.item.clay.name=Глиняный порошок
botany.item.botany.name=%2$s %1$s
botany.item.pollen.tag.name=Пыльца
botany.item.germling.tag.name=Росток
botany.item.pollen.tag.name=Пыльца цветка
botany.item.germling.tag.name=Росток цветка
botany.item.flowerCorrupted.name=Поврежденный цветок
botany.item.botanistDatabase.0.name=База данных ботаника
botany.item.botanistDatabase.1.name=База данных мастера-ботаника
item.trowelWood.name=Деревянный совок
item.trowelStone.name=Каменный совок
item.trowelIron.name=Железный совок
item.trowelGold.name=Золотой совок
item.trowelDiamond.name=Алмазный совок
botany.flower.dandelion=Одуванчик
botany.flower.poppy=Мак
botany.flower.orchid=Орхидея
botany.flower.allium=Лук
botany.flower.bluet=Голубой василек
botany.flower.tulip=Тюльпан
botany.flower.daisy=Маргаритка
botany.flower.cornflower=Василек
botany.flower.pansy=Анютины глазки
botany.flower.iris=Ирис
botany.flower.lavender=Лаванда
botany.flower.viola=Фиалка
botany.flower.daffodil=Нарцисс
botany.flower.dahlia=Георгин
botany.flower.peony=Пеоны
botany.flower.rose=Роза
botany.flower.lilac=Сирень
botany.flower.hydrangea=Гортензия
botany.flower.foxglove=Наперстянка
botany.flower.zinnia=Цинния
botany.flower.chrysanthemum=Хризантема
botany.flower.marigold=Ноготки
botany.flower.geranium=Герань
botany.flower.azalea=Азалия
botany.flower.primrose=Первоцвет
botany.flower.aster=Астра
botany.flower.carnation=Гвоздика садовая
botany.flower.lily=Лилия
botany.flower.yarrow=Тысячелистник
botany.flower.petunia=Петуния
botany.flower.agapanthus=Агапантус
botany.flower.fuchsia=Фуксия
botany.flower.dianthus=Гвоздика
botany.flower.forget-me-nots=Незабудка
botany.flower.anemone=Анемон
botany.flower.aquilegia=Аквилегия
botany.flower.edelweiss=Эдельвейс
botany.flower.scabious=Скабиоза
botany.flower.coneflower=Эхинация
botany.flower.gaillardia=Гайлардия
botany.flower.auricula=Первоцвет ушковидный
botany.flower.camellia=Камелия
botany.flower.goldenrod=Золотарник
botany.flower.althea=Алтей
botany.flower.penstemon=Пенстемон
botany.flower.delphinium=Живокость
botany.flower.hollyhock=Штокроза
botany.colour.double=%s - %s
botany.colour.aquamarine=Аквамарин (цвет морской волны)
botany.colour.black=Чёрный
@@ -124,6 +184,8 @@ botany.colour.white=Белый
botany.colour.yellow=Жёлтый
botany.colour.yellowgreen=Жёлто-зелёный
botany.effect.none=Нет
for.binnie.circuit.garden.dry.manual.fert=Fert. Garden (сухой)
for.binnie.circuit.garden.dry.acid.manual.fert=Fert. Garden (сухой, кислый)
for.binnie.circuit.garden.dry.neutral.manual.fert=Fert. Garden (сухой, средний)