From 21b26e491cbc16217f9794995e293c18b38f21e0 Mon Sep 17 00:00:00 2001 From: MysteriousAges Date: Fri, 24 Apr 2015 19:59:14 -0700 Subject: [PATCH] Turns out there was a reason .setGenomeTemplate existed not in the constructor. Idiot. -_- --- src/main/java/magicbees/bees/Allele.java | 25 +- .../java/magicbees/bees/BeeGenomeManager.java | 1 + src/main/java/magicbees/bees/BeeSpecies.java | 388 +++++++++++------- 3 files changed, 269 insertions(+), 145 deletions(-) diff --git a/src/main/java/magicbees/bees/Allele.java b/src/main/java/magicbees/bees/Allele.java index 45e9ba5..cb2bb02 100644 --- a/src/main/java/magicbees/bees/Allele.java +++ b/src/main/java/magicbees/bees/Allele.java @@ -53,12 +53,13 @@ public class Allele implements IAllele { public static IAlleleEffect effectInvisibility; public static IAlleleEffect effectDreaming; - public static IAlleleEffect spawnBrainyZombie; - public static IAlleleEffect spawnWisp; - public static IAlleleEffect spawnBats; public static IAlleleEffect spawnGhast; public static IAlleleEffect spawnSpider; public static IAlleleEffect spawnBlaze; + public static IAlleleEffect spawnWolf; + public static IAlleleEffect spawnBrainyZombie; + public static IAlleleEffect spawnWisp; + public static IAlleleEffect spawnBats; public static IAlleleEffect spawnBlizz; public static IAlleleEffect spawnManaDrainer; public static IAlleleEffect spawnWispOrHecate; @@ -144,13 +145,21 @@ public class Allele implements IAllele { Allele.effectInvisibility = new AlleleEffectPotion("Invisibility", Potion.invisibility, 10, false); - Allele.spawnGhast = new AlleleEffectSpawnMob("Ghastly", false, "Ghast", "mob.ghast.moan").setThrottle(2060).setChanceToSpawn(10) + Allele.spawnGhast = new AlleleEffectSpawnMob("Ghastly", false, "Ghast", "mob.ghast.moan") + .setThrottle(2060) + .setChanceToSpawn(10) .setMaxMobsInSpawnZone(1); - - Allele.spawnSpider = new AlleleEffectSpawnMob("Spidery", false, "Spider", "mob.spider.step").setThrottle(400).setChanceToSpawn(70) + Allele.spawnSpider = new AlleleEffectSpawnMob("Spidery", false, "Spider", "mob.spider.step") + .setThrottle(400) + .setChanceToSpawn(70) .setMaxMobsInSpawnZone(4); - - Allele.spawnBlaze = new AlleleEffectSpawnMob("Ablaze", false, "Blaze", "mob.blaze.breathe").setThrottle(800).setChanceToSpawn(60) + Allele.spawnBlaze = new AlleleEffectSpawnMob("Ablaze", false, "Blaze", "mob.blaze.breathe") + .setThrottle(800) + .setChanceToSpawn(60) + .setMaxMobsInSpawnZone(2); + Allele.spawnWolf = new AlleleEffectSpawnMob("Canine", false , "Wolf", "mob.wolf.panting") + .setThrottle(950) + .setChanceToSpawn(40) .setMaxMobsInSpawnZone(2); } diff --git a/src/main/java/magicbees/bees/BeeGenomeManager.java b/src/main/java/magicbees/bees/BeeGenomeManager.java index 5fc9325..4ab91da 100644 --- a/src/main/java/magicbees/bees/BeeGenomeManager.java +++ b/src/main/java/magicbees/bees/BeeGenomeManager.java @@ -331,6 +331,7 @@ public class BeeGenomeManager { genome[EnumBeeChromosome.SPECIES.ordinal()] = BeeSpecies.BIGBAD; genome[EnumBeeChromosome.CAVE_DWELLING.ordinal()] = Allele.getBaseAllele("boolTrue"); + genome[EnumBeeChromosome.EFFECT.ordinal()] = Allele.spawnWisp; return genome; } diff --git a/src/main/java/magicbees/bees/BeeSpecies.java b/src/main/java/magicbees/bees/BeeSpecies.java index 0bde5d2..1f503e8 100644 --- a/src/main/java/magicbees/bees/BeeSpecies.java +++ b/src/main/java/magicbees/bees/BeeSpecies.java @@ -47,273 +47,274 @@ import forestry.api.genetics.IMutation; public enum BeeSpecies implements IAlleleBeeSpecies, IIconProvider { - MYSTICAL("Mystical", "mysticum", BeeGenomeManager.getTemplateMystical(), BeeClassification.VEILED, + MYSTICAL("Mystical", "mysticum", BeeClassification.VEILED, 0xAFFFB7, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, false, true), - SORCEROUS("Sorcerous", "fascinatio", BeeGenomeManager.getTemplateSorcerous(), BeeClassification.VEILED, + SORCEROUS("Sorcerous", "fascinatio", BeeClassification.VEILED, 0xEA9A9A, EnumTemperature.HOT, EnumHumidity.ARID, false, false, true), - UNUSUAL("Unusual", "inusitatus", BeeGenomeManager.getTemplateUnusual(), BeeClassification.VEILED, + UNUSUAL("Unusual", "inusitatus", BeeClassification.VEILED, 0x72D361, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, false, true), - ATTUNED("Attuned", "similis", BeeGenomeManager.getTemplateAttuned(), BeeClassification.VEILED, + ATTUNED("Attuned", "similis", BeeClassification.VEILED, 0x0086A8, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, false, true), - ELDRITCH("Eldritch", "prodigiosus", BeeGenomeManager.getTemplateEldritch(), BeeClassification.VEILED, + ELDRITCH("Eldritch", "prodigiosus", BeeClassification.VEILED, 0x8D75A0, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, true), - ESOTERIC("Esoteric", "secretiore", BeeGenomeManager.getTemplateEsoteric(), BeeClassification.ARCANE, + ESOTERIC("Esoteric", "secretiore", BeeClassification.ARCANE, 0x001099, BodyColours.ARCANE, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, true), - MYSTERIOUS("Mysterious", "mysticus", BeeGenomeManager.getTemplateMysterious(), BeeClassification.ARCANE, + MYSTERIOUS("Mysterious", "mysticus", BeeClassification.ARCANE, 0x762bc2, BodyColours.ARCANE, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, true), - ARCANE("Arcane", "arcanus", BeeGenomeManager.getTemplateArcane(), BeeClassification.ARCANE, + ARCANE("Arcane", "arcanus", BeeClassification.ARCANE, 0xd242df, BodyColours.ARCANE, EnumTemperature.NORMAL, EnumHumidity.NORMAL, true, true), - CHARMED("Charmed", "larvatus", BeeGenomeManager.getTemplateCharmed(), BeeClassification.SUPERNATURAL, + CHARMED("Charmed", "larvatus", BeeClassification.SUPERNATURAL, 0x48EEEC, BodyColours.ARCANE, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, true), - ENCHANTED("Enchanted", "cantatus", BeeGenomeManager.getTemplateEnchanted(), BeeClassification.SUPERNATURAL, + ENCHANTED("Enchanted", "cantatus", BeeClassification.SUPERNATURAL, 0x18e726, BodyColours.ARCANE, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, true), - SUPERNATURAL("Supernatural", "coeleste", BeeGenomeManager.getTemplateSupernatural(), BeeClassification.SUPERNATURAL, + SUPERNATURAL("Supernatural", "coeleste", BeeClassification.SUPERNATURAL, 0x005614, BodyColours.ARCANE, EnumTemperature.NORMAL, EnumHumidity.NORMAL, true, true), - ETHEREAL("Ethereal", "diaphanum", BeeGenomeManager.getTemplateEthereal(),BeeClassification.MAGICAL, + ETHEREAL("Ethereal", "diaphanum",BeeClassification.MAGICAL, 0xBA3B3B, 0xEFF8FF, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, true), - WATERY("Watery", "aquatilis", BeeGenomeManager.getTemplateWatery(), BeeClassification.MAGICAL, + WATERY("Watery", "aquatilis", BeeClassification.MAGICAL, 0x313C5E, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, true), - EARTHY("Earthen", "fictili", BeeGenomeManager.getTemplateEarthy(), BeeClassification.MAGICAL, + EARTHY("Earthen", "fictili", BeeClassification.MAGICAL, 0x78822D, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, true), - FIREY("Firey", "ardens", BeeGenomeManager.getTemplateFirey(), BeeClassification.MAGICAL, + FIREY("Firey", "ardens", BeeClassification.MAGICAL, 0xD35119, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, true), - WINDY("Windy", "ventosum", BeeGenomeManager.getTemplateWindy(), BeeClassification.MAGICAL, + WINDY("Windy", "ventosum", BeeClassification.MAGICAL, 0xFFFDBA, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, true), - PUPIL("Pupil", "disciplina", BeeGenomeManager.getTemplatePupil(), BeeClassification.SCHOLARLY, + PUPIL("Pupil", "disciplina", BeeClassification.SCHOLARLY, 0xFFFF00, EnumTemperature.NORMAL, EnumHumidity.ARID, false, true), - SCHOLARLY("Scholarly", "studiosis", BeeGenomeManager.getTemplateScholarly(), BeeClassification.SCHOLARLY, + SCHOLARLY("Scholarly", "studiosis", BeeClassification.SCHOLARLY, 0x6E0000, EnumTemperature.NORMAL, EnumHumidity.ARID, false, false), - SAVANT("Savant", "philologus", BeeGenomeManager.getTemplateSavant(), BeeClassification.SCHOLARLY, + SAVANT("Savant", "philologus", BeeClassification.SCHOLARLY, 0xFFA042, EnumTemperature.NORMAL, EnumHumidity.ARID, true, false), - AWARE("Aware", "sensibilis", BeeGenomeManager.getTemplateAware(), BeeClassification.MAGICAL, + AWARE("Aware", "sensibilis", BeeClassification.MAGICAL, 0x5E95B5, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, false), - SPIRIT("Spirit", "larva", BeeGenomeManager.getTemplateSpirit(), BeeClassification.SOUL, + SPIRIT("Spirit", "larva", BeeClassification.SOUL, 0xb2964b, EnumTemperature.WARM, EnumHumidity.NORMAL, false, true), - SOUL("Soul", "anima", BeeGenomeManager.getTemplateSoul(), BeeClassification.SOUL, + SOUL("Soul", "anima", BeeClassification.SOUL, 0x7d591b, EnumTemperature.HELLISH, EnumHumidity.NORMAL, true, false), - SKULKING("Skulking", "malevolens", BeeGenomeManager.getTemplateSkulking(), BeeClassification.SKULKING, + SKULKING("Skulking", "malevolens", BeeClassification.SKULKING, 0x524827, BodyColours.SKULKING, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, true), - GHASTLY("Ghastly", "pallens", BeeGenomeManager.getTemplateGhastly(), BeeClassification.SKULKING, + GHASTLY("Ghastly", "pallens", BeeClassification.SKULKING, 0xccccee, 0xbf877c, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, false), - SPIDERY("Spidery", "araneolus", BeeGenomeManager.getTemplateSpidery(), BeeClassification.SKULKING, + SPIDERY("Spidery", "araneolus", BeeClassification.SKULKING, 0x0888888, 0x222222, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, true), - SMOULDERING("Smouldering", "flagrantia", BeeGenomeManager.getTemplateSmouldering(), BeeClassification.SKULKING, + SMOULDERING("Smouldering", "flagrantia", BeeClassification.SKULKING, 0xFFC747, 0xEA8344, EnumTemperature.HELLISH, EnumHumidity.NORMAL, false, false), - BIGBAD("BigBad", "magnumalum", BeeGenomeManager.getTemplateBigbad(), BeeClassification.SKULKING, - 0xA9344B, 0x453536, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, true), + BIGBAD("BigBad", "magnumalum", BeeClassification.SKULKING, + 0xA9344B, 0x453536, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, false, true, true, true), - TIMELY("Timely", "gallifreis", BeeGenomeManager.getTemplateTimely(), BeeClassification.TIME, + TIMELY("Timely", "gallifreis", BeeClassification.TIME, 0xC6AF86, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, true), - LORDLY("Lordly", "rassilonis", BeeGenomeManager.getTemplateLordly(), BeeClassification.TIME, + LORDLY("Lordly", "rassilonis", BeeClassification.TIME, 0xC6AF86, 0x8E0213, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, false), - DOCTORAL("Doctoral", "medicus qui", BeeGenomeManager.getTemplateDoctoral(), BeeClassification.TIME, + DOCTORAL("Doctoral", "medicus qui", BeeClassification.TIME, 0xDDE5FC, 0x4B6E8C, EnumTemperature.NORMAL, EnumHumidity.NORMAL, true, false), - INFERNAL("Infernal", "infernales", BeeGenomeManager.getTemplateInfernal(), BeeClassification.ABOMINABLE, + INFERNAL("Infernal", "infernales", BeeClassification.ABOMINABLE, 0xFF1C1C, BodyColours.ABOMINABLE, EnumTemperature.HELLISH, EnumHumidity.ARID, false, true), - HATEFUL("Hateful", "odibilis", BeeGenomeManager.getTemplateHateful(), BeeClassification.ABOMINABLE, + HATEFUL("Hateful", "odibilis", BeeClassification.ABOMINABLE, 0xDB00DB, BodyColours.ABOMINABLE, EnumTemperature.HELLISH, EnumHumidity.ARID, false, false), - SPITEFUL("Spiteful", "maligna", BeeGenomeManager.getTemplateSpiteful(), BeeClassification.ABOMINABLE, + SPITEFUL("Spiteful", "maligna", BeeClassification.ABOMINABLE, 0x5FCC00, BodyColours.ABOMINABLE, EnumTemperature.HELLISH, EnumHumidity.ARID, true, false), - WITHERING("Withering", "vietus", BeeGenomeManager.getTemplateWithering(), BeeClassification.ABOMINABLE, + WITHERING("Withering", "vietus", BeeClassification.ABOMINABLE, 0x5B5B5B, BodyColours.ABOMINABLE, EnumTemperature.HELLISH, EnumHumidity.ARID, true, false), - OBLIVION("Oblivion", "oblivioni", BeeGenomeManager.getTemplateOblivion(), BeeClassification.EXTRINSIC, + OBLIVION("Oblivion", "oblivioni", BeeClassification.EXTRINSIC, 0xD5C3E5, BodyColours.EXTRINSIC, EnumTemperature.COLD, EnumHumidity.NORMAL, false, false), - NAMELESS("Nameless", "sine nomine", BeeGenomeManager.getTemplateNameless(), BeeClassification.EXTRINSIC, + NAMELESS("Nameless", "sine nomine", BeeClassification.EXTRINSIC, 0x8ca7cb, BodyColours.EXTRINSIC, EnumTemperature.COLD, EnumHumidity.NORMAL, false, true), - ABANDONED("Abandoned", "reliquit", BeeGenomeManager.getTemplateAbandoned(), BeeClassification.EXTRINSIC, + ABANDONED("Abandoned", "reliquit", BeeClassification.EXTRINSIC, 0xc5cb8c, BodyColours.EXTRINSIC, EnumTemperature.COLD, EnumHumidity.NORMAL, false, true), - FORLORN("Forlorn", "perditus", BeeGenomeManager.getTemplateForlorn(), BeeClassification.EXTRINSIC, + FORLORN("Forlorn", "perditus", BeeClassification.EXTRINSIC, 0xcba88c, BodyColours.EXTRINSIC, EnumTemperature.COLD, EnumHumidity.NORMAL, true, false), - DRACONIC("Draconic", "draconic", BeeGenomeManager.getTemplateDraconic(), BeeClassification.EXTRINSIC, + DRACONIC("Draconic", "draconic", BeeClassification.EXTRINSIC, 0x9f56ad, 0x5a3b62, EnumTemperature.COLD, EnumHumidity.NORMAL, true, false), - IRON("Iron", "ferrus", BeeGenomeManager.getTemplateIron(), BeeClassification.METALLIC, + IRON("Iron", "ferrus", BeeClassification.METALLIC, 0x686868, 0xE9E9E9, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, true), - GOLD("Gold", "aurum", BeeGenomeManager.getTemplateGold(), BeeClassification.METALLIC, + GOLD("Gold", "aurum", BeeClassification.METALLIC, 0x684B01, 0xFFFF0B, EnumTemperature.NORMAL, EnumHumidity.NORMAL, true, false), - COPPER("Copper", "aercus", BeeGenomeManager.getTemplateCopper(), BeeClassification.METALLIC, + COPPER("Copper", "aercus", BeeClassification.METALLIC, 0x684B01, 0xFFC81A, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, true), - TIN("Tin", "stannum", BeeGenomeManager.getTemplateTin(), BeeClassification.METALLIC, + TIN("Tin", "stannum", BeeClassification.METALLIC, 0x3E596D, 0xA6BACB, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, true), - SILVER("Silver", "argenteus", BeeGenomeManager.getTemplateSilver(), BeeClassification.METALLIC, + SILVER("Silver", "argenteus", BeeClassification.METALLIC, 0x747C81, 0x96BFC4, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, false), - LEAD("Lead", "plumbeus", BeeGenomeManager.getTemplateLead(), BeeClassification.METALLIC, + LEAD("Lead", "plumbeus", BeeClassification.METALLIC, 0x96BFC4, 0x91A9F3, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, true), - ALUMINUM("Aluminum", "aluminium", BeeGenomeManager.getTemplateAluminum(), BeeClassification.METALLIC, + ALUMINUM("Aluminum", "aluminium", BeeClassification.METALLIC, 0xEDEDED, 0x767676, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, true), - ARDITE("Ardite", "aurantiaco", BeeGenomeManager.getTemplateArdite(), BeeClassification.METALLIC, + ARDITE("Ardite", "aurantiaco", BeeClassification.METALLIC, 0x720000, 0xFF9E00, EnumTemperature.HOT, EnumHumidity.ARID, false, false), - COBALT("Cobalt", "caeruleo", BeeGenomeManager.getTemplateCobalt(), BeeClassification.METALLIC, + COBALT("Cobalt", "caeruleo", BeeClassification.METALLIC, 0x03265F, 0x59AAEF, EnumTemperature.HOT, EnumHumidity.ARID, false, false), - MANYULLYN("Manyullyn", "manahmanah", BeeGenomeManager.getTemplateManyullyn(), BeeClassification.METALLIC, + MANYULLYN("Manyullyn", "manahmanah", BeeClassification.METALLIC, 0x481D6D, 0xBD92F1, EnumTemperature.HOT, EnumHumidity.ARID, true, false), - DIAMOND("Diamond", "diamond", BeeGenomeManager.getTemplateDiamond(), BeeClassification.GEM, + DIAMOND("Diamond", "diamond", BeeClassification.GEM, 0x209581, 0x8DF5E3, EnumTemperature.NORMAL, EnumHumidity.NORMAL, true, false), - EMERALD("Emerald", "prasinus", BeeGenomeManager.getTemplateEmerald(), BeeClassification.GEM, + EMERALD("Emerald", "prasinus", BeeClassification.GEM, 0x005300, 0x17DD62, EnumTemperature.NORMAL, EnumHumidity.NORMAL, true, false), - APATITE("Apatite", "apatite", BeeGenomeManager.getTemplateApatite(), BeeClassification.GEM, + APATITE("Apatite", "apatite", BeeClassification.GEM, 0x2EA7EC, 0x001D51, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, false), - MUTABLE("Mutable", "mutable", BeeGenomeManager.getTemplateMutable(), BeeClassification.TRANSMUTING, + MUTABLE("Mutable", "mutable", BeeClassification.TRANSMUTING, 0xDBB24C, 0xE0D5A6, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, false), - TRANSMUTING("Transmuting", "transmuting", BeeGenomeManager.getTemplateTransmuting(), BeeClassification.TRANSMUTING, + TRANSMUTING("Transmuting", "transmuting", BeeClassification.TRANSMUTING, 0xDBB24C, 0xA2D2D8, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, false), - CRUMBLING("Crumbling", "crumbling", BeeGenomeManager.getTemplateCrumbling(), BeeClassification.TRANSMUTING, + CRUMBLING("Crumbling", "crumbling", BeeClassification.TRANSMUTING, 0xDBB24C, 0xDBA4A4, EnumTemperature.HOT, EnumHumidity.ARID, false, false), - INVISIBLE("Invisible", "invisible", BeeGenomeManager.getTemplateInvisible(), BeeClassification.VEILED, + INVISIBLE("Invisible", "invisible", BeeClassification.VEILED, 0xffccff, 0xffffff, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, false), // --------- Thaumcraft Bees --------------------------------------------------------------------------------------- - TC_AIR("TCAir", "aether", BeeGenomeManager.getTemplateTCAir(), BeeClassification.THAUMIC, + TC_AIR("TCAir", "aether", BeeClassification.THAUMIC, 0xD9D636, BodyColours.THAUMCRAFT, EnumTemperature.NORMAL, EnumHumidity.NORMAL, true, true), - TC_FIRE("TCFire", "praefervidus", BeeGenomeManager.getTemplateTCFire(), BeeClassification.THAUMIC, + TC_FIRE("TCFire", "praefervidus", BeeClassification.THAUMIC, 0xE50B0B, BodyColours.THAUMCRAFT, EnumTemperature.HOT, EnumHumidity.ARID, true, true), - TC_WATER("TCWater", "umidus", BeeGenomeManager.getTemplateTCWater(), BeeClassification.THAUMIC, + TC_WATER("TCWater", "umidus", BeeClassification.THAUMIC, 0x36CFD9, BodyColours.THAUMCRAFT, EnumTemperature.NORMAL, EnumHumidity.DAMP, true, true), - TC_EARTH("TCEarth", "sordida", BeeGenomeManager.getTemplateTCEarth(), BeeClassification.THAUMIC, + TC_EARTH("TCEarth", "sordida", BeeClassification.THAUMIC, 0x005100, BodyColours.THAUMCRAFT, EnumTemperature.NORMAL, EnumHumidity.NORMAL, true, true), - TC_ORDER("TCOrder", "ordinatus", BeeGenomeManager.getTemplateTCOrder(), BeeClassification.THAUMIC, + TC_ORDER("TCOrder", "ordinatus", BeeClassification.THAUMIC, 0xaa32fc, BodyColours.THAUMCRAFT, EnumTemperature.NORMAL, EnumHumidity.NORMAL, true, true), - TC_CHAOS("TCChaos", "tenebrarum", BeeGenomeManager.getTemplateTCChaos(), BeeClassification.THAUMIC, + TC_CHAOS("TCChaos", "tenebrarum", BeeClassification.THAUMIC, 0xCCCCCC, BodyColours.THAUMCRAFT, EnumTemperature.NORMAL, EnumHumidity.NORMAL, true, false), - TC_VIS("TCVis", "arcanus saecula", BeeGenomeManager.getTemplateTCVis(), BeeClassification.THAUMIC, + TC_VIS("TCVis", "arcanus saecula", BeeClassification.THAUMIC, 0x004c99, 0x675ED1, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, false), - TC_TAINT("TCFlux", "arcanus labe", BeeGenomeManager.getTemplateTCTaint(), BeeClassification.THAUMIC, + TC_TAINT("TCFlux", "arcanus labe", BeeClassification.THAUMIC, 0x91376A, 0x675ED1, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, false), - TC_ATTRACT("TCAttractive", "tractus", BeeGenomeManager.getTemplateTCAttract(), BeeClassification.THAUMIC, + TC_ATTRACT("TCAttractive", "tractus", BeeClassification.THAUMIC, 0x96FFBC, 0x675ED1, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, true), - TC_REJUVENATING("TCRejuvenating", "arcanus vitae", BeeGenomeManager.getTemplateTCRejuvinating(), BeeClassification.THAUMIC, + TC_REJUVENATING("TCRejuvenating", "arcanus vitae", BeeClassification.THAUMIC, 0x91D0D9, 0x675ED1, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, false), - TC_PURE("TCPure", "arcanus puritatem", BeeGenomeManager.getTemplateTCPure(), BeeClassification.THAUMIC, + TC_PURE("TCPure", "arcanus puritatem", BeeClassification.THAUMIC, 0xb0092e, 0x675ED1, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, false), - TC_BRAINY("TCBrainy", "cerebrum", BeeGenomeManager.getTemplateTCBrainy(), BeeClassification.THAUMIC, + TC_BRAINY("TCBrainy", "cerebrum", BeeClassification.THAUMIC, 0x83FF70, BodyColours.SKULKING, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, true), - TC_WISPY("TCWispy", "umbrabilis", BeeGenomeManager.getTemplateTCWispy(), BeeClassification.THAUMIC, + TC_WISPY("TCWispy", "umbrabilis", BeeClassification.THAUMIC, 0x9cb8d5, BodyColours.SKULKING, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, false), - TC_BATTY("TCBatty", "chiroptera", BeeGenomeManager.getTemplateTCBatty(), BeeClassification.THAUMIC, + TC_BATTY("TCBatty", "chiroptera", BeeClassification.THAUMIC, 0x27350d, BodyColours.SKULKING, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, true), - TC_CHICKEN("TCChicken", "pullus", BeeGenomeManager.getTemplateTCChicken(), BeeClassification.FLESHY, + TC_CHICKEN("TCChicken", "pullus", BeeClassification.FLESHY, 0x7D431E, 0xE0905E, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, true), - TC_BEEF("TCBeef", "bubulae", BeeGenomeManager.getTemplateTCBeef(), BeeClassification.FLESHY, + TC_BEEF("TCBeef", "bubulae", BeeClassification.FLESHY, 0x40221A, 0xAC6753, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, true), - TC_PORK("TCPork", "porcina", BeeGenomeManager.getTemplateTCPork(), BeeClassification.FLESHY, + TC_PORK("TCPork", "porcina", BeeClassification.FLESHY, 0x725D2F, 0xD2BF93, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, true), // --------- Equivalent Exchange Bees ----------------------------------------------------------------------------- - EE_MINIUM("EEMinium", "mutabilis", BeeGenomeManager.getTemplateEEMinium(), BeeClassification.ALCHEMICAL, + EE_MINIUM("EEMinium", "mutabilis", BeeClassification.ALCHEMICAL, 0xac0921, 0x3a030b, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, true), // --------- Ars Magica Bees -------------------------------------------------------------------------------------- - AM_ESSENCE("AMEssence", "essentia", BeeGenomeManager.getTemplateAMEssence(), BeeClassification.ESSENTIAL, + AM_ESSENCE("AMEssence", "essentia", BeeClassification.ESSENTIAL, 0x86BBC5, BodyColours.ARSMAGICA, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, true), - AM_QUINTESSENCE("AMQuintessence", "cor essentia", BeeGenomeManager.getTemplateAMQuintessence(), BeeClassification.ESSENTIAL, + AM_QUINTESSENCE("AMQuintessence", "cor essentia", BeeClassification.ESSENTIAL, 0xE3A45B, BodyColours.ARSMAGICA, EnumTemperature.NORMAL, EnumHumidity.NORMAL, true, true), - AM_EARTH("AMEarth", "magica terra", BeeGenomeManager.getTemplateAMEarth(), BeeClassification.ESSENTIAL, + AM_EARTH("AMEarth", "magica terra", BeeClassification.ESSENTIAL, 0xAA875E, BodyColours.ARSMAGICA, EnumTemperature.WARM, EnumHumidity.ARID, false, false), - AM_AIR("AMAir", "magica aer", BeeGenomeManager.getTemplateAMAir(), BeeClassification.ESSENTIAL, + AM_AIR("AMAir", "magica aer", BeeClassification.ESSENTIAL, 0xD5EB9D, BodyColours.ARSMAGICA, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, false), - AM_FIRE("AMFire", "magica ignis", BeeGenomeManager.getTemplateAMFire(), BeeClassification.ESSENTIAL, + AM_FIRE("AMFire", "magica ignis", BeeClassification.ESSENTIAL, 0x93451E, BodyColours.ARSMAGICA, EnumTemperature.HOT, EnumHumidity.ARID, false, false), - AM_WATER("AMWater", "magica aqua", BeeGenomeManager.getTemplateAMWater(), BeeClassification.ESSENTIAL, + AM_WATER("AMWater", "magica aqua", BeeClassification.ESSENTIAL, 0x3B7D8C, BodyColours.ARSMAGICA, EnumTemperature.NORMAL, EnumHumidity.DAMP, false, false), - AM_LIGHTNING("AMLightning", "magica fulgur", BeeGenomeManager.getTemplateAMLightning(), BeeClassification.ESSENTIAL, + AM_LIGHTNING("AMLightning", "magica fulgur", BeeClassification.ESSENTIAL, 0xEBEFA1, BodyColours.ARSMAGICA, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, false), - AM_PLANT("AMPlant", "magica herba", BeeGenomeManager.getTemplateAMPlant(), BeeClassification.ESSENTIAL, + AM_PLANT("AMPlant", "magica herba", BeeClassification.ESSENTIAL, 0x49B549, BodyColours.ARSMAGICA, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, false), - AM_ICE("AMIce", "magica glacium", BeeGenomeManager.getTemplateAMIce(), BeeClassification.ESSENTIAL, + AM_ICE("AMIce", "magica glacium", BeeClassification.ESSENTIAL, 0x86BAC6, BodyColours.ARSMAGICA, EnumTemperature.COLD, EnumHumidity.NORMAL, false, false), - AM_ARCANE("AMArcane", "magica arcanum", BeeGenomeManager.getTemplateAMArcane(), BeeClassification.ESSENTIAL, + AM_ARCANE("AMArcane", "magica arcanum", BeeClassification.ESSENTIAL, 0x76184D, BodyColours.ARSMAGICA, EnumTemperature.NORMAL, EnumHumidity.NORMAL, true, false), - AM_VORTEX("AMVortex", "gurges", BeeGenomeManager.getTemplateAMVortex(), BeeClassification.ESSENTIAL, + AM_VORTEX("AMVortex", "gurges", BeeClassification.ESSENTIAL, 0x71BBE2, 0x0B35A8, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, true), - AM_WIGHT("AMWight", "vectem", BeeGenomeManager.getTemplateAMWight(), BeeClassification.ESSENTIAL, + AM_WIGHT("AMWight", "vectem", BeeClassification.ESSENTIAL, 0xB50000, 0x4C4837, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, false), // ---------------------Thermal Expansion Bees--------------------------- - TE_BLIZZY("TEBlizzy", "blizzard", BeeGenomeManager.getTemplateTEBlizzy(), BeeClassification.ABOMINABLE, + TE_BLIZZY("TEBlizzy", "blizzard", BeeClassification.ABOMINABLE, 0x0073C4, EnumTemperature.COLD, EnumHumidity.NORMAL, false, false), - TE_GELID("TEGelid", "cyro", BeeGenomeManager.getTemplateTEGelid(), BeeClassification.ABOMINABLE, + TE_GELID("TEGelid", "cyro", BeeClassification.ABOMINABLE, 0x4AAFF7, EnumTemperature.COLD, EnumHumidity.NORMAL, true, true), - TE_DANTE("TEDante", "inferno", BeeGenomeManager.getTemplateTEDante(), BeeClassification.ABOMINABLE, + TE_DANTE("TEDante", "inferno", BeeClassification.ABOMINABLE, 0xF7AC4A, EnumTemperature.HELLISH, EnumHumidity.ARID, false, false), - TE_PYRO("TEPyro", "pyromaniac", BeeGenomeManager .getTemplateTEPyro(), BeeClassification.ABOMINABLE, + TE_PYRO("TEPyro", "pyromaniac", BeeClassification.ABOMINABLE, 0xFA930C, EnumTemperature.HELLISH, EnumHumidity.ARID, true, true), - TE_ELECTRUM("TEElectrum", "electrum", BeeGenomeManager.getTemplateTEElectrum(), BeeClassification.THERMAL, + TE_ELECTRUM("TEElectrum", "electrum", BeeClassification.THERMAL, 0xEAF79E, EnumTemperature.HOT,EnumHumidity.ARID, false, false), - TE_PLATINUM("TEPlatinum", "platina", BeeGenomeManager.getTemplateTEPlatinum(), BeeClassification.THERMAL, + TE_PLATINUM("TEPlatinum", "platina", BeeClassification.THERMAL, 0x9EE7F7, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, false), - TE_NICKEL("TENickel", "nickel", BeeGenomeManager.getTemplateTENickel(),BeeClassification.THERMAL, + TE_NICKEL("TENickel", "nickel",BeeClassification.THERMAL, 0xB4C989, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, false), - TE_INVAR("TEInvar", "invar", BeeGenomeManager.getTemplateTEInvar(), BeeClassification.THERMAL, + TE_INVAR("TEInvar", "invar", BeeClassification.THERMAL, 0xCDE3A1, EnumTemperature.HOT, EnumHumidity.ARID, false, false), - TE_BRONZE("TEBronze", "pyropus",BeeGenomeManager.getTemplateTEBronze(), BeeClassification.THERMAL, + TE_BRONZE("TEBronze", "pyropus", BeeClassification.THERMAL, 0xB56D07, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, false), - TE_COAL("TECoal", "carbonis", BeeGenomeManager.getTemplateTECoal(), BeeClassification.THERMAL, + TE_COAL("TECoal", "carbonis", BeeClassification.THERMAL, 0x2E2D2D, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, false), - TE_DESTABILIZED("TEDestabilized", "electric", BeeGenomeManager.getTemplateTEDestabilized(), BeeClassification.THERMAL, + TE_DESTABILIZED("TEDestabilized", "electric", BeeClassification.THERMAL, 0x5E0203, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, false), - TE_LUX("TELux", "lux", BeeGenomeManager.getTemplateTELux(), BeeClassification.THERMAL, + TE_LUX("TELux", "lux", BeeClassification.THERMAL, 0xF1FA89, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, false), - TE_WINSOME("TEWinsome", "cuniculus", BeeGenomeManager.getTemplateTEWinsome(), BeeClassification.ADORABLE, + TE_WINSOME("TEWinsome", "cuniculus", BeeClassification.ADORABLE, 0x096B67, EnumTemperature.COLD, EnumHumidity.NORMAL, false, false), - TE_ENDEARING("TEEndearing", "cognito", BeeGenomeManager.getTemplateTEEndearing(), BeeClassification.ADORABLE, + TE_ENDEARING("TEEndearing", "cognito", BeeClassification.ADORABLE, 0x069E97, EnumTemperature.COLD, EnumHumidity.NORMAL, true, true), // --------------------Redstone Arsenal Bees----------------------------- - RSA_FLUXED("RSAFluxed", "Thermametallic electroflux", BeeGenomeManager.getTemplateRSAFluxed(), BeeClassification.THERMAL, + RSA_FLUXED("RSAFluxed", "Thermametallic electroflux", BeeClassification.THERMAL, 0x9E060D, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, false), // ----------------------Bloodmagic Bees--------------------------------- - BM_BLOODY("BMBloody", "sanguis", BeeGenomeManager.getTemplateBMBloody(), BeeClassification.BLOODY, + BM_BLOODY("BMBloody", "sanguis", BeeClassification.BLOODY, 0xb7102f, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, false), - BM_BOUND("BMBound", "obligatus", BeeGenomeManager.getTemplateBMBound(), BeeClassification.BLOODY, + BM_BOUND("BMBound", "obligatus", BeeClassification.BLOODY, 0xb7102f, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, false), // ----------------------Botania Bees--------------------------------------- - BOT_ROOTED("BotRooted", "truncus", BeeGenomeManager.getTemplateBotRooted(), BeeClassification.BOTANICAL, + BOT_ROOTED("BotRooted", "truncus", BeeClassification.BOTANICAL, 0x00A800, BodyColours.BOTANIA, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, true), - BOT_BOTANIC("BotBotanic", "botanica", BeeGenomeManager.getTemplateBotBotanic(), BeeClassification.BOTANICAL, + BOT_BOTANIC("BotBotanic", "botanica", BeeClassification.BOTANICAL, 0x94C661, BodyColours.BOTANIA, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, true), - BOT_BLOSSOM("BotBlossom", "viridis", BeeGenomeManager.getTemplateBotBlossom(), BeeClassification.BOTANICAL, + BOT_BLOSSOM("BotBlossom", "viridis", BeeClassification.BOTANICAL, 0xA4C193, BodyColours.BOTANIA, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, false), - BOT_FLORAL("BotFloral", "florens", BeeGenomeManager.getTemplateBotFloral(), BeeClassification.BOTANICAL, + BOT_FLORAL("BotFloral", "florens", BeeClassification.BOTANICAL, 0x29D81A, BodyColours.BOTANIA, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, true), - BOT_VAZBEE("BotVazbee", "vazbii", BeeGenomeManager.getTemplateBotVazbee(), BeeClassification.BOTANICAL, + BOT_VAZBEE("BotVazbee", "vazbii", BeeClassification.BOTANICAL, 0xff6b9c, BodyColours.BOTANIA, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, false), - BOT_SOMNOLENT("BotSomnolent", "soporatus", BeeGenomeManager.getTemplateBotSomnolent(), BeeClassification.BOTANICAL, - 0x2978C6, BodyColours.BOTANIA, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, true), - BOT_DREAMING("BotDreaming", "somnior", BeeGenomeManager.getTemplateBotDreaming(), BeeClassification.BOTANICAL, - 0x123456, BodyColours.BOTANIA, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, true), + BOT_SOMNOLENT("BotSomnolent", "soporatus", BeeClassification.BOTANICAL, + 0x2978C6, BodyColours.BOTANIA, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, false, true, true, true), + BOT_DREAMING("BotDreaming", "somnior", BeeClassification.BOTANICAL, + 0x123456, BodyColours.BOTANIA, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, false, true, true, true), - BOT_ALFHEIM("BotAlfheim", "alfheimis", BeeGenomeManager.getTemplateBotAelfheim(), BeeClassification.BOTANICAL, + BOT_ALFHEIM("BotAlfheim", "alfheimis", BeeClassification.BOTANICAL, -1, -1, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, false), ; // For body colours used by more than one bee. private class BodyColours { + final static int DEFAULT = 0xFF7C26; static final int ARCANE = 0xFF9D60; static final int ABOMINABLE = 0x960F00; static final int EXTRINSIC = 0xF696FF; @@ -324,6 +325,118 @@ public enum BeeSpecies implements IAlleleBeeSpecies, IIconProvider } public static void setupBeeSpecies() { + MYSTICAL.registerGenomeTemplate(BeeGenomeManager.getTemplateMystical()); + SORCEROUS.registerGenomeTemplate(BeeGenomeManager.getTemplateSorcerous()); + UNUSUAL.registerGenomeTemplate(BeeGenomeManager.getTemplateUnusual()); + ATTUNED.registerGenomeTemplate(BeeGenomeManager.getTemplateAttuned()); + ELDRITCH.registerGenomeTemplate(BeeGenomeManager.getTemplateEldritch()); + ESOTERIC.registerGenomeTemplate(BeeGenomeManager.getTemplateEsoteric()); + MYSTERIOUS.registerGenomeTemplate(BeeGenomeManager.getTemplateMysterious()); + ARCANE.registerGenomeTemplate(BeeGenomeManager.getTemplateArcane()); + CHARMED.registerGenomeTemplate(BeeGenomeManager.getTemplateCharmed()); + ENCHANTED.registerGenomeTemplate(BeeGenomeManager.getTemplateEnchanted()); + SUPERNATURAL.registerGenomeTemplate(BeeGenomeManager.getTemplateSupernatural()); + ETHEREAL.registerGenomeTemplate(BeeGenomeManager.getTemplateEthereal()); + WATERY.registerGenomeTemplate(BeeGenomeManager.getTemplateWatery()); + EARTHY.registerGenomeTemplate(BeeGenomeManager.getTemplateEarthy()); + FIREY.registerGenomeTemplate(BeeGenomeManager.getTemplateFirey()); + WINDY.registerGenomeTemplate(BeeGenomeManager.getTemplateWindy()); + PUPIL.registerGenomeTemplate(BeeGenomeManager.getTemplatePupil()); + SCHOLARLY.registerGenomeTemplate(BeeGenomeManager.getTemplateScholarly()); + SAVANT.registerGenomeTemplate(BeeGenomeManager.getTemplateSavant()); + AWARE.registerGenomeTemplate(BeeGenomeManager.getTemplateAware()); + SPIRIT.registerGenomeTemplate(BeeGenomeManager.getTemplateSpirit()); + SOUL.registerGenomeTemplate(BeeGenomeManager.getTemplateSoul()); + SKULKING.registerGenomeTemplate(BeeGenomeManager.getTemplateSkulking()); + GHASTLY.registerGenomeTemplate(BeeGenomeManager.getTemplateGhastly()); + SPIDERY.registerGenomeTemplate(BeeGenomeManager.getTemplateSpidery()); + SMOULDERING.registerGenomeTemplate(BeeGenomeManager.getTemplateSmouldering()); + BIGBAD.registerGenomeTemplate(BeeGenomeManager.getTemplateBigbad()); + TIMELY.registerGenomeTemplate(BeeGenomeManager.getTemplateTimely()); + LORDLY.registerGenomeTemplate(BeeGenomeManager.getTemplateLordly()); + DOCTORAL.registerGenomeTemplate(BeeGenomeManager.getTemplateDoctoral()); + INFERNAL.registerGenomeTemplate(BeeGenomeManager.getTemplateInfernal()); + HATEFUL.registerGenomeTemplate(BeeGenomeManager.getTemplateHateful()); + SPITEFUL.registerGenomeTemplate(BeeGenomeManager.getTemplateSpiteful()); + WITHERING.registerGenomeTemplate(BeeGenomeManager.getTemplateWithering()); + OBLIVION.registerGenomeTemplate(BeeGenomeManager.getTemplateOblivion()); + NAMELESS.registerGenomeTemplate(BeeGenomeManager.getTemplateNameless()); + ABANDONED.registerGenomeTemplate(BeeGenomeManager.getTemplateAbandoned()); + FORLORN.registerGenomeTemplate(BeeGenomeManager.getTemplateForlorn()); + DRACONIC.registerGenomeTemplate(BeeGenomeManager.getTemplateDraconic()); + IRON.registerGenomeTemplate(BeeGenomeManager.getTemplateIron()); + GOLD.registerGenomeTemplate(BeeGenomeManager.getTemplateGold()); + COPPER.registerGenomeTemplate(BeeGenomeManager.getTemplateCopper()); + TIN.registerGenomeTemplate(BeeGenomeManager.getTemplateTin()); + SILVER.registerGenomeTemplate(BeeGenomeManager.getTemplateSilver()); + LEAD.registerGenomeTemplate(BeeGenomeManager.getTemplateLead()); + ALUMINUM.registerGenomeTemplate(BeeGenomeManager.getTemplateAluminum()); + ARDITE.registerGenomeTemplate(BeeGenomeManager.getTemplateArdite()); + COBALT.registerGenomeTemplate(BeeGenomeManager.getTemplateCobalt()); + MANYULLYN.registerGenomeTemplate(BeeGenomeManager.getTemplateManyullyn()); + DIAMOND.registerGenomeTemplate(BeeGenomeManager.getTemplateDiamond()); + EMERALD.registerGenomeTemplate(BeeGenomeManager.getTemplateEmerald()); + APATITE.registerGenomeTemplate(BeeGenomeManager.getTemplateApatite()); + MUTABLE.registerGenomeTemplate(BeeGenomeManager.getTemplateMutable()); + TRANSMUTING.registerGenomeTemplate(BeeGenomeManager.getTemplateTransmuting()); + CRUMBLING.registerGenomeTemplate(BeeGenomeManager.getTemplateCrumbling()); + INVISIBLE.registerGenomeTemplate(BeeGenomeManager.getTemplateInvisible()); + TC_AIR.registerGenomeTemplate(BeeGenomeManager.getTemplateTCAir()); + TC_FIRE.registerGenomeTemplate(BeeGenomeManager.getTemplateTCFire()); + TC_WATER.registerGenomeTemplate(BeeGenomeManager.getTemplateTCWater()); + TC_EARTH.registerGenomeTemplate(BeeGenomeManager.getTemplateTCEarth()); + TC_ORDER.registerGenomeTemplate(BeeGenomeManager.getTemplateTCOrder()); + TC_CHAOS.registerGenomeTemplate(BeeGenomeManager.getTemplateTCChaos()); + TC_VIS.registerGenomeTemplate(BeeGenomeManager.getTemplateTCVis()); + TC_TAINT.registerGenomeTemplate(BeeGenomeManager.getTemplateTCTaint()); + TC_ATTRACT.registerGenomeTemplate(BeeGenomeManager.getTemplateTCAttract()); + TC_REJUVENATING.registerGenomeTemplate(BeeGenomeManager.getTemplateTCRejuvinating()); + TC_PURE.registerGenomeTemplate(BeeGenomeManager.getTemplateTCPure()); + TC_BRAINY.registerGenomeTemplate(BeeGenomeManager.getTemplateTCBrainy()); + TC_WISPY.registerGenomeTemplate(BeeGenomeManager.getTemplateTCWispy()); + TC_BATTY.registerGenomeTemplate(BeeGenomeManager.getTemplateTCBatty()); + TC_CHICKEN.registerGenomeTemplate(BeeGenomeManager.getTemplateTCChicken()); + TC_BEEF.registerGenomeTemplate(BeeGenomeManager.getTemplateTCBeef()); + TC_PORK.registerGenomeTemplate(BeeGenomeManager.getTemplateTCPork()); + EE_MINIUM.registerGenomeTemplate(BeeGenomeManager.getTemplateEEMinium()); + AM_ESSENCE.registerGenomeTemplate(BeeGenomeManager.getTemplateAMEssence()); + AM_QUINTESSENCE.registerGenomeTemplate(BeeGenomeManager.getTemplateAMQuintessence()); + AM_EARTH.registerGenomeTemplate(BeeGenomeManager.getTemplateAMEarth()); + AM_AIR.registerGenomeTemplate(BeeGenomeManager.getTemplateAMAir()); + AM_FIRE.registerGenomeTemplate(BeeGenomeManager.getTemplateAMFire()); + AM_WATER.registerGenomeTemplate(BeeGenomeManager.getTemplateAMWater()); + AM_LIGHTNING.registerGenomeTemplate(BeeGenomeManager.getTemplateAMLightning()); + AM_PLANT.registerGenomeTemplate(BeeGenomeManager.getTemplateAMPlant()); + AM_ICE.registerGenomeTemplate(BeeGenomeManager.getTemplateAMIce()); + AM_ARCANE.registerGenomeTemplate(BeeGenomeManager.getTemplateAMArcane()); + AM_VORTEX.registerGenomeTemplate(BeeGenomeManager.getTemplateAMVortex()); + AM_WIGHT.registerGenomeTemplate(BeeGenomeManager.getTemplateAMWight()); + TE_BLIZZY.registerGenomeTemplate(BeeGenomeManager.getTemplateTEBlizzy()); + TE_GELID.registerGenomeTemplate(BeeGenomeManager.getTemplateTEGelid()); + TE_DANTE.registerGenomeTemplate(BeeGenomeManager.getTemplateTEDante()); + TE_PYRO.registerGenomeTemplate(BeeGenomeManager.getTemplateTEPyro()); + TE_ELECTRUM.registerGenomeTemplate(BeeGenomeManager.getTemplateTEElectrum()); + TE_PLATINUM.registerGenomeTemplate(BeeGenomeManager.getTemplateTEPlatinum()); + TE_NICKEL.registerGenomeTemplate(BeeGenomeManager.getTemplateTENickel()); + TE_INVAR.registerGenomeTemplate(BeeGenomeManager.getTemplateTEInvar()); + TE_BRONZE.registerGenomeTemplate(BeeGenomeManager.getTemplateTEBronze()); + TE_COAL.registerGenomeTemplate(BeeGenomeManager.getTemplateTECoal()); + TE_DESTABILIZED.registerGenomeTemplate(BeeGenomeManager.getTemplateTEDestabilized()); + TE_LUX.registerGenomeTemplate(BeeGenomeManager.getTemplateTELux()); + TE_WINSOME.registerGenomeTemplate(BeeGenomeManager.getTemplateTEWinsome()); + TE_ENDEARING.registerGenomeTemplate(BeeGenomeManager.getTemplateTEEndearing()); + RSA_FLUXED.registerGenomeTemplate(BeeGenomeManager.getTemplateRSAFluxed()); + BM_BLOODY.registerGenomeTemplate(BeeGenomeManager.getTemplateBMBloody()); + BM_BOUND.registerGenomeTemplate(BeeGenomeManager.getTemplateBMBound()); + BOT_ROOTED.registerGenomeTemplate(BeeGenomeManager.getTemplateBotRooted()); + BOT_BOTANIC.registerGenomeTemplate(BeeGenomeManager.getTemplateBotBotanic()); + BOT_BLOSSOM.registerGenomeTemplate(BeeGenomeManager.getTemplateBotBlossom()); + BOT_FLORAL.registerGenomeTemplate(BeeGenomeManager.getTemplateBotFloral()); + BOT_VAZBEE.registerGenomeTemplate(BeeGenomeManager.getTemplateBotVazbee()); + BOT_SOMNOLENT.registerGenomeTemplate(BeeGenomeManager.getTemplateBotSomnolent()); + BOT_DREAMING.registerGenomeTemplate(BeeGenomeManager.getTemplateBotDreaming()); + BOT_ALFHEIM.registerGenomeTemplate(BeeGenomeManager.getTemplateBotAelfheim()); + BeeProductHelper.initBaseProducts(); BeeProductHelper.initOreDictSProducts(); @@ -428,38 +541,35 @@ public enum BeeSpecies implements IAlleleBeeSpecies, IIconProvider @SideOnly(Side.CLIENT) private IIcon[][] icons; - private final static int defaultBodyColour = 0xFF7C26; - - private BeeSpecies(String speciesName, String genusName, IAllele[] genome, IClassification classification, int firstColour, EnumTemperature preferredTemp, - EnumHumidity preferredHumidity, boolean hasGlowEffect, boolean isSpeciesDominant) { - this(speciesName, genusName, genome, classification, firstColour, defaultBodyColour, preferredTemp, preferredHumidity, hasGlowEffect, true, true, - isSpeciesDominant); - } - - private BeeSpecies(String speciesName, String genusName, IAllele[] genome, IClassification classification, int firstColour, int secondColour, + private BeeSpecies(String speciesName, String genusName, IClassification classification, int firstColour, EnumTemperature preferredTemp, EnumHumidity preferredHumidity, boolean hasGlowEffect, boolean isSpeciesDominant) { - this(speciesName, genusName, genome, classification, firstColour, secondColour, preferredTemp, preferredHumidity, hasGlowEffect, true, true, - isSpeciesDominant); + this(speciesName, genusName, classification, firstColour, BodyColours.DEFAULT, + preferredTemp, preferredHumidity, hasGlowEffect, true, true, isSpeciesDominant, false); } - private BeeSpecies(String speciesName, String genusName, IAllele[] genome, IClassification classification, int firstColour, int secondColour, + private BeeSpecies(String speciesName, String genusName, IClassification classification, int firstColour, int secondColour, + EnumTemperature preferredTemp, EnumHumidity preferredHumidity, boolean hasGlowEffect, boolean isSpeciesDominant) { + this(speciesName, genusName, classification, firstColour, secondColour, + preferredTemp, preferredHumidity, hasGlowEffect, true, true, isSpeciesDominant, false); + } + + private BeeSpecies(String speciesName, String genusName, IClassification classification, int firstColour, int secondColour, EnumTemperature preferredTemp, EnumHumidity preferredHumidity, boolean isSecret, boolean hasGlowEffect, boolean isSpeciesDominant) { - this(speciesName, genusName, genome, classification, firstColour, secondColour, preferredTemp, preferredHumidity, hasGlowEffect, isSecret, true, - isSpeciesDominant); + this(speciesName, genusName, classification, firstColour, secondColour, + preferredTemp, preferredHumidity, hasGlowEffect, isSecret, true, isSpeciesDominant, false); } - private BeeSpecies(String speciesName, String genusName, IAllele[] genome, IClassification classification, int firstColour, EnumTemperature preferredTemp, - EnumHumidity preferredHumidity, boolean isSecret, boolean hasGlowEffect, boolean isSpeciesDominant) { - this(speciesName, genusName, genome, classification, firstColour, defaultBodyColour, preferredTemp, preferredHumidity, hasGlowEffect, isSecret, true, - isSpeciesDominant); + private BeeSpecies(String speciesName, String genusName, IClassification classification, int firstColour, + EnumTemperature preferredTemp, EnumHumidity preferredHumidity, boolean isSecret, boolean hasGlowEffect, boolean isSpeciesDominant) { + this(speciesName, genusName, classification, firstColour, BodyColours.DEFAULT, + preferredTemp, preferredHumidity, hasGlowEffect, isSecret, true, isSpeciesDominant, false); } - private BeeSpecies(String speciesName, String genusName, IAllele[] genome, IClassification classification, int firstColour, int secondColour, + private BeeSpecies(String speciesName, String genusName, IClassification classification, int firstColour, int secondColour, EnumTemperature preferredTemp, EnumHumidity preferredHumidity, boolean hasGlowEffect, boolean isSpeciesSecret, boolean isSpeciesCounted, - boolean isSpeciesDominant) { + boolean isSpeciesDominant, boolean isSpeciesNocturnal) { this.uid = "magicbees.species" + speciesName; this.dominant = isSpeciesDominant; - genomeTemplate = genome; AlleleManager.alleleRegistry.registerAllele(this); binomial = genusName; authority = "MysteriousAges"; @@ -474,9 +584,8 @@ public enum BeeSpecies implements IAlleleBeeSpecies, IIconProvider specialties = new HashMap(); this.branch = classification; this.branch.addMemberSpecies(this); - this.isNocturnal = false; + this.isNocturnal = isSpeciesNocturnal; this.isActive = true; - BeeManager.beeRoot.registerTemplate(this.getGenome()); } public IAllele[] getGenome() { @@ -596,6 +705,11 @@ public enum BeeSpecies implements IAlleleBeeSpecies, IIconProvider public boolean isJubilant(IBeeGenome genome, IBeeHousing housing) { return true; } + + public void registerGenomeTemplate(IAllele[] genome) { + genomeTemplate = genome; + BeeManager.beeRoot.registerTemplate(getUID(), genome); + } @Override public int getIconColour(int renderPass) {