From 89f0b94f65b9a76592afce0d0783814eb754b585 Mon Sep 17 00:00:00 2001 From: kordum Date: Wed, 10 May 2017 19:52:16 +0300 Subject: [PATCH] #30 Added some localization for flowers --- .../java/binnie/botany/flower/ItemBotany.java | 17 +- .../botany/genetics/BotanistTracker.java | 1 + .../botany/genetics/EnumFlowerColor.java | 168 +++++++++--------- .../java/binnie/botany/genetics/Flower.java | 44 ++--- .../binnie/botany/genetics/FlowerSpecies.java | 129 +++++++------- .../extrabees/genetics/ExtraBeesSpecies.java | 30 ++-- .../resources/assets/botany/lang/en_GB.lang | 56 ++++++ .../resources/assets/botany/lang/en_US.lang | 56 ++++++ .../resources/assets/botany/lang/ru_RU.lang | 60 ++++++- 9 files changed, 356 insertions(+), 205 deletions(-) diff --git a/src/main/java/binnie/botany/flower/ItemBotany.java b/src/main/java/binnie/botany/flower/ItemBotany.java index 810bc64d..aa58ff6d 100644 --- a/src/main/java/binnie/botany/flower/ItemBotany.java +++ b/src/main/java/binnie/botany/flower/ItemBotany.java @@ -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()) { diff --git a/src/main/java/binnie/botany/genetics/BotanistTracker.java b/src/main/java/binnie/botany/genetics/BotanistTracker.java index 8820d62c..a5eb9efa 100644 --- a/src/main/java/binnie/botany/genetics/BotanistTracker.java +++ b/src/main/java/binnie/botany/genetics/BotanistTracker.java @@ -14,6 +14,7 @@ public class BotanistTracker extends BreedingTracker implements IBotanistTracker @Override public void registerPickup(IIndividual individual) { + // ignored } @Override diff --git a/src/main/java/binnie/botany/genetics/EnumFlowerColor.java b/src/main/java/binnie/botany/genetics/EnumFlowerColor.java index d97ae3ac..c814a914 100644 --- a/src/main/java/binnie/botany/genetics/EnumFlowerColor.java +++ b/src/main/java/binnie/botany/genetics/EnumFlowerColor.java @@ -5,93 +5,97 @@ import binnie.botany.api.IFlowerColor; import binnie.botany.core.BotanyCore; import forestry.api.genetics.IAlleleInteger; +import java.util.Locale; + public enum EnumFlowerColor implements IFlowerColor { - AQUAMARINE(0x7fffd4), - BLACK(0x282828), - BLUE(0x0000ff), - BROWN(0xa52a2a), - CADET_BLUE(0x5f9ea0), - CHOCOLATE(0xd2691e), - CORAL(0xff7f50), - CRIMSON(0xdc143c), - CYAN(0x00ffff), - DARK_GOLDENROD(0xb8860b), - DARK_GRAY(0xa9a9a9), - DARK_GREEN(0x006400), - DARK_KHAKI(0xbdb76b), - DARK_OLIVE_GREEN(0x556b2f), - DARK_ORANGE(0xff8c00), - DARK_SALMON(0xe9967a), - DARK_SEA_GREEN(0x8fbc8b), - DARK_SLATE_BLUE(0x483d8b), - DARK_SLATE_GRAY(0x2f4f4f), - DARK_TURQUOISE(0x00ced1), - DARK_VIOLET(0x9400d3), - DEEP_PINK(0xff1493), - DEEP_SKY_BLUE(0xbfff), - DIM_GRAY(0x696969), - DODGER_BLUE(0x1e90ff), - GOLD(0xffd700), - GOLDENROD(0xdaa520), - GRAY(0x808080), - GREEN(0x008000), - HOT_PINK(0xff69b4), - INDIAN_RED(0xcd5c5c), - INDIGO(0x4b0082), - KHAKI(0xf0e68c), - LAVENDER(0xe6e6fa), - LEMON_CHIFFON(0xfffacd), - LIGHT_GRAY(0xd3d3d3), - LIGHT_SEA_GREEN(0x20b2aa), - LIGHT_STEEL_BLUE(0xb0c4de), - LIME(0x00ff00), - LIME_GREEN(0x32cd32), - MAGENTA(0xff00ff), - MAROON(0x800000), - MEDIUM_AQUAMARINE(0x66cdaa), - MEDIUM_ORCHID(0xba55d3), - MEDIUM_PURPLE(0x9370db), - MEDIUM_SEA_GREEN(0x3cb371), - MEDIUM_VIOLET_RED(0xc71585), - MISTY_ROSE(0xffe4e1), - NAVY(0x000080), - OLIVE(0x808000), - OLIVE_DRAB(0x6b8e23), - ORANGE(0xffa500), - PALE_GREEN(0x98fb98), - PALE_TURQUOISE(0xafeeee), - PALE_VIOLET_RED(0xdb7093), - PERU(0xcd853f), - PINK(0xffc0cb), - PLUM(0xdda0dd), - PURPLE(0x800080), - RED(0xff0000), - ROSY_BROWN(0xbc8f8f), - ROYAL_BLUE(0x4169e1), - SALMON(0xfa8072), - SANDY_BROWN(0xf4a460), - SEA_GREEN(0x2e8b57), - SIENNA(0xa0522d), - SKY_BLUE(0x87ceeb), - SLATE_BLUE(0x6a5acd), - SLATE_GRAY(0x708090), - SPRING_GREEN(0x00ff7f), - STEEL_BLUE(0x4682b4), - TAN(0xd2b48c), - TEAL(0x008080), - THISTLE(0xd8bfd8), - TURQUOISE(0x40e0d0), - VIOLET(0xee82ee), - WHEAT(0xf5deb3), - WHITE(0xffffff), - YELLOW(0xffff00), - YELLOW_GREEN(0x9acd32); + AQUAMARINE("aquamarine", 0x7fffd4), + BLACK("black", 0x282828), + BLUE("blue", 0x0000ff), + BROWN("brown", 0xa52a2a), + CADET_BLUE("cadetBlue", 0x5f9ea0), + CHOCOLATE("chocolate", 0xd2691e), + CORAL("coral", 0xff7f50), + CRIMSON("crimson", 0xdc143c), + CYAN("cyan", 0x00ffff), + DARK_GOLDENROD("darkGoldenrod", 0xb8860b), + DARK_GRAY("darkGray", 0xa9a9a9), + DARK_GREEN("darkGreen", 0x006400), + DARK_KHAKI("darkKhaki", 0xbdb76b), + DARK_OLIVE_GREEN("darkOliveGreen", 0x556b2f), + DARK_ORANGE("darkOrange", 0xff8c00), + DARK_SALMON("darkSalmon", 0xe9967a), + DARK_SEA_GREEN("darkSeaGreen", 0x8fbc8b), + DARK_SLATE_BLUE("darkSlateBlue", 0x483d8b), + DARK_SLATE_GRAY("darkSlateGray", 0x2f4f4f), + DARK_TURQUOISE("darkTurquoise", 0x00ced1), + DARK_VIOLET("darkViolet", 0x9400d3), + DEEP_PINK("deepPink", 0xff1493), + DEEP_SKY_BLUE("deepSkyBlue", 0xbfff), + DIM_GRAY("dimGray", 0x696969), + DODGER_BLUE("dodgerBlue", 0x1e90ff), + GOLD("gold", 0xffd700), + GOLDENROD("goldenrod", 0xdaa520), + GRAY("gray", 0x808080), + GREEN("green", 0x008000), + HOT_PINK("hotPink", 0xff69b4), + INDIAN_RED("indianRed", 0xcd5c5c), + INDIGO("indigo", 0x4b0082), + KHAKI("khaki", 0xf0e68c), + LAVENDER("lavender", 0xe6e6fa), + LEMON_CHIFFON("lemonChiffon", 0xfffacd), + LIGHT_GRAY("lightGray", 0xd3d3d3), + LIGHT_SEA_GREEN("lightSeaGreen", 0x20b2aa), + LIGHT_STEEL_BLUE("lightSteelBlue", 0xb0c4de), + LIME("lime", 0x00ff00), + LIME_GREEN("limeGreen", 0x32cd32), + MAGENTA("magenta", 0xff00ff), + MAROON("maroon", 0x800000), + MEDIUM_AQUAMARINE("mediumAquamarine", 0x66cdaa), + MEDIUM_ORCHID("mediumOrchid", 0xba55d3), + MEDIUM_PURPLE("mediumPurple", 0x9370db), + MEDIUM_SEA_GREEN("mediumSeaGreen", 0x3cb371), + MEDIUM_VIOLET_RED("mediumVioletRed", 0xc71585), + MISTY_ROSE("mistyRose", 0xffe4e1), + NAVY("navy", 0x000080), + OLIVE("olive", 0x808000), + OLIVE_DRAB("oliveDrab", 0x6b8e23), + ORANGE("orange", 0xffa500), + PALE_GREEN("paleGreen", 0x98fb98), + PALE_TURQUOISE("paleTurquoise", 0xafeeee), + PALE_VIOLET_RED("paleVioletRed", 0xdb7093), + PERU("peru", 0xcd853f), + PINK("pink", 0xffc0cb), + PLUM("plum", 0xdda0dd), + PURPLE("purple", 0x800080), + RED("red", 0xff0000), + ROSY_BROWN("rosyBrown", 0xbc8f8f), + ROYAL_BLUE("royalBlue", 0x4169e1), + SALMON("salmon", 0xfa8072), + SANDY_BROWN("sandyBrown", 0xf4a460), + SEA_GREEN("seaGreen", 0x2e8b57), + SIENNA("sienna", 0xa0522d), + SKY_BLUE("skyBlue", 0x87ceeb), + SLATE_BLUE("slateBlue", 0x6a5acd), + SLATE_GRAY("slateGray", 0x708090), + SPRING_GREEN("springGreen", 0x00ff7f), + STEEL_BLUE("steelBlue", 0x4682b4), + TAN("tan", 0xd2b48c), + TEAL("teal", 0x008080), + THISTLE("thistle", 0xd8bfd8), + TURQUOISE("turquoise", 0x40e0d0), + VIOLET("violet", 0xee82ee), + WHEAT("wheat", 0xf5deb3), + WHITE("white", 0xffffff), + YELLOW("yellow", 0xffff00), + YELLOW_GREEN("yellowGreen", 0x9acd32); private int color; private int colorDis; + private String name; private AlleleColor allele; - EnumFlowerColor(int color) { + EnumFlowerColor(String name, int color) { + this.name = name; this.color = color; allele = new AlleleColor(this, "botany.color" + name(), toString(), this.color); int r = this.color >> 16 & 0xFF; @@ -2944,6 +2948,6 @@ public enum EnumFlowerColor implements IFlowerColor { @Override public String getName() { - return Botany.proxy.localise("colour." + name().toLowerCase()); + return Botany.proxy.localise("colour." + name.toLowerCase(Locale.ENGLISH)); } } diff --git a/src/main/java/binnie/botany/genetics/Flower.java b/src/main/java/binnie/botany/genetics/Flower.java index d7f70b17..65a904be 100644 --- a/src/main/java/binnie/botany/genetics/Flower.java +++ b/src/main/java/binnie/botany/genetics/Flower.java @@ -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,7 +9,9 @@ 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 forestry.api.arboriculture.EnumTreeChromosome; +import forestry.api.genetics.AlleleManager; import forestry.api.genetics.IAllele; import forestry.api.genetics.IChromosome; import forestry.core.genetics.Chromosome; @@ -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; @@ -36,9 +38,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 +51,6 @@ public class Flower extends Individual implements IFlower { if (species != null) { name += species.getName(); } - if (age == 0) { - name += ""; - } return name; } @@ -60,15 +59,15 @@ 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"); + // TODO localize enum strings + list.add(EnumChatFormatting.GRAY + I18N.localise(Botany.instance, "item.tooltip.age", getAge())); + list.add(EnumChatFormatting.GREEN + I18N.localise(Botany.instance, "item.tooltip.temperature", AlleleManager.climateHelper.toDisplay(primary.getTemperature()), genome.getToleranceTemperature())); + list.add(EnumChatFormatting.GREEN + I18N.localise(Botany.instance, "item.tooltip.moisture", primary.getMoisture().getLocalisedName(), genome.getToleranceMoisture())); + list.add(EnumChatFormatting.GREEN + I18N.localise(Botany.instance, "item.tooltip.pH", AlleleManager.climateHelper.toDisplay(primary.getHumidity()), genome.getTolerancePH())); + list.add(EnumChatFormatting.GRAY + I18N.localise(Botany.instance, "item.tooltip.fertility", genome.getFertility())); } @Override @@ -124,27 +123,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()); diff --git a/src/main/java/binnie/botany/genetics/FlowerSpecies.java b/src/main/java/binnie/botany/genetics/FlowerSpecies.java index ff8a234f..3a21d710 100644 --- a/src/main/java/binnie/botany/genetics/FlowerSpecies.java +++ b/src/main/java/binnie/botany/genetics/FlowerSpecies.java @@ -9,7 +9,6 @@ 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 com.mojang.authlib.GameProfile; import cpw.mods.fml.relauncher.Side; @@ -20,12 +19,16 @@ import forestry.api.core.IIconProvider; import forestry.api.genetics.AlleleManager; import forestry.api.genetics.EnumTolerance; import forestry.api.genetics.IAllele; +import forestry.api.genetics.IAlleleRegistry; import forestry.api.genetics.IClassification; import forestry.api.genetics.IIndividual; import forestry.api.genetics.ISpeciesRoot; +import forestry.core.genetics.alleles.AlleleHelper; +import forestry.core.genetics.alleles.EnumAllele; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.world.World; +import org.apache.commons.lang3.text.WordUtils; import java.util.ArrayList; import java.util.List; @@ -80,9 +83,9 @@ public enum FlowerSpecies implements IAlleleFlowerSpecies { 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; @@ -121,69 +124,69 @@ public enum FlowerSpecies implements IAlleleFlowerSpecies { public static void setupVariants() { FlowerSpecies.DANDELION - .setTraits(ForestryAllele.Fertility.High, ForestryAllele.Lifespan.Shortened, ForestryAllele.Sappiness.Lower) + .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(ForestryAllele.Fertility.High, ForestryAllele.Lifespan.Shorter, ForestryAllele.Sappiness.Average) + .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(ForestryAllele.Fertility.Normal, ForestryAllele.Lifespan.Long, ForestryAllele.Sappiness.Low) + .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(ForestryAllele.Fertility.Normal, ForestryAllele.Lifespan.Normal, ForestryAllele.Sappiness.Low) + .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(ForestryAllele.Fertility.Low, ForestryAllele.Lifespan.Normal, ForestryAllele.Sappiness.Lower) + .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(ForestryAllele.Fertility.Normal, ForestryAllele.Lifespan.Long, ForestryAllele.Sappiness.Average) + .setTraits(EnumAllele.Fertility.NORMAL, EnumAllele.Lifespan.LONG, EnumAllele.Sappiness.AVERAGE) .setMoisture(EnumMoisture.NORMAL, EnumTolerance.BOTH_1) .setStemColor(EnumFlowerColor.OLIVE_DRAB); FlowerSpecies.DAISY - .setTraits(ForestryAllele.Fertility.Normal, ForestryAllele.Lifespan.Normal, ForestryAllele.Sappiness.Low) + .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(ForestryAllele.Fertility.High, ForestryAllele.Lifespan.Shorter, ForestryAllele.Sappiness.Low) + .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(ForestryAllele.Fertility.Normal, ForestryAllele.Lifespan.Shortened, ForestryAllele.Sappiness.Average) + .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(ForestryAllele.Fertility.High, ForestryAllele.Lifespan.Normal, ForestryAllele.Sappiness.Average) + .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(ForestryAllele.Fertility.High, ForestryAllele.Lifespan.Normal, ForestryAllele.Sappiness.Low) + .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) @@ -191,42 +194,42 @@ public enum FlowerSpecies implements IAlleleFlowerSpecies { .setStemColor(EnumFlowerColor.GREEN); FlowerSpecies.VIOLA - .setTraits(ForestryAllele.Fertility.Normal, ForestryAllele.Lifespan.Shortened, ForestryAllele.Sappiness.Average) + .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(ForestryAllele.Fertility.High, ForestryAllele.Lifespan.Elongated, ForestryAllele.Sappiness.Average) + .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(ForestryAllele.Fertility.Normal, ForestryAllele.Lifespan.Normal, ForestryAllele.Sappiness.Higher) + .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(ForestryAllele.Fertility.Low, ForestryAllele.Lifespan.Longer, ForestryAllele.Sappiness.Average) + .setTraits(EnumAllele.Fertility.LOW, EnumAllele.Lifespan.LONGER, EnumAllele.Sappiness.AVERAGE) .setPH(EnumAcidity.ALKALINE, EnumTolerance.DOWN_1) .setStemColor(EnumFlowerColor.OLIVE_DRAB); FlowerSpecies.ROSE - .setTraits(ForestryAllele.Fertility.Low, ForestryAllele.Lifespan.Longer, ForestryAllele.Sappiness.High) + .setTraits(EnumAllele.Fertility.LOW, EnumAllele.Lifespan.LONGER, EnumAllele.Sappiness.HIGH) .setPH(EnumAcidity.ACID, EnumTolerance.UP_1) .setStemColor(EnumFlowerColor.GREEN); FlowerSpecies.PEONY - .setTraits(ForestryAllele.Fertility.Low, ForestryAllele.Lifespan.Long, ForestryAllele.Sappiness.Average) + .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(ForestryAllele.Fertility.High, ForestryAllele.Lifespan.Shorter, ForestryAllele.Sappiness.Average) + .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) @@ -234,21 +237,21 @@ public enum FlowerSpecies implements IAlleleFlowerSpecies { .setStemColor(EnumFlowerColor.GREEN); FlowerSpecies.HYDRANGEA - .setTraits(ForestryAllele.Fertility.Low, ForestryAllele.Lifespan.Longer, ForestryAllele.Sappiness.High) + .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(ForestryAllele.Fertility.Low, ForestryAllele.Lifespan.Shortened, ForestryAllele.Sappiness.Low) + .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(ForestryAllele.Fertility.Normal, ForestryAllele.Lifespan.Normal, ForestryAllele.Sappiness.Average) + .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) @@ -256,20 +259,20 @@ public enum FlowerSpecies implements IAlleleFlowerSpecies { .setStemColor(EnumFlowerColor.OLIVE_DRAB); FlowerSpecies.CHRYSANTHEMUM - .setTraits(ForestryAllele.Fertility.High, ForestryAllele.Lifespan.Long, ForestryAllele.Sappiness.High) + .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(ForestryAllele.Fertility.Normal, ForestryAllele.Lifespan.Normal, ForestryAllele.Sappiness.High) + .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(ForestryAllele.Fertility.Normal, ForestryAllele.Lifespan.Shorter, ForestryAllele.Sappiness.Average) + .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) @@ -277,41 +280,41 @@ public enum FlowerSpecies implements IAlleleFlowerSpecies { .setStemColor(EnumFlowerColor.MEDIUM_SEA_GREEN); FlowerSpecies.PRIMROSE - .setTraits(ForestryAllele.Fertility.Normal, ForestryAllele.Lifespan.Long, ForestryAllele.Sappiness.Average) + .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(ForestryAllele.Fertility.Normal, ForestryAllele.Lifespan.Normal, ForestryAllele.Sappiness.Average) + .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(ForestryAllele.Fertility.Low, ForestryAllele.Lifespan.Long, ForestryAllele.Sappiness.Low) + .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(ForestryAllele.Fertility.Low, ForestryAllele.Lifespan.Long, ForestryAllele.Sappiness.Low) + .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(ForestryAllele.Fertility.High, ForestryAllele.Lifespan.Normal, ForestryAllele.Sappiness.Low) + .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(ForestryAllele.Fertility.Normal, ForestryAllele.Lifespan.Shorter, ForestryAllele.Sappiness.Average) + .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) @@ -319,7 +322,7 @@ public enum FlowerSpecies implements IAlleleFlowerSpecies { .setStemColor(EnumFlowerColor.GREEN); FlowerSpecies.AGAPANTHUS - .setTraits(ForestryAllele.Fertility.Normal, ForestryAllele.Lifespan.Normal, ForestryAllele.Sappiness.Low) + .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) @@ -327,7 +330,7 @@ public enum FlowerSpecies implements IAlleleFlowerSpecies { .setStemColor(EnumFlowerColor.DARK_OLIVE_GREEN); FlowerSpecies.FUCHSIA - .setTraits(ForestryAllele.Fertility.Normal, ForestryAllele.Lifespan.Shortened, ForestryAllele.Sappiness.Average) + .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) @@ -335,7 +338,7 @@ public enum FlowerSpecies implements IAlleleFlowerSpecies { .setStemColor(EnumFlowerColor.SEA_GREEN); FlowerSpecies.DIANTHUS - .setTraits(ForestryAllele.Fertility.Normal, ForestryAllele.Lifespan.Short, ForestryAllele.Sappiness.High) + .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) @@ -343,7 +346,7 @@ public enum FlowerSpecies implements IAlleleFlowerSpecies { .setStemColor(EnumFlowerColor.OLIVE_DRAB); FlowerSpecies.FORGET - .setTraits(ForestryAllele.Fertility.Normal, ForestryAllele.Lifespan.Short, ForestryAllele.Sappiness.Lower) + .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) @@ -351,20 +354,20 @@ public enum FlowerSpecies implements IAlleleFlowerSpecies { .setStemColor(EnumFlowerColor.GREEN); FlowerSpecies.ANEMONE - .setTraits(ForestryAllele.Fertility.High, ForestryAllele.Lifespan.Normal, ForestryAllele.Sappiness.Low) + .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(ForestryAllele.Fertility.Normal, ForestryAllele.Lifespan.Normal, ForestryAllele.Sappiness.Average) + .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(ForestryAllele.Fertility.Low, ForestryAllele.Lifespan.Normal, ForestryAllele.Sappiness.Lowest) + .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) @@ -372,20 +375,20 @@ public enum FlowerSpecies implements IAlleleFlowerSpecies { .setStemColor(EnumFlowerColor.DARK_OLIVE_GREEN); FlowerSpecies.SCABIOUS - .setTraits(ForestryAllele.Fertility.Normal, ForestryAllele.Lifespan.Shortened, ForestryAllele.Sappiness.Low) + .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(ForestryAllele.Fertility.Normal, ForestryAllele.Lifespan.Normal, ForestryAllele.Sappiness.Higher) + .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(ForestryAllele.Fertility.High, ForestryAllele.Lifespan.Long, ForestryAllele.Sappiness.Higher) + .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) @@ -393,14 +396,14 @@ public enum FlowerSpecies implements IAlleleFlowerSpecies { .setStemColor(EnumFlowerColor.OLIVE_DRAB); FlowerSpecies.AURICULA - .setTraits(ForestryAllele.Fertility.Normal, ForestryAllele.Lifespan.Elongated, ForestryAllele.Sappiness.High) + .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(ForestryAllele.Fertility.Normal, ForestryAllele.Lifespan.Normal, ForestryAllele.Sappiness.High) + .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) @@ -408,34 +411,34 @@ public enum FlowerSpecies implements IAlleleFlowerSpecies { .setStemColor(EnumFlowerColor.DARK_OLIVE_GREEN); FlowerSpecies.GOLDENROD - .setTraits(ForestryAllele.Fertility.High, ForestryAllele.Lifespan.Normal, ForestryAllele.Sappiness.Higher) + .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(ForestryAllele.Fertility.Low, ForestryAllele.Lifespan.Elongated, ForestryAllele.Sappiness.High) + .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(ForestryAllele.Fertility.Low, ForestryAllele.Lifespan.Long, ForestryAllele.Sappiness.Low) + .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(ForestryAllele.Fertility.Low, ForestryAllele.Lifespan.Longer, ForestryAllele.Sappiness.Low) + .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(ForestryAllele.Fertility.Low, ForestryAllele.Lifespan.Long, ForestryAllele.Sappiness.High) + .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); @@ -473,8 +476,8 @@ public enum FlowerSpecies implements IAlleleFlowerSpecies { return this; } - private FlowerSpecies 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; @@ -594,17 +597,19 @@ public enum FlowerSpecies implements IAlleleFlowerSpecies { } public IAllele[] getTemplate() { + AlleleHelper alleleHelper = AlleleHelper.instance; + IAlleleRegistry alleleRegistry = AlleleManager.alleleRegistry; 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, primaryColor.getAllele()); + alleleHelper.set(template, EnumFlowerChromosome.SECONDARY, secondaryColor.getAllele()); + alleleHelper.set(template, EnumFlowerChromosome.TEMPERATURE_TOLERANCE, Binnie.Genetics.getToleranceAllele(tempTolerance)); + alleleHelper.set(template, EnumFlowerChromosome.PH_TOLERANCE, Binnie.Genetics.getToleranceAllele(pHTolerance)); + alleleHelper.set(template, EnumFlowerChromosome.HUMIDITY_TOLERANCE, Binnie.Genetics.getToleranceAllele(moistureTolerance)); + alleleHelper.set(template, EnumFlowerChromosome.FERTILITY, alleleRegistry.getAllele("forestry.fertility" + WordUtils.capitalize(fert.toString().toLowerCase()))); + alleleHelper.set(template, EnumFlowerChromosome.LIFESPAN, alleleRegistry.getAllele("forestry.lifespan" + WordUtils.capitalize(life.toString().toLowerCase()))); + alleleHelper.set(template, EnumFlowerChromosome.SAPPINESS, alleleRegistry.getAllele("forestry.sappiness" + WordUtils.capitalize(sap.toString().toLowerCase()))); + alleleHelper.set(template, EnumFlowerChromosome.STEM, stemColor.getAllele()); return template; } diff --git a/src/main/java/binnie/extrabees/genetics/ExtraBeesSpecies.java b/src/main/java/binnie/extrabees/genetics/ExtraBeesSpecies.java index f291e725..587482fc 100644 --- a/src/main/java/binnie/extrabees/genetics/ExtraBeesSpecies.java +++ b/src/main/java/binnie/extrabees/genetics/ExtraBeesSpecies.java @@ -1046,36 +1046,36 @@ public enum ExtraBeesSpecies implements IAlleleBeeSpecies, IIconProvider { public void 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; } } - private void setFertility(ForestryAllele.Fertility fert) { - template[EnumBeeChromosome.FERTILITY.ordinal()] = fert.getAllele(); + private void setFertility(ForestryAllele.Fertility fertility) { + template[EnumBeeChromosome.FERTILITY.ordinal()] = fertility.getAllele(); } - private void setLifespan(ForestryAllele.Lifespan fert) { - template[EnumBeeChromosome.LIFESPAN.ordinal()] = fert.getAllele(); + private void setLifespan(ForestryAllele.Lifespan lifespan) { + template[EnumBeeChromosome.LIFESPAN.ordinal()] = lifespan.getAllele(); } - private void setSpeed(ForestryAllele.Speed fert) { - template[EnumBeeChromosome.SPEED.ordinal()] = fert.getAllele(); + private void setSpeed(ForestryAllele.Speed speed) { + template[EnumBeeChromosome.SPEED.ordinal()] = speed.getAllele(); } - private void setTerritory(ForestryAllele.Territory fert) { - template[EnumBeeChromosome.TERRITORY.ordinal()] = fert.getAllele(); + private void setTerritory(ForestryAllele.Territory territory) { + template[EnumBeeChromosome.TERRITORY.ordinal()] = territory.getAllele(); } - private void setFlowering(ForestryAllele.Flowering fert) { - template[EnumBeeChromosome.FLOWERING.ordinal()] = fert.getAllele(); + private void setFlowering(ForestryAllele.Flowering flowering) { + template[EnumBeeChromosome.FLOWERING.ordinal()] = flowering.getAllele(); } - private void setHumidityTolerance(Tolerance fert) { - template[EnumBeeChromosome.HUMIDITY_TOLERANCE.ordinal()] = fert.getAllele(); + private void setHumidityTolerance(Tolerance humidityTolerance) { + template[EnumBeeChromosome.HUMIDITY_TOLERANCE.ordinal()] = humidityTolerance.getAllele(); } - private void setTemperatureTolerance(Tolerance both1) { - template[EnumBeeChromosome.TEMPERATURE_TOLERANCE.ordinal()] = both1.getAllele(); + private void setTemperatureTolerance(Tolerance temperatureTolerance) { + template[EnumBeeChromosome.TEMPERATURE_TOLERANCE.ordinal()] = temperatureTolerance.getAllele(); } @Override diff --git a/src/main/resources/assets/botany/lang/en_GB.lang b/src/main/resources/assets/botany/lang/en_GB.lang index 0cefb177..9a281cc9 100644 --- a/src/main/resources/assets/botany/lang/en_GB.lang +++ b/src/main/resources/assets/botany/lang/en_GB.lang @@ -29,6 +29,14 @@ botany.item.tooltip.holdMore= botany.item.tooltip.bugged=This item is bugged. Destroy it! botany.item.tooltip.unknownGenome= 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.pigment.name=Pigment botany.item.clay.name=Clay @@ -45,6 +53,54 @@ 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 diff --git a/src/main/resources/assets/botany/lang/en_US.lang b/src/main/resources/assets/botany/lang/en_US.lang index 2e80c105..6f2e9cd9 100644 --- a/src/main/resources/assets/botany/lang/en_US.lang +++ b/src/main/resources/assets/botany/lang/en_US.lang @@ -29,6 +29,14 @@ botany.item.tooltip.holdMore= botany.item.tooltip.bugged=This item is bugged. Destroy it! botany.item.tooltip.unknownGenome= 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.pigment.name=Pigment botany.item.clay.name=Clay @@ -45,6 +53,54 @@ 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 diff --git a/src/main/resources/assets/botany/lang/ru_RU.lang b/src/main/resources/assets/botany/lang/ru_RU.lang index 9e7b552c..427cc582 100644 --- a/src/main/resources/assets/botany/lang/ru_RU.lang +++ b/src/main/resources/assets/botany/lang/ru_RU.lang @@ -29,12 +29,20 @@ 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.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=База данных мастера-ботаника @@ -45,6 +53,54 @@ 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=Чёрный