Added some localization

This commit is contained in:
kordum committed 2017-06-08 10:26:43 +03:00
1 parent bd0dbc3e14
commit d8dfb3882b
6 files changed
+184 -129

No files matched your search

@@ -4,6 +4,7 @@ import binnie.Binnie;
import binnie.core.Mods;
import binnie.core.resource.BinnieResource;
import binnie.core.resource.ResourceType;
import binnie.core.util.I18N;
import binnie.extratrees.ExtraTrees;
import com.mojang.authlib.GameProfile;
import cpw.mods.fml.relauncher.Side;
@@ -23,33 +24,34 @@ import net.minecraft.item.ItemStack;
import net.minecraft.world.World;
import net.minecraftforge.common.BiomeDictionary;
import java.awt.Color;
import java.util.EnumSet;
import java.util.HashMap;
import java.util.Map;
public enum ButterflySpecies implements IAlleleButterflySpecies {
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);
WhiteAdmiral("whiteAdmiral", "Limenitis camilla", new Color(0xfafafa)),
PurpleEmperor("purpleEmperor", "Apatura iris", new Color(0x4232c6)),
RedAdmiral("redAdmiral", "Vanessa atalanta", new Color(0xe66f44)),
PaintedLady("paintedLady", "Vanessa cardui", new Color(0xeda048)),
SmallTortoiseshell("smallTortoiseshell", "Aglais urticae", new Color(0xea750b)),
CamberwellBeauty("camberwellBeauty", "Aglais antiopa", new Color(0x95a2cc)),
Peacock("peacock", "Inachis io", new Color(0xd33802)),
Wall("wall", "Lasiommata megera", new Color(0xefae1e)),
CrimsonRose("crimsonRose", "Atrophaneura hector", new Color(0xff627b)),
KaiserIHind("kaiserIHind", "Teinopalpus imperialis", new Color(0x77a040)),
GoldenBirdwing("Golden Birdwing", "Troides aeacus", new Color(0xf9dc1e)),
MarshFritillary("marshFritillary", "Euphydryas aurinia",new Color(0xff8c00)),
PearlBorderedFritillary("pearlBorderedFritillary", "Boloria euphrosyne", new Color(0xff8b03)),
QueenOfSpainFritillary("queenOfSpainFritillary", "Issoria lathonia", new Color(0xffd13f)),
SpeckledWood("speckledWood", "Pararge aegeria", new Color(0xf5f88d)),
ScotchAngus("scotchAngus", "Erebia aethiops", new Color(0xc25423)),
Gatekeeper("gatekeeper", "Pyronia tithonus", new Color(0xfac32a)),
MeadowBrown("meadowBrown", "Maniola jurtina", new Color(0xe39519)),
SmallHeath("smallHeath", "Coenonympha pamphilus", new Color(0xffa632)),
Ringlet("ringlet", "Aphantopus hyperantus", new Color(0x975d37)),
Monarch("monarch", "Danaus plexippus", new Color(0xffb206)),
MarbledWhite("marbledWhite", "Melanargia galathea", new Color(0xececec));
public IClassification branch;
@@ -62,10 +64,10 @@ public enum ButterflySpecies implements IAlleleButterflySpecies {
private Map<ItemStack, Float> butterflyLoot;
private Map<ItemStack, Float> caterpillarLoot;
ButterflySpecies(String name, String scientific, int color) {
ButterflySpecies(String name, String scientific, Color color) {
this.name = name;
this.scientific = scientific.split(" ")[1];
this.color = color;
this.color = color.getRGB();
butterflyLoot = new HashMap<>();
caterpillarLoot = new HashMap<>();
branchName = scientific.split(" ")[0].toLowerCase();
@@ -74,7 +76,7 @@ public enum ButterflySpecies implements IAlleleButterflySpecies {
@Override
public String getName() {
return name;
return I18N.localise("extratrees.butterflies.species." + name);
}
@Override
@@ -105,23 +105,21 @@ public enum ExtraTreeFruitGene implements IAlleleFruit, IFruitProvider {
protected HashMap<ItemStack, Float> products;
ExtraTreeFruitGene(int time, int unripe, int color, FruitSprite index) {
this.color = color;
this.index = index;
isRipening = false;
diffB = 0;
pod = null;
ripeningPeriod = 0;
products = new HashMap<>();
this.color = color;
this.index = index;
setRipening(time, unripe);
}
ExtraTreeFruitGene(String name, FruitPod pod) {
this.pod = pod;
isRipening = false;
diffB = 0;
this.pod = null;
ripeningPeriod = 0;
products = new HashMap<>();
this.pod = pod;
ripeningPeriod = 2;
}
@@ -1,6 +1,7 @@
package binnie.extratrees.genetics;
import binnie.Binnie;
import binnie.core.util.I18N;
import forestry.api.arboriculture.IAlleleTreeSpecies;
import forestry.api.arboriculture.ITreeGenome;
import forestry.api.arboriculture.ITreeMutation;
@@ -223,7 +224,7 @@ public class ExtraTreeMutation implements ITreeMutation {
public Collection<String> getSpecialConditions() {
List<String> conditions = new ArrayList<>();
if (height > 0.0f) {
conditions.add("Minimum height from bedrock of " + height);
conditions.add(I18N.localise("extratrees.genetics.requirements.height", height));
}
return conditions;
}
@@ -71,103 +71,103 @@ import java.util.Collection;
import java.util.Map;
public enum ExtraTreeSpecies implements IAlleleTreeSpecies, IIconProvider, IGermlingIconProvider {
OrchardApple("malus", "domestica", 0x648830, 0xff9cf3, ILogType.ExtraTreeLog.Apple, ExtraTreeFruitGene.Apple, WorldGenApple.OrchardApple.class),
SweetCrabapple("malus", "coronaria", 0x7a9953, 0xfc359f, ILogType.ExtraTreeLog.Apple, ExtraTreeFruitGene.Crabapple, WorldGenApple.SweetCrabapple.class),
FloweringCrabapple("malus", "hopa", 0x7a9953, 0xfc359f, ILogType.ExtraTreeLog.Apple, ExtraTreeFruitGene.Crabapple, WorldGenApple.FloweringCrabapple.class),
PrairieCrabapple("malus", "ioensis", 0x7a9953, 0xfc359f, ILogType.ExtraTreeLog.Apple, ExtraTreeFruitGene.Crabapple, WorldGenApple.PrairieCrabapple.class),
Blackthorn("prunus", "spinosa ", 0x6d8f1e, 0xff87c7, ILogType.ForestryLog.PLUM, ExtraTreeFruitGene.Blackthorn, null),
CherryPlum("prunus", "cerasifera", 0x6d8f1e, 0xff87c7, ILogType.ForestryLog.PLUM, ExtraTreeFruitGene.CherryPlum, null),
Peach("prunus", "persica", 0x6d8f1e, 0xff269a, ILogType.ForestryLog.PLUM, ExtraTreeFruitGene.Peach, null),
Nectarine("prunus", "nectarina", 0x6d8f1e, 0xff269a, ILogType.ForestryLog.PLUM, ExtraTreeFruitGene.Nectarine, null),
Apricot("prunus", "armeniaca", 0x6d8f1e, 0xf5b8d8, ILogType.ForestryLog.PLUM, ExtraTreeFruitGene.Apricot, null),
Almond("prunus", "amygdalus", 0x6d8f1e, 0xf584c0, ILogType.ForestryLog.PLUM, ExtraTreeFruitGene.Almond, null),
WildCherry("prunus", "avium", 0x6d8f1e, 0xf7ebf6, ILogType.ExtraTreeLog.Cherry, ExtraTreeFruitGene.WildCherry, null),
SourCherry("prunus", "cerasus", 0x6d8f1e, 0xf7ebf6, ILogType.ExtraTreeLog.Cherry, ExtraTreeFruitGene.SourCherry, null),
BlackCherry("prunus", "serotina", 0x6d8f1e, 0xfae1f8, ILogType.ExtraTreeLog.Cherry, ExtraTreeFruitGene.BlackCherry, null),
Orange("citrus", "sinensis", 0x88af54, 0xa3b850, ILogType.ForestryLog.CITRUS, ExtraTreeFruitGene.Orange, null),
Manderin("citrus", "reticulata", 0x88af54, 0xa3b850, ILogType.ForestryLog.CITRUS, ExtraTreeFruitGene.Manderin, null),
Satsuma("citrus", "unshiu", 0x88af54, 0xa3b850, ILogType.ForestryLog.CITRUS, ExtraTreeFruitGene.Satsuma, null),
Tangerine("citrus", "tangerina", 0x88af54, 0xa3b850, ILogType.ForestryLog.CITRUS, ExtraTreeFruitGene.Tangerine, null),
Lime("citrus", "latifolia", 0x88af54, 0xa3b850, ILogType.ForestryLog.CITRUS, ExtraTreeFruitGene.Lime, null),
KeyLime("citrus", "aurantifolia", 0x88af54, 0xa3b850, ILogType.ForestryLog.CITRUS, ExtraTreeFruitGene.KeyLime, null),
FingerLime("citrus", "australasica", 0x88af54, 0xa3b850, ILogType.ForestryLog.CITRUS, ExtraTreeFruitGene.FingerLime, null),
Pomelo("citrus", "maxima", 0x88af54, 0xa3b850, ILogType.ForestryLog.CITRUS, ExtraTreeFruitGene.Pomelo, null),
Grapefruit("citrus", "paradisi", 0x88af54, 0xa3b850, ILogType.ForestryLog.CITRUS, ExtraTreeFruitGene.Grapefruit, null),
Kumquat("citrus", "margarita", 0x88af54, 0xa3b850, ILogType.ForestryLog.CITRUS, ExtraTreeFruitGene.Kumquat, null),
Citron("citrus", "medica", 0x88af54, 0xa3b850, ILogType.ForestryLog.CITRUS, ExtraTreeFruitGene.Citron, null),
BuddhaHand("citrus", "sarcodactylus", 0x88af54, 0xa3b850, ILogType.ForestryLog.CITRUS, ExtraTreeFruitGene.BuddhaHand, null),
Banana("musa", "sinensis", 0xa1cd8e, 0x44e500, ILogType.ExtraTreeLog.Banana, ExtraTreeFruitGene.Banana, WorldGenBanana.class),
RedBanana("musa", "rubra", 0xa1cd8e, 0x44e500, ILogType.ExtraTreeLog.Banana, ExtraTreeFruitGene.RedBanana, WorldGenBanana.class),
Plantain("musa", "paradisiaca", 0xa1cd8e, 0x44e500, ILogType.ExtraTreeLog.Banana, ExtraTreeFruitGene.Plantain, WorldGenBanana.class),
Butternut("juglans", "cinerea", 0x82b58c, 0x82dd8c, ILogType.ExtraTreeLog.Butternut, ExtraTreeFruitGene.Butternut, WorldGenWalnut.Butternut.class),
Rowan("sorbus", "aucuparia", 0x9ec79b, 0x9ee8b2, ILogType.ExtraTreeLog.Rowan, null, WorldGenSorbus.Rowan.class),
Hemlock("tsuga", "heterophylla", 0x5cac72, 0x5cd172, ILogType.ExtraTreeLog.Hemlock, null, WorldGenConifer.WesternHemlock.class),
Ash("fraxinus", "excelsior", 0x488e2b, 0x48e42b, ILogType.ExtraTreeLog.Ash, null, WorldGenAsh.CommonAsh.class),
Alder("alnus", "glutinosa", 0x698a33, 0x69ae33, ILogType.ExtraTreeLog.Alder, null, WorldGenAlder.CommonAlder.class),
Beech("fagus", "sylvatica", 0x83a04c, 0x83c64c, ILogType.ExtraTreeLog.Beech, ExtraTreeFruitGene.Beechnut, WorldGenBeech.CommonBeech.class),
CopperBeech("fagus", "purpurea", 0x801318, 0xd15b4d, ILogType.ExtraTreeLog.Beech, ExtraTreeFruitGene.Beechnut, WorldGenBeech.CopperBeech.class),
Aspen("populus", "tremula", 0x8acc37, 0x8ae18f, ILogType.ForestryLog.POPLAR, null, WorldGenPoplar.Aspen.class),
Yew("taxus", "baccata", 0x948a4d, 0x94ae4d, ILogType.ExtraTreeLog.Yew, null, WorldGenConifer.Yew.class),
Cypress("chamaecyparis", "lawsoniana", 0x89c9a7, 0x89ddc6, ILogType.ExtraTreeLog.Cypress, null, WorldGenConifer.Cypress.class),
DouglasFir("pseudotsuga", "menziesii", 0x99b582, 0x99d1aa, ILogType.ExtraTreeLog.Fir, null, WorldGenFir.DouglasFir.class),
Hazel("Corylus", "avellana", 0x9bb552, 0x9be152, ILogType.ExtraTreeLog.Hazel, ExtraTreeFruitGene.Hazelnut, WorldGenTree3.Hazel.class),
Sycamore("ficus", "sycomorus", 0xa0a52f, 0xb4d55c, ILogType.ExtraTreeLog.Fig, ExtraTreeFruitGene.Fig, WorldGenTree3.Sycamore.class),
Whitebeam("sorbus", "aria", 0xbace99, 0x72863f, ILogType.ExtraTreeLog.Whitebeam, null, WorldGenSorbus.Whitebeam.class),
Hawthorn("crataegus", "monogyna", 0x6ba84a, 0x98b77b, ILogType.ExtraTreeLog.Hawthorn, null, WorldGenTree3.Hawthorn.class),
Pecan("carya", "illinoinensis", 0x85b674, 0x2c581b, ILogType.ExtraTreeLog.Hickory, ExtraTreeFruitGene.Pecan, WorldGenTree3.Pecan.class),
Elm("ulmus", "procera", 0x7c9048, 0x7cbe48, ILogType.ExtraTreeLog.Elm, null, WorldGenTree3.Elm.class),
Elder("sambucus", "nigra", 0xaeb873, 0xe0e7bd, ILogType.ExtraTreeLog.Elder, ExtraTreeFruitGene.Elderberry, WorldGenTree3.Elder.class),
Holly("ilex", "aquifolium", 0x254b4c, 0x6e9284, ILogType.ExtraTreeLog.Holly, null, WorldGenHolly.Holly.class),
Hornbeam("carpinus", "betulus", 0x96a71b, 0x96dd1b, ILogType.ExtraTreeLog.Hornbeam, null, WorldGenTree3.Hornbeam.class),
Sallow("salix", "caprea", 0xaeb323, 0xb7ec25, ILogType.ForestryLog.WILLOW, null, WorldGenTree3.Sallow.class),
AcornOak("quercus", "robur", 0x66733e, 0x9ea231, ILogType.VanillaLog.Oak, ExtraTreeFruitGene.Acorn, WorldGenTree3.AcornOak.class),
Fir("abies", "alba", 0x6f7c20, 0x6fd120, ILogType.ExtraTreeLog.Fir, null, WorldGenFir.SilverFir.class),
Cedar("cedrus", "libani", 0x95a370, 0x95e870, ILogType.ExtraTreeLog.Cedar, null, WorldGenConifer.Cedar.class),
Olive("olea", "europaea", 0x3c4834, 0x3c4834, ILogType.ExtraTreeLog.Olive, ExtraTreeFruitGene.Olive, WorldGenTree2.Olive.class),
RedMaple("acer", "ubrum", 0xe82e17, 0xe82e17, ILogType.ForestryLog.MAPLE, null, WorldGenMaple.RedMaple.class),
BalsamFir("abies", "balsamea", 0x74a07c, 0x74a07c, ILogType.ExtraTreeLog.Fir, null, WorldGenFir.BalsamFir.class),
LoblollyPine("pinus", "taeda", 0x6f8a47, 0x6f8a47, ILogType.ForestryLog.PINE, null, WorldGenConifer.LoblollyPine.class),
Sweetgum("liquidambar", "styraciflua", 0x8b8762, 0x8b8762, ILogType.ExtraTreeLog.Sweetgum, null, WorldGenTree2.Sweetgum.class),
Locust("robinia", "pseudoacacia", 0x887300, 0x887300, ILogType.ExtraTreeLog.Locust, null, WorldGenTree2.Locust.class),
Pear("pyrus", "communis", 0x5e8826, 0x5e8826, ILogType.ExtraTreeLog.Pear, ExtraTreeFruitGene.Pear, WorldGenTree2.Pear.class),
OsangeOsange("maclura", "pomifera", 0x687a50, 0x687a50, ILogType.ExtraTreeLog.Maclura, ExtraTreeFruitGene.OsangeOsange, WorldGenJungle.OsangeOsange.class),
OldFustic("maclura", "tinctoria", 0x687a50, 0x687a50, ILogType.ExtraTreeLog.Maclura, null, WorldGenJungle.OldFustic.class),
Brazilwood("caesalpinia", "echinata", 0x607459, 0x607459, ILogType.ExtraTreeLog.Brazilwood, null, WorldGenJungle.Brazilwood.class),
Logwood("haematoxylum", "campechianum", 0x889f6b, 0x889f6b, ILogType.ExtraTreeLog.Logwood, null, WorldGenJungle.Logwood.class),
Rosewood("dalbergia", "latifolia", 0x879b22, 0x879b22, ILogType.ExtraTreeLog.Rosewood, null, WorldGenJungle.Rosewood.class),
Purpleheart("peltogyne", "spp.", 0x778f55, 0x778f55, ILogType.ExtraTreeLog.Purpleheart, null, WorldGenJungle.Purpleheart.class),
Iroko("milicia", "excelsa", 0xafc86c, 0xafc86c, ILogType.ExtraTreeLog.Iroko, null, WorldGenTree2.Iroko.class),
Gingko("ginkgo", "biloba", 0x719651, 0x719651, ILogType.ExtraTreeLog.Gingko, ExtraTreeFruitGene.GingkoNut, WorldGenTree2.Gingko.class),
Brazilnut("bertholletia", "excelsa", 0x7c8f7b, 0x7c8f7b, ILogType.VanillaLog.Jungle, ExtraTreeFruitGene.BrazilNut, WorldGenJungle.BrazilNut.class),
RoseGum("eucalyptus", "grandis", 0x9ca258, 0x9ca258, ILogType.ExtraTreeLog.Eucalyptus, null, WorldGenEucalyptus.RoseGum.class),
SwampGum("eucalyptus", "grandis", 0xa2c686, 0xa2c686, ILogType.ExtraTreeLog.Eucalyptus2, null, WorldGenEucalyptus.SwampGum.class),
Box("boxus", "sempervirens", 0x72996d, 0x72996d, ILogType.ExtraTreeLog.Box, null, WorldGenTree2.Box.class),
Clove("syzygium", "aromaticum", 0x7a821f, 0x7a821f, ILogType.ExtraTreeLog.Syzgium, ExtraTreeFruitGene.Clove, WorldGenTree2.Clove.class),
Coffee("coffea", "arabica", 0x6f9065, 0x6f9065, ILogType.VanillaLog.Jungle, ExtraTreeFruitGene.Coffee, WorldGenJungle.Coffee.class),
MonkeyPuzzle("araucaria", "araucana", 0x576158, 0x576158, ILogType.ForestryLog.PINE, null, WorldGenConifer.MonkeyPuzzle.class),
RainbowGum("eucalyptus", "deglupta", 0xb7f025, 0xb7f025, ILogType.ExtraTreeLog.Eucalyptus3, null, WorldGenEucalyptus.RainbowGum.class),
PinkIvory("berchemia", "zeyheri", 0x7c9159, 0x7c9159, ILogType.ExtraTreeLog.PinkIvory, null, WorldGenTree.class),
Blackcurrant("ribes", "nigrum", 0xa6da5c, 0xa6da5c, null, ExtraTreeFruitGene.Blackcurrant, WorldGenShrub.Shrub.class),
Redcurrant("ribes", "rubrum", 0x74ac00, 0x74ac00, null, ExtraTreeFruitGene.Redcurrant, WorldGenShrub.Shrub.class),
Blackberry("rubus", "fruticosus", 0x92c15b, 0x92c15b, null, ExtraTreeFruitGene.Blackberry, WorldGenShrub.Shrub.class),
Raspberry("rubus", "idaeus", 0x83b96e, 0x83b96e, null, ExtraTreeFruitGene.Raspberry, WorldGenShrub.Shrub.class),
Blueberry("vaccinium", "corymbosum", 0x72c750, 0x72c750, null, ExtraTreeFruitGene.Blueberry, WorldGenShrub.Shrub.class),
Cranberry("vaccinium", "oxycoccos", 0x96d179, 0x96d179, null, ExtraTreeFruitGene.Cranberry, WorldGenShrub.Shrub.class),
Juniper("juniperus", "communis", 0x90b149, 0x90b149, null, ExtraTreeFruitGene.Juniper, WorldGenShrub.Shrub.class),
Gooseberry("ribes", "grossularia", 0x79bb00, 0x79bb00, null, ExtraTreeFruitGene.Gooseberry, WorldGenShrub.Shrub.class),
GoldenRaspberry("rubus", "occidentalis", 0x83b96e, 0x83b96e, null, ExtraTreeFruitGene.GoldenRaspberry, WorldGenShrub.Shrub.class),
Cinnamon("cinnamomum", "cassia", 0x738e0b, 0x738e0b, ILogType.ExtraTreeLog.Cinnamon, null, WorldGenLazy.Tree.class),
Coconut("cocous", "nucifera", 0x649923, 0x649923, ILogType.VanillaLog.Jungle, ExtraTreeFruitGene.Coconut, WorldGenPalm.Coconut.class),
Cashew("anacardium", "occidentale", 0xabb962, 0xabb962, ILogType.VanillaLog.Jungle, ExtraTreeFruitGene.Cashew, WorldGenLazy.Tree.class),
Avacado("persea", "americana", 0x96a375, 0x96a375, ILogType.VanillaLog.Jungle, ExtraTreeFruitGene.Avacado, WorldGenLazy.Tree.class),
Nutmeg("myristica", "fragrans", 0x488d4c, 0x488d4c, ILogType.VanillaLog.Jungle, ExtraTreeFruitGene.Nutmeg, WorldGenLazy.Tree.class),
Allspice("pimenta", "dioica", 0x7c9724, 0x7c9724, ILogType.VanillaLog.Jungle, ExtraTreeFruitGene.Allspice, WorldGenLazy.Tree.class),
Chilli("capsicum", "annuum", 0x2a9f01, 0x2a9f01, ILogType.VanillaLog.Jungle, ExtraTreeFruitGene.Chilli, WorldGenLazy.Tree.class),
StarAnise("illicium", "verum", 0x7fc409, 0x7fc409, ILogType.VanillaLog.Jungle, ExtraTreeFruitGene.StarAnise, WorldGenLazy.Tree.class),
Mango("mangifera", "indica", 0x87b574, 0x87b574, ILogType.VanillaLog.Jungle, ExtraTreeFruitGene.Mango, WorldGenTropical.Mango.class),
Starfruit("averrhoa", "carambola", 0x6da92d, 0x6da92d, ILogType.VanillaLog.Jungle, ExtraTreeFruitGene.Starfruit, WorldGenLazy.Tree.class),
Candlenut("aleurites", "moluccana", 0x8aa36c, 0x8aa36c, ILogType.VanillaLog.Jungle, ExtraTreeFruitGene.Candlenut, WorldGenLazy.Tree.class),
DwarfHazel("Corylus", "americana", 0x9bb552, 0x9be152, ILogType.ExtraTreeLog.Hazel, ExtraTreeFruitGene.Hazelnut, WorldGenShrub.Shrub.class);
OrchardApple("malus", "domestica", 0x648830, ILogType.ExtraTreeLog.Apple, ExtraTreeFruitGene.Apple, WorldGenApple.OrchardApple.class),
SweetCrabapple("malus", "coronaria", 0x7a9953, ILogType.ExtraTreeLog.Apple, ExtraTreeFruitGene.Crabapple, WorldGenApple.SweetCrabapple.class),
FloweringCrabapple("malus", "hopa", 0x7a9953, ILogType.ExtraTreeLog.Apple, ExtraTreeFruitGene.Crabapple, WorldGenApple.FloweringCrabapple.class),
PrairieCrabapple("malus", "ioensis", 0x7a9953, ILogType.ExtraTreeLog.Apple, ExtraTreeFruitGene.Crabapple, WorldGenApple.PrairieCrabapple.class),
Blackthorn("prunus", "spinosa ", 0x6d8f1e, ILogType.ForestryLog.PLUM, ExtraTreeFruitGene.Blackthorn),
CherryPlum("prunus", "cerasifera", 0x6d8f1e, ILogType.ForestryLog.PLUM, ExtraTreeFruitGene.CherryPlum),
Peach("prunus", "persica", 0x6d8f1e, ILogType.ForestryLog.PLUM, ExtraTreeFruitGene.Peach),
Nectarine("prunus", "nectarina", 0x6d8f1e, ILogType.ForestryLog.PLUM, ExtraTreeFruitGene.Nectarine),
Apricot("prunus", "armeniaca", 0x6d8f1e, ILogType.ForestryLog.PLUM, ExtraTreeFruitGene.Apricot),
Almond("prunus", "amygdalus", 0x6d8f1e, ILogType.ForestryLog.PLUM, ExtraTreeFruitGene.Almond),
WildCherry("prunus", "avium", 0x6d8f1e, ILogType.ExtraTreeLog.Cherry, ExtraTreeFruitGene.WildCherry),
SourCherry("prunus", "cerasus", 0x6d8f1e, ILogType.ExtraTreeLog.Cherry, ExtraTreeFruitGene.SourCherry),
BlackCherry("prunus", "serotina", 0x6d8f1e, ILogType.ExtraTreeLog.Cherry, ExtraTreeFruitGene.BlackCherry),
Orange("citrus", "sinensis", 0x88af54, ILogType.ForestryLog.CITRUS, ExtraTreeFruitGene.Orange),
Manderin("citrus", "reticulata", 0x88af54, ILogType.ForestryLog.CITRUS, ExtraTreeFruitGene.Manderin),
Satsuma("citrus", "unshiu", 0x88af54, ILogType.ForestryLog.CITRUS, ExtraTreeFruitGene.Satsuma),
Tangerine("citrus", "tangerina", 0x88af54, ILogType.ForestryLog.CITRUS, ExtraTreeFruitGene.Tangerine),
Lime("citrus", "latifolia", 0x88af54, ILogType.ForestryLog.CITRUS, ExtraTreeFruitGene.Lime),
KeyLime("citrus", "aurantifolia", 0x88af54, ILogType.ForestryLog.CITRUS, ExtraTreeFruitGene.KeyLime),
FingerLime("citrus", "australasica", 0x88af54, ILogType.ForestryLog.CITRUS, ExtraTreeFruitGene.FingerLime),
Pomelo("citrus", "maxima", 0x88af54, ILogType.ForestryLog.CITRUS, ExtraTreeFruitGene.Pomelo),
Grapefruit("citrus", "paradisi", 0x88af54, ILogType.ForestryLog.CITRUS, ExtraTreeFruitGene.Grapefruit),
Kumquat("citrus", "margarita", 0x88af54, ILogType.ForestryLog.CITRUS, ExtraTreeFruitGene.Kumquat),
Citron("citrus", "medica", 0x88af54, ILogType.ForestryLog.CITRUS, ExtraTreeFruitGene.Citron),
BuddhaHand("citrus", "sarcodactylus", 0x88af54, ILogType.ForestryLog.CITRUS, ExtraTreeFruitGene.BuddhaHand),
Banana("musa", "sinensis", 0xa1cd8e, ILogType.ExtraTreeLog.Banana, ExtraTreeFruitGene.Banana, WorldGenBanana.class),
RedBanana("musa", "rubra", 0xa1cd8e, ILogType.ExtraTreeLog.Banana, ExtraTreeFruitGene.RedBanana, WorldGenBanana.class),
Plantain("musa", "paradisiaca", 0xa1cd8e, ILogType.ExtraTreeLog.Banana, ExtraTreeFruitGene.Plantain, WorldGenBanana.class),
Butternut("juglans", "cinerea", 0x82b58c, ILogType.ExtraTreeLog.Butternut, ExtraTreeFruitGene.Butternut, WorldGenWalnut.Butternut.class),
Rowan("sorbus", "aucuparia", 0x9ec79b, ILogType.ExtraTreeLog.Rowan, null, WorldGenSorbus.Rowan.class),
Hemlock("tsuga", "heterophylla", 0x5cac72, ILogType.ExtraTreeLog.Hemlock, null, WorldGenConifer.WesternHemlock.class),
Ash("fraxinus", "excelsior", 0x488e2b, ILogType.ExtraTreeLog.Ash, null, WorldGenAsh.CommonAsh.class),
Alder("alnus", "glutinosa", 0x698a33, ILogType.ExtraTreeLog.Alder, null, WorldGenAlder.CommonAlder.class),
Beech("fagus", "sylvatica", 0x83a04c, ILogType.ExtraTreeLog.Beech, ExtraTreeFruitGene.Beechnut, WorldGenBeech.CommonBeech.class),
CopperBeech("fagus", "purpurea", 0x801318, ILogType.ExtraTreeLog.Beech, ExtraTreeFruitGene.Beechnut, WorldGenBeech.CopperBeech.class),
Aspen("populus", "tremula", 0x8acc37, ILogType.ForestryLog.POPLAR, null, WorldGenPoplar.Aspen.class),
Yew("taxus", "baccata", 0x948a4d, ILogType.ExtraTreeLog.Yew, null, WorldGenConifer.Yew.class),
Cypress("chamaecyparis", "lawsoniana", 0x89c9a7, ILogType.ExtraTreeLog.Cypress, null, WorldGenConifer.Cypress.class),
DouglasFir("pseudotsuga", "menziesii", 0x99b582, ILogType.ExtraTreeLog.Fir, null, WorldGenFir.DouglasFir.class),
Hazel("Corylus", "avellana", 0x9bb552, ILogType.ExtraTreeLog.Hazel, ExtraTreeFruitGene.Hazelnut, WorldGenTree3.Hazel.class),
Sycamore("ficus", "sycomorus", 0xa0a52f, ILogType.ExtraTreeLog.Fig, ExtraTreeFruitGene.Fig, WorldGenTree3.Sycamore.class),
Whitebeam("sorbus", "aria", 0xbace99, ILogType.ExtraTreeLog.Whitebeam, null, WorldGenSorbus.Whitebeam.class),
Hawthorn("crataegus", "monogyna", 0x6ba84a, ILogType.ExtraTreeLog.Hawthorn, null, WorldGenTree3.Hawthorn.class),
Pecan("carya", "illinoinensis", 0x85b674, ILogType.ExtraTreeLog.Hickory, ExtraTreeFruitGene.Pecan, WorldGenTree3.Pecan.class),
Elm("ulmus", "procera", 0x7c9048, ILogType.ExtraTreeLog.Elm, null, WorldGenTree3.Elm.class),
Elder("sambucus", "nigra", 0xaeb873, ILogType.ExtraTreeLog.Elder, ExtraTreeFruitGene.Elderberry, WorldGenTree3.Elder.class),
Holly("ilex", "aquifolium", 0x254b4c, ILogType.ExtraTreeLog.Holly, null, WorldGenHolly.Holly.class),
Hornbeam("carpinus", "betulus", 0x96a71b, ILogType.ExtraTreeLog.Hornbeam, null, WorldGenTree3.Hornbeam.class),
Sallow("salix", "caprea", 0xaeb323, ILogType.ForestryLog.WILLOW, null, WorldGenTree3.Sallow.class),
AcornOak("quercus", "robur", 0x66733e, ILogType.VanillaLog.Oak, ExtraTreeFruitGene.Acorn, WorldGenTree3.AcornOak.class),
Fir("abies", "alba", 0x6f7c20, ILogType.ExtraTreeLog.Fir, null, WorldGenFir.SilverFir.class),
Cedar("cedrus", "libani", 0x95a370, ILogType.ExtraTreeLog.Cedar, null, WorldGenConifer.Cedar.class),
Olive("olea", "europaea", 0x3c4834, ILogType.ExtraTreeLog.Olive, ExtraTreeFruitGene.Olive, WorldGenTree2.Olive.class),
RedMaple("acer", "ubrum", 0xe82e17, ILogType.ForestryLog.MAPLE, null, WorldGenMaple.RedMaple.class),
BalsamFir("abies", "balsamea", 0x74a07c, ILogType.ExtraTreeLog.Fir, null, WorldGenFir.BalsamFir.class),
LoblollyPine("pinus", "taeda", 0x6f8a47, ILogType.ForestryLog.PINE, null, WorldGenConifer.LoblollyPine.class),
Sweetgum("liquidambar", "styraciflua", 0x8b8762, ILogType.ExtraTreeLog.Sweetgum, null, WorldGenTree2.Sweetgum.class),
Locust("robinia", "pseudoacacia", 0x887300, ILogType.ExtraTreeLog.Locust, null, WorldGenTree2.Locust.class),
Pear("pyrus", "communis", 0x5e8826, ILogType.ExtraTreeLog.Pear, ExtraTreeFruitGene.Pear, WorldGenTree2.Pear.class),
OsangeOsange("maclura", "pomifera", 0x687a50, ILogType.ExtraTreeLog.Maclura, ExtraTreeFruitGene.OsangeOsange, WorldGenJungle.OsangeOsange.class),
OldFustic("maclura", "tinctoria", 0x687a50, ILogType.ExtraTreeLog.Maclura, null, WorldGenJungle.OldFustic.class),
Brazilwood("caesalpinia", "echinata", 0x607459, ILogType.ExtraTreeLog.Brazilwood, null, WorldGenJungle.Brazilwood.class),
Logwood("haematoxylum", "campechianum", 0x889f6b, ILogType.ExtraTreeLog.Logwood, null, WorldGenJungle.Logwood.class),
Rosewood("dalbergia", "latifolia", 0x879b22, ILogType.ExtraTreeLog.Rosewood, null, WorldGenJungle.Rosewood.class),
Purpleheart("peltogyne", "spp.", 0x778f55, ILogType.ExtraTreeLog.Purpleheart, null, WorldGenJungle.Purpleheart.class),
Iroko("milicia", "excelsa", 0xafc86c, ILogType.ExtraTreeLog.Iroko, null, WorldGenTree2.Iroko.class),
Gingko("ginkgo", "biloba", 0x719651, ILogType.ExtraTreeLog.Gingko, ExtraTreeFruitGene.GingkoNut, WorldGenTree2.Gingko.class),
Brazilnut("bertholletia", "excelsa", 0x7c8f7b, ILogType.VanillaLog.Jungle, ExtraTreeFruitGene.BrazilNut, WorldGenJungle.BrazilNut.class),
RoseGum("eucalyptus", "grandis", 0x9ca258, ILogType.ExtraTreeLog.Eucalyptus, null, WorldGenEucalyptus.RoseGum.class),
SwampGum("eucalyptus", "grandis", 0xa2c686, ILogType.ExtraTreeLog.Eucalyptus2, null, WorldGenEucalyptus.SwampGum.class),
Box("boxus", "sempervirens", 0x72996d, ILogType.ExtraTreeLog.Box, null, WorldGenTree2.Box.class),
Clove("syzygium", "aromaticum", 0x7a821f, ILogType.ExtraTreeLog.Syzgium, ExtraTreeFruitGene.Clove, WorldGenTree2.Clove.class),
Coffee("coffea", "arabica", 0x6f9065, ILogType.VanillaLog.Jungle, ExtraTreeFruitGene.Coffee, WorldGenJungle.Coffee.class),
MonkeyPuzzle("araucaria", "araucana", 0x576158, ILogType.ForestryLog.PINE, null, WorldGenConifer.MonkeyPuzzle.class),
RainbowGum("eucalyptus", "deglupta", 0xb7f025, ILogType.ExtraTreeLog.Eucalyptus3, null, WorldGenEucalyptus.RainbowGum.class),
PinkIvory("berchemia", "zeyheri", 0x7c9159, ILogType.ExtraTreeLog.PinkIvory, null, WorldGenTree.class),
Blackcurrant("ribes", "nigrum", 0xa6da5c, null, ExtraTreeFruitGene.Blackcurrant, WorldGenShrub.Shrub.class),
Redcurrant("ribes", "rubrum", 0x74ac00, null, ExtraTreeFruitGene.Redcurrant, WorldGenShrub.Shrub.class),
Blackberry("rubus", "fruticosus", 0x92c15b, null, ExtraTreeFruitGene.Blackberry, WorldGenShrub.Shrub.class),
Raspberry("rubus", "idaeus", 0x83b96e, null, ExtraTreeFruitGene.Raspberry, WorldGenShrub.Shrub.class),
Blueberry("vaccinium", "corymbosum", 0x72c750, null, ExtraTreeFruitGene.Blueberry, WorldGenShrub.Shrub.class),
Cranberry("vaccinium", "oxycoccos", 0x96d179, null, ExtraTreeFruitGene.Cranberry, WorldGenShrub.Shrub.class),
Juniper("juniperus", "communis", 0x90b149, null, ExtraTreeFruitGene.Juniper, WorldGenShrub.Shrub.class),
Gooseberry("ribes", "grossularia", 0x79bb00, null, ExtraTreeFruitGene.Gooseberry, WorldGenShrub.Shrub.class),
GoldenRaspberry("rubus", "occidentalis", 0x83b96e, null, ExtraTreeFruitGene.GoldenRaspberry, WorldGenShrub.Shrub.class),
Cinnamon("cinnamomum", "cassia", 0x738e0b, ILogType.ExtraTreeLog.Cinnamon, null, WorldGenLazy.Tree.class),
Coconut("cocous", "nucifera", 0x649923, ILogType.VanillaLog.Jungle, ExtraTreeFruitGene.Coconut, WorldGenPalm.Coconut.class),
Cashew("anacardium", "occidentale", 0xabb962, ILogType.VanillaLog.Jungle, ExtraTreeFruitGene.Cashew, WorldGenLazy.Tree.class),
Avacado("persea", "americana", 0x96a375, ILogType.VanillaLog.Jungle, ExtraTreeFruitGene.Avacado, WorldGenLazy.Tree.class),
Nutmeg("myristica", "fragrans", 0x488d4c, ILogType.VanillaLog.Jungle, ExtraTreeFruitGene.Nutmeg, WorldGenLazy.Tree.class),
Allspice("pimenta", "dioica", 0x7c9724, ILogType.VanillaLog.Jungle, ExtraTreeFruitGene.Allspice, WorldGenLazy.Tree.class),
Chilli("capsicum", "annuum", 0x2a9f01, ILogType.VanillaLog.Jungle, ExtraTreeFruitGene.Chilli, WorldGenLazy.Tree.class),
StarAnise("illicium", "verum", 0x7fc409, ILogType.VanillaLog.Jungle, ExtraTreeFruitGene.StarAnise, WorldGenLazy.Tree.class),
Mango("mangifera", "indica", 0x87b574, ILogType.VanillaLog.Jungle, ExtraTreeFruitGene.Mango, WorldGenTropical.Mango.class),
Starfruit("averrhoa", "carambola", 0x6da92d, ILogType.VanillaLog.Jungle, ExtraTreeFruitGene.Starfruit, WorldGenLazy.Tree.class),
Candlenut("aleurites", "moluccana", 0x8aa36c, ILogType.VanillaLog.Jungle, ExtraTreeFruitGene.Candlenut, WorldGenLazy.Tree.class),
DwarfHazel("Corylus", "americana", 0x9bb552, ILogType.ExtraTreeLog.Hazel, ExtraTreeFruitGene.Hazelnut, WorldGenShrub.Shrub.class);
public ILogType wood;
@@ -186,7 +186,11 @@ public enum ExtraTreeSpecies implements IAlleleTreeSpecies, IIconProvider, IGerm
private LeafType leafType;
private SaplingType saplingType;
ExtraTreeSpecies(String branch, String binomial, int color, int polColor, ILogType wood, IAlleleFruit fruit, Class<? extends WorldGenerator> gen) {
ExtraTreeSpecies(String branch, String binomial, int color, ILogType wood, IAlleleFruit fruit) {
this(branch, binomial, color, wood, fruit, null);
}
ExtraTreeSpecies(String branch, String binomial, int color, ILogType wood, IAlleleFruit fruit, Class<? extends WorldGenerator> gen) {
this.color = color;
this.wood = wood;
this.fruit = fruit;