diff --git a/magicbees_res/changelog.txt b/magicbees_res/changelog.txt index f1f87ed..5d33c30 100644 --- a/magicbees_res/changelog.txt +++ b/magicbees_res/changelog.txt @@ -1,3 +1,5 @@ +2.0.0 +Enabling Retrogen of hives in case you missed them initially. Tearing out all old mutations, rewriting from the ground up. Maybe these will be less frustrating. ;) New bee species New hives @@ -5,6 +7,8 @@ Added zh_CN localization (by crafteverywhere) Added de_DE localization (by philip98) Added ru_RU localization (by CrazyTechno) +=========== Old Thaumic Bees Changelog ================ + 1.4.7b Fix for creative mode crash when a certain config option is enabled. diff --git a/magicbees_res/mods/magicbees/lang/en_US.xml b/magicbees_res/mods/magicbees/lang/en_US.xml index cf65dd6..18fb3e5 100644 --- a/magicbees_res/mods/magicbees/lang/en_US.xml +++ b/magicbees_res/mods/magicbees/lang/en_US.xml @@ -29,21 +29,23 @@ Occult Comb Otherworldy Comb Papery Comb - Stark Comb - Airy Comb + Soul Comb + Furtive Comb + Memory Comb + Temporal Comb + Harmonizing Comb + Windy Comb Firey Comb Watery Comb Earthy Comb Infused Comb - Memory Comb - Furtive Comb - Soul Comb Essence Comb Potent Comb Magic Wax Soulful Wax + Amnesic Wax Enchanting Drop @@ -71,13 +73,15 @@ Flowing Propolis Stony Propolis Infused Propolis + Unstable Propolis Lore Fragment Aromatic Lump Concentrated Compound + Wither Skeleton Bone Chip + Wither Skeleton Skull Fragment Bees and Magic - Stark Infusion Crystalized %s Aspect @@ -126,6 +130,17 @@ Thaumaturge's Backpack Thaumic Bees + + + Requires a foundation of %s + Occurs between the %s and %s + During the %s + Only occurs when a node is near + Only occurs within influence of a %s node + Occurs within a %s + Pure + Dark + Chaotic Mystical @@ -136,8 +151,6 @@ "A curious specimen for my collection!"|Junior Apiarist Attuned They fly as though guided by unseen threads through the air.|Apinomicon - Infernal - Spawned deep within the hellish realm, they have acquired unknown abilities|Apinomicon Oblivion It is unclear whether these bees are native to this world, or some other.|Apinomicon @@ -181,6 +194,8 @@ "*sigh*... Really, Myst?"|Taveria, irritated Apiarist Spidery Spiderbee; n. Does whatever a spider-bee does.|Unknown + Smouldering + The Skulking bees have become alight with the fire of the ever-burning Blazes.|Apinomicon Timely "An apiarist is never late. He arrives precisely when he means to!"|Sengir, Mad Apiarist @@ -188,6 +203,15 @@ They live in peace, within the sight of the Eye of Harmony|Tattered Remains of ancient Apinomicon Doctoral "Would you like a Jelly Baby?"|Passing stranger with a great scarf and a blue box + + Infernal + Spawned deep within the hellish realm, none have survived long enough to determine their abilities.|Apinomicon + Hateful + |Apinomicon + Spiteful + They guard their territory fiercely, with the zeal of fiends, and welts of fire.|Apinomicon + Withering + Their mere passing causes life to fail, slowly drawing all energy from their territory.|Apinomicon Ferrous Having absorbed some of the base metal, these bees can concentrate the essence of iron from the region.|Apinomicon @@ -290,7 +314,8 @@ Mining Swiftness Time Warp - Aura Attract + Withering + Aura Attract Purify Aura Aura Flux Aura Charge @@ -299,6 +324,7 @@ Wispy Ghastly Spidery + Ablaze Vortex Spiritual Books @@ -323,6 +349,8 @@ Though clever use of time travel, these bees accomplish twice as much in one day.|Apinomicon Soulful It would be eerie to think that they collected the souls of the deceased.|Apinomicon + Abominable + Spawned in the firey depths of the Nether, there is nothing pleasant about these creatures.|Apinomicon Metallic They collect fragments of metal and combine them into larger portions.|Apinomicon Gem diff --git a/magicbees_res/mods/magicbees/research/research.xml b/magicbees_res/mods/magicbees/research/research.xml index 6f58a9c..d31a4ad 100644 --- a/magicbees_res/mods/magicbees/research/research.xml +++ b/magicbees_res/mods/magicbees/research/research.xml @@ -1,5 +1,5 @@ - + Bees And Magic Across Fields and Forest There is something about your world that makes you think trees and bees require more research. @@ -8,34 +8,6 @@ The potential exists for further study. All that is required is some creative thinking to apply new uses to old, familiar items. - -Stark Bees -Crossing two boundaries -The cursory investigation you have completed in the direction of Beekeeping has yielded fruit. Perhaps under the right conditions, you can find a bee mutation that will enable you to infuse them with magic. -Even bees are susceptible to the influence of magic, some more than others. - -Perhaps it would be possible to breed a bee from two species which are affected by Arcane or Supernatural powers. If such a species truly does exist, it could be possible that they could reveal additional secrets. Further research may be needed, in addition to a specimen. - - - -Thaumic Bees -Magical Apiculture -Further research into this so-called Stark Bee has provided you with insight into how a bee may become infused with elemental energy, or the raw essence of magic itself. -You have refined your previous theory regarding bees taking on aspects of elemental magic, and have come up with a way to attach elements to bees. It remains to be seen if this will be a benefit, or something you may regret in the future. - -By placing a legendary Stark Bee into the Infusion Altar along with a charged shard of some kind, you will be able to imprint an aspect onto the insect. Unfortunately, it only seems to work with princesses or drones, as the Queens are too sensitive to undergo the infusion process. -BEEINFUSION1 -BEEINFUSION2 -BEEINFUSION3 -BEEINFUSION4 -BEEINFUSION5 -BEEINFUSION6 -BEEINFUSION7 -BEEINFUSION8 -BEEINFUSION9 -BEEINFUSION0 - - Concentrated Compound An Apatite for more... diff --git a/magicbees_res/mods/magicbees/textures/blocks/beehive.4.side.png b/magicbees_res/mods/magicbees/textures/blocks/beehive.4.side.png index 83730a7..f3be5e3 100644 Binary files a/magicbees_res/mods/magicbees/textures/blocks/beehive.4.side.png and b/magicbees_res/mods/magicbees/textures/blocks/beehive.4.side.png differ diff --git a/magicbees_res/mods/magicbees/textures/blocks/beehive.4.top.png b/magicbees_res/mods/magicbees/textures/blocks/beehive.4.top.png index c51fa08..39f5308 100644 Binary files a/magicbees_res/mods/magicbees/textures/blocks/beehive.4.top.png and b/magicbees_res/mods/magicbees/textures/blocks/beehive.4.top.png differ diff --git a/magicbees_res/mods/magicbees/textures/blocks/beehive.5.side.png b/magicbees_res/mods/magicbees/textures/blocks/beehive.5.side.png index 8197a61..86f1125 100644 Binary files a/magicbees_res/mods/magicbees/textures/blocks/beehive.5.side.png and b/magicbees_res/mods/magicbees/textures/blocks/beehive.5.side.png differ diff --git a/magicbees_res/mods/magicbees/textures/blocks/beehive.5.top.png b/magicbees_res/mods/magicbees/textures/blocks/beehive.5.top.png index 89e6041..832d7f3 100644 Binary files a/magicbees_res/mods/magicbees/textures/blocks/beehive.5.top.png and b/magicbees_res/mods/magicbees/textures/blocks/beehive.5.top.png differ diff --git a/magicbees_res/mods/magicbees/textures/items/skullChip.png b/magicbees_res/mods/magicbees/textures/items/skullChip.png new file mode 100644 index 0000000..8d405cf Binary files /dev/null and b/magicbees_res/mods/magicbees/textures/items/skullChip.png differ diff --git a/magicbees_res/mods/magicbees/textures/items/skullFragment.png b/magicbees_res/mods/magicbees/textures/items/skullFragment.png new file mode 100644 index 0000000..a84e1c7 Binary files /dev/null and b/magicbees_res/mods/magicbees/textures/items/skullFragment.png differ diff --git a/magicbees_src/magicbees/bees/Allele.java b/magicbees_src/magicbees/bees/Allele.java index b5c0efa..e5655da 100644 --- a/magicbees_src/magicbees/bees/Allele.java +++ b/magicbees_src/magicbees/bees/Allele.java @@ -24,15 +24,17 @@ public class Allele implements IAllele public static IAlleleFlowers flowerAuraNode; public static IAlleleEffect effectCleansing; - public static IAlleleEffect digSpeed; - public static IAlleleEffect moveSpeed; - public static IAlleleEffect slowSpeed; + public static IAlleleEffect effectDigSpeed; + public static IAlleleEffect effectMoveSpeed; + public static IAlleleEffect effectSlowSpeed; + public static IAlleleEffect effectWithering; 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 spawnManaDrainer; public static IAlleleEffect spawnWispOrHecate; @@ -93,15 +95,19 @@ public class Allele implements IAllele Allele.effectNodeCharge = new AlleleEffectAuraNodeCharge("NodeCharge", true, 1200); Allele.effectCleansing = new AlleleEffectCure("Curative", false); - Allele.digSpeed = new AlleleEffectPotion("DigSpeed", Potion.digSpeed, 15, false); - Allele.moveSpeed = new AlleleEffectPotion("MoveSpeed", Potion.moveSpeed, 10, false); - Allele.slowSpeed = new AlleleEffectPotion("SlowSpeed", Potion.moveSlowdown, 3, false); + Allele.effectDigSpeed = new AlleleEffectPotion("DigSpeed", Potion.digSpeed, 15, false); + Allele.effectMoveSpeed = new AlleleEffectPotion("MoveSpeed", Potion.moveSpeed, 10, false); + Allele.effectSlowSpeed = new AlleleEffectPotion("SlowSpeed", Potion.moveSlowdown, 3, false); + Allele.effectWithering = new AlleleEffectPotion("Withering", Potion.wither, 10, false); 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).setMaxMobsInSpawnZone(4); + + Allele.spawnBlaze = new AlleleEffectSpawnMob("Ablaze", false, "Blaze", "mob.blaze.breathe") + .setThrottle(800).setChanceToSpawn(60).setMaxMobsInSpawnZone(2); } public static void registerDeprecatedAlleleReplacements() @@ -116,9 +122,9 @@ public class Allele implements IAllele registry.registerDeprecatedAlleleReplacement("thaumicbees.effectNodeFlux", effectNodeFlux); registry.registerDeprecatedAlleleReplacement("thaumicbees.effectNodeCharge", effectNodeCharge); registry.registerDeprecatedAlleleReplacement("thaumicbees.effectCurative", effectCleansing); - registry.registerDeprecatedAlleleReplacement("thaumicbees.effecteffectDigSpeed", digSpeed); - registry.registerDeprecatedAlleleReplacement("thaumicbees.effecteffectMoveSpeed", moveSpeed); - registry.registerDeprecatedAlleleReplacement("thaumicbees.effecteffectSlowSpeed", slowSpeed); + registry.registerDeprecatedAlleleReplacement("thaumicbees.effecteffectDigSpeed", effectDigSpeed); + registry.registerDeprecatedAlleleReplacement("thaumicbees.effecteffectMoveSpeed", effectMoveSpeed); + registry.registerDeprecatedAlleleReplacement("thaumicbees.effecteffectSlowSpeed", effectSlowSpeed); registry.registerDeprecatedAlleleReplacement("thaumicbees.Ghast", spawnGhast); registry.registerDeprecatedAlleleReplacement("thaumicbees.Spider", spawnSpider); registry.registerDeprecatedAlleleReplacement("thaumicbees.speciesEsoteric", BeeSpecies.ESOTERIC); diff --git a/magicbees_src/magicbees/bees/BeeClassification.java b/magicbees_src/magicbees/bees/BeeClassification.java index a477650..9aa8736 100644 --- a/magicbees_src/magicbees/bees/BeeClassification.java +++ b/magicbees_src/magicbees/bees/BeeClassification.java @@ -14,23 +14,25 @@ import forestry.api.genetics.IClassification; public enum BeeClassification implements IClassification { VEILED("Veiled", "velata"), - ARCANE("Arcane", "Arcanus"), - SUPERNATURAL("Supernatural", "Occultus"), - SCHOLARLY("Scholarly", "Docto"), - SKULKING("Skulking", "Malevolens"), - MAGICAL("Magic", "Magica"), - TIME("Time", "Tempestivus"), - SOUL("Soul", "Animus"), + ARCANE("Arcane", "arcanus"), + SUPERNATURAL("Supernatural", "occultus"), + SCHOLARLY("Scholarly", "docto"), + SKULKING("Skulking", "malevolens"), + MAGICAL("Magic", "magica"), + TIME("Time", "tempestivus"), + SOUL("Soul", "animus"), - METALLIC("Metallic", "Metallicis"), - GEM("Gem", "Lapidi"), + ABOMINABLE("Abominable", "detestabilis"), - THAUMIC("Thaumic", "Thaumis"), - FLESHY("Fleshy", "Carnosa"), + METALLIC("Metallic", "metallicis"), + GEM("Gem", "lapidi"), - ALCHEMICAL("Alchemical", "Alchimia"), + THAUMIC("Thaumic", "thaumis"), + FLESHY("Fleshy", "carnosa"), - ESSENTIAL("Essential", "Essentia"), + ALCHEMICAL("Alchemical", "alchimia"), + + ESSENTIAL("Essential", "essentia"), ; private String uID; diff --git a/magicbees_src/magicbees/bees/BeeGenomeManager.java b/magicbees_src/magicbees/bees/BeeGenomeManager.java index ccd6b53..ecc10b2 100644 --- a/magicbees_src/magicbees/bees/BeeGenomeManager.java +++ b/magicbees_src/magicbees/bees/BeeGenomeManager.java @@ -87,19 +87,6 @@ public class BeeGenomeManager return genome; } - public static IAllele[] getTemplateInfernal() - { - IAllele[] genome = getTemplateModBase(); - - genome[EnumBeeChromosome.SPECIES.ordinal()] = BeeSpecies.INFERNAL; - genome[EnumBeeChromosome.TEMPERATURE_TOLERANCE.ordinal()] = Allele.getBaseAllele("toleranceDown2"); - genome[EnumBeeChromosome.FLOWER_PROVIDER.ordinal()] = Allele.getBaseAllele("flowersNether"); - genome[EnumBeeChromosome.EFFECT.ordinal()] = Allele.getBaseAllele("effectAggressive"); - genome[EnumBeeChromosome.LIFESPAN.ordinal()] = Allele.getBaseAllele("lifespanShort"); - - return genome; - } - public static IAllele[] getTemplateOblivion() { IAllele[] genome = getTemplateModBase(); @@ -352,6 +339,18 @@ public class BeeGenomeManager return genome; } + public static IAllele[] getTemplateSmouldering() + { + IAllele[] genome = getTemplateBaseMalevolent(); + + genome[EnumBeeChromosome.SPECIES.ordinal()] = BeeSpecies.SMOULDERING; + genome[EnumBeeChromosome.CAVE_DWELLING.ordinal()] = Allele.getBaseAllele("boolTrue"); + genome[EnumBeeChromosome.NOCTURNAL.ordinal()] = Allele.getBaseAllele("boolTrue"); + genome[EnumBeeChromosome.EFFECT.ordinal()] = Allele.spawnBlaze; + + return genome; + } + private static IAllele[] getTemplateBaseTemporal() { IAllele[] genome = getTemplateModBase(); @@ -369,7 +368,7 @@ public class BeeGenomeManager IAllele[] genome = getTemplateBaseTemporal(); genome[EnumBeeChromosome.SPECIES.ordinal()] = BeeSpecies.TIMELY; - genome[EnumBeeChromosome.EFFECT.ordinal()] = Allele.slowSpeed; + genome[EnumBeeChromosome.EFFECT.ordinal()] = Allele.effectSlowSpeed; genome[EnumBeeChromosome.LIFESPAN.ordinal()] = Allele.getBaseAllele("lifespanElongated"); return genome; @@ -380,7 +379,7 @@ public class BeeGenomeManager IAllele[] genome = getTemplateBaseTemporal(); genome[EnumBeeChromosome.SPECIES.ordinal()] = BeeSpecies.LORDLY; - genome[EnumBeeChromosome.EFFECT.ordinal()] = Allele.slowSpeed; + genome[EnumBeeChromosome.EFFECT.ordinal()] = Allele.effectSlowSpeed; genome[EnumBeeChromosome.LIFESPAN.ordinal()] = Allele.getBaseAllele("lifespanLong"); genome[EnumBeeChromosome.NOCTURNAL.ordinal()] = Allele.getBaseAllele("boolTrue"); genome[EnumBeeChromosome.EFFECT.ordinal()] = Allele.getBaseAllele("effectDrunkard"); @@ -393,7 +392,7 @@ public class BeeGenomeManager IAllele[] genome = getTemplateBaseTemporal(); genome[EnumBeeChromosome.SPECIES.ordinal()] = BeeSpecies.DOCTORAL; - genome[EnumBeeChromosome.EFFECT.ordinal()] = Allele.slowSpeed; + genome[EnumBeeChromosome.EFFECT.ordinal()] = Allele.effectSlowSpeed; genome[EnumBeeChromosome.TEMPERATURE_TOLERANCE.ordinal()] = Allele.getBaseAllele("toleranceBoth3"); genome[EnumBeeChromosome.TERRITORY.ordinal()] = Allele.getBaseAllele("territoryLarge"); genome[EnumBeeChromosome.NOCTURNAL.ordinal()] = Allele.getBaseAllele("boolTrue"); @@ -403,6 +402,68 @@ public class BeeGenomeManager return genome; } + private static IAllele[] getTemplateAbominableBase() + { + IAllele[] genome = getTemplateModBase(); + + genome[EnumBeeChromosome.SPECIES.ordinal()] = BeeSpecies.INFERNAL; + genome[EnumBeeChromosome.TEMPERATURE_TOLERANCE.ordinal()] = Allele.getBaseAllele("toleranceDown2"); + genome[EnumBeeChromosome.FLOWER_PROVIDER.ordinal()] = Allele.getBaseAllele("flowersNether"); + genome[EnumBeeChromosome.NOCTURNAL.ordinal()] = Allele.getBaseAllele("boolTrue"); + genome[EnumBeeChromosome.CAVE_DWELLING.ordinal()] = Allele.getBaseAllele("boolTrue"); + genome[EnumBeeChromosome.EFFECT.ordinal()] = Allele.getBaseAllele("effectAggressive"); + genome[EnumBeeChromosome.LIFESPAN.ordinal()] = Allele.getBaseAllele("lifespanShort"); + + return genome; + } + + public static IAllele[] getTemplateInfernal() + { + IAllele[] genome = getTemplateAbominableBase(); + + genome[EnumBeeChromosome.SPECIES.ordinal()] = BeeSpecies.INFERNAL; + genome[EnumBeeChromosome.SPEED.ordinal()] = Allele.getBaseAllele("speedSlow"); + + return genome; + } + + public static IAllele[] getTemplateHateful() + { + IAllele[] genome = getTemplateAbominableBase(); + + genome[EnumBeeChromosome.SPECIES.ordinal()] = BeeSpecies.HATEFUL; + genome[EnumBeeChromosome.SPEED.ordinal()] = Allele.getBaseAllele("speedSlow"); + genome[EnumBeeChromosome.LIFESPAN.ordinal()] = Allele.getBaseAllele("lifespanElongated"); + genome[EnumBeeChromosome.TERRITORY.ordinal()] = Allele.getBaseAllele("territoryLarger"); + genome[EnumBeeChromosome.EFFECT.ordinal()] = Allele.getBaseAllele("effectMisanthrope"); + + return genome; + } + + public static IAllele[] getTemplateSpiteful() + { + IAllele[] genome = getTemplateAbominableBase(); + + genome[EnumBeeChromosome.SPECIES.ordinal()] = BeeSpecies.SPITEFUL; + genome[EnumBeeChromosome.LIFESPAN.ordinal()] = Allele.getBaseAllele("lifespanLong"); + genome[EnumBeeChromosome.SPEED.ordinal()] = Allele.getBaseAllele("speedNorm"); + genome[EnumBeeChromosome.TERRITORY.ordinal()] = Allele.getBaseAllele("territoryLarger"); + genome[EnumBeeChromosome.EFFECT.ordinal()] = Allele.getBaseAllele("effectMisanthrope"); + + return genome; + } + + public static IAllele[] getTemplateWithering() + { + IAllele[] genome = getTemplateAbominableBase(); + + genome[EnumBeeChromosome.SPECIES.ordinal()] = BeeSpecies.WITHERING; + genome[EnumBeeChromosome.TERRITORY.ordinal()] = Allele.getBaseAllele("territoryLargest"); + genome[EnumBeeChromosome.EFFECT.ordinal()] = Allele.effectWithering; + + return genome; + } + private static IAllele[] getTemplateBaseMetallic() { IAllele[] genome = getTemplateModBase(); @@ -528,7 +589,7 @@ public class BeeGenomeManager genome[EnumBeeChromosome.TERRITORY.ordinal()] = Allele.getBaseAllele("territoryLargest"); genome[EnumBeeChromosome.TOLERANT_FLYER.ordinal()] = Allele.getBaseAllele("boolTrue"); genome[EnumBeeChromosome.FLOWERING.ordinal()] = Allele.getBaseAllele("floweringMaximum"); - genome[EnumBeeChromosome.EFFECT.ordinal()] = Allele.moveSpeed; + genome[EnumBeeChromosome.EFFECT.ordinal()] = Allele.effectMoveSpeed; return genome; } @@ -574,7 +635,7 @@ public class BeeGenomeManager genome[EnumBeeChromosome.TOLERANT_FLYER.ordinal()] = Allele.getBaseAllele("boolTrue"); genome[EnumBeeChromosome.CAVE_DWELLING.ordinal()] = Allele.getBaseAllele("boolTrue"); genome[EnumBeeChromosome.FLOWERING.ordinal()] = Allele.getBaseAllele("floweringFastest"); - genome[EnumBeeChromosome.EFFECT.ordinal()] = Allele.digSpeed; + genome[EnumBeeChromosome.EFFECT.ordinal()] = Allele.effectDigSpeed; return genome; } @@ -613,6 +674,30 @@ public class BeeGenomeManager return genome; } + public static IAllele[] getTemplateTCFlux() + { + IAllele[] genome = getTemplateTCBaseVis(); + + genome[EnumBeeChromosome.SPECIES.ordinal()] = BeeSpecies.TC_FLUX; + genome[EnumBeeChromosome.HUMIDITY_TOLERANCE.ordinal()] = Allele.getBaseAllele("toleranceNone"); + genome[EnumBeeChromosome.TEMPERATURE_TOLERANCE.ordinal()] = Allele.getBaseAllele("toleranceNone"); + genome[EnumBeeChromosome.FLOWER_PROVIDER.ordinal()] = Allele.flowerAuraNode; + genome[EnumBeeChromosome.EFFECT.ordinal()] = Allele.effectNodeFlux; + + return genome; + } + + public static IAllele[] getTemplateTCAttract() + { + IAllele[] genome = getTemplateTCBaseVis(); + + genome[EnumBeeChromosome.SPECIES.ordinal()] = BeeSpecies.TC_ATTRACT; + genome[EnumBeeChromosome.FLOWER_PROVIDER.ordinal()] = Allele.flowerAuraNode; + genome[EnumBeeChromosome.EFFECT.ordinal()] = Allele.effectNodeAttract; + + return genome; + } + public static IAllele[] getTemplateTCPure() { IAllele[] genome = getTemplateTCBaseVis(); @@ -627,19 +712,6 @@ public class BeeGenomeManager return genome; } - public static IAllele[] getTemplateTCFlux() - { - IAllele[] genome = getTemplateTCBaseVis(); - - genome[EnumBeeChromosome.SPECIES.ordinal()] = BeeSpecies.TC_FLUX; - genome[EnumBeeChromosome.HUMIDITY_TOLERANCE.ordinal()] = Allele.getBaseAllele("toleranceNone"); - genome[EnumBeeChromosome.TEMPERATURE_TOLERANCE.ordinal()] = Allele.getBaseAllele("toleranceNone"); - genome[EnumBeeChromosome.FLOWER_PROVIDER.ordinal()] = Allele.flowerAuraNode; - genome[EnumBeeChromosome.EFFECT.ordinal()] = Allele.effectNodeFlux; - - return genome; - } - public static IAllele[] getTemplateTCRejuvinating() { IAllele[] genome = getTemplateTCBaseVis(); @@ -687,25 +759,6 @@ public class BeeGenomeManager return genome; } - private static IAllele[] getTemplateEEBase() - { - IAllele[] genome = getTemplateModBase(); - - genome[EnumBeeChromosome.TERRITORY.ordinal()] = Allele.getBaseAllele("territoryLarge"); - genome[EnumBeeChromosome.SPEED.ordinal()] = Allele.getBaseAllele("speedSlow"); - - return genome; - } - - public static IAllele[] getTemplateEEMinium() - { - IAllele[] genome = getTemplateEEBase(); - - genome[EnumBeeChromosome.SPECIES.ordinal()] = BeeSpecies.EE_MINIUM; - - return genome; - } - public static IAllele[] getTemplateTCChicken() { IAllele[] genome = getTemplateBaseMetallic(); @@ -733,6 +786,25 @@ public class BeeGenomeManager return genome; } + private static IAllele[] getTemplateEEBase() + { + IAllele[] genome = getTemplateModBase(); + + genome[EnumBeeChromosome.TERRITORY.ordinal()] = Allele.getBaseAllele("territoryLarge"); + genome[EnumBeeChromosome.SPEED.ordinal()] = Allele.getBaseAllele("speedSlow"); + + return genome; + } + + public static IAllele[] getTemplateEEMinium() + { + IAllele[] genome = getTemplateEEBase(); + + genome[EnumBeeChromosome.SPECIES.ordinal()] = BeeSpecies.EE_MINIUM; + + return genome; + } + private static IAllele[] getTemplateAMBase() { IAllele[] genome = getTemplateModBase(); diff --git a/magicbees_src/magicbees/bees/BeeMutation.java b/magicbees_src/magicbees/bees/BeeMutation.java index 34e1108..dfb86ab 100644 --- a/magicbees_src/magicbees/bees/BeeMutation.java +++ b/magicbees_src/magicbees/bees/BeeMutation.java @@ -1,14 +1,11 @@ package magicbees.bees; -import forestry.api.apiculture.*; -import forestry.api.core.BlockInterface; -import forestry.api.core.ItemInterface; -import forestry.api.genetics.IAllele; -import forestry.api.genetics.IGenome; import java.util.ArrayList; import java.util.Collection; -import magicbees.main.MagicBees; +import thaumcraft.api.aura.EnumNodeType; + +import magicbees.main.utils.LocalizationManager; import magicbees.main.utils.MoonPhase; import magicbees.main.utils.compat.ArsMagicaHelper; import magicbees.main.utils.compat.EquivalentExchangeHelper; @@ -17,25 +14,30 @@ import magicbees.main.utils.compat.ForestryHelper; import magicbees.main.utils.compat.ThaumcraftHelper; import net.minecraft.block.Block; import net.minecraft.item.ItemStack; +import net.minecraftforge.common.BiomeDictionary; import net.minecraftforge.oredict.OreDictionary; - import cpw.mods.fml.common.FMLLog; - -import thaumcraft.api.ThaumcraftApi; -import thaumcraft.api.aura.AuraNode; -import thaumcraft.api.aura.EnumNodeType; +import forestry.api.apiculture.IAlleleBeeSpecies; +import forestry.api.apiculture.IBeeGenome; +import forestry.api.apiculture.IBeeHousing; +import forestry.api.apiculture.IBeeMutation; +import forestry.api.apiculture.IBeeRoot; +import forestry.api.core.BlockInterface; +import forestry.api.genetics.IAllele; +import forestry.api.genetics.IGenome; public class BeeMutation implements IBeeMutation { public static void setupMutations() { IAlleleBeeSpecies baseA, baseB; + BeeMutation mutation; // Forestry + These -> Common BeeSpecies[] magicMundane = new BeeSpecies[] { BeeSpecies.MYSTICAL, BeeSpecies.SORCEROUS, BeeSpecies.UNUSUAL, BeeSpecies.ATTUNED }; String[] forestryMundane = new String[] { "Forest", "Meadows", "Modest", "Wintry", "Tropical", "Marshy" }; - String[] binnieMundane = new String[] { "marble", "rocky", "water", "embittered" }; + String[] binnieMundane = new String[] { "marble", "rock", "water", "basalt" }; for (BeeSpecies species : magicMundane) { @@ -47,6 +49,7 @@ public class BeeMutation implements IBeeMutation { for (String str : binnieMundane) { + FMLLog.info("Registering %s", str); new BeeMutation(species, Allele.getExtraSpecies(str), ForestryHelper.getTemplateForestryForSpecies("Common"), 15); } } @@ -60,9 +63,11 @@ public class BeeMutation implements IBeeMutation new BeeMutation(Allele.getBaseSpecies("Cultivated"), BeeSpecies.ELDRITCH, BeeSpecies.CHARMED, 10); new BeeMutation(BeeSpecies.ELDRITCH, BeeSpecies.CHARMED, BeeSpecies.ENCHANTED, 8); - new BeeMutation(BeeSpecies.CHARMED, BeeSpecies.ENCHANTED, BeeSpecies.SUPERNATURAL, 8); + new BeeMutation(BeeSpecies.CHARMED, BeeSpecies.ENCHANTED, BeeSpecies.SUPERNATURAL, 8) + .setMoonPhaseRestricted(MoonPhase.FULL, MoonPhase.WANING_GIBBOUS); - new BeeMutation(BeeSpecies.ARCANE, BeeSpecies.SUPERNATURAL, BeeSpecies.ETHEREAL, 7); + new BeeMutation(BeeSpecies.ARCANE, BeeSpecies.SUPERNATURAL, BeeSpecies.ETHEREAL, 7) + .setMoonPhaseRestricted(MoonPhase.FULL, MoonPhase.FULL); new BeeMutation(BeeSpecies.ETHEREAL, BeeSpecies.ATTUNED, BeeSpecies.AWARE, 10); new BeeMutation(BeeSpecies.ETHEREAL, BeeSpecies.AWARE, BeeSpecies.SPIRIT, 8); @@ -76,7 +81,94 @@ public class BeeMutation implements IBeeMutation new BeeMutation(Allele.getBaseSpecies("Imperial"), BeeSpecies.ETHEREAL, BeeSpecies.TIMELY, 8); new BeeMutation(Allele.getBaseSpecies("Imperial"), BeeSpecies.TIMELY, BeeSpecies.LORDLY, 8); new BeeMutation(BeeSpecies.TIMELY, BeeSpecies.LORDLY, BeeSpecies.DOCTORAL, 7); - + + new BeeMutation(BeeSpecies.INFERNAL, BeeSpecies.ELDRITCH, BeeSpecies.HATEFUL, 9) + .setBiomeRequired(BiomeDictionary.Type.NETHER); + new BeeMutation(BeeSpecies.INFERNAL, BeeSpecies.HATEFUL, BeeSpecies.SPITEFUL, 7) + .setBiomeRequired(BiomeDictionary.Type.NETHER); + new BeeMutation(Allele.getBaseSpecies("Demonic"), BeeSpecies.SPITEFUL, BeeSpecies.WITHERING, 6) + .setBiomeRequired(BiomeDictionary.Type.NETHER); + + new BeeMutation(Allele.getBaseSpecies("Modest"), BeeSpecies.ELDRITCH, BeeSpecies.SKULKING, 12); + new BeeMutation(Allele.getBaseSpecies("Tropical"), BeeSpecies.SKULKING, BeeSpecies.SPIDERY, 10); + new BeeMutation(BeeSpecies.SKULKING, BeeSpecies.ETHEREAL, BeeSpecies.GHASTLY, 9); + new BeeMutation(BeeSpecies.SKULKING, BeeSpecies.HATEFUL, BeeSpecies.SMOULDERING, 7) + .setBiomeRequired(BiomeDictionary.Type.NETHER); + + if (BeeSpecies.COPPER.isActive()) + { + new BeeMutation(Allele.getBaseSpecies("Industrious"), Allele.getBaseSpecies("Meadows"), BeeSpecies.COPPER, 12) + .setBlockRequired("blockCopper"); + } + if (BeeSpecies.TIN.isActive()) + { + new BeeMutation(Allele.getBaseSpecies("Industrious"), Allele.getBaseSpecies("Forest"), BeeSpecies.TIN, 12) + .setBlockRequired("blockTin"); + } + new BeeMutation(Allele.getBaseSpecies("Common"), Allele.getBaseSpecies("Industrious"), BeeSpecies.IRON, 10) + .setBlockRequired(Block.blockIron); + if (BeeSpecies.LEAD.isActive()) + { + baseA = (BeeSpecies.TIN.isActive()) ? BeeSpecies.TIN : (BeeSpecies.COPPER.isActive()) ? BeeSpecies.COPPER : BeeSpecies.IRON; + mutation = new BeeMutation(baseA, Allele.getBaseSpecies("Common"), BeeSpecies.LEAD, 10); + if (OreDictionary.getOres("blockLead").size() > 0) + { + mutation.setBlockRequired("blockLead"); + } + } + if (BeeSpecies.SILVER.isActive()) + { + mutation = new BeeMutation(Allele.getBaseSpecies("Imperial"), Allele.getBaseSpecies("Modest"), BeeSpecies.SILVER, 8); + if (OreDictionary.getOres("blockSilver").size() > 0) + { + mutation.setBlockRequired("blockSilver"); + } + } + baseA = (BeeSpecies.EE_MINIUM.isActive()) ? BeeSpecies.EE_MINIUM : Allele.getBaseSpecies("Imperial"); + baseB = (BeeSpecies.LEAD.isActive()) ? BeeSpecies.LEAD : BeeSpecies.IRON; + new BeeMutation(baseA, baseB, BeeSpecies.GOLD, 8) + .setBlockRequired(Block.blockGold); + new BeeMutation(Allele.getBaseSpecies("Austere"), BeeSpecies.GOLD, BeeSpecies.DIAMOND, 7) + .setBlockRequired(Block.blockDiamond); + baseA = (BeeSpecies.SILVER.isActive()) ? BeeSpecies.SILVER : Allele.getBaseSpecies("Imperial"); + new BeeMutation(Allele.getBaseSpecies("Austere"), baseA, BeeSpecies.EMERALD, 6) + .setBlockRequired(Block.blockEmerald); + new BeeMutation(Allele.getBaseSpecies("Rural"), BeeSpecies.COPPER, BeeSpecies.APATITE, 12) + .setBlockAndMetaRequired(BlockInterface.getBlock("resources").itemID, 0); + + if (ThaumcraftHelper.isActive()) + { + new BeeMutation(BeeSpecies.ELDRITCH, BeeSpecies.ETHEREAL, BeeSpecies.TC_VIS, 10) + .setAuraNodeRequired(75); + new BeeMutation(Allele.getBaseSpecies("Demonic"), BeeSpecies.TC_VIS, BeeSpecies.TC_FLUX, 8) + .setAuraNodeTypeRequired(50, thaumcraft.api.aura.EnumNodeType.DARK); + new BeeMutation(Allele.getBaseSpecies("Demonic"), BeeSpecies.TC_VIS, BeeSpecies.TC_FLUX, 9) + .setAuraNodeTypeRequired(200, thaumcraft.api.aura.EnumNodeType.UNSTABLE); + new BeeMutation(BeeSpecies.TC_VIS, BeeSpecies.TC_FLUX, BeeSpecies.TC_ATTRACT, 6) + .setAuraNodeTypeRequired(20, EnumNodeType.UNSTABLE); + new BeeMutation(Allele.getBaseSpecies("Imperial"), BeeSpecies.TC_VIS, BeeSpecies.TC_REJUVENATING, 8) + .setAuraNodeRequired(25); + new BeeMutation(BeeSpecies.TC_VIS, BeeSpecies.TC_REJUVENATING, BeeSpecies.TC_PURE, 6) + .setAuraNodeTypeRequired(10, thaumcraft.api.aura.EnumNodeType.PURE); + + new BeeMutation(BeeSpecies.SKULKING, BeeSpecies.WINDY, BeeSpecies.TC_BATTY, 9); + new BeeMutation(BeeSpecies.SKULKING, BeeSpecies.PUPIL, BeeSpecies.TC_BRAINY, 9); + new BeeMutation(BeeSpecies.ETHEREAL, BeeSpecies.GHASTLY, BeeSpecies.TC_WISPY, 9); + } + + if (ArsMagicaHelper.isActive()) + { + new BeeMutation(BeeSpecies.ARCANE, BeeSpecies.ETHEREAL, BeeSpecies.AM_ESSENCE, 10); + new BeeMutation(BeeSpecies.ARCANE, BeeSpecies.AM_ESSENCE, BeeSpecies.AM_QUINTESSENCE, 7); + + new BeeMutation(BeeSpecies.SKULKING, BeeSpecies.AM_ESSENCE, BeeSpecies.AM_VORTEX, 8); + new BeeMutation(BeeSpecies.SKULKING, BeeSpecies.GHASTLY, BeeSpecies.AM_WIGHT, 8); + } + + if (EquivalentExchangeHelper.isActive()) + { + new BeeMutation(Allele.getBaseSpecies("Common"), BeeSpecies.ELDRITCH, BeeSpecies.EE_MINIUM, 8); + } } private IAllele parent1; @@ -89,12 +181,13 @@ public class BeeMutation implements IBeeMutation private MoonPhase moonPhaseEnd; private float moonPhaseMutationBonus; private boolean nodeRequired; - private EnumNodeType nodeType; + private thaumcraft.api.aura.EnumNodeType nodeType; private double nodeRange; private boolean requiresBlock; private int requiredBlockId; private int requiredBlockMeta; private String requiredBlockOreDictEntry; + private BiomeDictionary.Type requiredBiomeType; public BeeMutation(IAlleleBeeSpecies species0, IAlleleBeeSpecies species1, BeeSpecies resultSpecies, int percentChance) { @@ -114,6 +207,7 @@ public class BeeMutation implements IBeeMutation this.requiresBlock = false; this.requiredBlockMeta = OreDictionary.WILDCARD_VALUE; this.requiredBlockOreDictEntry = null; + this.requiredBiomeType = null; Allele.beeRoot.registerMutation(this); } @@ -146,14 +240,14 @@ public class BeeMutation implements IBeeMutation if (this.nodeRequired) { - int nodeId = ThaumcraftApi.getClosestAuraWithinRange(housing.getWorld(), + int nodeId = thaumcraft.api.ThaumcraftApi.getClosestAuraWithinRange(housing.getWorld(), housing.getXCoord(), housing.getYCoord(), housing.getZCoord(), this.nodeRange); if (nodeId >= 0) { if (this.nodeType != null) { // Needs a _specific_ variety of node - AuraNode node = ThaumcraftApi.getNodeCopy(nodeId); + thaumcraft.api.aura.AuraNode node = thaumcraft.api.ThaumcraftApi.getNodeCopy(nodeId); if (node.type != this.nodeType) { chance = 0; @@ -192,6 +286,24 @@ public class BeeMutation implements IBeeMutation } } + if (this.requiredBiomeType != null) + { + BiomeDictionary.Type[] types = BiomeDictionary.getTypesForBiome(housing.getWorld().getBiomeGenForCoords(housing.getXCoord(), housing.getZCoord())); + boolean found = false; + for (int i = 0; i < types.length; ++i) + { + if (this.requiredBiomeType == types[i]) + { + found = true; + break; + } + } + if (!found) + { + chance = 0; + } + } + finalChance = Math.round(chance * housing.getMutationModifier((IBeeGenome) genome0, (IBeeGenome) genome1, chance) @@ -245,7 +357,56 @@ public class BeeMutation implements IBeeMutation @Override public Collection getSpecialConditions() { - return new ArrayList(0); + ArrayList conditions = new ArrayList(); + + if (this.isMoonRestricted && moonPhaseStart != null && moonPhaseEnd != null) + { + if (moonPhaseStart != moonPhaseEnd) + { + conditions.add(String.format(LocalizationManager.getLocalizedString("research.requiresPhase"), + moonPhaseStart.getLocalizedName(), moonPhaseEnd.getLocalizedName())); + } + else + { + conditions.add(String.format(LocalizationManager.getLocalizedString("research.requiresPhaseSingle"), + moonPhaseStart.getLocalizedName())); + } + } + if (this.nodeRequired) + { + if (this.nodeType != null) + { + conditions.add(LocalizationManager.getLocalizedString("research.requiresNode")); + } + else + { + conditions.add(String.format(LocalizationManager.getLocalizedString("research.requiresNodeSpecific"), + LocalizationManager.getLocalizedString("research.node." + this.nodeType.name().toLowerCase()))); + } + } + if (this.requiresBlock) + { + if (this.requiredBlockOreDictEntry != null) + { + ArrayList ores = OreDictionary.getOres(this.requiredBlockOreDictEntry); + if (ores.size() > 0) + { + conditions.add(String.format(LocalizationManager.getLocalizedString("research.requiresBlock"), ores.get(0).getDisplayName())); + } + } + else + { + conditions.add(String.format(LocalizationManager.getLocalizedString("research.requiresBlock"), + new ItemStack(this.requiredBlockId, 1, this.requiredBlockMeta).getDisplayName())); + } + } + if (this.requiredBiomeType != null) + { + String biomeName = this.requiredBiomeType.name().substring(0, 1) + this.requiredBiomeType.name().substring(1).toLowerCase(); + conditions.add(String.format(LocalizationManager.getLocalizedString("research.requiresBiome"), biomeName)); + } + + return conditions; } @Override @@ -340,10 +501,17 @@ public class BeeMutation implements IBeeMutation return this; } - public BeeMutation setAuraNodeTypeRequired(double range, EnumNodeType type) + public BeeMutation setAuraNodeTypeRequired(double range, thaumcraft.api.aura.EnumNodeType type) { this.nodeType = type; return this.setAuraNodeRequired(range); } + + public BeeMutation setBiomeRequired(BiomeDictionary.Type biomeType) + { + this.requiredBiomeType = biomeType; + + return this; + } } diff --git a/magicbees_src/magicbees/bees/BeeSpecies.java b/magicbees_src/magicbees/bees/BeeSpecies.java index a553cdf..9082c66 100644 --- a/magicbees_src/magicbees/bees/BeeSpecies.java +++ b/magicbees_src/magicbees/bees/BeeSpecies.java @@ -1,7 +1,10 @@ package magicbees.bees; +import java.util.ArrayList; +import java.util.Collection; import java.util.HashMap; import java.util.Locale; +import java.util.Map; import magicbees.item.types.CombType; import magicbees.item.types.DropType; @@ -15,7 +18,6 @@ import magicbees.main.utils.compat.ArsMagicaHelper; import magicbees.main.utils.compat.EquivalentExchangeHelper; import magicbees.main.utils.compat.ForestryHelper; import magicbees.main.utils.compat.ThaumcraftHelper; -import net.minecraft.block.Block; import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -24,7 +26,6 @@ import net.minecraft.world.World; import net.minecraftforge.oredict.OreDictionary; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import forestry.api.apiculture.BeeManager; import forestry.api.apiculture.EnumBeeChromosome; import forestry.api.apiculture.EnumBeeType; import forestry.api.apiculture.IAlleleBeeSpecies; @@ -38,7 +39,7 @@ import forestry.api.genetics.AlleleManager; import forestry.api.genetics.IAllele; import forestry.api.genetics.IClassification; import forestry.api.genetics.IIndividual; -import forestry.api.genetics.ISpeciesRoot; +import forestry.api.genetics.IMutation; public enum BeeSpecies implements IAlleleBeeSpecies, IIconProvider { @@ -50,10 +51,9 @@ public enum BeeSpecies implements IAlleleBeeSpecies, IIconProvider BeeClassification.VEILED, 0x72D361, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, false, true), ATTUNED("Attuned", "similis", BeeClassification.VEILED, 0x0086A8, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, false, true), - INFERNAL("Infernal", "infernales", - BeeClassification.VEILED, 0xFF1C1C, 0x960F00, EnumTemperature.HELLISH, EnumHumidity.ARID, false, false, true), - OBLIVION("Oblivion", "lethe", - BeeClassification.VEILED, 0xD5C3E5, 0xF696FF, EnumTemperature.COLD, EnumHumidity.NORMAL, false, false, false), + + OBLIVION("Oblivion", "oblivioni", + BeeClassification.VEILED, 0xD5C3E5, 0xF696FF, EnumTemperature.COLD, EnumHumidity.NORMAL, false, false), ELDRITCH("Eldritch", "prodigiosus", BeeClassification.VEILED, 0x8D75A0, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, true), @@ -104,6 +104,8 @@ public enum BeeSpecies implements IAlleleBeeSpecies, IIconProvider BeeClassification.SKULKING, 0xccccee, 0xbf877c, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, false), SPIDERY("Spidery", "araneolus", BeeClassification.SKULKING, 0x0888888, 0x222222, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, true), + SMOULDERING("Smouldering", "flagrantia", + BeeClassification.SKULKING, 0xFFC747, 0xEA8344, EnumTemperature.HELLISH, EnumHumidity.NORMAL, false, false), TIMELY("Timely", "gallifreis", BeeClassification.TIME, 0xC6AF86, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, true), @@ -111,6 +113,15 @@ public enum BeeSpecies implements IAlleleBeeSpecies, IIconProvider BeeClassification.TIME, 0xC6AF86, 0x8E0213, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, false), DOCTORAL("Doctoral", "medicus qui", BeeClassification.TIME, 0xDDE5FC, 0x4B6E8C, EnumTemperature.NORMAL, EnumHumidity.NORMAL, true, false), + + INFERNAL("Infernal", "infernales", + BeeClassification.ABOMINABLE, 0xFF1C1C, 0x960F00, EnumTemperature.HELLISH, EnumHumidity.ARID, false, true), + HATEFUL("Hateful", "odibilis", + BeeClassification.ABOMINABLE, 0xDB00DB, 0x960F00, EnumTemperature.HELLISH, EnumHumidity.ARID, false, false), + SPITEFUL("Spiteful", "maligna", + BeeClassification.ABOMINABLE, 0x5FCC00, 0x960F00, EnumTemperature.HELLISH, EnumHumidity.ARID, true, false), + WITHERING("Withering", "vietus", + BeeClassification.ABOMINABLE, 0x5B5B5B, 0x960F00, EnumTemperature.HELLISH, EnumHumidity.NORMAL, true, false), IRON("Iron", "ferrus", BeeClassification.METALLIC, 0x686868, 0xE9E9E9, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, true), @@ -149,9 +160,9 @@ public enum BeeSpecies implements IAlleleBeeSpecies, IIconProvider TC_VIS("TCVis", "arcanus saecula", BeeClassification.THAUMIC, 0x004c99, 0x675ED1, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, false), TC_FLUX("TCFlux", "arcanus labe", - BeeClassification.THAUMIC, 0x004c99, 0x675ED1, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, false), - TC_ATTRACT("TCAttractive", "", - BeeClassification.THAUMIC, 0x0, 0x675ED1, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, true), + BeeClassification.THAUMIC, 0x91376A, 0x675ED1, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, false), + TC_ATTRACT("TCAttractive", "tractus", + BeeClassification.THAUMIC, 0x96FFBC, 0x675ED1, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, true), TC_REJUVENATING("TCRejuvenating", "arcanus vitae", BeeClassification.THAUMIC, 0x91D0D9, 0x675ED1, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, false), TC_PURE("TCPure", "arcanus puritatem", @@ -170,14 +181,7 @@ public enum BeeSpecies implements IAlleleBeeSpecies, IIconProvider BeeClassification.FLESHY, 0x40221A, 0xAC6753, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, true), TC_PORK("TCPork", "porcina", BeeClassification.FLESHY, 0x725D2F, 0xD2BF93, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, true), - -/* @Deprecated - TC_NODE("TCNode", "conficiens", - BeeClassification.THAUMIC, 0xFFF266, 0xFF8CE9, EnumTemperature.NORMAL, EnumHumidity.NORMAL, true, false), - @Deprecated - TC_GOSSAMER("TCGossamer", "perlucidus", - BeeClassification.THAUMIC, 0x183f66, 0xe15236, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, true), -*/ + // --------- Equivalent Exchange Bees ----------------------------------------------------------------------------- EE_MINIUM("EEMinium", "mutabilis", BeeClassification.ALCHEMICAL, 0xac0921, 0x3a030b, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, true), @@ -218,8 +222,16 @@ public enum BeeSpecies implements IAlleleBeeSpecies, IIconProvider // Species must be set inactive prior to registration. if (ThaumcraftHelper.isActive()) { - TC_AIR.addSpecialty(new ItemStack(Config.tcNuggets, 1, ThaumcraftHelper.NuggetType.QUICKSILVER.ordinal()), 8); - TC_EARTH.addSpecialty(new ItemStack(Config.tcMiscResource, 1, ThaumcraftHelper.MiscResource.AMBER.ordinal()), 6); + SCHOLARLY.addSpecialty(Config.miscResources.getStackForType(ResourceType.LORE_FRAGMENT), 2); + SAVANT.addSpecialty(Config.miscResources.getStackForType(ResourceType.LORE_FRAGMENT), 5); + + TC_STARK.addSpecialty(new ItemStack(Config.tcShard, 1, ThaumcraftHelper.ShardType.DULL.ordinal()), 5); + TC_AIR.addSpecialty(new ItemStack(Config.tcShard, 1, ThaumcraftHelper.ShardType.AIR.ordinal()), 5); + TC_FIRE.addSpecialty(new ItemStack(Config.tcShard, 1, ThaumcraftHelper.ShardType.FIRE.ordinal()), 5); + TC_WATER.addSpecialty(new ItemStack(Config.tcShard, 1, ThaumcraftHelper.ShardType.WATER.ordinal()), 5); + TC_EARTH.addSpecialty(new ItemStack(Config.tcShard, 1, ThaumcraftHelper.ShardType.EARTH.ordinal()), 5); + TC_MAGIC.addSpecialty(new ItemStack(Config.tcShard, 1, ThaumcraftHelper.ShardType.MAGIC.ordinal()), 5); + TC_BRAINY.addSpecialty(new ItemStack(Config.tcMiscResource, 1, ThaumcraftHelper.MiscResource.ZOMBIE_BRAIN.ordinal()), 2); TC_CHICKEN.addSpecialty(new ItemStack(Config.tcNuggetChicken, 1), 9); TC_BEEF.addSpecialty(new ItemStack(Config.tcNuggetBeef, 1), 9); @@ -227,10 +239,16 @@ public enum BeeSpecies implements IAlleleBeeSpecies, IIconProvider } else { + TC_STARK.setInactive(); + TC_AIR.setInactive(); + TC_FIRE.setInactive(); + TC_WATER.setInactive(); + TC_EARTH.setInactive(); TC_MAGIC.setInactive(); TC_VIS.setInactive(); - TC_PURE.setInactive(); TC_FLUX.setInactive(); + TC_ATTRACT.setInactive(); + TC_PURE.setInactive(); TC_REJUVENATING.setInactive(); TC_BRAINY.setInactive(); TC_WISPY.setInactive(); @@ -239,9 +257,6 @@ public enum BeeSpecies implements IAlleleBeeSpecies, IIconProvider TC_BEEF.setInactive(); TC_PORK.setInactive(); } - /*TC_GOSSAMER.setInactive(); - // Node bee is getting phased out. - TC_NODE.setInactive();*/ if (EquivalentExchangeHelper.isActive()) { @@ -318,31 +333,28 @@ public enum BeeSpecies implements IAlleleBeeSpecies, IIconProvider ELDRITCH.addProduct(Config.combs.getStackForType(CombType.MUNDANE), 15) .setGenome(BeeGenomeManager.getTemplateEldritch()) .register(); - INFERNAL.addProduct(Config.combs.getStackForType(CombType.MOLTEN), 12) - .setGenome(BeeGenomeManager.getTemplateInfernal()) - .register(); OBLIVION.addProduct(Config.combs.getStackForType(CombType.FORGOTTEN), 14) .setGenome(BeeGenomeManager.getTemplateOblivion()) .register(); - ESOTERIC.addProduct(Config.combs.getStackForType(CombType.OCCULT), 20) + ESOTERIC.addProduct(Config.combs.getStackForType(CombType.OCCULT), 18) .setGenome(BeeGenomeManager.getTemplateEsoteric()) .register(); - MYSTERIOUS.addProduct(Config.combs.getStackForType(CombType.OCCULT), 25) + MYSTERIOUS.addProduct(Config.combs.getStackForType(CombType.OCCULT), 20) .setGenome(BeeGenomeManager.getTemplateMysterious()) .register(); - ARCANE.addProduct(Config.combs.getStackForType(CombType.OCCULT), 30) + ARCANE.addProduct(Config.combs.getStackForType(CombType.OCCULT), 25) .addSpecialty(Config.drops.getStackForType(DropType.ENCHANTED, 1), 9) .setGenome(BeeGenomeManager.getTemplateArcane()) .register(); - CHARMED.addProduct(Config.combs.getStackForType(CombType.OTHERWORLDLY), 20) + CHARMED.addProduct(Config.combs.getStackForType(CombType.OTHERWORLDLY), 18) .setGenome(BeeGenomeManager.getTemplateCharmed()) .register(); - ENCHANTED.addProduct(Config.combs.getStackForType(CombType.OTHERWORLDLY), 30) + ENCHANTED.addProduct(Config.combs.getStackForType(CombType.OTHERWORLDLY), 20) .setGenome(BeeGenomeManager.getTemplateEnchanted()) .register(); - SUPERNATURAL.addProduct(Config.combs.getStackForType(CombType.OTHERWORLDLY), 40) + SUPERNATURAL.addProduct(Config.combs.getStackForType(CombType.OTHERWORLDLY), 25) .addSpecialty(Config.pollen.getStackForType(PollenType.UNUSUAL), 8) .setGenome(BeeGenomeManager.getTemplateSupernatural()) .register(); @@ -356,11 +368,9 @@ public enum BeeSpecies implements IAlleleBeeSpecies, IIconProvider .setGenome(BeeGenomeManager.getTemplatePupil()) .register(); SCHOLARLY.addProduct(Config.combs.getStackForType(CombType.PAPERY), 25) - .addSpecialty(Config.miscResources.getStackForType(ResourceType.LORE_FRAGMENT), 2) .setGenome(BeeGenomeManager.getTemplateScholarly()) .register(); SAVANT.addProduct(Config.combs.getStackForType(CombType.PAPERY), 40) - .addSpecialty(Config.miscResources.getStackForType(ResourceType.LORE_FRAGMENT), 5) .setGenome(BeeGenomeManager.getTemplateSavant()) .register(); @@ -374,34 +384,47 @@ public enum BeeSpecies implements IAlleleBeeSpecies, IIconProvider .setGenome(BeeGenomeManager.getTemplateSoul()) .register(); - SKULKING.addProduct(Config.combs.getStackForType(CombType.SKULKING), 10) + SKULKING.addProduct(Config.combs.getStackForType(CombType.FURTIVE), 10) .setGenome(BeeGenomeManager.getTemplateSkulking()) .register(); - GHASTLY.addProduct(Config.combs.getStackForType(CombType.SKULKING), 8) + GHASTLY.addProduct(Config.combs.getStackForType(CombType.FURTIVE), 8) .addSpecialty(new ItemStack(Item.ghastTear), 2) .setGenome(BeeGenomeManager.getTemplateGhastly()) .register(); - SPIDERY.addProduct(Config.combs.getStackForType(CombType.SKULKING), 13) + SPIDERY.addProduct(Config.combs.getStackForType(CombType.FURTIVE), 13) .addProduct(new ItemStack(Item.silk), 8) .addSpecialty(new ItemStack(Item.spiderEye), 8) .setGenome(BeeGenomeManager.getTemplateSpidery()) .register(); + SMOULDERING.addProduct(Config.combs.getStackForType(CombType.FURTIVE), 10) + .addProduct(Config.combs.getStackForType(CombType.MOLTEN), 10) + .addSpecialty(new ItemStack(Item.blazeRod), 5) + .setGenome(BeeGenomeManager.getTemplateSmouldering()) + .register(); - TIMELY.addProduct(new ItemStack(Config.fBeeComb, 1, ForestryHelper.Comb.DRIPPING.ordinal()), 25) - .addProduct(Config.pollen.getStackForType(PollenType.PHASED), 10) + TIMELY.addProduct(Config.combs.getStackForType(CombType.TEMPORAL), 16) .setGenome(BeeGenomeManager.getTemplateTimely()) .register(); - LORDLY.addProduct(new ItemStack(Config.fBeeComb, 1, ForestryHelper.Comb.MYSTERIOUS.ordinal()), 5) - .addProduct(new ItemStack(Config.fBeeComb, 1, ForestryHelper.Comb.DRIPPING.ordinal()), 25) - .addProduct(Config.pollen.getStackForType(PollenType.PHASED), 15) + LORDLY.addProduct(Config.combs.getStackForType(CombType.TEMPORAL), 19) .setGenome(BeeGenomeManager.getTemplateLordly()) .register(); - DOCTORAL.addProduct(new ItemStack(Config.fBeeComb, 1, ForestryHelper.Comb.MYSTERIOUS.ordinal()), 10) - .addProduct(new ItemStack(Config.fBeeComb, 1, ForestryHelper.Comb.DRIPPING.ordinal()), 25) - .addProduct(Config.pollen.getStackForType(PollenType.PHASED), 19) + DOCTORAL.addProduct(Config.combs.getStackForType(CombType.TEMPORAL), 24) .addSpecialty(new ItemStack(Config.jellyBaby), 7) .setGenome(BeeGenomeManager.getTemplateDoctoral()) .register(); + + INFERNAL.addProduct(Config.combs.getStackForType(CombType.MOLTEN), 12) + .setGenome(BeeGenomeManager.getTemplateInfernal()) + .register(); + HATEFUL.addProduct(Config.combs.getStackForType(CombType.MOLTEN), 18) + .setGenome(BeeGenomeManager.getTemplateHateful()) + .register(); + SPITEFUL.addProduct(Config.combs.getStackForType(CombType.MOLTEN), 24) + .setGenome(BeeGenomeManager.getTemplateSpiteful()) + .register(); + WITHERING.addSpecialty(Config.miscResources.getStackForType(ResourceType.SKULL_CHIP), 5) + .setGenome(BeeGenomeManager.getTemplateWithering()) + .register(); IRON.addProduct(new ItemStack(Config.fBeeComb, 1, ForestryHelper.Comb.HONEY.ordinal()), 10) .addSpecialty(Config.nuggets.getStackForType(NuggetType.IRON), 8) @@ -441,47 +464,46 @@ public enum BeeSpecies implements IAlleleBeeSpecies, IIconProvider .register(); - TC_STARK.addProduct(Config.combs.getStackForType(CombType.TC_STARK), 10) + TC_STARK.addProduct(Config.combs.getStackForType(CombType.HARMONIZING), 10) .setGenome(BeeGenomeManager.getTemplateTCStark()) .register(); - TC_AIR.addProduct(Config.combs.getStackForType(CombType.TC_AIRY), 9) - .addSpecialty(new ItemStack(Item.feather), 4) + TC_AIR.addProduct(Config.combs.getStackForType(CombType.AIRY), 9) .setGenome(BeeGenomeManager.getTemplateTCAir()) .register(); - TC_FIRE.addProduct(Config.combs.getStackForType(CombType.TC_FIREY), 15) - .addSpecialty(new ItemStack(Item.blazePowder), 4) + TC_FIRE.addProduct(Config.combs.getStackForType(CombType.FIREY), 15) .setGenome(BeeGenomeManager.getTemplateTCFire()) .register(); - TC_WATER.addProduct(Config.combs.getStackForType(CombType.TC_WATERY), 20) - .addSpecialty(new ItemStack(Block.ice), 1) + TC_WATER.addProduct(Config.combs.getStackForType(CombType.WATERY), 20) .setGenome(BeeGenomeManager.getTemplateTCWater()) .register(); - TC_EARTH.addProduct(Config.combs.getStackForType(CombType.TC_EARTHY), 30) - .addSpecialty(new ItemStack(Block.obsidian), 4) + TC_EARTH.addProduct(Config.combs.getStackForType(CombType.EARTHY), 20) .setGenome(BeeGenomeManager.getTemplateTCEarth()) .register(); - TC_MAGIC.addProduct(Config.combs.getStackForType(CombType.TC_INFUSED), 20) + TC_MAGIC.addProduct(Config.combs.getStackForType(CombType.INFUSED), 20) .setGenome(BeeGenomeManager.getTemplateTCMagic()) .register(); - TC_VIS.addProduct(Config.combs.getStackForType(CombType.INTELLECT), 25) + TC_VIS.addProduct(Config.combs.getStackForType(CombType.INTELLECT), 10) .setGenome(BeeGenomeManager.getTemplateTCVis()) .register(); - TC_PURE.addProduct(Config.combs.getStackForType(CombType.INTELLECT), 20) - .setGenome(BeeGenomeManager.getTemplateTCPure()) - .register(); - TC_FLUX.addProduct(Config.combs.getStackForType(CombType.INTELLECT), 20) + TC_FLUX.addProduct(Config.combs.getStackForType(CombType.INTELLECT), 18) .setGenome(BeeGenomeManager.getTemplateTCFlux()) .register(); - TC_REJUVENATING.addProduct(Config.combs.getStackForType(CombType.INTELLECT), 20) + TC_ATTRACT.addProduct(Config.combs.getStackForType(CombType.INTELLECT), 14) + .setGenome(BeeGenomeManager.getTemplateTCAttract()) + .register(); + TC_PURE.addProduct(Config.combs.getStackForType(CombType.INTELLECT), 16) + .setGenome(BeeGenomeManager.getTemplateTCPure()) + .register(); + TC_REJUVENATING.addProduct(Config.combs.getStackForType(CombType.INTELLECT), 18) .setGenome(BeeGenomeManager.getTemplateTCRejuvinating()) .register(); - TC_BRAINY.addProduct(Config.combs.getStackForType(CombType.SKULKING), 10) + TC_BRAINY.addProduct(Config.combs.getStackForType(CombType.FURTIVE), 10) .addProduct(new ItemStack(Item.rottenFlesh), 6) .setGenome(BeeGenomeManager.getTemplateTCBrainy()) .register(); - TC_BATTY.addProduct(Config.combs.getStackForType(CombType.SKULKING), 10) + TC_BATTY.addProduct(Config.combs.getStackForType(CombType.FURTIVE), 10) .addSpecialty(new ItemStack(Item.gunpowder), 4) .setGenome(BeeGenomeManager.getTemplateTCBatty()) .register(); @@ -542,14 +564,13 @@ public enum BeeSpecies implements IAlleleBeeSpecies, IIconProvider .setGenome(BeeGenomeManager.getTemplateAMVortex()) .register(); AM_WIGHT.addProduct(Config.combs.getStackForType(CombType.SOUL), 30) - .addProduct(Config.combs.getStackForType(CombType.SKULKING), 10) + .addProduct(Config.combs.getStackForType(CombType.FURTIVE), 10) .setGenome(BeeGenomeManager.getTemplateAMWight()) .register(); } private String binomial; private String authority; - private int bodyType; private int primaryColour; private int secondaryColour; private EnumTemperature temperature; @@ -559,46 +580,55 @@ public enum BeeSpecies implements IAlleleBeeSpecies, IIconProvider private boolean isCounted; private boolean isActive; private IClassification branch; - private HashMap products; - private HashMap specialty; + private HashMap products; + private HashMap specialties; private IAllele genomeTemplate[]; private String uid; private boolean dominant; + private int complexity; @SideOnly(Side.CLIENT) private Icon[][] icons; - private final static boolean defaultSecretSetting = true; + private final static boolean defaultSecretSetting = false; private final static int defaultBodyColour = 0xFF7C26; - private BeeSpecies(String speciesName, String genusName, IClassification classification, int firstColour, EnumTemperature preferredTemp, EnumHumidity preferredHumidity, boolean hasGlowEffect, boolean isSpeciesDominant) + private BeeSpecies(String speciesName, String genusName, IClassification classification, int firstColour, + EnumTemperature preferredTemp, EnumHumidity preferredHumidity, boolean hasGlowEffect, boolean isSpeciesDominant) { - this(speciesName, genusName, classification, 0, firstColour, defaultBodyColour, preferredTemp, preferredHumidity, hasGlowEffect, defaultSecretSetting, true, isSpeciesDominant); + this(speciesName, genusName, classification, firstColour, defaultBodyColour, + preferredTemp, preferredHumidity, hasGlowEffect, defaultSecretSetting, true, isSpeciesDominant); } - private BeeSpecies(String speciesName, String genusName, IClassification classification, int firstColour, int secondColour, EnumTemperature preferredTemp, EnumHumidity preferredHumidity, boolean hasGlowEffect, boolean isSpeciesDominant) + private BeeSpecies(String speciesName, String genusName, IClassification classification, int firstColour, int secondColour, + EnumTemperature preferredTemp, EnumHumidity preferredHumidity, boolean hasGlowEffect, boolean isSpeciesDominant) { - this(speciesName, genusName, classification, 0, firstColour, secondColour, preferredTemp, preferredHumidity, hasGlowEffect, defaultSecretSetting, true, isSpeciesDominant); + this(speciesName, genusName, classification, firstColour, secondColour, preferredTemp, preferredHumidity, hasGlowEffect, defaultSecretSetting, true, isSpeciesDominant); } - private BeeSpecies(String speciesName, String genusName, IClassification classification, int firstColour, int secondColour, EnumTemperature preferredTemp, EnumHumidity preferredHumidity, boolean isSecret, boolean hasGlowEffect, boolean isSpeciesDominant) + 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, classification, 0, firstColour, secondColour, preferredTemp, preferredHumidity, hasGlowEffect, isSecret, true, isSpeciesDominant); + this(speciesName, genusName, classification, firstColour, secondColour, + 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) + private BeeSpecies(String speciesName, String genusName, IClassification classification, int firstColour, + EnumTemperature preferredTemp, EnumHumidity preferredHumidity, boolean isSecret, boolean hasGlowEffect, boolean isSpeciesDominant) { - this(speciesName, genusName, classification, 0, firstColour, defaultBodyColour, preferredTemp, preferredHumidity, hasGlowEffect, isSecret, true, isSpeciesDominant); + this(speciesName, genusName, classification, firstColour, defaultBodyColour, + preferredTemp, preferredHumidity, hasGlowEffect, isSecret, true, isSpeciesDominant); } - private BeeSpecies(String speciesName, String genusName, IClassification classification, int body, int firstColour, int secondColour, EnumTemperature preferredTemp, EnumHumidity preferredHumidity, boolean hasGlowEffect, boolean isSpeciesSecret, boolean isSpeciesCounted, boolean isSpeciesDominant) + private BeeSpecies(String speciesName, String genusName, IClassification classification, int firstColour, int secondColour, + EnumTemperature preferredTemp, EnumHumidity preferredHumidity, + boolean hasGlowEffect, boolean isSpeciesSecret, boolean isSpeciesCounted, boolean isSpeciesDominant) { this.uid = "magicbees.species" + speciesName; this.dominant = isSpeciesDominant; AlleleManager.alleleRegistry.registerAllele(this); binomial = genusName; authority = "MysteriousAges"; - bodyType = body; primaryColour = firstColour; secondaryColour = secondColour; temperature = preferredTemp; @@ -607,7 +637,7 @@ public enum BeeSpecies implements IAlleleBeeSpecies, IIconProvider isSecret = isSpeciesSecret; isCounted = isSpeciesCounted; products = new HashMap(); - specialty = new HashMap(); + specialties = new HashMap(); this.branch = classification; this.branch.addMemberSpecies(this); this.isActive = true; @@ -626,13 +656,13 @@ public enum BeeSpecies implements IAlleleBeeSpecies, IIconProvider public BeeSpecies addProduct(ItemStack produce, int percentChance) { - products.put(produce, Integer.valueOf(percentChance)); + products.put(produce, percentChance); return this; } public BeeSpecies addSpecialty(ItemStack produce, int percentChance) { - specialty.put(produce, Integer.valueOf(percentChance)); + specialties.put(produce, Integer.valueOf(percentChance)); return this; } @@ -721,7 +751,7 @@ public enum BeeSpecies implements IAlleleBeeSpecies, IIconProvider @Override public HashMap getSpecialty() { - return specialty; + return specialties; } @Override @@ -791,7 +821,7 @@ public enum BeeSpecies implements IAlleleBeeSpecies, IIconProvider return icons[type.ordinal()][Math.min(renderPass, 2)]; } - private static final BeeSpecies[] skulkingIconBees = { SKULKING, GHASTLY, SPIDERY, TC_BRAINY, TC_WISPY, TC_BATTY, AM_VORTEX, TC_WISPY }; + private static final BeeSpecies[] skulkingIconBees = { SKULKING, GHASTLY, SPIDERY, SMOULDERING, TC_BRAINY, TC_WISPY, TC_BATTY, AM_VORTEX, TC_WISPY }; public void registerItemIcons(IconRegister itemMap) { @@ -818,7 +848,7 @@ public enum BeeSpecies implements IAlleleBeeSpecies, IIconProvider switch (this) { - case SKULKING: case GHASTLY: case SPIDERY: + case SKULKING: case GHASTLY: case SPIDERY: case SMOULDERING: case TC_BRAINY: case TC_WISPY: case TC_BATTY: case AM_VORTEX: case AM_WIGHT: value = VersionInfo.ModName.toLowerCase() + ":bees/skulking/"; @@ -848,17 +878,87 @@ public enum BeeSpecies implements IAlleleBeeSpecies, IIconProvider @Override public int getComplexity() { - return 0; + return 1; } @Override - public float getResearchSuitability(ItemStack itemstack) + public float getResearchSuitability(ItemStack itemStack) { - return 0; + float value = 0f; + if(itemStack != null) + { + for (ItemStack product : this.products.keySet()) + { + if (itemStack.isItemEqual(product)) + { + value = 1f; + break; + } + } + + if (value <= 0f) + { + for (ItemStack specialty : this.specialties.keySet()) + { + if (specialty.isItemEqual(itemStack)) + { + value = 1f; + break; + } + } + if (value <= 0f) + { + if (itemStack.itemID == Config.fHoneyDrop.itemID) + { + + } + else if (itemStack.itemID == Config.fHoneydew.itemID) + { + + } + else if (itemStack.itemID == Config.fBeeComb.itemID || + itemStack.itemID == Config.combs.itemID) + { + value = 4f; + } + else + { + for (Map.Entry catalyst : Allele.beeRoot.getResearchCatalysts().entrySet()) + { + if (OreDictionary.itemMatches(itemStack, catalyst.getKey(), false)) + { + value = catalyst.getValue().floatValue(); + break; + } + } + } + } + } + } + + return value; } @Override public ItemStack[] getResearchBounty(World world, String researcher, IIndividual individual, int bountyLevel) + { + ArrayList bounty = new ArrayList(); + + if (true)//world.rand.nextFloat() < ((10f / bountyLevel))) + { + Collection resultantMutations = getRoot().getCombinations(this); + if (resultantMutations.size() > 0) + { + IMutation[] candidates = resultantMutations.toArray(new IMutation[resultantMutations.size()]); + bounty.add(AlleleManager.alleleRegistry.getMutationNoteStack(researcher, candidates[world.rand.nextInt(candidates.length)])); + } + } + + return bounty.toArray(new ItemStack[bounty.size()]); + } + + @Override + public String getEntityTexture() { return null; } diff --git a/magicbees_src/magicbees/bees/FlowerProviderArsMagicaFlower.java b/magicbees_src/magicbees/bees/FlowerProviderArsMagicaFlower.java index 31b8e19..b5d7b80 100644 --- a/magicbees_src/magicbees/bees/FlowerProviderArsMagicaFlower.java +++ b/magicbees_src/magicbees/bees/FlowerProviderArsMagicaFlower.java @@ -49,7 +49,7 @@ public class FlowerProviderArsMagicaFlower implements IFlowerProvider @Override public String getDescription() { - return LocalizationManager.getLocalizedString("tb.bees.flower.arsmagica"); + return LocalizationManager.getLocalizedString("flowerProvider.arsmagica"); } @Override diff --git a/magicbees_src/magicbees/bees/FlowerProviderAuraNode.java b/magicbees_src/magicbees/bees/FlowerProviderAuraNode.java index 95aeb61..03cd27a 100644 --- a/magicbees_src/magicbees/bees/FlowerProviderAuraNode.java +++ b/magicbees_src/magicbees/bees/FlowerProviderAuraNode.java @@ -34,7 +34,7 @@ public class FlowerProviderAuraNode implements IFlowerProvider @Override public String getDescription() { - return LocalizationManager.getLocalizedString("tb.bees.flower.node"); + return LocalizationManager.getLocalizedString("flowerProvider.node"); } @Override diff --git a/magicbees_src/magicbees/bees/FlowerProviderBookshelf.java b/magicbees_src/magicbees/bees/FlowerProviderBookshelf.java index 4cd3bce..b85d4f2 100644 --- a/magicbees_src/magicbees/bees/FlowerProviderBookshelf.java +++ b/magicbees_src/magicbees/bees/FlowerProviderBookshelf.java @@ -51,6 +51,6 @@ public class FlowerProviderBookshelf implements IFlowerProvider public String getDescription() { - return LocalizationManager.getLocalizedString("tb.bees.flower.book"); + return LocalizationManager.getLocalizedString("flowerProvider.book"); } } diff --git a/magicbees_src/magicbees/bees/FlowerProviderThaumcraftFlower.java b/magicbees_src/magicbees/bees/FlowerProviderThaumcraftFlower.java index d9c66eb..bd52adc 100644 --- a/magicbees_src/magicbees/bees/FlowerProviderThaumcraftFlower.java +++ b/magicbees_src/magicbees/bees/FlowerProviderThaumcraftFlower.java @@ -53,7 +53,7 @@ public class FlowerProviderThaumcraftFlower implements IFlowerProvider @Override public String getDescription() { - return LocalizationManager.getLocalizedString("tb.bees.flower.magic"); + return LocalizationManager.getLocalizedString("flowerProvider.magic"); } @Override diff --git a/magicbees_src/magicbees/block/BlockEffectJar.java b/magicbees_src/magicbees/block/BlockEffectJar.java index 8dd7531..61ff439 100644 --- a/magicbees_src/magicbees/block/BlockEffectJar.java +++ b/magicbees_src/magicbees/block/BlockEffectJar.java @@ -6,6 +6,7 @@ import magicbees.client.gui.UIScreens; import magicbees.main.CommonProxy; import magicbees.main.MagicBees; import magicbees.main.utils.TabMagicBees; +import magicbees.main.utils.VersionInfo; import magicbees.tileentity.TileEntityEffectJar; import net.minecraft.block.Block; import net.minecraft.block.BlockContainer; @@ -18,7 +19,7 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; public class BlockEffectJar extends BlockContainer -{ +{ public BlockEffectJar(int id) { super(id, Material.glass); diff --git a/magicbees_src/magicbees/client/render/EffectJarRenderer.java b/magicbees_src/magicbees/client/render/EffectJarRenderer.java index 3a38f8d..14a110d 100644 --- a/magicbees_src/magicbees/client/render/EffectJarRenderer.java +++ b/magicbees_src/magicbees/client/render/EffectJarRenderer.java @@ -42,21 +42,22 @@ public class EffectJarRenderer extends TileEntitySpecialRenderer implements IIte { switch (type) { + default: case ENTITY: doRender(0, 0, 0, 1.8f); break; case EQUIPPED: + doRender(0, 0, 0, 1.5f); + break; + + case EQUIPPED_FIRST_PERSON: doRender(-.5, .5, 0.25, 1f); break; case INVENTORY: doRender(0.3, 0.25, 0.3, 1.5f); - break; - - default: - break; - + break; } } diff --git a/magicbees_src/magicbees/item/ItemThaumiumGrafter.java b/magicbees_src/magicbees/item/ItemThaumiumGrafter.java index 59f7fe9..5bd6b87 100644 --- a/magicbees_src/magicbees/item/ItemThaumiumGrafter.java +++ b/magicbees_src/magicbees/item/ItemThaumiumGrafter.java @@ -2,6 +2,7 @@ package magicbees.item; import cpw.mods.fml.common.registry.GameRegistry; import magicbees.main.Config; +import magicbees.main.utils.VersionInfo; import magicbees.main.utils.compat.ThaumcraftHelper; import net.minecraft.block.Block; import net.minecraft.entity.Entity; @@ -25,8 +26,8 @@ public class ItemThaumiumGrafter extends Item implements IVisRepairable, IToolGr this.setMaxStackSize(1); this.setMaxDamage(15); this.setCreativeTab(forestry.api.core.Tabs.tabArboriculture); - this.setUnlocalizedName("thaumicbees:thaumiumGrafter"); - GameRegistry.registerItem(this, "thaumicbees:thaumiumGrafter"); + this.setUnlocalizedName(VersionInfo.ModName.toLowerCase() + ":thaumiumGrafter"); + GameRegistry.registerItem(this, VersionInfo.ModName.toLowerCase() + ":thaumiumGrafter"); } @Override diff --git a/magicbees_src/magicbees/item/ItemThaumiumScoop.java b/magicbees_src/magicbees/item/ItemThaumiumScoop.java index c2ac44d..ba1a4b4 100644 --- a/magicbees_src/magicbees/item/ItemThaumiumScoop.java +++ b/magicbees_src/magicbees/item/ItemThaumiumScoop.java @@ -1,5 +1,6 @@ package magicbees.item; +import magicbees.main.utils.VersionInfo; import net.minecraft.block.Block; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLiving; @@ -20,8 +21,8 @@ public class ItemThaumiumScoop extends Item implements IVisRepairable, IToolScoo this.setMaxStackSize(1); this.setMaxDamage(30); this.setCreativeTab(forestry.api.core.Tabs.tabApiculture); - this.setUnlocalizedName("thaumicbees:thaumiumScoop"); - GameRegistry.registerItem(this, "thaumicbees:thaumiumScoop"); + this.setUnlocalizedName(VersionInfo.ModName.toLowerCase() + ":thaumiumScoop"); + GameRegistry.registerItem(this, VersionInfo.ModName.toLowerCase() + ":thaumiumScoop"); } @Override diff --git a/magicbees_src/magicbees/item/ItemWax.java b/magicbees_src/magicbees/item/ItemWax.java index fd12525..c8cd848 100644 --- a/magicbees_src/magicbees/item/ItemWax.java +++ b/magicbees_src/magicbees/item/ItemWax.java @@ -49,7 +49,7 @@ public class ItemWax extends Item @SideOnly(Side.CLIENT) public Icon getIconFromDamage(int meta) { - return (WaxType.values()[meta].sparkly) ? this.secondaryIcon : this.itemIcon; + return (WaxType.values()[meta].sparkly) ? this.itemIcon : this.secondaryIcon; } @Override diff --git a/magicbees_src/magicbees/item/types/CombType.java b/magicbees_src/magicbees/item/types/CombType.java index d571b5f..7a1c049 100644 --- a/magicbees_src/magicbees/item/types/CombType.java +++ b/magicbees_src/magicbees/item/types/CombType.java @@ -7,21 +7,22 @@ public enum CombType { MUNDANE("mundane", true), MOLTEN("molten", true), - FORGOTTEN("forgotten", true), + FORGOTTEN("forgotten", false), OCCULT("occult", true), OTHERWORLDLY("otherworldly", true), + PAPERY("paper", true), SOUL("soul", true), - SKULKING("furtive", true), - + FURTIVE("furtive", true), INTELLECT("aware", false), + TEMPORAL("time", false), - TC_STARK("stark", false), - TC_AIRY("air", false), - TC_FIREY("fire", false), - TC_WATERY("water", false), - TC_EARTHY("earth", false), - TC_INFUSED("magic", false), + HARMONIZING("harmonizing", false), + AIRY("air", false), + FIREY("fire", false), + WATERY("water", false), + EARTHY("earth", false), + INFUSED("magic", false), AM_ESSENCE("essence", false), AM_POTENT("potent", false), @@ -33,11 +34,12 @@ public enum CombType {0x9872FF, 0x2D2D2D}, {0x3EE0D8, 0x3A3820}, {0xE5425D, 0x323291}, + {0xBCA664, 0x35332E}, {0x7F7171, 0x876D53}, {0xcda6cd, 0x545454}, - {0x0092e9, 0x618fff}, + {0x0, 0x0}, {0xB0B0BC, 0x414144}, {0xffff7e, 0x606308}, diff --git a/magicbees_src/magicbees/item/types/PropolisType.java b/magicbees_src/magicbees/item/types/PropolisType.java index 035bbbe..ff10dd2 100644 --- a/magicbees_src/magicbees/item/types/PropolisType.java +++ b/magicbees_src/magicbees/item/types/PropolisType.java @@ -11,6 +11,7 @@ public enum PropolisType WATER("water", 0x1054A1), EARTH("earth", 0x00a000), INFUSED("magic", 0xaa32fc), + UNSTABLE("unstable", 0xEFB492), ; private PropolisType(String pName, int overlayColour) diff --git a/magicbees_src/magicbees/item/types/ResourceType.java b/magicbees_src/magicbees/item/types/ResourceType.java index 6a4d6b4..a2aabfb 100644 --- a/magicbees_src/magicbees/item/types/ResourceType.java +++ b/magicbees_src/magicbees/item/types/ResourceType.java @@ -8,6 +8,8 @@ public enum ResourceType LORE_FRAGMENT("fragment", true), AROMATIC_LUMP("lump", true), EXTENDED_FERTILIZER("fertilizer", true), + SKULL_CHIP("skullChip", true), + SKULL_FRAGMENT("skullFragment", true), // Dummy items for Thaumanomicon research icons. // These won't ever actually exist in-game, and so @@ -23,6 +25,11 @@ public enum ResourceType private String name; public boolean showInList; + public void setHidden() + { + this.showInList = false; + } + public String getName() { return this.name; diff --git a/magicbees_src/magicbees/item/types/WaxType.java b/magicbees_src/magicbees/item/types/WaxType.java index 7c449d9..2f2cb95 100644 --- a/magicbees_src/magicbees/item/types/WaxType.java +++ b/magicbees_src/magicbees/item/types/WaxType.java @@ -5,8 +5,9 @@ import cpw.mods.fml.common.registry.LanguageRegistry; public enum WaxType { - MAGIC("magic", false, 0xd242df), - SOUL("soul", true, 0x967C63), + MAGIC("magic", true, 0xd242df), + SOUL("soul", false, 0x967C63), + AMNESIC("amnesic", true, 0x856DFF) ; private WaxType(String n, boolean sp, int c) diff --git a/magicbees_src/magicbees/main/Config.java b/magicbees_src/magicbees/main/Config.java index 11da0c9..bbacbc7 100644 --- a/magicbees_src/magicbees/main/Config.java +++ b/magicbees_src/magicbees/main/Config.java @@ -25,6 +25,7 @@ import magicbees.item.types.CapsuleType; import magicbees.item.types.HiveFrameType; import magicbees.item.types.NuggetType; import magicbees.item.types.ResourceType; +import magicbees.item.types.WaxType; import magicbees.main.utils.LocalizationManager; import magicbees.main.utils.VersionInfo; import magicbees.main.utils.compat.ArsMagicaHelper; @@ -70,6 +71,7 @@ public class Config public String ThaumaturgeExtraItems; public int CapsuleStackSizeMax; public boolean DoHiveRetrogen; + public boolean ForceHiveRegen; public static BlockPlanks planksWood; public static BlockWoodSlab slabWoodHalf; @@ -111,6 +113,8 @@ public class Config //----- Forestry Blocks ------------------------------------ //----- Forestry Items ------------------------------------- public static Item fBeeComb; + public static Item fHoneydew; + public static Item fHoneyDrop; public static Item fPollen; public static Item fCraftingResource; //----- Thaumcraft Blocks ---------------------------------- @@ -159,7 +163,6 @@ public class Config public Config(File configFile) { this.configuration = new Configuration(configFile); - this.configuration.load(); this.doMiscConfig(); } @@ -191,7 +194,6 @@ public class Config Item.itemsList[planksWood.blockID] = null; Item.itemsList[planksWood.blockID] = new ItemMultiTextureTile(planksWood.blockID - 256, planksWood, PlankType.getAllNames()); - OreDictionary.registerOre("plankWood", new ItemStack(planksWood, 1, -1)); FMLInterModComms.sendMessage("BuildCraft|Transport", "add-facade", MagicBees.getConfig().planksWood.blockID + "@" + PlankType.GREATWOOD.ordinal()); FMLInterModComms.sendMessage("BuildCraft|Transport", "add-facade", MagicBees.getConfig().planksWood.blockID + "@" + PlankType.SILVERWOOD.ordinal()); @@ -206,13 +208,14 @@ public class Config Item.itemsList[slabWoodFull.blockID] = null; Item.itemsList[slabWoodFull.blockID] = new ItemSlab(slabWoodFull.blockID - 256, slabWoodHalf, slabWoodFull, true); + OreDictionary.registerOre("plankWood", new ItemStack(planksWood, 1, -1)); OreDictionary.registerOre("slabWood", new ItemStack(slabWoodHalf, 1, -1)); } } effectJar = new BlockEffectJar(configuration.getBlock("effectJar", blockIdBase++).getInt()); GameRegistry.registerBlock(effectJar, "effectJar"); - GameRegistry.registerTileEntity(TileEntityEffectJar.class, TileEntityEffectJar.entityName); + GameRegistry.registerTileEntity(TileEntityEffectJar.class, TileEntityEffectJar.tileEntityName); hive = new BlockHive(configuration.getBlock("hives", blockIdBase++).getInt()); GameRegistry.registerBlock(hive, "hive"); @@ -236,7 +239,7 @@ public class Config int itemIDBase = 26090; combs= new ItemComb(configuration.getItem("combs", itemIDBase++).getInt() - 256); - wax = new ItemWax(configuration.getItem("wax", itemIDBase++).getInt() - 256); + wax = new ItemWax(configuration.getItem("wax", itemIDBase++).getInt() - 256); propolis = new ItemPropolis(configuration.getItem("propolis", itemIDBase++).getInt() - 256); drops = new ItemDrop(configuration.getItem("drop", itemIDBase++).getInt() - 256); miscResources = new ItemMiscResources(configuration.getItem("miscResources", itemIDBase++).getInt() - 256); @@ -305,8 +308,8 @@ public class Config jellyBaby = new ItemFood(configuration.getItem("jellyBabies", itemIDBase++).getInt() - 256, 1, false).setAlwaysEdible() .setPotionEffect(Potion.moveSpeed.id, 5, 1, 1f); - jellyBaby.setUnlocalizedName("magicbees:jellyBabies"); - GameRegistry.registerItem(jellyBaby, "magicbees:jellyBabies"); + jellyBaby.setUnlocalizedName(VersionInfo.ModName.toLowerCase() + ":jellyBabies"); + GameRegistry.registerItem(jellyBaby, VersionInfo.ModName.toLowerCase() + ":jellyBabies"); voidCapsule = new ItemCapsule(CapsuleType.VOID, configuration.getItem("voidCapsule", itemIDBase++).getInt() - 256, this.CapsuleStackSizeMax); @@ -336,6 +339,8 @@ public class Config nuggets = new ItemNugget(configuration.getItem("beeNuggets", itemIDBase++).getInt() - 256); OreDictionary.registerOre("beeComb", new ItemStack(combs, 1, OreDictionary.WILDCARD_VALUE)); + OreDictionary.registerOre("waxMagical", wax.getStackForType(WaxType.MAGIC)); + OreDictionary.registerOre("waxMagical", wax.getStackForType(WaxType.AMNESIC)); OreDictionary.registerOre("nuggetIron", nuggets.getStackForType(NuggetType.IRON)); OreDictionary.registerOre("nuggetCopper", nuggets.getStackForType(NuggetType.COPPER)); OreDictionary.registerOre("nuggetTin", nuggets.getStackForType(NuggetType.TIN)); @@ -392,9 +397,24 @@ public class Config p.comment = "set to true to show the current moon phase in mouse-over text."; this.MoonDialShowsPhaseInText = p.getBoolean(false); - p = configuration.get("general", "performHiveRetrogen", false); + p = configuration.get("Retrogen", "doHiveRetrogen", false); p.comment = "Set to true to enable retroactive worldgen of Magic Bees hives."; this.DoHiveRetrogen = p.getBoolean(false); + + p = configuration.get("Retrogen", "forceHiveRegen", false); + p.comment = "Set to true to force a regeneration of Magic Bees hives. Will set config option to false after parsed. (Implies doHiveRetrogen=true)"; + this.ForceHiveRegen = p.getBoolean(false); + + if (this.ForceHiveRegen) + { + FMLLog.info("Magic Bees will aggressively regenerate hives in all chunks for this game instance. Config option set to false."); + p.set(false); + this.DoHiveRetrogen = true; + } + else if (this.DoHiveRetrogen) + { + FMLLog.info("Magic Bees will attempt to regenerate hives in chunks that were generated before the mod was added."); + } } } diff --git a/magicbees_src/magicbees/main/MagicBees.java b/magicbees_src/magicbees/main/MagicBees.java index e8e8ab1..b9f4ad9 100644 --- a/magicbees_src/magicbees/main/MagicBees.java +++ b/magicbees_src/magicbees/main/MagicBees.java @@ -74,6 +74,8 @@ public class MagicBees { this.guiHandler = new GUIHandler(); NetworkRegistry.instance().registerGuiHandler(this, this.guiHandler); + + proxy.registerRenderers(); BeeManager.ititializeBees(); diff --git a/magicbees_src/magicbees/main/utils/CraftingManager.java b/magicbees_src/magicbees/main/utils/CraftingManager.java index 9d9ec39..119c391 100644 --- a/magicbees_src/magicbees/main/utils/CraftingManager.java +++ b/magicbees_src/magicbees/main/utils/CraftingManager.java @@ -75,10 +75,10 @@ public class CraftingManager // Magic capsules output = new ItemStack(Config.magicCapsule); output.stackSize = 4; - GameRegistry.addRecipe(output, new Object[] { + GameRegistry.addRecipe(new ShapedOreRecipe(output, new Object[] { "WWW", - 'W', Config.wax.getStackForType(WaxType.MAGIC) - }); + 'W', "waxMagical" + })); // Concentrated Fertilizer -> Forestry fertilizer input = Config.miscResources.getStackForType(ResourceType.EXTENDED_FERTILIZER); @@ -144,6 +144,16 @@ public class CraftingManager 'q', Item.netherQuartz, 'D', "dyeGreen" })); + + GameRegistry.addRecipe(Config.miscResources.getStackForType(ResourceType.SKULL_FRAGMENT), new Object[] { + "xxx", "xxx", "xxx", + 'x', Config.miscResources.getStackForType(ResourceType.SKULL_CHIP) + }); + + GameRegistry.addRecipe(new ItemStack(Item.skull, 1, 1), new Object[] { + "xxx", "xxx", + 'x', Config.miscResources.getStackForType(ResourceType.SKULL_FRAGMENT) + }); if (OreDictionary.getOres("ingotCopper").size() <= 0) { @@ -285,11 +295,19 @@ public class CraftingManager private static void setupCentrifugeRecipes() { ItemStack beeswax = ItemInterface.getItem("beeswax"); + ItemStack propolis = ItemInterface.getItem("propolis"); + propolis.setItemDamage(ForestryHelper.Propolis.PULSATING.ordinal()); // 20 is the 'average' time to centrifuge a comb. RecipeManagers.centrifugeManager.addRecipe(20, Config.combs.getStackForType(CombType.MUNDANE), new ItemStack[] {beeswax, ItemInterface.getItem("honeyDrop"), Config.wax.getStackForType(WaxType.MAGIC)}, new int[] {90, 60, 10}); + RecipeManagers.centrifugeManager.addRecipe(20, Config.combs.getStackForType(CombType.MOLTEN), + new ItemStack[] {ItemInterface.getItem("refractoryWax"), ItemInterface.getItem("honeyDrop")}, + new int[] {86, 8}); + RecipeManagers.centrifugeManager.addRecipe(20, Config.combs.getStackForType(CombType.FORGOTTEN), + new ItemStack[] {Config.wax.getStackForType(WaxType.AMNESIC), propolis, ItemInterface.getItem("honeyDrop")}, + new int[] {50, 50, 22}); RecipeManagers.centrifugeManager.addRecipe(20, Config.combs.getStackForType(CombType.OCCULT), new ItemStack[] {Config.wax.getStackForType(WaxType.MAGIC), ItemInterface.getItem("honeyDrop") }, new int[] { 100, 60 }); @@ -302,57 +320,39 @@ public class CraftingManager RecipeManagers.centrifugeManager.addRecipe(20, Config.combs.getStackForType(CombType.INTELLECT), new ItemStack[] { Config.wax.getStackForType(WaxType.MAGIC), ItemInterface.getItem("honeydew"), Config.drops.getStackForType(DropType.INTELLECT) }, new int[] { 90, 40, 10 }); - RecipeManagers.centrifugeManager.addRecipe(20, Config.combs.getStackForType(CombType.SKULKING), + RecipeManagers.centrifugeManager.addRecipe(20, Config.combs.getStackForType(CombType.FURTIVE), new ItemStack[] {ItemInterface.getItem("beeswax"), ItemInterface.getItem("propolis"), ItemInterface.getItem("honeydew") }, new int[] { 90, 20, 35 }); RecipeManagers.centrifugeManager.addRecipe(20, Config.combs.getStackForType(CombType.SOUL), new ItemStack[] {Config.wax.getStackForType(WaxType.SOUL), ItemInterface.getItem("honeydew") }, new int[] { 95, 26 }); - - RecipeManagers.centrifugeManager.addRecipe(25, Config.combs.getStackForType(CombType.TC_STARK), - new ItemStack[] {ItemInterface.getItem("beeswax"), Config.wax.getStackForType(WaxType.MAGIC), Config.propolis.getStackForType(PropolisType.STARK) }, - new int[] { 10, 95, 15 }); - RecipeManagers.centrifugeManager.addRecipe(25, Config.combs.getStackForType(CombType.TC_AIRY), - new ItemStack[] {Config.wax.getStackForType(WaxType.MAGIC), Config.propolis.getStackForType(PropolisType.AIR) }, - new int[] { 100, 65 }); - RecipeManagers.centrifugeManager.addRecipe(25, Config.combs.getStackForType(CombType.TC_FIREY), - new ItemStack[] {Config.wax.getStackForType(WaxType.MAGIC), Config.propolis.getStackForType(PropolisType.FIRE) }, - new int[] { 100, 65 }); - RecipeManagers.centrifugeManager.addRecipe(25, Config.combs.getStackForType(CombType.TC_WATERY), - new ItemStack[] {Config.wax.getStackForType(WaxType.MAGIC), Config.propolis.getStackForType(PropolisType.WATER)}, - new int[] { 100, 65 }); - RecipeManagers.centrifugeManager.addRecipe(25, Config.combs.getStackForType(CombType.TC_EARTHY), - new ItemStack[] {Config.wax.getStackForType(WaxType.MAGIC), Config.propolis.getStackForType(PropolisType.EARTH) }, - new int[] { 100, 65 }); - RecipeManagers.centrifugeManager.addRecipe(25, Config.combs.getStackForType(CombType.TC_INFUSED), - new ItemStack[] {Config.wax.getStackForType(WaxType.MAGIC), Config.wax.getStackForType(WaxType.MAGIC), Config.propolis.getStackForType(PropolisType.INFUSED) }, - new int[] { 100, 50, 65 }); + RecipeManagers.centrifugeManager.addRecipe(20, Config.combs.getStackForType(CombType.TEMPORAL), + new ItemStack[] {Config.wax.getStackForType(WaxType.MAGIC), Config.pollen.getStackForType(PollenType.PHASED), new ItemStack(Config.fHoneydew, 1)}, + new int[] {100, 5, 60}); + RecipeManagers.centrifugeManager.addRecipe(20, Config.combs.getStackForType(CombType.HARMONIZING), + new ItemStack[] {ItemInterface.getItem("beeswax"), Config.wax.getStackForType(WaxType.MAGIC) }, + new int[] { 10, 95, 10 }); + RecipeManagers.centrifugeManager.addRecipe(20, Config.combs.getStackForType(CombType.AIRY), + new ItemStack[] {Config.wax.getStackForType(WaxType.MAGIC) }, + new int[] { 100 }); + RecipeManagers.centrifugeManager.addRecipe(20, Config.combs.getStackForType(CombType.FIREY), + new ItemStack[] {Config.wax.getStackForType(WaxType.MAGIC) }, + new int[] { 100 }); + RecipeManagers.centrifugeManager.addRecipe(20, Config.combs.getStackForType(CombType.WATERY), + new ItemStack[] {Config.wax.getStackForType(WaxType.MAGIC) }, + new int[] { 100 }); + RecipeManagers.centrifugeManager.addRecipe(20, Config.combs.getStackForType(CombType.EARTHY), + new ItemStack[] {Config.wax.getStackForType(WaxType.MAGIC) }, + new int[] { 100 }); + RecipeManagers.centrifugeManager.addRecipe(20, Config.combs.getStackForType(CombType.INFUSED), + new ItemStack[] {Config.wax.getStackForType(WaxType.MAGIC), Config.wax.getStackForType(WaxType.MAGIC) }, + new int[] { 100, 50 }); RecipeManagers.centrifugeManager.addRecipe(20, Config.combs.getStackForType(CombType.AM_POTENT), new ItemStack[] {ItemInterface.getItem("beeswax"), ItemInterface.getItem("refractoryWax"), ItemInterface.getItem("honeydew") }, new int[] { 50, 50, 65 } ); - if (ThaumcraftHelper.isActive()) - { - RecipeManagers.centrifugeManager.addRecipe(8, Config.propolis.getStackForType(PropolisType.STARK), - new ItemStack[] {new ItemStack(Config.tcShard, 1, ThaumcraftHelper.ShardType.DULL.ordinal())}, - new int[] { 10 }); - RecipeManagers.centrifugeManager.addRecipe(8, Config.propolis.getStackForType(PropolisType.AIR), - new ItemStack[] {new ItemStack(Config.tcShard, 1, ThaumcraftHelper.ShardType.AIR.ordinal())}, - new int[] { 10 }); - RecipeManagers.centrifugeManager.addRecipe(8, Config.propolis.getStackForType(PropolisType.FIRE), - new ItemStack[] {new ItemStack(Config.tcShard, 1, ThaumcraftHelper.ShardType.FIRE.ordinal())}, - new int[] { 10 }); - RecipeManagers.centrifugeManager.addRecipe(8, Config.propolis.getStackForType(PropolisType.WATER), - new ItemStack[] {new ItemStack(Config.tcShard, 1, ThaumcraftHelper.ShardType.WATER.ordinal())}, - new int[] { 10 }); - RecipeManagers.centrifugeManager.addRecipe(8, Config.propolis.getStackForType(PropolisType.EARTH), - new ItemStack[] {new ItemStack(Config.tcShard, 1, ThaumcraftHelper.ShardType.EARTH.ordinal())}, - new int[] { 10 }); - RecipeManagers.centrifugeManager.addRecipe(8, Config.propolis.getStackForType(PropolisType.INFUSED), - new ItemStack[] {new ItemStack(Config.tcShard, 1, ThaumcraftHelper.ShardType.MAGIC.ordinal())}, - new int[] { 10 }); - } + // if (ThaumcraftHelper.isActive()) { } if (ArsMagicaHelper.isActive()) { @@ -365,15 +365,7 @@ public class CraftingManager private static void setupSqueezerRecipes() { // Squeezer recipes - if (ThaumcraftHelper.isActive()) - { - RecipeManagers.squeezerManager.addRecipe(20, new ItemStack[] {Config.propolis.getStackForType(PropolisType.FIRE) }, - new LiquidStack(Block.lavaStill, 250), - new ItemStack(Config.tcShard, 1, ThaumcraftHelper.ShardType.FIRE.ordinal()), 8); - RecipeManagers.squeezerManager.addRecipe(20, new ItemStack[] {Config.propolis.getStackForType(PropolisType.WATER) }, - new LiquidStack(Block.waterStill, 500), - new ItemStack(Config.tcShard, 1, ThaumcraftHelper.ShardType.WATER.ordinal()), 8); - } + // if (ThaumcraftHelper.isActive()) { } } private static void setupCarpenterRecipes() diff --git a/magicbees_src/magicbees/main/utils/MoonPhase.java b/magicbees_src/magicbees/main/utils/MoonPhase.java index a674a42..3ce530a 100644 --- a/magicbees_src/magicbees/main/utils/MoonPhase.java +++ b/magicbees_src/magicbees/main/utils/MoonPhase.java @@ -44,7 +44,7 @@ public enum MoonPhase public String getLocalizedName() { - return LocalizationManager.getLocalizedString("tb.moon." + this.phaseName); + return LocalizationManager.getLocalizedString("moon." + this.phaseName); } public static MoonPhase getMoonPhase(World w) diff --git a/magicbees_src/magicbees/main/utils/compat/ForestryHelper.java b/magicbees_src/magicbees/main/utils/compat/ForestryHelper.java index e6f21e8..a431804 100644 --- a/magicbees_src/magicbees/main/utils/compat/ForestryHelper.java +++ b/magicbees_src/magicbees/main/utils/compat/ForestryHelper.java @@ -104,9 +104,11 @@ public class ForestryHelper public static void getItems() { - Config.fBeeComb = Item.itemsList[ItemInterface.getItem("beeComb").itemID]; - Config.fPollen = Item.itemsList[ItemInterface.getItem("pollen").itemID]; - Config.fCraftingResource = Item.itemsList[ItemInterface.getItem("craftingMaterial").itemID]; + Config.fBeeComb = ItemInterface.getItem("beeComb").getItem(); + Config.fPollen = ItemInterface.getItem("pollen").getItem(); + Config.fCraftingResource = ItemInterface.getItem("craftingMaterial").getItem(); + Config.fHoneyDrop = ItemInterface.getItem("honeyDrop").getItem(); + Config.fHoneydew = ItemInterface.getItem("honeydew").getItem(); } public static IAllele[] getTemplateForestryForSpecies(String speciesName) diff --git a/magicbees_src/magicbees/main/utils/compat/ThaumcraftHelper.java b/magicbees_src/magicbees/main/utils/compat/ThaumcraftHelper.java index c72dc14..0d822b3 100644 --- a/magicbees_src/magicbees/main/utils/compat/ThaumcraftHelper.java +++ b/magicbees_src/magicbees/main/utils/compat/ThaumcraftHelper.java @@ -135,6 +135,11 @@ public class ThaumcraftHelper registerResearchXML(); } + else + { + // Switch off TC-dependant items. + ResourceType.LORE_FRAGMENT.setHidden(); + } } public static void getBlocks() @@ -263,17 +268,17 @@ public class ThaumcraftHelper tags = new ObjectTags(Config.combs.itemID, -1).add(EnumTag.MAGIC, 2); ThaumcraftApi.registerObjectTag(Config.combs.itemID, CombType.OCCULT.ordinal(), tags); ThaumcraftApi.registerObjectTag(Config.combs.itemID, CombType.OTHERWORLDLY.ordinal(), tags); - ThaumcraftApi.registerObjectTag(Config.combs.itemID, CombType.TC_STARK.ordinal(), tags); + ThaumcraftApi.registerObjectTag(Config.combs.itemID, CombType.HARMONIZING.ordinal(), tags); tags = new ObjectTags(Config.combs.itemID, -1).add(EnumTag.MAGIC, 4); - ThaumcraftApi.registerObjectTag(Config.combs.itemID, CombType.TC_INFUSED.ordinal(), tags); + ThaumcraftApi.registerObjectTag(Config.combs.itemID, CombType.INFUSED.ordinal(), tags); tags = new ObjectTags(Config.combs.itemID, -1).add(EnumTag.MAGIC, 2).add(EnumTag.MOTION, 2); - ThaumcraftApi.registerObjectTag(Config.combs.itemID, CombType.TC_AIRY.ordinal(), tags); + ThaumcraftApi.registerObjectTag(Config.combs.itemID, CombType.AIRY.ordinal(), tags); tags = new ObjectTags(Config.combs.itemID, -1).add(EnumTag.MAGIC, 2).add(EnumTag.POWER, 2); - ThaumcraftApi.registerObjectTag(Config.combs.itemID, CombType.TC_FIREY.ordinal(), tags); + ThaumcraftApi.registerObjectTag(Config.combs.itemID, CombType.FIREY.ordinal(), tags); tags = new ObjectTags(Config.combs.itemID, -1).add(EnumTag.MAGIC, 2).add(EnumTag.COLD, 2); - ThaumcraftApi.registerObjectTag(Config.combs.itemID, CombType.TC_WATERY.ordinal(), tags); + ThaumcraftApi.registerObjectTag(Config.combs.itemID, CombType.WATERY.ordinal(), tags); tags = new ObjectTags(Config.combs.itemID, -1).add(EnumTag.MAGIC, 2).add(EnumTag.ROCK, 2); - ThaumcraftApi.registerObjectTag(Config.combs.itemID, CombType.TC_EARTHY.ordinal(), tags); + ThaumcraftApi.registerObjectTag(Config.combs.itemID, CombType.EARTHY.ordinal(), tags); // Tagging capsules. tags = new ObjectTags().add(EnumTag.VOID, 2).add(EnumTag.MAGIC, 2); @@ -542,27 +547,16 @@ public class ThaumcraftHelper ObjectTags tags; tags = new ObjectTags().add(EnumTag.WOOD, 10).add(EnumTag.PLANT, 10).add(EnumTag.INSECT, 10); - ResearchItem startNode = new ResearchItem("TBSTARTNODE", tags, 10, 1, Config.miscResources.getStackForType(ResourceType.RESEARCH_STARTNODE)) + ResearchItem startNode = new ResearchItem("BEESTARTNODE", tags, 10, 1, Config.miscResources.getStackForType(ResourceType.RESEARCH_STARTNODE)) .setParents(ResearchList.getResearch("UTFT")) .registerResearchItem(); - tags = new ObjectTags().add(EnumTag.INSECT, 9).add(EnumTag.MAGIC, 4).add(EnumTag.FLUX, 4); - ResearchItem starkHint = new ResearchItem("STARKHINT", tags, 5, 2, ItemInterface.getItem("beeQueenGE")) - .setParents(startNode) - .registerResearchItem(); - - tags = new ObjectTags().add(EnumTag.INSECT, 15).add(EnumTag.MAGIC, 5).add(EnumTag.WATER, 5).add(EnumTag.EARTH, 5) - .add(EnumTag.WIND, 5).add(EnumTag.FIRE, 5); - ResearchItem beeInfusion = new ResearchItem("BEEINFUSION", tags, 5, 3, Config.miscResources.getStackForType(ResourceType.RESEARCH_BEEINFUSION)) - .setParents(starkHint).setHidden() - .registerResearchItem(); - - tags = new ObjectTags().add(EnumTag.CROP, 20).add(EnumTag.EARTH, 20).add(EnumTag.WATER, 5); + tags = new ObjectTags().add(EnumTag.CROP, 15).add(EnumTag.EARTH, 15).add(EnumTag.WATER, 15); ResearchItem fertilizer = new ResearchItem("FERTILIZER", tags, 16, 0, ItemInterface.getItem("apatite")) .setParents(startNode) .registerResearchItem(); - tags = new ObjectTags().add(EnumTag.TOOL, 6).add(EnumTag.INSECT, 15).add(EnumTag.BEAST, 2) + tags = new ObjectTags().add(EnumTag.TOOL, 6).add(EnumTag.INSECT, 10).add(EnumTag.BEAST, 2) .add(EnumTag.MAGIC, 5); ResearchItem magicFrame = new ResearchItem("HIVEFRAME", tags, 10, -2, Config.hiveFrameMagic) .setParents(startNode) @@ -575,13 +569,13 @@ public class ThaumcraftHelper .registerResearchItem(); tags = new ObjectTags().add(EnumTag.TOOL, 4).add(EnumTag.INSECT, 10).add(EnumTag.LIFE, 5).add(EnumTag.EXCHANGE, 6) - .add(EnumTag.HEAL, 2).add(EnumTag.FLOWER, 6); + .add(EnumTag.FLOWER, 6); ResearchItem gentleFrame = new ResearchItem("HIVEFRAMEGENTLE", tags, 12, -2, Config.hiveFrameGentle) .setParents(magicFrame).setHidden() .registerResearchItem(); tags = new ObjectTags().add(EnumTag.TOOL, 4).add(EnumTag.INSECT, 10).add(EnumTag.LIFE, 6).add(EnumTag.EXCHANGE, 8) - .add(EnumTag.MAGIC, 8).add(EnumTag.MOTION, 4).add(EnumTag.FLESH, 4); + .add(EnumTag.MAGIC, 8).add(EnumTag.MOTION, 4); ResearchItem metabolicFrame = new ResearchItem("HIVEFRAMEMETA", tags, 9, -3, Config.hiveFrameMetabolic) .setParents(magicFrame).setHidden() .registerResearchItem(); diff --git a/magicbees_src/magicbees/tileentity/TileEntityEffectJar.java b/magicbees_src/magicbees/tileentity/TileEntityEffectJar.java index 7f3cc7c..a536846 100644 --- a/magicbees_src/magicbees/tileentity/TileEntityEffectJar.java +++ b/magicbees_src/magicbees/tileentity/TileEntityEffectJar.java @@ -1,6 +1,7 @@ package magicbees.tileentity; import magicbees.bees.Allele; +import magicbees.main.utils.VersionInfo; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; @@ -14,7 +15,7 @@ import forestry.api.genetics.IEffectData; public class TileEntityEffectJar extends TileEntity implements IInventory { - public static final String entityName = "tileEntity.effectJar"; + public static final String tileEntityName = VersionInfo.ModName.toLowerCase() + ".effectJar"; private String ownerName; private EffectJarHousing housingLogic; diff --git a/magicbees_src/magicbees/world/WorldGeneratorHandler.java b/magicbees_src/magicbees/world/WorldGeneratorHandler.java index 4fb4b41..3971ee9 100644 --- a/magicbees_src/magicbees/world/WorldGeneratorHandler.java +++ b/magicbees_src/magicbees/world/WorldGeneratorHandler.java @@ -52,6 +52,13 @@ public class WorldGeneratorHandler implements IWorldGenerator { doRetrogen = true; } + else + { + if (!tag.hasKey("hiveRetrogen") || MagicBees.getConfig().ForceHiveRegen) + { + doRetrogen = true; + } + } if (doRetrogen) {