Hives, retrogen, worldgen, loc fixes, and assloads of refactoring.

This commit is contained in:
MysteriousAges committed 2013-05-29 11:15:25 -07:00
1 parent f7fcf5ed9d
commit 48b9d59f33
56 files changed
+2109 -1539

No files matched your search

+3
View File
@@ -5,6 +5,9 @@ Added zh_CN localization (by crafteverywhere)
Added de_DE localization (by philip98)
Added ru_RU localization (by CrazyTechno)
1.4.7b
Fix for creative mode crash when a certain config option is enabled.
1.4.7a
Update for Forestry Beta.
+189 -185
View File
@@ -1,190 +1,194 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd">
<properties version="1.0">
<!-- Item names -->
<entry key="item.jellyBabies.name">Handvoll Gummibärchen</entry>
<entry key="item.tb.thaumiumScoop.name">Thaumium-Kescher</entry>
<entry key="item.tb.thaumiumGrafter.name">Thaumium-Gartenschere</entry>
<!-- Block names -->
<entry key="tile.tb.planks.greatwood.name">Großholz-Planken</entry>
<entry key="tile.tb.slab.wood.greatwood.name">Großholz-Stufe</entry>
<entry key="tile.tb.planks.silverwood.name">Silberholz-Planken</entry>
<entry key="tile.tb.slab.wood.silverwood.name">Silberholz-Stufe</entry>
<!-- Comb names -->
<entry key="tb.comb.occult">Okkultistische Wabe</entry>
<entry key="tb.comb.otherworldly">Jenseitige Wabe</entry>
<entry key="tb.comb.papery">Papierwabe</entry>
<entry key="tb.comb.stark">Extreme Wabe</entry>
<entry key="tb.comb.air">Luftige Wabe</entry>
<entry key="tb.comb.fire">Feurige Wabe</entry>
<entry key="tb.comb.water">Wässrige Wabe</entry>
<entry key="tb.comb.earth">Irdene Wabe</entry>
<entry key="tb.comb.magic">Magische Wabe</entry>
<entry key="tb.comb.aware">Gedächniswabe</entry>
<entry key="tb.comb.futive">Verstohlene Wabe</entry>
<!-- Wax names -->
<entry key="tb.wax.magic">Magisches Wachs</entry>
<!-- Drop names -->
<entry key="tb.drop.enchanting">Bezaubernder Tropfen</entry>
<entry key="tb.drop.intellect">Verstandestropfen</entry>
<!-- Pollen names -->
<entry key="tb.pollen.unusual">Ungewöhnliche Pollen</entry>
<entry key="tb.pollen.phased">Geschichtete Pollen</entry>
<!-- Propolis names -->
<entry key="tb.propolis.dull">Trübe Propolis</entry>
<entry key="tb.propolis.air">Hauchige Propolis</entry>
<entry key="tb.propolis.fire">Brennende Propolis</entry>
<entry key="tb.propolis.water">Fließende Propolis</entry>
<entry key="tb.propolis.earth">Steinige Propolis</entry>
<entry key="tb.propolis.magic">Durchdrungene Propolis</entry>
<!-- Misc Resources -->
<entry key="tb.resource.fragment">Wissensfragment</entry>
<entry key="tb.resource.lump">Aromatischer Klumpen</entry>
<entry key="tb.resource.fertilizer">Konzentriertes Gemisch</entry>
<entry key="tb.resource.crystalFlux">Kristallisierter %s - Aspekt</entry>
<!-- Frames -->
<entry key="tb.frame.magic">Magisches Rähmchen</entry>
<entry key="tb.frame.resilient">Elastisches Rähmchen</entry>
<entry key="tb.frame.gentle">Behutsames Rähmchen</entry>
<entry key="tb.frame.metabolic">Metabolisches Rähmchen</entry>
<entry key="tb.frame.necrotic">Nekrotisches Rähmchen</entry>
<entry key="tb.frame.temporal">Zeiträhmchen</entry>
<!-- Capsule names -->
<entry key="tb.capsule.magic">Magische Kapsel</entry>
<entry key="tb.capsule.void">Kapsel der Leere</entry>
<!-- Liquids -->
<entry key="tb.liquid.">Leere</entry>
<entry key="tb.liquid.water">Wasser</entry>
<entry key="tb.liquid.lava">Lava</entry>
<entry key="tb.liquid.biomass">Biomasse</entry>
<entry key="tb.liquid.biofuel">Biodiesel</entry>
<entry key="tb.liquid.Oil">Öl</entry>
<entry key="tb.liquid.Fuel">Diesel</entry>
<entry key="tb.liquid.seedoil">Samenkernöl</entry>
<entry key="tb.liquid.honey">Honig</entry>
<entry key="tb.liquid.juice">Saft</entry>
<entry key="tb.liquid.ice">Eis</entry>
<entry key="tb.liquid.milk">Milch</entry>
<entry key="tb.liquid.acid">Säure</entry>
<entry key="tb.liquid.poison">Gift</entry>
<entry key="tb.liquid.liquidNitrogen">Flüssiger Stickstoff</entry>
<entry key="tb.liquid.liquidDNA">DNA</entry>
<entry key="tb.liquid.Creosote Oil">Kreosot</entry>
<entry key="tb.liquid.Steam">Dampf</entry>
<!-- Moon Phases -->
<entry key="tb.moon.full">Vollmond</entry>
<entry key="tb.moon.gibbousWaning">Abnehmender Dreiviertelmond</entry>
<entry key="tb.moon.gibbousWaxing">Zunehmender Dreiviertelmond</entry>
<entry key="tb.moon.halfWaning">Abnehmender Halbmond</entry>
<entry key="tb.moon.halfWaxing">Zunehmender Halbmond</entry>
<entry key="tb.moon.crescentWaning">Abnehmender Sichelmond</entry>
<entry key="tb.moon.crescentWaxing">Zunehmender Sichelmond</entry>
<entry key="tb.moon.new">Neumond</entry>
<!-- Miscellaneous names -->
<entry key="tb.backpack.thaumaturge">Rucksack des Wundertäters</entry>
<!-- Species names -->
<entry key="thaumicbees.speciesEsoteric">Esoterisch</entry>
<entry key="thaumicbees.speciesEsoteric.description">Eine ungewöhnliche Kreuzung, welche magische Eigenschaften zu haben scheint.|Apinomicon</entry>
<entry key="thaumicbees.speciesMysterious">Mysteriös</entry>
<entry key="thaumicbees.speciesMysterious.description">Diese Bienen sind zum Ender der Welt und wieder zurück geflogen, ihre Macht ist dabei gestiegen.|Apinomicon</entry>
<entry key="thaumicbees.speciesArcane">Geheimnisvoll</entry>
<entry key="thaumicbees.speciesArcane.description">"Ihre Erzeugnisse sind mit Energie geladen."|Azanor, Master Thaumaturge</entry>
<entry key="thaumicbees.speciesCharmed">Bezaubert</entry>
<entry key="thaumicbees.speciesCharmed.description">Deine ersten Versuche in der Thaumcraft-Bienenzucht haben Früchte getragen. Summende Früchte.|Apinomicon</entry>
<entry key="thaumicbees.speciesEnchanted">Verzaubert</entry>
<entry key="thaumicbees.speciesEnchanted.description">Erfolgreiche Generationen bezauberter Bienen haben ihre Verbindungen zum Unbekannten verstärkt.|Apinomicon</entry>
<entry key="thaumicbees.speciesSupernatural">Übernatürlich</entry>
<entry key="thaumicbees.speciesSupernatural.description">Diese Bienen markieren die Linie zwischen dieser Welt und dem Jenseits.|Apinomicon</entry>
<entry key="thaumicbees.speciesPupil">Schülerhaft</entry>
<entry key="thaumicbees.speciesPupil.description">"Was will die Biene mit meinem Papier?!"|Yorae, Biblothekar</entry>
<entry key="thaumicbees.speciesScholarly">Schulisch</entry>
<entry key="thaumicbees.speciesScholarly.description">"Ich bin mir nicht sicher, aber ich glaube sie sind schlauer als ich..."|Yorae, Bibliothekar</entry>
<entry key="thaumicbees.speciesSavant">Gelehrt</entry>
<entry key="thaumicbees.speciesSavant.description">lim(x^(i / pi)/ log(e * 7 - ln(32/x^-pi))). Löse nach Honig auf.|Notiz, gefunden auf Yoraes Schreibtisch</entry>
<entry key="thaumicbees.speciesStark">Extrem</entry>
<entry key="thaumicbees.speciesStark.description">"Diese fühlen sich ungewönlich zu Scherben hingezogen. Das verlangt weitere Untersuchungen."|Azanor, Meister-Thaumaturg</entry>
<entry key="thaumicbees.speciesAura">Aura</entry>
<entry key="thaumicbees.speciesAura.description">"Sie arbeiten so atemberaubend schnell."|Sengir, verrückter Imker</entry>
<entry key="thaumicbees.speciesIgnis">Ignis</entry>
<entry key="thaumicbees.speciesIgnis.description">Achtung: Inhalt des Bienenkorbs extrem heiß.|Warnschild auf Azanors Bienenkorb</entry>
<entry key="thaumicbees.speciesAqua">Aqua</entry>
<entry key="thaumicbees.speciesAqua.description">"Ich habe mal versucht, die zu züchten, aber es lief nicht alles so gut."|MysteriousAges, Fortgeschrittener Thaumaturge</entry>
<entry key="thaumicbees.speciesSolum">Solum</entry>
<entry key="thaumicbees.speciesSolum.description">"Ich muss noch mal das Rezept für diese Bienen ausgraben, aber Achtung, ihre Stacheln boren sich in deine Haut."|MysteriousAges, Anfänger in der Comedy</entry>
<entry key="thaumicbees.speciesPraecantatio">Praecantatio</entry>
<entry key="thaumicbees.speciesPraecantatio.description">Bienenzucht ist Magie!|Apinomicon, Preface</entry>
<entry key="thaumicbees.speciesAware">Bewusst</entry>
<entry key="thaumicbees.speciesAware.description">"Sie können in deine Seele sehen!"|Florastar, Bienenzucht-Expertin</entry>
<entry key="thaumicbees.speciesVis">Vis</entry>
<entry key="thaumicbees.speciesVis.description">"Sie können Veränderungen in der Aura wahrnehmen, aber noch nicht verändern."|Azanors Mitschriften</entry>
<entry key="thaumicbees.speciesPure">Pur</entry>
<entry key="thaumicbees.speciesPure.description">"Es ist wie ein Bienenwächter!"|MysteriousAges, Thaumaturg</entry>
<entry key="thaumicbees.speciesFlux">Flux</entry>
<entry key="thaumicbees.speciesFlux.description">"Ich dachte, sie würden mit beim Aufräumen helfen, aber sie haben es noch dreckiger gemacht!"|Kreicus, Fortgeschrittener Thaumaturg</entry>
<entry key="thaumicbees.speciesNode">Knotenhaft</entry>
<entry key="thaumicbees.speciesNode.description">Nachdem sie eine irre Verwandlung hinter sich gebracht haben, wirken diese Bienen nun anziehend auf Magie.|Apinomicon</entry>
<entry key="thaumicbees.speciesSkulking">Schleichend</entry>
<entry key="thaumicbees.speciesSkulking.description">Diese Bienen wurden xenophob und schlecht gelaunt, lass Vorsicht walten!|Apinomicon</entry>
<entry key="thaumicbees.speciesBrainy">Intelligent</entry>
<entry key="thaumicbees.speciesBrainy.description">Ihre Waben mögen zwar übel riechen und stinken, aber ihr Geist ist weit entwickelt.|Apinomicon</entry>
<entry key="thaumicbees.speciesGossamer">Hauchdünn</entry>
<entry key="thaumicbees.speciesGossamer.description">Während sie arbeiten werden sie immer wieder für kurze Zeit unsichtbar.|Apinomicon</entry>
<entry key="thaumicbees.speciesWispy">Dünn</entry>
<entry key="thaumicbees.speciesWispy.description">Ihre Sprache ist entstellt und unverständlich. Es ist möglich, dass sie zu unnatürlichen Wesen sprechen.|Apinomicon</entry>
<entry key="thaumicbees.speciesBatty">Verrückt</entry>
<entry key="thaumicbees.speciesBatty.description">Sie scheinen auf unerklärliche Art und Weise Fledermäuse anzuziehen.|Apinomicon</entry>
<entry key="thaumicbees.speciesGhastly">Gespenstisch</entry>
<entry key="thaumicbees.speciesGhastly.description">"*seufz*... Ernsthaft?"|Taveria</entry>
<entry key="thaumicbees.speciesTimely">Rechtzeitig</entry>
<entry key="thaumicbees.speciesTimely.description">"Ein Imker ist nie zu spät. Er kommt immer dann an, wenn er er es geplant hat!"|Sengir, Verrückter Imker</entry>
<entry key="thaumicbees.speciesLordly">Stolz</entry>
<entry key="thaumicbees.speciesLordly.description">Sie leben in Frieden innerhalb des Sichtfelds des Auges der Harmonie|Ramponierte überreste des antiken Apinomicons</entry>
<entry key="thaumicbees.speciesDoctoral">Doktorisch</entry>
<entry key="thaumicbees.speciesDoctoral.description">"Willst du ein Gummibärchen haben?"|Vorbeigehender Unbekannter mit großem Schal und blauer Box</entry>
<!-- Bee Alleles -->
<entry key="thaumicbees.effectCurative">Reinigend</entry>
<entry key="thaumicbees.effecteffectDigSpeed">Abbaugeschwindigkeit</entry>
<entry key="thaumicbees.effecteffectMoveSpeed">Schnelligkeit</entry>
<entry key="thaumicbees.effecteffectSlowSpeed">Langsamkeit</entry>
<entry key="thaumicbees.effectNodeGeneration">Aura-Anziehungskraft</entry>
<entry key="thaumicbees.effectBrainy">Intelligent</entry>
<entry key="thaumicbees.effectBatty">Verrückt</entry>
<entry key="thaumicbees.effectWispy">Dünn</entry>
<entry key="thaumicbees.Ghast">Gespenstisch</entry>
<entry key="tb.bees.flower.book">Bücher</entry>
<entry key="tb.bees.flower.magic">Magische Blumen</entry>
<entry key="tb.bees.flower.node">Knotenpunkt</entry>
<entry key="tb.bees.flower.nodePure">Knotenreinigung</entry>
<entry key="tb.bees.flower.nodeFlux">Knotenverschmutzung</entry>
<!-- Classification -->
<entry key="classification.arcane">Geheimnisvoll</entry>
<entry key="classification.arcane.description"></entry>
<entry key="classification.supernatural">Übernatürlich</entry>
<entry key="classification.supernatural.description"></entry>
<entry key="classification.scholarly">Gelehrt</entry>
<entry key="classification.scholarly.description"></entry>
<entry key="classification.thaumic">Thaumisch</entry>
<entry key="classification.thaumic.description"></entry>
<entry key="classification.skulking">Schleichend</entry>
<entry key="classification.skulking.description"></entry>
<entry key="classification.vis">Kraft</entry>
<entry key="classification.vis.description"></entry>
<entry key="classification.time">Zwit</entry>
<entry key="classification.time.description"></entry>
<!-- Item names -->
<entry key="item.magicbees:jellyBabies.name">Handvoll Gummibärchen</entry>
<entry key="item.magicbees:thaumiumScoop.name">Thaumium-Kescher</entry>
<entry key="item.magicbees:thaumiumGrafter.name">Thaumium-Gartenschere</entry>
<!-- Block names -->
<entry key="tile.planks.greatwood.name">Großholz-Planken</entry>
<entry key="tile.slab.wood.greatwood.name">Großholz-Stufe</entry>
<entry key="tile.planks.silverwood.name">Silberholz-Planken</entry>
<entry key="tile.slab.wood.silverwood.name">Silberholz-Stufe</entry>
<!-- Comb names -->
<entry key="comb.occult">Okkultistische Wabe</entry>
<entry key="comb.otherworldly">Jenseitige Wabe</entry>
<entry key="comb.papery">Papierwabe</entry>
<entry key="comb.stark">Extreme Wabe</entry>
<entry key="comb.air">Luftige Wabe</entry>
<entry key="comb.fire">Feurige Wabe</entry>
<entry key="comb.water">Wässrige Wabe</entry>
<entry key="comb.earth">Irdene Wabe</entry>
<entry key="comb.magic">Magische Wabe</entry>
<entry key="comb.aware">Gedächniswabe</entry>
<entry key="comb.futive">Verstohlene Wabe</entry>
<!-- Wax names -->
<entry key="wax.magic">Magisches Wachs</entry>
<!-- Drop names -->
<entry key="drop.enchanting">Bezaubernder Tropfen</entry>
<entry key="drop.intellect">Verstandestropfen</entry>
<!-- Pollen names -->
<entry key="pollen.unusual">Ungewöhnliche Pollen</entry>
<entry key="pollen.phased">Geschichtete Pollen</entry>
<!-- Propolis names -->
<entry key="propolis.dull">Trübe Propolis</entry>
<entry key="propolis.air">Hauchige Propolis</entry>
<entry key="propolis.fire">Brennende Propolis</entry>
<entry key="propolis.water">Fließende Propolis</entry>
<entry key="propolis.earth">Steinige Propolis</entry>
<entry key="propolis.magic">Durchdrungene Propolis</entry>
<!-- Misc Resources -->
<entry key="resource.fragment">Wissensfragment</entry>
<entry key="resource.lump">Aromatischer Klumpen</entry>
<entry key="resource.fertilizer">Konzentriertes Gemisch</entry>
<entry key="resource.crystalFlux">Kristallisierter %s - Aspekt</entry>
<!-- Frames -->
<entry key="frame.magic">Magisches Rähmchen</entry>
<entry key="frame.resilient">Elastisches Rähmchen</entry>
<entry key="frame.gentle">Behutsames Rähmchen</entry>
<entry key="frame.metabolic">Metabolisches Rähmchen</entry>
<entry key="frame.necrotic">Nekrotisches Rähmchen</entry>
<entry key="frame.temporal">Zeiträhmchen</entry>
<!-- Capsule names -->
<entry key="capsule.magic">Magische Kapsel</entry>
<entry key="capsule.void">Kapsel der Leere</entry>
<!-- Liquids -->
<entry key="liquid.">Leere</entry>
<entry key="liquid.water">Wasser</entry>
<entry key="liquid.lava">Lava</entry>
<entry key="liquid.biomass">Biomasse</entry>
<entry key="liquid.biofuel">Biodiesel</entry>
<entry key="liquid.Oil">Öl</entry>
<entry key="liquid.Fuel">Diesel</entry>
<entry key="liquid.seedoil">Samenkernöl</entry>
<entry key="liquid.honey">Honig</entry>
<entry key="liquid.juice">Saft</entry>
<entry key="liquid.ice">Eis</entry>
<entry key="liquid.milk">Milch</entry>
<entry key="liquid.acid">Säure</entry>
<entry key="liquid.poison">Gift</entry>
<entry key="liquid.liquidNitrogen">Flüssiger Stickstoff</entry>
<entry key="liquid.liquidDNA">DNA</entry>
<entry key="liquid.Creosote Oil">Kreosot</entry>
<entry key="liquid.Steam">Dampf</entry>
<!-- Moon Phases -->
<entry key="moon.full">Vollmond</entry>
<entry key="moon.gibbousWaning">Abnehmender Dreiviertelmond</entry>
<entry key="moon.gibbousWaxing">Zunehmender Dreiviertelmond</entry>
<entry key="moon.halfWaning">Abnehmender Halbmond</entry>
<entry key="moon.halfWaxing">Zunehmender Halbmond</entry>
<entry key="moon.crescentWaning">Abnehmender Sichelmond</entry>
<entry key="moon.crescentWaxing">Zunehmender Sichelmond</entry>
<entry key="moon.new">Neumond</entry>
<!-- Miscellaneous names -->
<entry key="backpack.thaumaturge">Rucksack des Wundertäters</entry>
<!-- Species names -->
<entry key="magicbees.speciesEsoteric">Esoterisch</entry>
<entry key="magicbees.speciesEsoteric.description">Eine ungewöhnliche Kreuzung, welche magische Eigenschaften zu haben scheint.|Apinomicon</entry>
<entry key="magicbees.speciesMysterious">Mysteriös</entry>
<entry key="magicbees.speciesMysterious.description">Diese Bienen sind zum Ender der Welt und wieder zurück geflogen, ihre Macht ist dabei gestiegen.|Apinomicon</entry>
<entry key="magicbees.speciesArcane">Geheimnisvoll</entry>
<entry key="magicbees.speciesArcane.description">"Ihre Erzeugnisse sind mit Energie geladen."|Azanor, Master Thaumaturge</entry>
<entry key="magicbees.speciesCharmed">Bezaubert</entry>
<entry key="magicbees.speciesCharmed.description">Deine ersten Versuche in der Thaumcraft-Bienenzucht haben Früchte getragen. Summende Früchte.|Apinomicon</entry>
<entry key="magicbees.speciesEnchanted">Verzaubert</entry>
<entry key="magicbees.speciesEnchanted.description">Erfolgreiche Generationen bezauberter Bienen haben ihre Verbindungen zum Unbekannten verstärkt.|Apinomicon</entry>
<entry key="magicbees.speciesSupernatural">Übernatürlich</entry>
<entry key="magicbees.speciesSupernatural.description">Diese Bienen markieren die Linie zwischen dieser Welt und dem Jenseits.|Apinomicon</entry>
<entry key="magicbees.speciesPupil">Schülerhaft</entry>
<entry key="magicbees.speciesPupil.description">"Was will die Biene mit meinem Papier?!"|Yorae, Biblothekar</entry>
<entry key="magicbees.speciesScholarly">Schulisch</entry>
<entry key="magicbees.speciesScholarly.description">"Ich bin mir nicht sicher, aber ich glaube sie sind schlauer als ich..."|Yorae, Bibliothekar</entry>
<entry key="magicbees.speciesSavant">Gelehrt</entry>
<entry key="magicbees.speciesSavant.description">lim(x^(i / pi)/ log(e * 7 - ln(32/x^-pi))). Löse nach Honig auf.|Notiz, gefunden auf Yoraes Schreibtisch</entry>
<entry key="magicbees.speciesAware">Bewusst</entry>
<entry key="magicbees.speciesAware.description">"Sie können in deine Seele sehen!"|Florastar, Bienenzucht-Expertin</entry>
<entry key="magicbees.speciesSkulking">Schleichend</entry>
<entry key="magicbees.speciesSkulking.description">Diese Bienen wurden xenophob und schlecht gelaunt, lass Vorsicht walten!|Apinomicon</entry>
<entry key="magicbees.speciesGhastly">Gespenstisch</entry>
<entry key="magicbees.speciesGhastly.description">"*seufz*... Ernsthaft?"|Taveria</entry>
<entry key="magicbees.speciesTimely">Rechtzeitig</entry>
<entry key="magicbees.speciesTimely.description">"Ein Imker ist nie zu spät. Er kommt immer dann an, wenn er er es geplant hat!"|Sengir, Verrückter Imker</entry>
<entry key="magicbees.speciesLordly">Stolz</entry>
<entry key="magicbees.speciesLordly.description">Sie leben in Frieden innerhalb des Sichtfelds des Auges der Harmonie|Ramponierte überreste des antiken Apinomicons</entry>
<entry key="magicbees.speciesDoctoral">Doktorisch</entry>
<entry key="magicbees.speciesDoctoral.description">"Willst du ein Gummibärchen haben?"|Vorbeigehender Unbekannter mit großem Schal und blauer Box</entry>
<entry key="magicbees.speciesTCStark">Extrem</entry>
<entry key="magicbees.speciesTCStark.description">"Diese fühlen sich ungewönlich zu Scherben hingezogen. Das verlangt weitere Untersuchungen."|Azanor, Meister-Thaumaturg</entry>
<entry key="magicbees.speciesTCAir">Aura</entry>
<entry key="magicbees.speciesTCAir.description">"Sie arbeiten so atemberaubend schnell."|Sengir, verrückter Imker</entry>
<entry key="magicbees.speciesTCFire">Ignis</entry>
<entry key="magicbees.speciesTCFire.description">Achtung: Inhalt des Bienenkorbs extrem heiß.|Warnschild auf Azanors Bienenkorb</entry>
<entry key="magicbees.speciesTCWater">Aqua</entry>
<entry key="magicbees.speciesTCWater.description">"Ich habe mal versucht, die zu züchten, aber es lief nicht alles so gut."|MysteriousAges, Fortgeschrittener Thaumaturge</entry>
<entry key="magicbees.speciesTCEarth">Solum</entry>
<entry key="magicbees.speciesTCEarth.description">"Ich muss noch mal das Rezept für diese Bienen ausgraben, aber Achtung, ihre Stacheln boren sich in deine Haut."|MysteriousAges, Anfänger in der Comedy</entry>
<entry key="magicbees.speciesTCMagic">Praecantatio</entry>
<entry key="magicbees.speciesTCMagic.description">Bienenzucht ist Magie!|Apinomicon, Preface</entry>
<entry key="magicbees.speciesTCVis">Vis</entry>
<entry key="magicbees.speciesTCVis.description">"Sie können Veränderungen in der Aura wahrnehmen, aber noch nicht verändern."|Azanors Mitschriften</entry>
<entry key="magicbees.speciesTCPure">Pur</entry>
<entry key="magicbees.speciesTCPure.description">"Es ist wie ein Bienenwächter!"|MysteriousAges, Thaumaturg</entry>
<entry key="magicbees.speciesTCFlux">Flux</entry>
<entry key="magicbees.speciesTCFlux.description">"Ich dachte, sie würden mit beim Aufräumen helfen, aber sie haben es noch dreckiger gemacht!"|Kreicus, Fortgeschrittener Thaumaturg</entry>
<entry key="magicbees.speciesTCBrainy">Intelligent</entry>
<entry key="magicbees.speciesTCBrainy.description">Ihre Waben mögen zwar übel riechen und stinken, aber ihr Geist ist weit entwickelt.|Apinomicon</entry>
<entry key="magicbees.speciestcWispy">Dünn</entry>
<entry key="magicbees.speciesTCWispy.description">Ihre Sprache ist entstellt und unverständlich. Es ist möglich, dass sie zu unnatürlichen Wesen sprechen.|Apinomicon</entry>
<entry key="magicbees.speciesTCBatty">Verrückt</entry>
<entry key="magicbees.speciesTCBatty.description">Sie scheinen auf unerklärliche Art und Weise Fledermäuse anzuziehen.|Apinomicon</entry>
<!-- Bee Alleles -->
<entry key="magicbees.effectCurative">Reinigend</entry>
<entry key="magicbees.effecteffectDigSpeed">Abbaugeschwindigkeit</entry>
<entry key="magicbees.effecteffectMoveSpeed">Schnelligkeit</entry>
<entry key="magicbees.effecteffectSlowSpeed">Langsamkeit</entry>
<entry key="magicbees.effectNodeGeneration">Aura-Anziehungskraft</entry>
<entry key="magicbees.effectBrainy">Intelligent</entry>
<entry key="magicbees.effectBatty">Verrückt</entry>
<entry key="magicbees.effectWispy">Dünn</entry>
<entry key="magicbees.Ghast">Gespenstisch</entry>
<entry key="flowerProvider.book">Bücher</entry>
<entry key="flowerProvider.magic">Magische Blumen</entry>
<entry key="flowerProvider.node">Knotenpunkt</entry>
<entry key="flowerProvider.nodePure">Knotenreinigung</entry>
<entry key="flowerProvider.nodeFlux">Knotenverschmutzung</entry>
<!-- Classification -->
<entry key="classification.arcane">Geheimnisvoll</entry>
<entry key="classification.arcane.description"></entry>
<entry key="classification.supernatural">Übernatürlich</entry>
<entry key="classification.supernatural.description"></entry>
<entry key="classification.scholarly">Gelehrt</entry>
<entry key="classification.scholarly.description"></entry>
<entry key="classification.thaumic">Thaumisch</entry>
<entry key="classification.thaumic.description"></entry>
<entry key="classification.skulking">Schleichend</entry>
<entry key="classification.skulking.description"></entry>
<entry key="classification.vis">Kraft</entry>
<entry key="classification.vis.description"></entry>
<entry key="classification.time">Zwit</entry>
<entry key="classification.time.description"></entry>
</properties>
+252 -223
View File
@@ -2,79 +2,81 @@
<!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd">
<properties version="1.0">
<!-- Item names -->
<entry key="item.thaumicbees:jellyBabies.name">Handful of Jelly Babies</entry>
<entry key="item.thaumicbees:thaumiumScoop.name">Thaumium Scoop</entry>
<entry key="item.thaumicbees:thaumiumGrafter.name">Thaumium Grafter</entry>
<entry key="item.magicbees:jellyBabies.name">Handful of Jelly Babies</entry>
<entry key="item.magicbees:thaumiumScoop.name">Thaumium Scoop</entry>
<entry key="item.magicbees:thaumiumGrafter.name">Thaumium Grafter</entry>
<!-- Specially handled Item names -->
<entry key="item.tb.moonDial.name">Jade Moon Dial</entry>
<entry key="item.moonDial.name">Jade Moon Dial</entry>
<!-- Block names -->
<entry key="tile.tb.planks.greatwood.name">Greatwood Planks</entry>
<entry key="tile.tb.slab.wood.greatwood.name">Greatwood Slab</entry>
<entry key="tile.tb.planks.silverwood.name">Silverwood Planks</entry>
<entry key="tile.tb.slab.wood.silverwood.name">Silverwood Slab</entry>
<entry key="tile.tb.effectJar.name">Bee Collector's Jar</entry>
<entry key="tile.tb.hive.curious.name">Curious Hive</entry>
<entry key="tile.tb.hive.unusual.name">Unusual Hive</entry>
<entry key="tile.tb.hive.deep.name">Deep Hive</entry>
<entry key="tile.tb.hive.infernal.name">Infernal Hive</entry>
<entry key="tile.tb.hive.end.name">Oblivion Hive</entry>
<entry key="tile.planks.greatwood.name">Greatwood Planks</entry>
<entry key="tile.slab.wood.greatwood.name">Greatwood Slab</entry>
<entry key="tile.planks.silverwood.name">Silverwood Planks</entry>
<entry key="tile.slab.wood.silverwood.name">Silverwood Slab</entry>
<entry key="tile.effectJar.name">Bee Collector's Jar</entry>
<entry key="tile.hive.curious.name">Curious Hive</entry>
<entry key="tile.hive.unusual.name">Unusual Hive</entry>
<entry key="tile.hive.deep.name">Deep Hive</entry>
<entry key="tile.hive.resonant.name">Resonating Hive</entry>
<entry key="tile.hive.infernal.name">Infernal Hive</entry>
<entry key="tile.hive.oblivion.name">Oblivion Hive</entry>
<!-- Comb names -->
<entry key="tb.comb.occult">Occult Comb</entry>
<entry key="tb.comb.otherworldly">Otherworldy Comb</entry>
<entry key="tb.comb.paper">Papery Comb</entry>
<entry key="tb.comb.stark">Stark Comb</entry>
<entry key="tb.comb.air">Airy Comb</entry>
<entry key="tb.comb.fire">Firey Comb</entry>
<entry key="tb.comb.water">Watery Comb</entry>
<entry key="tb.comb.earth">Earthy Comb</entry>
<entry key="tb.comb.magic">Infused Comb</entry>
<entry key="tb.comb.aware">Memory Comb</entry>
<entry key="tb.comb.furtive">Furtive Comb</entry>
<entry key="tb.comb.soul">Soul Comb</entry>
<entry key="tb.comb.essence">Essence Comb</entry>
<entry key="tb.comb.potent">Potent Comb</entry>
<entry key="comb.mundane">Mundane Comb</entry>
<entry key="comb.occult">Occult Comb</entry>
<entry key="comb.otherworldly">Otherworldy Comb</entry>
<entry key="comb.paper">Papery Comb</entry>
<entry key="comb.stark">Stark Comb</entry>
<entry key="comb.air">Airy Comb</entry>
<entry key="comb.fire">Firey Comb</entry>
<entry key="comb.water">Watery Comb</entry>
<entry key="comb.earth">Earthy Comb</entry>
<entry key="comb.magic">Infused Comb</entry>
<entry key="comb.aware">Memory Comb</entry>
<entry key="comb.furtive">Furtive Comb</entry>
<entry key="comb.soul">Soul Comb</entry>
<entry key="comb.essence">Essence Comb</entry>
<entry key="comb.potent">Potent Comb</entry>
<!-- Wax names -->
<entry key="tb.wax.magic">Magic Wax</entry>
<entry key="tb.wax.soul">Soulful Wax</entry>
<entry key="wax.magic">Magic Wax</entry>
<entry key="wax.soul">Soulful Wax</entry>
<!-- Drop names -->
<entry key="tb.drop.enchanting">Enchanting Drop</entry>
<entry key="tb.drop.intellect">Intellect Drop</entry>
<entry key="drop.enchanting">Enchanting Drop</entry>
<entry key="drop.intellect">Intellect Drop</entry>
<!-- Pollen names -->
<entry key="tb.pollen.unusual">Unusual Pollen</entry>
<entry key="tb.pollen.phased">Phased Pollen</entry>
<entry key="pollen.unusual">Unusual Pollen</entry>
<entry key="pollen.phased">Phased Pollen</entry>
<!-- Nugget names -->
<entry key="tb.nugget.iron">Iron Nugget</entry>
<entry key="tb.nugget.steel">Steel Nugget</entry>
<entry key="tb.nugget.copper">Copper Nugget</entry>
<entry key="tb.nugget.tin">Tin Nugget</entry>
<entry key="tb.nugget.silver">Silver Nugget</entry>
<entry key="tb.nugget.lead">Lead Nugget</entry>
<entry key="tb.nugget.diamond">Diamond Shard</entry>
<entry key="tb.nugget.emerald">Emerald Shard</entry>
<entry key="tb.nugget.apatite">Apatite Shard</entry>
<entry key="nugget.iron">Iron Nugget</entry>
<entry key="nugget.steel">Steel Nugget</entry>
<entry key="nugget.copper">Copper Nugget</entry>
<entry key="nugget.tin">Tin Nugget</entry>
<entry key="nugget.silver">Silver Nugget</entry>
<entry key="nugget.lead">Lead Nugget</entry>
<entry key="nugget.diamond">Diamond Shard</entry>
<entry key="nugget.emerald">Emerald Shard</entry>
<entry key="nugget.apatite">Apatite Shard</entry>
<!-- Propolis names -->
<entry key="tb.propolis.dull">Dull Propolis</entry>
<entry key="tb.propolis.air">Breezey Propolis</entry>
<entry key="tb.propolis.fire">Burning Propolis</entry>
<entry key="tb.propolis.water">Flowing Propolis</entry>
<entry key="tb.propolis.earth">Stony Propolis</entry>
<entry key="tb.propolis.magic">Infused Propolis</entry>
<entry key="propolis.dull">Dull Propolis</entry>
<entry key="propolis.air">Breezey Propolis</entry>
<entry key="propolis.fire">Burning Propolis</entry>
<entry key="propolis.water">Flowing Propolis</entry>
<entry key="propolis.earth">Stony Propolis</entry>
<entry key="propolis.magic">Infused Propolis</entry>
<!-- Misc Resources -->
<entry key="tb.resource.fragment">Lore Fragment</entry>
<entry key="tb.resource.lump">Aromatic Lump</entry>
<entry key="tb.resource.fertilizer">Concentrated Compound</entry>
<entry key="tb.resource.startNode">Bees and Magic</entry>
<entry key="tb.resource.beeEnchant">Stark Infusion</entry>
<entry key="tb.resource.crystalAspect">Crystalized %s Aspect</entry>
<entry key="resource.fragment">Lore Fragment</entry>
<entry key="resource.lump">Aromatic Lump</entry>
<entry key="resource.fertilizer">Concentrated Compound</entry>
<entry key="resource.startNode">Bees and Magic</entry>
<entry key="resource.beeEnchant">Stark Infusion</entry>
<entry key="resource.crystalAspect">Crystalized %s Aspect</entry>
<!-- Frames -->
<entry key="item.frameMagic.name">Magic Frame</entry>
@@ -86,190 +88,217 @@
<entry key="item.frameOblivion.name">Oblivion Frame</entry>
<!-- Capsule names -->
<entry key="tb.capsule.magic">Magic Capsule</entry>
<entry key="tb.capsule.void">Void Capsule</entry>
<entry key="capsule.magic">Magic Capsule</entry>
<entry key="capsule.void">Void Capsule</entry>
<!-- Liquids -->
<entry key="tb.liquid.">Empty</entry>
<entry key="tb.liquid.water">Water</entry>
<entry key="tb.liquid.lava">Lava</entry>
<entry key="tb.liquid.biomass">Biomass</entry>
<entry key="tb.liquid.biofuel">Biofuel</entry>
<entry key="tb.liquid.Oil">Oil</entry>
<entry key="tb.liquid.Fuel">Fuel</entry>
<entry key="tb.liquid.seedoil">Seed Oil</entry>
<entry key="tb.liquid.honey">Honey</entry>
<entry key="tb.liquid.juice">Juice</entry>
<entry key="tb.liquid.ice">Ice</entry>
<entry key="tb.liquid.milk">Milk</entry>
<entry key="tb.liquid.acid">Acid</entry>
<entry key="tb.liquid.poison">Poison</entry>
<entry key="tb.liquid.liquidNitrogen">Liquid Nitrogen</entry>
<entry key="tb.liquid.liquidDNA">Liquid DNA</entry>
<entry key="tb.liquid.Creosote Oil">Creosote Oil</entry>
<entry key="tb.liquid.Steam">Steam</entry>
<entry key="liquid.">Empty</entry>
<entry key="liquid.water">Water</entry>
<entry key="liquid.lava">Lava</entry>
<entry key="liquid.biomass">Biomass</entry>
<entry key="liquid.biofuel">Biofuel</entry>
<entry key="liquid.Oil">Oil</entry>
<entry key="liquid.Fuel">Fuel</entry>
<entry key="liquid.seedoil">Seed Oil</entry>
<entry key="liquid.honey">Honey</entry>
<entry key="liquid.juice">Juice</entry>
<entry key="liquid.ice">Ice</entry>
<entry key="liquid.milk">Milk</entry>
<entry key="liquid.acid">Acid</entry>
<entry key="liquid.poison">Poison</entry>
<entry key="liquid.liquidNitrogen">Liquid Nitrogen</entry>
<entry key="liquid.liquidDNA">Liquid DNA</entry>
<entry key="liquid.Creosote Oil">Creosote Oil</entry>
<entry key="liquid.Steam">Steam</entry>
<!-- Moon Phases -->
<entry key="tb.moon.full">Full Moon</entry>
<entry key="tb.moon.gibbousWaning">Waning Gibbous</entry>
<entry key="tb.moon.gibbousWaxing">Waxing Gibbous</entry>
<entry key="tb.moon.halfWaning">Waning Half</entry>
<entry key="tb.moon.halfWaxing">Waxing Half</entry>
<entry key="tb.moon.crescentWaning">Waning Crescent</entry>
<entry key="tb.moon.crescentWaxing">Waxing Crescent</entry>
<entry key="tb.moon.new">New Moon</entry>
<entry key="moon.full">Full Moon</entry>
<entry key="moon.gibbousWaning">Waning Gibbous</entry>
<entry key="moon.gibbousWaxing">Waxing Gibbous</entry>
<entry key="moon.halfWaning">Waning Half</entry>
<entry key="moon.halfWaxing">Waxing Half</entry>
<entry key="moon.crescentWaning">Waning Crescent</entry>
<entry key="moon.crescentWaxing">Waxing Crescent</entry>
<entry key="moon.new">New Moon</entry>
<!-- Miscellaneous names -->
<entry key="tb.backpack.thaumaturge">Thaumaturge's Backpack</entry>
<entry key="itemGroup.thaumicBees">Thaumic Bees</entry>
<entry key="backpack.thaumaturge">Thaumaturge's Backpack</entry>
<entry key="itemGroup.magicBees">Thaumic Bees</entry>
<!-- Species names -->
<entry key="thaumicbees.speciesEsoteric">Esoteric</entry>
<entry key="thaumicbees.speciesEsoteric.description">An unusual crossbreed which seems to have magical properties.|Apinomicon</entry>
<entry key="thaumicbees.speciesMysterious">Mysterious</entry>
<entry key="thaumicbees.speciesMysterious.description">These bees have been to the end of the world and back, and their power has grown.|Apinomicon</entry>
<entry key="thaumicbees.speciesArcane">Arcane</entry>
<entry key="thaumicbees.speciesArcane.description">"Their produce is charged with magic."|Azanor, Master Thaumaturge</entry>
<entry key="thaumicbees.speciesCharmed">Charmed</entry>
<entry key="thaumicbees.speciesCharmed.description">Your first experiments in Thaumaturgical Apiculture have yielded fruit. Buzzing fruit.|Apinomicon</entry>
<entry key="thaumicbees.speciesEnchanted">Enchanted</entry>
<entry key="thaumicbees.speciesEnchanted.description">Successive generations of Charmed bees have reinforced their connection to the unknown.|Apinomicon</entry>
<entry key="thaumicbees.speciesSupernatural">Supernatural</entry>
<entry key="thaumicbees.speciesSupernatural.description">These bees walk the line between this world and the unseen.|Apinomicon</entry>
<entry key="thaumicbees.speciesPupil">Pupil</entry>
<entry key="thaumicbees.speciesPupil.description">"What does that bee want with my paper?!"|Yorae, Librarian</entry>
<entry key="thaumicbees.speciesStark">Stark</entry>
<entry key="thaumicbees.speciesStark.description">"These are unusually attracted to shards. This warrents further investigation."|Azanor, Master Thaumaturge</entry>
<entry key="thaumicbees.speciesAura">Aura</entry>
<entry key="thaumicbees.speciesAura.description">"They work so fast it's breathtaking."|Sengir, Mad Apiarist</entry>
<entry key="thaumicbees.speciesIgnis">Ignis</entry>
<entry key="thaumicbees.speciesIgnis.description">Caution: Contents of hive extremely hot.|Warning label on Azanor's apiary</entry>
<entry key="thaumicbees.speciesAqua">Aqua</entry>
<entry key="thaumicbees.speciesAqua.description">"I tried to breed them once, but that was a wash."|MysteriousAges, Apprentice Thaumaturge</entry>
<entry key="thaumicbees.speciesSolum">Solum</entry>
<entry key="thaumicbees.speciesSolum.description">"You're really gonna dig these bees, but watch out - they bore quite easily."|MysteriousAges, Apprentice Comedian</entry>
<entry key="thaumicbees.speciesAware">Aware</entry>
<entry key="thaumicbees.speciesAware.description">"They can see into your soul!"|Florastar, Expert Beekeeper</entry>
<entry key="thaumicbees.speciesSkulking">Skulking</entry>
<entry key="thaumicbees.speciesSkulking.description">These bees have become xenophobic and bad-tempered. Use caution.|Apinomicon</entry>
<entry key="thaumicbees.speciesGhastly">Ghastly</entry>
<entry key="thaumicbees.speciesGhastly.description">"*sigh*... Really, Myst?"|Taveria, irritated Apiarist</entry>
<entry key="thaumicbees.speciesSpidery">Spidery</entry>
<entry key="thaumicbees.speciesSpidery.description">Spiderbee; n. Does whatever a spider-bee does.|Unknown</entry>
<entry key="thaumicbees.speciesTimely">Timely</entry>
<entry key="thaumicbees.speciesTimely.description">"An apiarist is never late. He arrives precisely when he means to!"|Sengir, Mad Apiarist</entry>
<entry key="thaumicbees.speciesLordly">Lordly</entry>
<entry key="thaumicbees.speciesLordly.description">They live in peace, within the sight of the Eye of Harmony|Tattered Remains of ancient Apinomicon</entry>
<entry key="thaumicbees.speciesDoctoral">Doctoral</entry>
<entry key="thaumicbees.speciesDoctoral.description">"Would you like a Jelly Baby?"|Passing stranger with a great scarf and a blue box</entry>
<entry key="thaumicbees.speciesSpirit">Spirit</entry>
<entry key="thaumicbees.speciesSpirit.description">It is said these bees are able to contact the dead.|Apinomicon</entry>
<entry key="thaumicbees.speciesSoul">Soul</entry>
<entry key="thaumicbees.speciesSoul.description">"The Dread Pirate Roberts has come for your SOOOOOOULS!"|Dread Pirate Roberts</entry>
<entry key="thaumicbees.speciesIron">Ferrous</entry>
<entry key="thaumicbees.speciesIron.description">Having absorbed some of the base metal, these bees can concentrate the essence of iron from the region.|Apinomicon</entry>
<entry key="thaumicbees.speciesGold">Auric</entry>
<entry key="thaumicbees.speciesGold.description">Not all that glitters is gold.|Ancient Aphorism</entry>
<entry key="thaumicbees.speciesCopper">Cuprum</entry>
<entry key="thaumicbees.speciesCopper.description">A base metal common in many applications; these bees are helpful for resource-starved magicians.|Apinomicon</entry>
<entry key="thaumicbees.speciesTin">Stannum</entry>
<entry key="thaumicbees.speciesTin.description">While metalic, these bees are suprisingly fragile.|Apinomicon</entry>
<entry key="thaumicbees.speciesSilver">Argentum</entry>
<entry key="thaumicbees.speciesSilver.description">While they do not recieve as much attention as Golden bees, they are nonetheless valuable.|Apinomicon</entry>
<entry key="thaumicbees.speciesLead">Plumbum</entry>
<entry key="thaumicbees.speciesLead.description">A favourite of amateur alchemists, they believe they can transform these bees into gold.|Apinomicon</entry>
<entry key="thaumicbees.speciesDiamond">Diamandi</entry>
<entry key="thaumicbees.speciesDiamond.description">Crystalline, glittering, and harder than dragon's teeth. These bees are none of those.|Apinomicon</entry>
<entry key="thaumicbees.speciesEmerald">Esmeraldi</entry>
<entry key="thaumicbees.speciesEmerald.description">It is said they have been to a land ruled by a Great Wizard, and have taken the aspect of his city.|Apinomicon</entry>
<entry key="thaumicbees.speciesApatite">Apatine</entry>
<entry key="thaumicbees.speciesApatite.description">Day and night the whining droned on. I barricaded the windows and hid in the cellar, but everywhere the high-pitched noise of the apatine bees penetrated the walls and drove me to distraction.|Beekeeping 101</entry>
<entry key="magicbees.speciesMystical">Mystical</entry>
<entry key="magicbees.speciesMystical.description"></entry>
<entry key="magicbees.speciesSorcerous">Sorcerous</entry>
<entry key="magicbees.speciesSorcerous.description"></entry>
<entry key="magicbees.speciesUnusual">Unusual</entry>
<entry key="magicbees.speciesUnusual.description"></entry>
<entry key="magicbees.speciesAttuned">Attuned</entry>
<entry key="magicbees.speciesAttuned.description"></entry>
<entry key="thaumicbees.speciesScholarly">Scholarly</entry>
<entry key="thaumicbees.speciesScholarly.description">"I can't be sure, but I think they might be smarter than me..."|Yorae, Librarian</entry>
<entry key="thaumicbees.speciesSavant">Savant</entry>
<entry key="thaumicbees.speciesSavant.description">lim(x^(i / pi)/ log(e * 7 - ln(32/x^-pi))). Solve for honey.|Note found on Yorae's desk</entry>
<entry key="thaumicbees.speciesPraecantatio">Praecantatio</entry>
<entry key="thaumicbees.speciesPraecantatio.description">Beekeeping is magic!|Apinomicon, Preface</entry>
<entry key="thaumicbees.speciesVis">Vis</entry>
<entry key="thaumicbees.speciesVis.description">"They can feel changes in the aura, but are not yet able to affect it."|Azanor, research notes</entry>
<entry key="thaumicbees.speciesPure">Pure</entry>
<entry key="thaumicbees.speciesPure.description">"It's like a bee janitor!"|MysteriousAges, Thaumaturge</entry>
<entry key="thaumicbees.speciesFlux">Flux</entry>
<entry key="thaumicbees.speciesFlux.description">"I thought they would help clean up, but it only makes things worse!"|Kreicus, Apprentice Thaumaturge</entry>
<entry key="thaumicbees.speciesNode">Node</entry>
<entry key="thaumicbees.speciesNode.description">Having undergone a freak mutation, these bees now attract magic to them.|Apinomicon</entry>
<entry key="thaumicbees.speciesRejuvenating">Rejuvenating</entry>
<entry key="thaumicbees.speciesRejuvenating.description">The hum of the hive is magical, and over time is absorbed by nearby nodes.|Apinomicon</entry>
<entry key="thaumicbees.speciesBrainy">Brainy</entry>
<entry key="thaumicbees.speciesBrainy.description">Their combs may be fetid and foul-smelling, but their intelligence is well-developed.|Apinomicon</entry>
<entry key="thaumicbees.speciesGossamer">Gossamer</entry>
<entry key="thaumicbees.speciesGossamer.description">As they work, they seem to fade out from light for brief moments.|Apinomicon</entry>
<entry key="thaumicbees.speciesWispy">Wispy</entry>
<entry key="thaumicbees.speciesWispy.description">Their language is garbled and unintelligible. It is probable they are speaking to unnatural beings.|Apinomicon</entry>
<entry key="thaumicbees.speciesBatty">Batty</entry>
<entry key="thaumicbees.speciesBatty.description">They tend to attract bats to their hives through means unknown.|Apinomicon</entry>
<entry key="thaumicbees.speciesChicken">Poultry</entry>
<entry key="thaumicbees.speciesChicken.description">"Cluck. Cluck cluck! ... You heard me."|Confused bee</entry>
<entry key="thaumicbees.speciesBeef">Beefy</entry>
<entry key="thaumicbees.speciesBeef.description">"Moo, moo, moo. Wait, what?"|Confused bee</entry>
<entry key="thaumicbees.speciesPork">Porcine</entry>
<entry key="thaumicbees.speciesPork.description">"Oink, oink. Er.... bzzz?"|Confused bee</entry>
<entry key="magicbees.speciesEldritch">Eldritch</entry>
<entry key="magicbees.speciesEldritch.description"></entry>
<entry key="thaumicbees.speciesMinium">Minium</entry>
<entry key="thaumicbees.speciesMinium.description">It may be possible to exploit their mercurial and changeable nature.|Apinomicon</entry>
<entry key="magicbees.speciesEsoteric">Esoteric</entry>
<entry key="magicbees.speciesEsoteric.description">An unusual crossbreed which seems to have magical properties.|Apinomicon</entry>
<entry key="magicbees.speciesMysterious">Mysterious</entry>
<entry key="magicbees.speciesMysterious.description">These bees have been to the end of the world and back, and their power has grown.|Apinomicon</entry>
<entry key="magicbees.speciesArcane">Arcane</entry>
<entry key="magicbees.speciesArcane.description">"Their produce is charged with magic."|Azanor, Master Thaumaturge</entry>
<entry key="thaumicbees.speciesEssence">Essence</entry>
<entry key="thaumicbees.speciesEssence.description">Drawing from motes of dust in the air and ground, they concentrate the energy</entry>
<entry key="thaumicbees.speciesQuintessence">Quintessential</entry>
<entry key="thaumicbees.speciesQuintessence.description">The heart of magic lies dormant in all things.|Apinomicon, preface</entry>
<entry key="thaumicbees.speciesErde">Erde</entry>
<entry key="thaumicbees.speciesErde.description">Empowered by the Earth, their produce is infused with its essence.|Apinomicon</entry>
<entry key="thaumicbees.speciesLuft">Luft</entry>
<entry key="thaumicbees.speciesLuft.description">Swift as the wind, and lighter than air.|Apinomicon</entry>
<entry key="thaumicbees.speciesFeuer">Feuer</entry>
<entry key="thaumicbees.speciesFeuer.description">Their colony can reach temperatures that boil water and melt metals.|Apinomicon</entry>
<entry key="thaumicbees.speciesWasser">Wasser</entry>
<entry key="thaumicbees.speciesWasser.description">Through prolonged exposure to liquids, their combs are quite wet and heavy.|Apinomicon</entry>
<entry key="thaumicbees.speciesBlitz">Blitz</entry>
<entry key="thaumicbees.speciesBlitz.description">They can travel vast distances in a blink, and are known for starting many wildfires.|Apinomicon</entry>
<entry key="thaumicbees.speciesStaude">Staude</entry>
<entry key="thaumicbees.speciesStaude.description">They have an affinity for all that is green and grows.|Apinomicon</entry>
<entry key="thaumicbees.speciesEis">Eis</entry>
<entry key="thaumicbees.speciesEis.description">"They keep stealing stuff from me, and I never see them. They're far too slippery."|MysteriousAges, incorrigible punster</entry>
<entry key="thaumicbees.speciesMagma">Magma</entry>
<entry key="thaumicbees.speciesMagma.description">As they fly by, they sear the surface of the landscape, eventually scouring all plants and fragile minerals away.|Apinomicon</entry>
<entry key="thaumicbees.speciesArkanen">Arkanen</entry>
<entry key="thaumicbees.speciesArkanen.description">"Curious creatures, though their produce is quite useful."|Mithion, Adept</entry>
<entry key="thaumicbees.speciesVortex">Vortex</entry>
<entry key="thaumicbees.speciesVortex.description">Ravenous for mana, they may be dangerous for any caster.|Apinomicon</entry>
<entry key="thaumicbees.speciesWight">Wight</entry>
<entry key="thaumicbees.speciesWight.description">"They attract magical spirits; not always docile."|Mithion, Adept</entry>
<entry key="magicbees.speciesCharmed">Charmed</entry>
<entry key="magicbees.speciesCharmed.description">Your first experiments in Thaumaturgical Apiculture have yielded fruit. Buzzing fruit.|Apinomicon</entry>
<entry key="magicbees.speciesEnchanted">Enchanted</entry>
<entry key="magicbees.speciesEnchanted.description">Successive generations of Charmed bees have reinforced their connection to the unknown.|Apinomicon</entry>
<entry key="magicbees.speciesSupernatural">Supernatural</entry>
<entry key="magicbees.speciesSupernatural.description">These bees walk the line between this world and the unseen.|Apinomicon</entry>
<entry key="magicbees.speciesEthereal">Ethereal</entry>
<entry key="magicbees.speciesEthereal.description"></entry>
<entry key="magicbees.speciesPupil">Pupil</entry>
<entry key="magicbees.speciesPupil.description">"What does that bee want with my paper?!"|Yorae, Librarian</entry>
<entry key="magicbees.speciesScholarly">Scholarly</entry>
<entry key="magicbees.speciesScholarly.description">"I can't be sure, but I think they might be smarter than me..."|Yorae, Librarian</entry>
<entry key="magicbees.speciesSavant">Savant</entry>
<entry key="magicbees.speciesSavant.description">lim(x^(i / pi)/ log(e * 7 - ln(32/x^-pi))). Solve for honey.|Note found on Yorae's desk</entry>
<entry key="magicbees.speciesAware">Aware</entry>
<entry key="magicbees.speciesAware.description">"They can see into your soul!"|Florastar, Expert Beekeeper</entry>
<entry key="magicbees.speciesSpirit">Spirit</entry>
<entry key="magicbees.speciesSpirit.description">It is said these bees are able to contact the dead.|Apinomicon</entry>
<entry key="magicbees.speciesSoul">Soul</entry>
<entry key="magicbees.speciesSoul.description">"The Dread Pirate Roberts has come for your SOOOOOOULS!"|Dread Pirate Roberts</entry>
<entry key="magicbees.speciesSkulking">Skulking</entry>
<entry key="magicbees.speciesSkulking.description">These bees have become xenophobic and bad-tempered. Use caution.|Apinomicon</entry>
<entry key="magicbees.speciesGhastly">Ghastly</entry>
<entry key="magicbees.speciesGhastly.description">"*sigh*... Really, Myst?"|Taveria, irritated Apiarist</entry>
<entry key="magicbees.speciesSpidery">Spidery</entry>
<entry key="magicbees.speciesSpidery.description">Spiderbee; n. Does whatever a spider-bee does.|Unknown</entry>
<entry key="magicbees.speciesTimely">Timely</entry>
<entry key="magicbees.speciesTimely.description">"An apiarist is never late. He arrives precisely when he means to!"|Sengir, Mad Apiarist</entry>
<entry key="magicbees.speciesLordly">Lordly</entry>
<entry key="magicbees.speciesLordly.description">They live in peace, within the sight of the Eye of Harmony|Tattered Remains of ancient Apinomicon</entry>
<entry key="magicbees.speciesDoctoral">Doctoral</entry>
<entry key="magicbees.speciesDoctoral.description">"Would you like a Jelly Baby?"|Passing stranger with a great scarf and a blue box</entry>
<entry key="magicbees.speciesIron">Ferrous</entry>
<entry key="magicbees.speciesIron.description">Having absorbed some of the base metal, these bees can concentrate the essence of iron from the region.|Apinomicon</entry>
<entry key="magicbees.speciesGold">Auric</entry>
<entry key="magicbees.speciesGold.description">Not all that glitters is gold.|Ancient Aphorism</entry>
<entry key="magicbees.speciesCopper">Cuprum</entry>
<entry key="magicbees.speciesCopper.description">A base metal common in many applications; these bees are helpful for resource-starved magicians.|Apinomicon</entry>
<entry key="magicbees.speciesTin">Stannum</entry>
<entry key="magicbees.speciesTin.description">While metalic, these bees are suprisingly fragile.|Apinomicon</entry>
<entry key="magicbees.speciesSilver">Argentum</entry>
<entry key="magicbees.speciesSilver.description">While they do not recieve as much attention as Golden bees, they are nonetheless valuable.|Apinomicon</entry>
<entry key="magicbees.speciesLead">Plumbum</entry>
<entry key="magicbees.speciesLead.description">A favourite of amateur alchemists, they believe they can transform these bees into gold.|Apinomicon</entry>
<entry key="magicbees.speciesDiamond">Diamandi</entry>
<entry key="magicbees.speciesDiamond.description">Crystalline, glittering, and harder than dragon's teeth. These bees are none of those.|Apinomicon</entry>
<entry key="magicbees.speciesEmerald">Esmeraldi</entry>
<entry key="magicbees.speciesEmerald.description">It is said they have been to a land ruled by a Great Wizard, and have taken the aspect of his city.|Apinomicon</entry>
<entry key="magicbees.speciesApatite">Apatine</entry>
<entry key="magicbees.speciesApatite.description">Day and night the whining droned on. I barricaded the windows and hid in the cellar, but everywhere the high-pitched noise of the apatine bees penetrated the walls and drove me to distraction.|Beekeeping 101</entry>
<entry key="magicbees.speciesTCStark">Stark</entry>
<entry key="magicbees.speciesTCStark.description">"These are unusually attracted to shards. This warrents further investigation."|Azanor, Master Thaumaturge</entry>
<entry key="magicbees.speciesTCAir">Aura</entry>
<entry key="magicbees.speciesTCAir.description">"They work so fast it's breathtaking."|Sengir, Mad Apiarist</entry>
<entry key="magicbees.speciesTCFire">Ignis</entry>
<entry key="magicbees.speciesTCFire.description">Caution: Contents of hive extremely hot.|Warning label on Azanor's apiary</entry>
<entry key="magicbees.speciesTCWater">Aqua</entry>
<entry key="magicbees.speciesTCWater.description">"I tried to breed them once, but that was a wash."|MysteriousAges, Apprentice Thaumaturge</entry>
<entry key="magicbees.speciesTCEarth">Solum</entry>
<entry key="magicbees.speciesTCEarth.description">"You're really gonna dig these bees, but watch out - they bore quite easily."|MysteriousAges, Apprentice Comedian</entry>
<entry key="magicbees.speciesTCMagic">Praecantatio</entry>
<entry key="magicbees.speciesTCMagic.description">Beekeeping is magic!|Apinomicon, Preface</entry>
<entry key="magicbees.speciesTCVis">Vis</entry>
<entry key="magicbees.speciesTCVis.description">"They can feel changes in the aura, but are not yet able to affect it."|Azanor, research notes</entry>
<entry key="magicbees.speciesTCPure">Pure</entry>
<entry key="magicbees.speciesTCPure.description">"It's like a bee janitor!"|MysteriousAges, Thaumaturge</entry>
<entry key="magicbees.speciesTCFlux">Flux</entry>
<entry key="magicbees.speciesTCFlux.description">"I thought they would help clean up, but it only makes things worse!"|Kreicus, Apprentice Thaumaturge</entry>
<entry key="magicbees.speciesTCAttractive">Attractive</entry>
<entry key="magicbees.speciesTCAttractive.description">Having undergone a freak mutation, these bees now attract magic to them.|Apinomicon</entry>
<entry key="magicbees.speciesTCRejuvenating">Rejuvenating</entry>
<entry key="magicbees.speciesTCRejuvenating.description">The hum of the hive is magical, and over time is absorbed by nearby nodes.|Apinomicon</entry>
<entry key="magicbees.speciesTCBrainy">Brainy</entry>
<entry key="magicbees.speciesTCBrainy.description">Their combs may be fetid and foul-smelling, but their intelligence is well-developed.|Apinomicon</entry>
<entry key="magicbees.speciesTCWispy">Wispy</entry>
<entry key="magicbees.speciesTCWispy.description">Their language is garbled and unintelligible. It is probable they are speaking to unnatural beings.|Apinomicon</entry>
<entry key="magicbees.speciesTCBatty">Batty</entry>
<entry key="magicbees.speciesTCBatty.description">They tend to attract bats to their hives through means unknown.|Apinomicon</entry>
<entry key="magicbees.speciesTCChicken">Poultry</entry>
<entry key="magicbees.speciesTCChicken.description">"Cluck. Cluck cluck! ... You heard me."|Confused bee</entry>
<entry key="magicbees.speciesTCBeef">Beefy</entry>
<entry key="magicbees.speciesTCBeef.description">"Moo, moo, moo. Wait, what?"|Confused bee</entry>
<entry key="magicbees.speciesTCPork">Porcine</entry>
<entry key="magicbees.speciesTCPork.description">"Oink, oink. Er.... bzzz?"|Confused bee</entry>
<entry key="magicbees.speciesEEMinium">Minium</entry>
<entry key="magicbees.speciesEEMinium.description">It may be possible to exploit their mercurial and changeable nature.|Apinomicon</entry>
<entry key="magicbees.speciesAMEssence">Essence</entry>
<entry key="magicbees.speciesAMEssence.description">Drawing from motes of dust in the air and ground, they concentrate the energy</entry>
<entry key="magicbees.speciesAMQuintessence">Quintessential</entry>
<entry key="magicbees.speciesAMQuintessence.description">The heart of magic lies dormant in all things.|Apinomicon, preface</entry>
<entry key="magicbees.speciesAMEarth">Erde</entry>
<entry key="magicbees.speciesAMEarth.description">Empowered by the Earth, their produce is infused with its essence.|Apinomicon</entry>
<entry key="magicbees.speciesAMAir">Luft</entry>
<entry key="magicbees.speciesAMAir.description">Swift as the wind, and lighter than air.|Apinomicon</entry>
<entry key="magicbees.speciesAMFire">Feuer</entry>
<entry key="magicbees.speciesAMFire.description">Their colony can reach temperatures that boil water and melt metals.|Apinomicon</entry>
<entry key="magicbees.speciesAMWater">Wasser</entry>
<entry key="magicbees.speciesAMWater.description">Through prolonged exposure to liquids, their combs are quite wet and heavy.|Apinomicon</entry>
<entry key="magicbees.speciesAMLightning">Blitz</entry>
<entry key="magicbees.speciesAMLightning.description">They can travel vast distances in a blink, and are known for starting many wildfires.|Apinomicon</entry>
<entry key="magicbees.speciesAMPlant">Staude</entry>
<entry key="magicbees.speciesAMPlant.description">They have an affinity for all that is green and grows.|Apinomicon</entry>
<entry key="magicbees.speciesAMIce">Eis</entry>
<entry key="magicbees.speciesAMIce.description">"They keep stealing stuff from me, and I never see them. They're far too slippery."|MysteriousAges, incorrigible punster</entry>
<entry key="magicbees.speciesAMMagma">Magma</entry>
<entry key="magicbees.speciesAMMagma.description">As they fly by, they sear the surface of the landscape, eventually scouring all plants and fragile minerals away.|Apinomicon</entry>
<entry key="magicbees.speciesAMArcane">Arkanen</entry>
<entry key="magicbees.speciesAMArcane.description">"Curious creatures, though their produce is quite useful."|Mithion, Adept</entry>
<entry key="magicbees.speciesAMVortex">Vortex</entry>
<entry key="magicbees.speciesAMVortex.description">Ravenous for mana, they may be dangerous for any caster.|Apinomicon</entry>
<entry key="magicbees.speciesAMWight">Wight</entry>
<entry key="magicbees.speciesAMWight.description">"They attract magical spirits; not always docile."|Mithion, Adept</entry>
<!-- Blank species entries
<entry key="thaumicbees.species"></entry>
<entry key="thaumicbees.species.description"></entry>
<entry key="magicbees.species"></entry>
<entry key="magicbees.species.description"></entry>
-->
<!-- Bee Alleles -->
<entry key="thaumicbees.effectCurative">Cleansing</entry>
<entry key="thaumicbees.effecteffectDigSpeed">Mining</entry>
<entry key="thaumicbees.effecteffectMoveSpeed">Swiftness</entry>
<entry key="thaumicbees.effecteffectSlowSpeed">Time Warp</entry>
<entry key="thaumicbees.effectNodeGeneration">Aura Attract</entry>
<entry key="thaumicbees.effectNodePurify">Purify Aura</entry>
<entry key="thaumicbees.effectNodeFlux">Aura Flux</entry>
<entry key="thuamicbees.effectNodeCharge">Aura Charge</entry>
<entry key="thaumicbees.effectBrainy">Brainy</entry>
<entry key="thaumicbees.effectBatty">Batty</entry>
<entry key="thaumicbees.effectWispy">Wispy</entry>
<entry key="thaumicbees.Ghast">Ghastly</entry>
<entry key="thaumicbees.effectManaDrainer">Vortex</entry>
<entry key="thaumicbees.effectAMWisp">Spiritual</entry>
<entry key="tb.bees.flower.book">Books</entry>
<entry key="tb.bees.flower.magic">Thaumic Flowers</entry>
<entry key="tb.bees.flower.arsmagica">Exotic Flowers</entry>
<entry key="tb.bees.flower.node">Node</entry>
<entry key="magicbees.effectCurative">Cleansing</entry>
<entry key="magicbees.effectDigSpeed">Mining</entry>
<entry key="magicbees.effectMoveSpeed">Swiftness</entry>
<entry key="magicbees.effectSlowSpeed">Time Warp</entry>
<entry key="magicbees.effectNodeGeneration">Aura Attract</entry>
<entry key="magicbees.effectNodePurify">Purify Aura</entry>
<entry key="magicbees.effectNodeFlux">Aura Flux</entry>
<entry key="magicbees.effectNodeCharge">Aura Charge</entry>
<entry key="magicbees.effectBrainy">Brainy</entry>
<entry key="magicbees.effectBatty">Batty</entry>
<entry key="magicbees.effectWispy">Wispy</entry>
<entry key="magicbees.effectGhastly">Ghastly</entry>
<entry key="magicbees.effectSpidery">Spidery</entry>
<entry key="magicbees.effectManaDrainer">Vortex</entry>
<entry key="magicbees.effectAMWisp">Spiritual</entry>
<entry key="flowerProvider.book">Books</entry>
<entry key="flowerProvider.magic">Thaumic Flowers</entry>
<entry key="flowerProvider.arsmagica">Exotic Flowers</entry>
<entry key="flowerProvider.node">Node</entry>
<!-- Classifications -->
<entry key="classification.arcane">Arcane</entry>
+99 -159
View File
@@ -2,190 +2,130 @@
<!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd">
<properties version="1.0">
<!-- Item names -->
<entry key="item.jellyBabies.name">Горсть Маленького Желе</entry>
<entry key="item.tb.thaumiumScoop.name">Таумический Сачок</entry>
<entry key="item.tb.thaumiumGrafter.name">Таумический Садовый Нож</entry>
<entry key="item.magicbees:jellyBabies.name">Горсть Маленького Желе</entry>
<entry key="item.magicbees:thaumiumScoop.name">Таумический Сачок</entry>
<entry key="item.magicbees:thaumiumGrafter.name">Таумический Садовый Нож</entry>
<!-- Block names -->
<entry key="tile.tb.planks.greatwood.name">Доски Великого Дерева</entry>
<entry key="tile.tb.slab.wood.greatwood.name">Плита Великого Дерева</entry>
<entry key="tile.tb.planks.silverwood.name">Доски Сильвервуда</entry>
<entry key="tile.tb.slab.wood.silverwood.name">Плиты Сильвервуда</entry>
<entry key="tile.planks.greatwood.name">Доски Великого Дерева</entry>
<entry key="tile.slab.wood.greatwood.name">Плита Великого Дерева</entry>
<entry key="tile.planks.silverwood.name">Доски Сильвервуда</entry>
<entry key="tile.slab.wood.silverwood.name">Плиты Сильвервуда</entry>
<!-- Comb names -->
<entry key="tb.comb.occult">Оккультические Соты</entry>
<entry key="tb.comb.otherworldly">Потусторонние Соты</entry>
<entry key="tb.comb.paper">Бумажные Соты</entry>
<entry key="tb.comb.stark">Абсолютные Соты</entry>
<entry key="tb.comb.air">Воздушные Соты</entry>
<entry key="tb.comb.fire">Огненные Соты</entry>
<entry key="tb.comb.water">Водяные Соты</entry>
<entry key="tb.comb.earth">Земляные Соты</entry>
<entry key="tb.comb.magic">Зраяженные Соты</entry>
<entry key="tb.comb.aware">Памятные Соты</entry>
<entry key="tb.comb.furtive">Незаметные Соты</entry>
<entry key="comb.occult">Оккультические Соты</entry>
<entry key="comb.otherworldly">Потусторонние Соты</entry>
<entry key="comb.paper">Бумажные Соты</entry>
<entry key="comb.stark">Абсолютные Соты</entry>
<entry key="comb.air">Воздушные Соты</entry>
<entry key="comb.fire">Огненные Соты</entry>
<entry key="comb.water">Водяные Соты</entry>
<entry key="comb.earth">Земляные Соты</entry>
<entry key="comb.magic">Зраяженные Соты</entry>
<entry key="comb.aware">Памятные Соты</entry>
<entry key="comb.furtive">Незаметные Соты</entry>
<!-- Wax names -->
<entry key="tb.wax.magic">Магичнский Воск</entry>
<entry key="wax.magic">Магичнский Воск</entry>
<!-- Drop names -->
<entry key="tb.drop.enchanting">Зачарованая Капля</entry>
<entry key="tb.drop.intellect">Интеллектуальная Капля</entry>
<entry key="drop.enchanting">Зачарованая Капля</entry>
<entry key="drop.intellect">Интеллектуальная Капля</entry>
<!-- Pollen names -->
<entry key="tb.pollen.unusual">Необычная Пыльца</entry>
<entry key="tb.pollen.phased">Поэтепная Пыльца</entry>
<entry key="pollen.unusual">Необычная Пыльца</entry>
<entry key="pollen.phased">Поэтепная Пыльца</entry>
<!-- Propolis names -->
<entry key="tb.propolis.dull">Тупой Прополис</entry>
<entry key="tb.propolis.air">Прохладный Пропорлис</entry>
<entry key="tb.propolis.fire">Горящий Прополис</entry>
<entry key="tb.propolis.water">Текущий Прополис</entry>
<entry key="tb.propolis.earth">Каменный Прополис</entry>
<entry key="tb.propolis.magic">Заряженный Прополис</entry>
<entry key="propolis.dull">Тупой Прополис</entry>
<entry key="propolis.air">Прохладный Пропорлис</entry>
<entry key="propolis.fire">Горящий Прополис</entry>
<entry key="propolis.water">Текущий Прополис</entry>
<entry key="propolis.earth">Каменный Прополис</entry>
<entry key="propolis.magic">Заряженный Прополис</entry>
<!-- Misc Resources -->
<entry key="tb.resource.fragment">Фрагмент Знаний</entry>
<entry key="tb.resource.lump">Ароматическая Лампа</entry>
<entry key="tb.resource.fertilizer">Концентрированные соединения</entry>
<entry key="tb.resource.crystalFlux">Кристаллизованный %s Аспект</entry>
<entry key="resource.fragment">Фрагмент Знаний</entry>
<entry key="resource.lump">Ароматическая Лампа</entry>
<entry key="resource.fertilizer">Концентрированные соединения</entry>
<entry key="resource.crystalFlux">Кристаллизованный %s Аспект</entry>
<!-- Frames -->
<entry key="tb.frame.magic">Магическая Рамка</entry>
<entry key="tb.frame.resillient">Эластичная Рамка</entry>
<entry key="tb.frame.gentle">Нежная Рамка</entry>
<entry key="tb.frame.metabolic">Метобалическая Рамка</entry>
<entry key="tb.frame.necrotic">Некротическая Рамка</entry>
<entry key="tb.frame.temporal">Временная Рамка</entry>
<entry key="frame.magic">Магическая Рамка</entry>
<entry key="frame.resillient">Эластичная Рамка</entry>
<entry key="frame.gentle">Нежная Рамка</entry>
<entry key="frame.metabolic">Метобалическая Рамка</entry>
<entry key="frame.necrotic">Некротическая Рамка</entry>
<entry key="frame.temporal">Временная Рамка</entry>
<!-- Capsule names -->
<entry key="tb.capsule.magic">Магическая Капсула</entry>
<entry key="tb.capsule.void">Пустотная Капсула</entry>
<entry key="capsule.magic">Магическая Капсула</entry>
<entry key="capsule.void">Пустотная Капсула</entry>
<!-- Liquids -->
<entry key="tb.liquid.">Пустая</entry>
<entry key="tb.liquid.water">Вода</entry>
<entry key="tb.liquid.lava">Лава</entry>
<entry key="tb.liquid.biomass">Биомасса</entry>
<entry key="tb.liquid.biofuel">Биотопливная</entry>
<entry key="tb.liquid.Oil">Нефтяная</entry>
<entry key="tb.liquid.Fuel">Дизельно Топливная</entry>
<entry key="tb.liquid.seedoil">Подсолнечная</entry>
<entry key="tb.liquid.honey">Медная/entry>
<entry key="tb.liquid.juice">Фруктовая</entry>
<entry key="tb.liquid.ice">Ледяная</entry>
<entry key="tb.liquid.milk">Молочная</entry>
<entry key="tb.liquid.acid">Кислотная</entry>
<entry key="tb.liquid.poison">Ядовитая</entry>
<entry key="tb.liquid.liquidNitrogen">Жидкий Азот</entry>
<entry key="tb.liquid.liquidDNA">Жидкий ДНК</entry>
<entry key="tb.liquid.Creosote Oil">Креозотное Масло</entry>
<entry key="tb.liquid.Steam">Пар</entry>
<entry key="liquid.">Пустая</entry>
<entry key="liquid.water">Вода</entry>
<entry key="liquid.lava">Лава</entry>
<entry key="liquid.biomass">Биомасса</entry>
<entry key="liquid.biofuel">Биотопливная</entry>
<entry key="liquid.Oil">Нефтяная</entry>
<entry key="liquid.Fuel">Дизельно Топливная</entry>
<entry key="liquid.seedoil">Подсолнечная</entry>
<entry key="liquid.honey">Медная/entry>
<entry key="liquid.juice">Фруктовая</entry>
<entry key="liquid.ice">Ледяная</entry>
<entry key="liquid.milk">Молочная</entry>
<entry key="liquid.acid">Кислотная</entry>
<entry key="liquid.poison">Ядовитая</entry>
<entry key="liquid.liquidNitrogen">Жидкий Азот</entry>
<entry key="liquid.liquidDNA">Жидкий ДНК</entry>
<entry key="liquid.Creosote Oil">Креозотное Масло</entry>
<entry key="liquid.Steam">Пар</entry>
<!-- Moon Phases -->
<entry key="tb.moon.full">Полная Луна</entry>
<entry key="tb.moon.gibbousWaning">Убывающая луна</entry>
<entry key="tb.moon.gibousWaxing">Растущая луна</entry>
<entry key="tb.moon.halfWaning">Убывающая половина</entry>
<entry key="tb.moon.halfWaxing">Растущая половина</entry>
<entry key="tb.moon.crescentWaning">Убывающая луна</entry>
<entry key="tb.moon.crescentWaxing">Растущая луна</entry>
<entry key="tb.moon.new">Новая Луна</entry>
<entry key="moon.full">Полная Луна</entry>
<entry key="moon.gibbousWaning">Убывающая луна</entry>
<entry key="moon.gibousWaxing">Растущая луна</entry>
<entry key="moon.halfWaning">Убывающая половина</entry>
<entry key="moon.halfWaxing">Растущая половина</entry>
<entry key="moon.crescentWaning">Убывающая луна</entry>
<entry key="moon.crescentWaxing">Растущая луна</entry>
<entry key="moon.new">Новая Луна</entry>
<!-- Miscellaneous names -->
<entry key="tb.backpack.thaumaturge">Таумотургический Рюкзак</entry>
<!-- Species names -->
<entry key="thaumicbees.speciesEsoteric">Esoteric</entry>
<entry key="thaumicbees.speciesEsoteric.description">An unusual crossbreed which seems to have magical properties.|Apinomicon</entry>
<entry key="thaumicbees.speciesMysterious">Mysterious</entry>
<entry key="thaumicbees.speciesMysterious.description">These bees have been to the end of the world and back, and their power has grown.|Apinomicon</entry>
<entry key="thaumicbees.speciesArcane">Arcane</entry>
<entry key="thaumicbees.speciesArcane.description">"Their produce is charged with magic."|Azanor, Master Thaumaturge</entry>
<entry key="thaumicbees.speciesCharmed">Charmed</entry>
<entry key="thaumicbees.speciesCharmed.description">Your first experiments in Thaumaturgical Apiculture have yielded fruit. Buzzing fruit.|Apinomicon</entry>
<entry key="thaumicbees.speciesEnchanted">Enchanted</entry>
<entry key="thaumicbees.speciesEnchanted.description">Successive generations of Charmed bees have reinforced their connection to the unknown.|Apinomicon</entry>
<entry key="thaumicbees.speciesSupernatural">Supernatural</entry>
<entry key="thaumicbees.speciesSupernatural.description">These bees walk the line between this world and the unseen.|Apinomicon</entry>
<entry key="thaumicbees.speciesPupil">Pupil</entry>
<entry key="thaumicbees.speciesPupil.description">"What does that bee want with my paper?!|Yorae, Librarian</entry>
<entry key="thaumicbees.speciesScholarly">Scholarly</entry>
<entry key="thaumicbees.speciesScholarly.description">"I can't be sure, but I think they might be smarter than me..."|Yorae, Librarian</entry>
<entry key="thaumicbees.speciesSavant">Savant</entry>
<entry key="thaumicbees.speciesSavant.description">lim(x^(i / pi)/ log(e * 7 - ln(32/x^-pi))). Solve for honey.|Note found on Yorae's desk</entry>
<entry key="thaumicbees.speciesStark">Stark</entry>
<entry key="thaumicbees.speciesStark.description">"These are unusually attracted to shards. This warrents further investigation."|Azanor, Master Thaumaturge</entry>
<entry key="thaumicbees.speciesAura">Aura</entry>
<entry key="thaumicbees.speciesAura.description">"They work so fast it's breathtaking."|Sengir, Mad Apiarist</entry>
<entry key="thaumicbees.speciesIgnis">Ignis</entry>
<entry key="thaumicbees.speciesIgnis.description">Caution: Contents of hive extremely hot.|Warning label on Azanor's apiary</entry>
<entry key="thaumicbees.speciesAqua">Aqua</entry>
<entry key="thaumicbees.speciesAqua.description">"I tried to breed them once, but that was a wash."|MysteriousAges, Apprentice Thaumaturge</entry>
<entry key="thaumicbees.speciesSolum">Solum</entry>
<entry key="thaumicbees.speciesSolum.description">"You're really gonna dig these bees, but watch out - they bore quite easily."|MysteriousAges, Apprentice Comedian</entry>
<entry key="thaumicbees.speciesPraecantatio">Praecantatio</entry>
<entry key="thaumicbees.speciesPraecantatio.description">Beekeeping is magic!|Apinomicon, Preface</entry>
<entry key="thaumicbees.speciesAware">Aware</entry>
<entry key="thaumicbees.speciesAware.description">"They can see into your soul!"|Florastar, Expert Beekeeper</entry>
<entry key="thaumicbees.speciesVis">Vis</entry>
<entry key="thaumicbees.speciesVis.description">"They can feel changes in the aura, but are not yet able to affect it."|Azanor, research notes</entry>
<entry key="thaumicbees.speciesPure">Pure</entry>
<entry key="thaumicbees.speciesPure.description">"It's like a bee janitor!"|MysteriousAges, Thaumaturge</entry>
<entry key="thaumicbees.speciesFlux">Flux</entry>
<entry key="thaumicbees.speciesFlux.description">"I thought they would help clean up, but it only makes things worse!"|Kreicus, Apprentice Thaumaturge</entry>
<entry key="thaumicbees.speciesNode">Node</entry>
<entry key="thaumicbees.speciesNode.description">Having undergone a freak mutation, these bees now attract magic to them.|Apinomicon</entry>
<entry key="thaumicbees.speciesSkulking">Skulking</entry>
<entry key="thaumicbees.speciesSkulking.description">These bees have become xenophobic and bad-tempered. Use caution.|Apinomicon</entry>
<entry key="thaumicbees.speciesBrainy">Brainy</entry>
<entry key="thaumicbees.speciesBrainy.description">Their combs may be fetid and foul-smelling, but their intelligence is well-developed.|Apinomicon</entry>
<entry key="thaumicbees.speciesGossamer">Gossamer</entry>
<entry key="thaumicbees.speciesGossamer.description">As they work, they seem to fade out from light for brief moments.|Apinomicon</entry>
<entry key="thaumicbees.speciesWispy">Wispy</entry>
<entry key="thaumicbees.speciesWispy.description">Their language is garbled and unintelligible. It is probable they are speaking to unnatural beings.|Apinomicon</entry>
<entry key="thaumicbees.speciesBatty">Batty</entry>
<entry key="thaumicbees.speciesBatty.description">They tend to attract bats to their hives through means unknown.|Apinomicon</entry>
<entry key="thaumicbees.speciesGhastly">Ghastly</entry>
<entry key="thaumicbees.speciesGhastly.description">"*sigh*... Really, Myst?"|Taveria</entry>
<entry key="thaumicbees.speciesTimely">Timely</entry>
<entry key="thaumicbees.speciesTimely.description">"An apiarist is never late. He arrives precicely when he means to!"|Sengir, Mad Apiarist</entry>
<entry key="thaumicbees.speciesLordly">Lordly</entry>
<entry key="thaumicbees.speciesLordly.description">They live in peace, within the sight of the Eye of Harmony|Tattered Remains of ancient Apinomicon</entry>
<entry key="thaumicbees.speciesDoctoral">Doctoral</entry>
<entry key="thaumicbees.speciesDoctoral.description">"Would you like a Jelly Baby?"|Passing stranger with a great scarf and a blue box</entry>
<entry key="backpack.thaumaturge">Таумотургический Рюкзак</entry>
<!-- Bee Alleles -->
<entry key="thaumicbees.effectCurative">Очищающая</entry>
<entry key="thaumicbees.effecteffectDigSpeed">Добывающая</entry>
<entry key="thaumicbees.effecteffectMoveSpeed">Ускоряющая</entry>
<entry key="thaumicbees.effecteffectSlowSpeed">Искревляющая Время</entry>
<entry key="thaumicbees.effectNodeGeneration">Привлеченная Аурой</entry>
<entry key="thaumicbees.effectBrainy">Умная</entry>
<entry key="thaumicbees.effectBatty">Сумашедшая</entry>
<entry key="thaumicbees.effectWispy">Призрачная</entry>
<entry key="thaumicbees.Ghast">Ужасная</entry>
<entry key="tb.bees.flower.book">Книги</entry>
<entry key="tb.bees.flower.magic">Магические Цветы</entry>
<entry key="tb.bees.flower.node">Узел</entry>
<entry key="tb.bees.flower.nodePure">Очищающая Узел</entry>
<entry key="tb.bees.flower.nodeFlux">Загрезняющая Узел</entry>
<!-- Classifications -->
<entry key="classification.arcane">Тайныее</entry>
<entry key="classification.arcane.description"></entry>
<entry key="classification.supernatural">Сверхестественные</entry>
<entry key="classification.supernatural.description"></entry>
<entry key="classification.scholarly">Научные</entry>
<entry key="classification.scholarly.description"></entry>
<entry key="classification.thaumic">Таумические</entry>
<entry key="classification.thaumic.description"></entry>
<entry key="classification.skulking">Прячующиеся</entry>
<entry key="classification.skulking.description"></entry>
<entry key="classification.vis">Vis</entry>
<entry key="classification.vis.description"></entry>
<entry key="classification.time">Временные</entry>
<entry key="classification.time.description"></entry>
<!-- Bee Alleles -->
<entry key="magicbees.effectCurative">Очищающая</entry>
<entry key="magicbees.effectDigSpeed">Добывающая</entry>
<entry key="magicbees.effectMoveSpeed">Ускоряющая</entry>
<entry key="magicbees.effectSlowSpeed">Искревляющая Время</entry>
<entry key="magicbees.effectNodeGeneration">Привлеченная Аурой</entry>
<entry key="magicbees.effectBrainy">Умная</entry>
<entry key="magicbees.effectBatty">Сумашедшая</entry>
<entry key="magicbees.effectWispy">Призрачная</entry>
<entry key="magicbees.effectGhastly">Ужасная</entry>
<entry key="flowerProvider.book">Книги</entry>
<entry key="flowerProvider.magic">Магические Цветы</entry>
<entry key="flowerProvider.node">Узел</entry>
<entry key="flowerProvider.nodePure">Очищающая Узел</entry>
<entry key="flowerProvider.nodeFlux">Загрезняющая Узел</entry>
<!-- Classifications -->
<entry key="classification.arcane">Тайныее</entry>
<entry key="classification.arcane.description"></entry>
<entry key="classification.supernatural">Сверхестественные</entry>
<entry key="classification.supernatural.description"></entry>
<entry key="classification.scholarly">Научные</entry>
<entry key="classification.scholarly.description"></entry>
<entry key="classification.thaumic">Таумические</entry>
<entry key="classification.thaumic.description"></entry>
<entry key="classification.skulking">Прячующиеся</entry>
<entry key="classification.skulking.description"></entry>
<entry key="classification.vis">Vis</entry>
<entry key="classification.vis.description"></entry>
<entry key="classification.time">Временные</entry>
<entry key="classification.time.description"></entry>
</properties>
+228 -218
View File
@@ -2,73 +2,74 @@
<!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd">
<properties version="1.0">
<!-- Item names -->
<entry key="item.jellyBabies.name">胶糖娃娃</entry>
<entry key="item.tb.thaumiumScoop.name">奥法捕蜂网</entry>
<entry key="item.tb.thaumiumGrafter.name">奥法剪枝器</entry>
<entry key="item.magicbees:jellyBabies.name">胶糖娃娃</entry>
<entry key="item.magicbees:thaumiumScoop.name">奥法捕蜂网</entry>
<entry key="item.magicbees:thaumiumGrafter.name">奥法剪枝器</entry>
<!-- Specially handled Item names -->
<entry key="item.tb.moonDial.name">翡翠色月相盘</entry>
<entry key="item.moonDial.name">翡翠色月相盘</entry>
<!-- Block names -->
<entry key="tile.tb.planks.greatwood.name">宏伟之木木板</entry>
<entry key="tile.tb.slab.wood.greatwood.name">宏伟之木台阶</entry>
<entry key="tile.tb.planks.silverwood.name">银树木板</entry>
<entry key="tile.tb.slab.wood.silverwood.name">银树台阶</entry>
<entry key="tile.tb.effectJar.name">蜜蜂收集者的罐子</entry>
<entry key="tile.planks.greatwood.name">宏伟之木木板</entry>
<entry key="tile.slab.wood.greatwood.name">宏伟之木台阶</entry>
<entry key="tile.planks.silverwood.name">银树木板</entry>
<entry key="tile.slab.wood.silverwood.name">银树台阶</entry>
<entry key="tile.effectJar.name">蜜蜂收集者的罐子</entry>
<!-- Comb names -->
<entry key="tb.comb.occult">神秘蜂巢</entry>
<entry key="tb.comb.otherworldly">异域蜂巢</entry>
<entry key="tb.comb.paper">纸质蜂巢</entry>
<entry key="tb.comb.stark">朴实蜂巢</entry>
<entry key="tb.comb.air">风之蜂巢</entry>
<entry key="tb.comb.fire">火之蜂巢</entry>
<entry key="tb.comb.water">水之蜂巢</entry>
<entry key="tb.comb.earth">地之蜂巢</entry>
<entry key="tb.comb.magic">蕴魔蜂巢</entry>
<entry key="tb.comb.aware">回忆蜂巢</entry>
<entry key="tb.comb.furtive">诡秘蜂巢</entry>
<entry key="tb.comb.soul">灵魂蜂巢</entry>
<entry key="tb.comb.essence">源质蜂巢</entry>
<entry key="tb.comb.potent">强力蜂巢</entry>
<entry key="comb.occult">神秘蜂巢</entry>
<entry key="comb.otherworldly">异域蜂巢</entry>
<entry key=.comb.paper">纸质蜂巢</entry>
<entry key="comb.stark">朴实蜂巢</entry>
<entry key="comb.air">风之蜂巢</entry>
<entry key="comb.fire">火之蜂巢</entry>
<entry key="comb.water">水之蜂巢</entry>
<entry key="comb.earth">地之蜂巢</entry>
<entry key="comb.magic">蕴魔蜂巢</entry>
<entry key="comb.aware">回忆蜂巢</entry>
<entry key="comb.furtive">诡秘蜂巢</entry>
<entry key="comb.soul">灵魂蜂巢</entry>
<entry key="comb.essence">源质蜂巢</entry>
<entry key="comb.potent">强力蜂巢</entry>
<!-- Wax names -->
<entry key="tb.wax.magic">魔力蜜蜡</entry>
<entry key="tb.wax.soul">灵魂蜜蜡</entry>
<entry key="wax.magic">魔力蜜蜡</entry>
<entry key=.wax.soul">灵魂蜜蜡</entry>
<!-- Drop names -->
<entry key="tb.drop.enchanting">蕴魔液滴</entry>
<entry key="tb.drop.intellect">智慧液滴</entry>
<entry key="drop.enchanting">蕴魔液滴</entry>
<entry key="drop.intellect">智慧液滴</entry>
<!-- Pollen names -->
<entry key="tb.pollen.unusual">罕见花粉</entry>
<entry key="tb.pollen.phased">相位花粉</entry>
<entry key="pollen.unusual">罕见花粉</entry>
<entry key="pollen.phased">相位花粉</entry>
<!-- Nugget names -->
<entry key="tb.nugget.iron">铁粒</entry>
<entry key="tb.nugget.steel">钢粒</entry>
<entry key="tb.nugget.copper">铜粒</entry>
<entry key="tb.nugget.tin">锡粒</entry>
<entry key="tb.nugget.silver">银粒</entry>
<entry key="tb.nugget.lead">铅粒</entry>
<entry key="tb.nugget.diamond">钻石碎片</entry>
<entry key="tb.nugget.emerald">绿宝石碎片</entry>
<entry key="tb.nugget.apatite">磷灰石碎片</entry>
<entry key="nugget.iron">铁粒</entry>
<entry key="nugget.steel">钢粒</entry>
<entry key="nugget.copper">铜粒</entry>
<entry key="nugget.tin">锡粒</entry>
<entry key="nugget.silver">银粒</entry>
<entry key="nugget.lead">铅粒</entry>
<entry key="nugget.diamond">钻石碎片</entry>
<entry key="nugget.emerald">绿宝石碎片</entry>
<entry key="nugget.apatite">磷灰石碎片</entry>
<!-- Propolis names -->
<entry key="tb.propolis.dull">枯竭蜂胶</entry>
<entry key="tb.propolis.air">和风蜂胶</entry>
<entry key="tb.propolis.fire">炽热蜂胶</entry>
<entry key="tb.propolis.water">奔流蜂胶</entry>
<entry key="tb.propolis.earth">石化蜂胶</entry>
<entry key="tb.propolis.magic">蕴魔蜂胶</entry>
<entry key="propolis.dull">枯竭蜂胶</entry>
<entry key="propolis.air">和风蜂胶</entry>
<entry key="propolis.fire">炽热蜂胶</entry>
<entry key="propolis.water">奔流蜂胶</entry>
<entry key="propolis.earth">石化蜂胶</entry>
<entry key="propolis.magic">蕴魔蜂胶</entry>
<!-- Misc Resources -->
<entry key="tb.resource.fragment">卷章碎片</entry>
<entry key="tb.resource.lump">芬芳块</entry>
<entry key="tb.resource.fertilizer">浓缩复合物</entry>
<entry key="tb.resource.startNode">蜜蜂与魔法</entry>
<entry key="tb.resource.beeEnchant">朴实蜂蕴魔物</entry>
<entry key="tb.resource.crystalAspect">晶化%s要素</entry>
<entry key="resource.fragment">卷章碎片</entry>
<entry key="resource.lump">芬芳块</entry>
<entry key="resource.fertilizer">浓缩复合物</entry>
<entry key="resource.startNode">蜜蜂与魔法</entry>
<entry key="resource.beeEnchant">朴实蜂蕴魔物</entry>
<entry key="resource.crystalAspect">晶化%s要素</entry>
<!-- Frames -->
<entry key="item.frameMagic.name">魔力框架</entry>
@@ -80,186 +81,195 @@
<entry key="item.frameOblivion.name">湮灭框架</entry>
<!-- Capsule names -->
<entry key="tb.capsule.magic">魔力胶囊</entry>
<entry key="tb.capsule.void">虚空胶囊</entry>
<entry key="capsule.magic">魔力胶囊</entry>
<entry key="capsule.void">虚空胶囊</entry>
<!-- Liquids -->
<entry key="tb.liquid.">空</entry>
<entry key="tb.liquid.water">水</entry>
<entry key="tb.liquid.lava">岩浆</entry>
<entry key="tb.liquid.biomass">生物质</entry>
<entry key="tb.liquid.biofuel">空</entry>
<entry key="tb.liquid.Oil">石油</entry>
<entry key="tb.liquid.Fuel">燃油</entry>
<entry key="tb.liquid.seedoil">种子油</entry>
<entry key="tb.liquid.honey">蜂蜜</entry>
<entry key="tb.liquid.juice">果汁</entry>
<entry key="tb.liquid.ice">冰</entry>
<entry key="tb.liquid.milk">牛奶</entry>
<entry key="tb.liquid.acid">酸</entry>
<entry key="tb.liquid.poison">毒液</entry>
<entry key="tb.liquid.liquidNitrogen">液氮</entry>
<entry key="tb.liquid.liquidDNA">液态DNA</entry>
<entry key="tb.liquid.Creosote Oil">木榴油</entry>
<entry key="tb.liquid.Steam">蒸汽</entry>
<entry key="liquid.">空</entry>
<entry key="liquid.water">水</entry>
<entry key="liquid.lava">岩浆</entry>
<entry key="liquid.biomass">生物质</entry>
<entry key="liquid.biofuel">空</entry>
<entry key="liquid.Oil">石油</entry>
<entry key="liquid.Fuel">燃油</entry>
<entry key="liquid.seedoil">种子油</entry>
<entry key="liquid.honey">蜂蜜</entry>
<entry key="liquid.juice">果汁</entry>
<entry key="liquid.ice">冰</entry>
<entry key="liquid.milk">牛奶</entry>
<entry key="liquid.acid">酸</entry>
<entry key="liquid.poison">毒液</entry>
<entry key="liquid.liquidNitrogen">液氮</entry>
<entry key="liquid.liquidDNA">液态DNA</entry>
<entry key="liquid.Creosote Oil">木榴油</entry>
<entry key="liquid.Steam">蒸汽</entry>
<!-- Moon Phases -->
<entry key="tb.moon.full">满月</entry>
<entry key="tb.moon.gibbousWaning">亏凸月</entry>
<entry key="tb.moon.gibousWaxing">盈凸月</entry>
<entry key="tb.moon.halfWaning">下弦月</entry>
<entry key="tb.moon.halfWaxing">上弦月</entry>
<entry key="tb.moon.crescentWaning">亏蛾眉月</entry>
<entry key="tb.moon.crescentWaxing">凸娥眉月</entry>
<entry key="tb.moon.new">新月</entry>
<entry key="moon.full">满月</entry>
<entry key="moon.gibbousWaning">亏凸月</entry>
<entry key="moon.gibousWaxing">盈凸月</entry>
<entry key="moon.halfWaning">下弦月</entry>
<entry key="moon.halfWaxing">上弦月</entry>
<entry key="moon.crescentWaning">亏蛾眉月</entry>
<entry key="moon.crescentWaxing">凸娥眉月</entry>
<entry key="moon.new">新月</entry>
<!-- Miscellaneous names -->
<entry key="tb.backpack.thaumaturge">神秘使背包</entry>
<entry key="itemGroup.thaumicBees">神秘蜜蜂</entry>
<entry key="backpack.thaumaturge">神秘使背包</entry>
<entry key="itemGroup.magicbees">神秘蜜蜂</entry>
<!-- Species names -->
<entry key="thaumicbees.speciesEsoteric">玄奥</entry>
<entry key="thaumicbees.speciesEsoteric.description">罕见的杂交品种,具有魔力特性。|Apinomicon</entry>
<entry key="thaumicbees.speciesMysterious">神秘</entry>
<entry key="thaumicbees.speciesMysterious.description">这些蜜蜂曾经去过世界的尽头并凯旋归来,它们的能力得到了长足增强。|Apinomicon</entry>
<entry key="thaumicbees.speciesArcane">奥能</entry>
<entry key="thaumicbees.speciesArcane.description">"它们的产物充满了魔力!"|Azanor, 大神秘使</entry>
<entry key="thaumicbees.speciesCharmed">魅惑</entry>
<entry key="thaumicbees.speciesCharmed.description">你的神秘学养蜂试验终于结出了硕果-一种会嗡嗡叫名为蜜蜂的硕果。|Apinomicon</entry>
<entry key="thaumicbees.speciesEnchanted">蕴魔</entry>
<entry key="thaumicbees.speciesEnchanted.description">数带魅惑蜂的繁衍让小东西们逐渐接触到未知的存在。|Apinomicon</entry>
<entry key="thaumicbees.speciesSupernatural">超能</entry>
<entry key="thaumicbees.speciesSupernatural.description">蜜蜂行走在不可视境界线之上。|Apinomicon</entry>
<entry key="thaumicbees.speciesPupil">学徒</entry>
<entry key="thaumicbees.speciesPupil.description">"这群蜜蜂想对我的研究稿做什么?!|Yorae,图书馆馆员</entry>
<entry key="thaumicbees.speciesStark">朴实</entry>
<entry key="thaumicbees.speciesStark.description">"它们能吸引魔力的碎片,具体有待研究!"|Azanor,大神秘使</entry>
<entry key="thaumicbees.speciesAura">灵气</entry>
<entry key="thaumicbees.speciesAura.description">"工作敏捷,扣人心弦!"|Sengir,养蜂狂人</entry>
<entry key="thaumicbees.speciesIgnis">灼热</entry>
<entry key="thaumicbees.speciesIgnis.description">注意:蜂房中的东西相当灼热。|Azanor的蜂房的警告牌</entry>
<entry key="thaumicbees.speciesAqua">流水</entry>
<entry key="thaumicbees.speciesAqua.description">"我试图养育它们,结果变成落汤鸡!"|MysteriousAges,神秘使学徒</entry>
<entry key="thaumicbees.speciesSolum">泥土</entry>
<entry key="thaumicbees.speciesSolum.description">"这些蜜蜂真心是挖掘专家,小心它们挖洞"|MysteriousAges,滑稽剧学徒</entry>
<entry key="thaumicbees.speciesAware">感知</entry>
<entry key="thaumicbees.speciesAware.description">"它们看得见你的灵魂!"|Florastar,养蜂专家</entry>
<entry key="thaumicbees.speciesSkulking">诡隐</entry>
<entry key="thaumicbees.speciesSkulking.description">这些蜜蜂变得暴躁排外,你可得当心了!|Apinomicon</entry>
<entry key="thaumicbees.speciesGhastly">幽魂</entry>
<entry key="thaumicbees.speciesGhastly.description">"*叹息*... 真的,神秘?"|Taveria</entry>
<entry key="thaumicbees.speciesSpidery">蜘蛛</entry>
<entry key="thaumicbees.speciesSpidery.description">蜘蛛蜂; 嗯.做蜘蛛蜂该做的事情。|未知语</entry>
<entry key="thaumicbees.speciesTimely">瞬息</entry>
<entry key="thaumicbees.speciesTimely.description">"养蜂员从不迟到,他想去的时候就能准点到达!"|Sengir,养蜂狂人</entry>
<entry key="thaumicbees.speciesLordly">贵族</entry>
<entry key="thaumicbees.speciesLordly.description">它们平和生活,共建和谐社会|古遗物</entry>
<entry key="thaumicbees.speciesDoctoral">博士</entry>
<entry key="thaumicbees.speciesDoctoral.description">"你们喜欢胶糖娃娃吗?"|戴着大围巾,手持蓝色盒子的陌生人</entry>
<entry key="thaumicbees.speciesSpirit">精神</entry>
<entry key="thaumicbees.speciesSpirit.description">据说这种蜜蜂能和死者沟通。|Apinomicon</entry>
<entry key="thaumicbees.speciesSoul">魂魄</entry>
<entry key="thaumicbees.speciesSoul.description">"路西法亲自收割你的灵魂来啦!"|Yooooooooo</entry>
<entry key="thaumicbees.speciesIron">灰铁</entry>
<entry key="thaumicbees.speciesIron.description">这种蜜蜂能从周围聚集铁元素。|Apinomicon</entry>
<entry key="thaumicbees.speciesGold">黄金</entry>
<entry key="thaumicbees.speciesGold.description">闪光的东西未必是黄金。|古代格言</entry>
<entry key="thaumicbees.speciesCopper">紫铜</entry>
<entry key="thaumicbees.speciesCopper.description">铜是非常有用的常见金属,这种蜜蜂能从周围聚集铜元素。|Apinomicon</entry>
<entry key="thaumicbees.speciesTin">白锡</entry>
<entry key="thaumicbees.speciesTin.description">涉及到金属的时候,这些蜜蜂异常脆弱。|Apinomicon</entry>
<entry key="thaumicbees.speciesSilver">白银</entry>
<entry key="thaumicbees.speciesSilver.description">即使略逊于黄金蜂,它们也自有其价值所在。|Apinomicon</entry>
<entry key="thaumicbees.speciesLead">黑铅</entry>
<entry key="thaumicbees.speciesLead.description">业余炼金术师的最好,它们相信这种蜜蜂能点铅化金。|Apinomicon</entry>
<entry key="thaumicbees.speciesDiamond">钻石</entry>
<entry key="thaumicbees.speciesDiamond.description">闪光的结晶,硬比龙牙。钻石恒久远,一颗永流传。|Apinomicon</entry>
<entry key="thaumicbees.speciesEmerald">宝石</entry>
<entry key="thaumicbees.speciesEmerald.description">据说它们曾造访伟大巫师统治之地,并带走了巫师之城的要素。|Apinomicon</entry>
<entry key="thaumicbees.speciesApatite">磷化</entry>
<entry key="thaumicbees.speciesApatite.description">这些东西真心是日夜牢骚不断。我关紧窗户躲进地下室,但蜜蜂尖锐的嗡嗡声却无处不在地透墙而过,乱我心绪。|养蜂入门</entry>
<entry key="thaumicbees.speciesScholarly">博学</entry>
<entry key="thaumicbees.speciesScholarly.description">"我难以确信,但我觉得它们比我更聪明 ..."|Yorae,图书馆馆员</entry>
<entry key="thaumicbees.speciesSavant">专家</entry>
<entry key="thaumicbees.speciesSavant.description">lim(x^(i / pi)/ log(e * 7 - ln(32/x^-pi))). 把这个解出来我就给你们蜂蜜。|Yorae的桌子上发现的便签</entry>
<entry key="thaumicbees.speciesPraecantatio">奇术</entry>
<entry key="thaumicbees.speciesPraecantatio.description">养蜂本身就是一种魔法!|Apinomicon,绪论</entry>
<entry key="thaumicbees.speciesVis">魔力</entry>
<entry key="thaumicbees.speciesVis.description">"它们能感知到魔力的存在,却还不能影响到魔力。"|Azanor,研究笔记</entry>
<entry key="thaumicbees.speciesPure">纯净</entry>
<entry key="thaumicbees.speciesPure.description">"蜜蜂中的卫士!"|MysteriousAges,神秘使</entry>
<entry key="thaumicbees.speciesFlux">咒波</entry>
<entry key="thaumicbees.speciesFlux.description">"我以为能解决咒波问题呢,结果情况更糟糕了!"|Kreicus,神秘使学徒</entry>
<entry key="thaumicbees.speciesNode">节点</entry>
<entry key="thaumicbees.speciesNode.description">经历了不寻常的突变后,这些蜜蜂具备了吸引魔力的能力。|Apinomicon</entry>
<entry key="thaumicbees.speciesRejuvenating">复兴</entry>
<entry key="thaumicbees.speciesRejuvenating.description">神奇的蜜蜂,能吸引附近的节点靠近。|Apinomicon</entry>
<entry key="thaumicbees.speciesBrainy">怒尸</entry>
<entry key="thaumicbees.speciesBrainy.description">蜂巢变得恶臭难闻,但这些家伙变得好聪明!|Apinomicon</entry>
<entry key="thaumicbees.speciesGossamer">蜘丝</entry>
<entry key="thaumicbees.speciesGossamer.description">他们工作的瞬息彷佛消失在光芒之中。|Apinomicon</entry>
<entry key="thaumicbees.speciesWispy">精灵</entry>
<entry key="thaumicbees.speciesWispy.description">它们的语言支离破碎,难以理解,也许它们在和某种超自然的生物沟通?|Apinomicon</entry>
<entry key="thaumicbees.speciesBatty">火蝠</entry>
<entry key="thaumicbees.speciesBatty.description">它们通过未知的方法吸引了许多火焰蝙蝠。|Apinomicon</entry>
<entry key="thaumicbees.speciesChicken">家禽</entry>
<entry key="thaumicbees.speciesChicken.description">"咯咯。咯咯咯,咯咯咯咯! ... 听到没?"|困惑的蜜蜂</entry>
<entry key="thaumicbees.speciesBeef">壮牛</entry>
<entry key="thaumicbees.speciesBeef.description">"哞哞,哞哞,哞哞。稍等,咋回事?"|困惑的蜜蜂</entry>
<entry key="thaumicbees.speciesPork">猪啰</entry>
<entry key="thaumicbees.speciesPork.description">"呼噜,呼噜噜.额.... 嗡嗡?"|困惑的蜜蜂</entry>
<entry key="thaumicbees.speciesMinium">铅丹</entry>
<entry key="thaumicbees.speciesMinium.description">善变乃其天性。|Apinomicon</entry>
<entry key="thaumicbees.speciesEssence">源质</entry>
<entry key="thaumicbees.speciesEssence.description">集中力量汇集大气中的微尘。|Apinomicon</entry>
<entry key="thaumicbees.speciesQuintessence">精萃</entry>
<entry key="thaumicbees.speciesQuintessence.description">魔法之心蕴藏世间诸事。|Apinomicon,绪论</entry>
<entry key="thaumicbees.speciesErde">大地</entry>
<entry key="thaumicbees.speciesErde.description">大地的力量灌注下,它们制造地属性的源质。|Apinomicon</entry>
<entry key="thaumicbees.speciesLuft">和风</entry>
<entry key="thaumicbees.speciesLuft.description">在风的加持下,比空气更轻盈。|Apinomicon</entry>
<entry key="thaumicbees.speciesFeuer">焰火</entry>
<entry key="thaumicbees.speciesFeuer.description">它们能沸水溶金。|Apinomicon</entry>
<entry key="thaumicbees.speciesWasser">水灵</entry>
<entry key="thaumicbees.speciesWasser.description">浸透了液体后,它们的蜂巢潮湿又沉重。|Apinomicon</entry>
<entry key="thaumicbees.speciesBlitz">闪电</entry>
<entry key="thaumicbees.speciesBlitz.description">瞬息千里,所到即生野火。|Apinomicon</entry>
<entry key="thaumicbees.speciesStaude">延年</entry>
<entry key="thaumicbees.speciesStaude.description">与绿色和生命的力量天生亲和。|Apinomicon</entry>
<entry key="thaumicbees.speciesEis">冰霜</entry>
<entry key="thaumicbees.speciesEis.description">"它们老偷我东西,但我却抓不住它们。它们太滑溜。"|MysteriousAges, incorrigible punster</entry>
<entry key="thaumicbees.speciesMagma">熔岩</entry>
<entry key="thaumicbees.speciesMagma.description">它们飞过之处,大地被烧灼成灰烬之地,所有的植被都被焚烧干净。|Apinomicon</entry>
<entry key="thaumicbees.speciesArkanen">奥义</entry>
<entry key="thaumicbees.speciesArkanen.description">"古怪的生物,但是产物蛮有用的"|Mithion,专家级法师</entry>
<entry key="thaumicbees.speciesVortex">漩涡</entry>
<entry key="thaumicbees.speciesVortex.description">它们贪婪地渴求法力,被任何施法者它们都能危险。|Apinomicon</entry>
<entry key="thaumicbees.speciesWight">重量</entry>
<entry key="thaumicbees.speciesWight.description">"它们能吸收魔力;并非总是很温顺。"|Mithion,专家级法师</entry>
<entry key="magicbees.speciesEsoteric">玄奥</entry>
<entry key="magicbees.speciesEsoteric.description">罕见的杂交品种,具有魔力特性。|Apinomicon</entry>
<entry key="magicbees.speciesMysterious">神秘</entry>
<entry key="magicbees.speciesMysterious.description">这些蜜蜂曾经去过世界的尽头并凯旋归来,它们的能力得到了长足增强。|Apinomicon</entry>
<entry key="magicbees.speciesArcane">奥能</entry>
<entry key="magicbees.speciesArcane.description">"它们的产物充满了魔力!"|Azanor, 大神秘使</entry>
<entry key="magicbees.speciesCharmed">魅惑</entry>
<entry key="magicbees.speciesCharmed.description">你的神秘学养蜂试验终于结出了硕果-一种会嗡嗡叫名为蜜蜂的硕果。|Apinomicon</entry>
<entry key="magicbees.speciesEnchanted">蕴魔</entry>
<entry key="magicbees.speciesEnchanted.description">数带魅惑蜂的繁衍让小东西们逐渐接触到未知的存在。|Apinomicon</entry>
<entry key="magicbees.speciesSupernatural">超能</entry>
<entry key="magicbees.speciesSupernatural.description">蜜蜂行走在不可视境界线之上。|Apinomicon</entry>
<entry key="magicbees.speciesPupil">学徒</entry>
<entry key="magicbees.speciesPupil.description">"这群蜜蜂想对我的研究稿做什么?!|Yorae,图书馆馆员</entry>
<entry key="magicbees.speciesScholarly">博学</entry>
<entry key="magicbees.speciesScholarly.description">"我难以确信,但我觉得它们比我更聪明 ..."|Yorae,图书馆馆员</entry>
<entry key="magicbees.speciesSavant">专家</entry>
<entry key="magicbees.speciesSavant.description">lim(x^(i / pi)/ log(e * 7 - ln(32/x^-pi))). 把这个解出来我就给你们蜂蜜。|Yorae的桌子上发现的便签</entry>
<entry key="magicbees.speciesAware">感知</entry>
<entry key="magicbees.speciesAware.description">"它们看得见你的灵魂!"|Florastar,养蜂专家</entry>
<entry key="magicbees.speciesSpirit">精神</entry>
<entry key="magicbees.speciesSpirit.description">据说这种蜜蜂能和死者沟通。|Apinomicon</entry>
<entry key="magicbees.speciesSoul">魂魄</entry>
<entry key="magicbees.speciesSoul.description">"路西法亲自收割你的灵魂来啦!"|Yooooooooo</entry>
<entry key="magicbees.speciesSkulking">诡隐</entry>
<entry key="magicbees.speciesSkulking.description">这些蜜蜂变得暴躁排外,你可得当心了!|Apinomicon</entry>
<entry key="magicbees.speciesGhastly">幽魂</entry>
<entry key="magicbees.speciesGhastly.description">"*叹息*... 真的,神秘?"|Taveria</entry>
<entry key="magicbees.speciesSpidery">蜘蛛</entry>
<entry key="magicbees.speciesSpidery.description">蜘蛛蜂; 嗯.做蜘蛛蜂该做的事情。|未知语</entry>
<entry key="magicbees.speciesTimely">瞬息</entry>
<entry key="magicbees.speciesTimely.description">"养蜂员从不迟到,他想去的时候就能准点到达!"|Sengir,养蜂狂人</entry>
<entry key="magicbees.speciesLordly">贵族</entry>
<entry key="magicbees.speciesLordly.description">它们平和生活,共建和谐社会|古遗物</entry>
<entry key="magicbees.speciesDoctoral">博士</entry>
<entry key="magicbees.speciesDoctoral.description">"你们喜欢胶糖娃娃吗?"|戴着大围巾,手持蓝色盒子的陌生人</entry>
<entry key="magicbees.speciesIron">灰铁</entry>
<entry key="magicbees.speciesIron.description">这种蜜蜂能从周围聚集铁元素。|Apinomicon</entry>
<entry key="magicbees.speciesGold">黄金</entry>
<entry key="magicbees.speciesGold.description">闪光的东西未必是黄金。|古代格言</entry>
<entry key="magicbees.speciesCopper">紫铜</entry>
<entry key="magicbees.speciesCopper.description">铜是非常有用的常见金属,这种蜜蜂能从周围聚集铜元素。|Apinomicon</entry>
<entry key="magicbees.speciesTin">白锡</entry>
<entry key="magicbees.speciesTin.description">涉及到金属的时候,这些蜜蜂异常脆弱。|Apinomicon</entry>
<entry key="magicbees.speciesSilver">白银</entry>
<entry key="magicbees.speciesSilver.description">即使略逊于黄金蜂,它们也自有其价值所在。|Apinomicon</entry>
<entry key="magicbees.speciesLead">黑铅</entry>
<entry key="magicbees.speciesLead.description">业余炼金术师的最好,它们相信这种蜜蜂能点铅化金。|Apinomicon</entry>
<entry key="magicbees.speciesDiamond">钻石</entry>
<entry key="magicbees.speciesDiamond.description">闪光的结晶,硬比龙牙。钻石恒久远,一颗永流传。|Apinomicon</entry>
<entry key="magicbees.speciesEmerald">宝石</entry>
<entry key="magicbees.speciesEmerald.description">据说它们曾造访伟大巫师统治之地,并带走了巫师之城的要素。|Apinomicon</entry>
<entry key="magicbees.speciesApatite">磷化</entry>
<entry key="magicbees.speciesApatite.description">这些东西真心是日夜牢骚不断。我关紧窗户躲进地下室,但蜜蜂尖锐的嗡嗡声却无处不在地透墙而过,乱我心绪。|养蜂入门</entry>
<entry key="magicbees.speciesTCStark">朴实</entry>
<entry key="magicbees.speciesTCStark.description">"它们能吸引魔力的碎片,具体有待研究!"|Azanor,大神秘使</entry>
<entry key="magicbees.speciesTCAir">灵气</entry>
<entry key="magicbees.speciesTCAir.description">"工作敏捷,扣人心弦!"|Sengir,养蜂狂人</entry>
<entry key="magicbees.speciesTCFire">灼热</entry>
<entry key="magicbees.speciesTCFire.description">注意:蜂房中的东西相当灼热。|Azanor的蜂房的警告牌</entry>
<entry key="magicbees.speciesTCWater">流水</entry>
<entry key="magicbees.speciesTCWater.description">"我试图养育它们,结果变成落汤鸡!"|MysteriousAges,神秘使学徒</entry>
<entry key="magicbees.speciesTCEarth">泥土</entry>
<entry key="magicbees.speciesTCEarth.description">"这些蜜蜂真心是挖掘专家,小心它们挖洞"|MysteriousAges,滑稽剧学徒</entry>
<entry key="magicbees.speciesTCMagic">奇术</entry>
<entry key="magicbees.speciesTCMagic.description">养蜂本身就是一种魔法!|Apinomicon,绪论</entry>
<entry key="magicbees.speciesTCVis">魔力</entry>
<entry key="magicbees.speciesTCVis.description">"它们能感知到魔力的存在,却还不能影响到魔力。"|Azanor,研究笔记</entry>
<entry key="magicbees.speciesTCPure">纯净</entry>
<entry key="magicbees.speciesTCPure.description">"蜜蜂中的卫士!"|MysteriousAges,神秘使</entry>
<entry key="magicbees.speciesTCFlux">咒波</entry>
<entry key="magicbees.speciesTCFlux.description">"我以为能解决咒波问题呢,结果情况更糟糕了!"|Kreicus,神秘使学徒</entry>
<entry key="magicbees.speciesTCRejuvenating">复兴</entry>
<entry key="magicbees.speciesTCRejuvenating.description">神奇的蜜蜂,能吸引附近的节点靠近。|Apinomicon</entry>
<entry key="magicbees.speciesTCBrainy">怒尸</entry>
<entry key="magicbees.speciesTCBrainy.description">蜂巢变得恶臭难闻,但这些家伙变得好聪明!|Apinomicon</entry>
<entry key="magicbees.speciesTCWispy">精灵</entry>
<entry key="magicbees.speciesTCWispy.description">它们的语言支离破碎,难以理解,也许它们在和某种超自然的生物沟通?|Apinomicon</entry>
<entry key="magicbees.speciesTCBatty">火蝠</entry>
<entry key="magicbees.speciesTCBatty.description">它们通过未知的方法吸引了许多火焰蝙蝠。|Apinomicon</entry>
<entry key="magicbees.speciesTCChicken">家禽</entry>
<entry key="magicbees.speciesTCChicken.description">"咯咯。咯咯咯,咯咯咯咯! ... 听到没?"|困惑的蜜蜂</entry>
<entry key="magicbees.speciesTCBeef">壮牛</entry>
<entry key="magicbees.speciesTCBeef.description">"哞哞,哞哞,哞哞。稍等,咋回事?"|困惑的蜜蜂</entry>
<entry key="magicbees.speciesTCPork">猪啰</entry>
<entry key="magicbees.speciesTCPork.description">"呼噜,呼噜噜.额.... 嗡嗡?"|困惑的蜜蜂</entry>
<entry key="magicbees.speciesEEMinium">铅丹</entry>
<entry key="magicbees.speciesEEMinium.description">善变乃其天性。|Apinomicon</entry>
<entry key="magicbees.speciesEssence">源质</entry>
<entry key="magicbees.speciesEssence.description">集中力量汇集大气中的微尘。|Apinomicon</entry>
<entry key="magicbees.speciesQuintessence">精萃</entry>
<entry key="magicbees.speciesQuintessence.description">魔法之心蕴藏世间诸事。|Apinomicon,绪论</entry>
<entry key="magicbees.speciesErde">大地</entry>
<entry key="magicbees.speciesErde.description">大地的力量灌注下,它们制造地属性的源质。|Apinomicon</entry>
<entry key="magicbees.speciesLuft">和风</entry>
<entry key="magicbees.speciesLuft.description">在风的加持下,比空气更轻盈。|Apinomicon</entry>
<entry key="magicbees.speciesFeuer">焰火</entry>
<entry key="magicbees.speciesFeuer.description">它们能沸水溶金。|Apinomicon</entry>
<entry key="magicbees.speciesWasser">水灵</entry>
<entry key="magicbees.speciesWasser.description">浸透了液体后,它们的蜂巢潮湿又沉重。|Apinomicon</entry>
<entry key="magicbees.speciesBlitz">闪电</entry>
<entry key="magicbees.speciesBlitz.description">瞬息千里,所到即生野火。|Apinomicon</entry>
<entry key="magicbees.speciesStaude">延年</entry>
<entry key="magicbees.speciesStaude.description">与绿色和生命的力量天生亲和。|Apinomicon</entry>
<entry key="magicbees.speciesEis">冰霜</entry>
<entry key="magicbees.speciesEis.description">"它们老偷我东西,但我却抓不住它们。它们太滑溜。"|MysteriousAges, incorrigible punster</entry>
<entry key="magicbees.speciesMagma">熔岩</entry>
<entry key="magicbees.speciesMagma.description">它们飞过之处,大地被烧灼成灰烬之地,所有的植被都被焚烧干净。|Apinomicon</entry>
<entry key="magicbees.speciesArkanen">奥义</entry>
<entry key="magicbees.speciesArkanen.description">"古怪的生物,但是产物蛮有用的"|Mithion,专家级法师</entry>
<entry key="magicbees.speciesVortex">漩涡</entry>
<entry key="magicbees.speciesVortex.description">它们贪婪地渴求法力,被任何施法者它们都能危险。|Apinomicon</entry>
<entry key="magicbees.speciesWight">重量</entry>
<entry key="magicbees.speciesWight.description">"它们能吸收魔力;并非总是很温顺。"|Mithion,专家级法师</entry>
<!-- Blank species entries
<entry key="thaumicbees.species"></entry>
<entry key="thaumicbees.species.description"></entry>
<entry key="magicbees.species"></entry>
<entry key="magicbees.species.description"></entry>
-->
<!-- Bee Alleles -->
<entry key="thaumicbees.effectCurative">驱散</entry>
<entry key="thaumicbees.effecteffectDigSpeed">挖掘加速</entry>
<entry key="thaumicbees.effecteffectMoveSpeed">速度</entry>
<entry key="thaumicbees.effecteffectSlowSpeed">缓慢</entry>
<entry key="thaumicbees.effectNodeGeneration">灵气吸收</entry>
<entry key="thaumicbees.effectNodePurify">灵气纯化</entry>
<entry key="thaumicbees.effectNodeFlux">咒波</entry>
<entry key="thuamicbees.effectNodeCharge">灵气充能</entry>
<entry key="thaumicbees.effectBrainy">怒尸</entry>
<entry key="thaumicbees.effectBatty">火蝠</entry>
<entry key="thaumicbees.effectWispy">精灵</entry>
<entry key="thaumicbees.Ghast">幽魂</entry>
<entry key="thaumicbees.effectManaDrainer">漩涡</entry>
<entry key="thaumicbees.effectAMWisp">精灵[AM]</entry>
<entry key="tb.bees.flower.book">书</entry>
<entry key="tb.bees.flower.magic">神秘植物</entry>
<entry key="tb.bees.flower.arsmagica">异域植物</entry>
<entry key="tb.bees.flower.node">节点</entry>
<entry key="magicbees.effectCurative">驱散</entry>
<entry key="magicbees.effectDigSpeed">挖掘加速</entry>
<entry key="magicbees.effectMoveSpeed">速度</entry>
<entry key="magicbees.effectSlowSpeed">缓慢</entry>
<entry key="magicbees.effectNodeGeneration">灵气吸收</entry>
<entry key="magicbees.effectNodePurify">灵气纯化</entry>
<entry key="magicbees.effectNodeFlux">咒波</entry>
<entry key="magicbees.effectNodeCharge">灵气充能</entry>
<entry key="magicbees.effectBrainy">怒尸</entry>
<entry key="magicbees.effectBatty">火蝠</entry>
<entry key="magicbees.effectWispy">精灵</entry>
<entry key="magicbees.effectGhastly">幽魂</entry>
<entry key="magicbees.effectManaDrainer">漩涡</entry>
<entry key="magicbees.effectAMWisp">精灵[AM]</entry>
<entry key="flowerProvider.book">书</entry>
<entry key="flowerProvider.magic">神秘植物</entry>
<entry key="flowerProvider.arsmagica">异域植物</entry>
<entry key="flowerProvider.node">节点</entry>
<!-- Classifications -->
<entry key="classification.arcane">奥能</entry>
<entry key="classification.arcane.description">对奥法亲和的蜜蜂。|Apinomicon</entry>
+109 -31
View File
@@ -1,5 +1,6 @@
package magicbees.bees;
import magicbees.main.utils.LocalizationManager;
import magicbees.main.utils.compat.ArsMagicaHelper;
import magicbees.main.utils.compat.ThaumcraftHelper;
import net.minecraft.potion.Potion;
@@ -9,6 +10,7 @@ import forestry.api.genetics.AlleleManager;
import forestry.api.genetics.IAllele;
import forestry.api.genetics.IAlleleEffect;
import forestry.api.genetics.IAlleleFlowers;
import forestry.api.genetics.IAlleleRegistry;
public class Allele implements IAllele
{
@@ -21,12 +23,8 @@ public class Allele implements IAllele
public static IAlleleFlowers flowerThaumcraft;
public static IAlleleFlowers flowerArsMagica;
public static IAlleleFlowers flowerAuraNode;
@Deprecated
public static IAlleleFlowers flowerNodePurify;
@Deprecated
public static IAlleleFlowers flowerNodeFluxify;
public static IAlleleEffect cleansingEffect;
public static IAlleleEffect effectCleansing;
public static IAlleleEffect digSpeed;
public static IAlleleEffect moveSpeed;
public static IAlleleEffect slowSpeed;
@@ -51,29 +49,25 @@ public class Allele implements IAllele
Allele.fertilityHighDominant = new AlleleInteger("fertilityHighDominant", 3, true);
Allele.speedBlinding = new AlleleFloat("speedBlinding", 2f, false);
Allele.flowerBookshelf = new AlleleFlower("flowerBookshelf", new FlowerProviderBookshelf(), true);
Allele.flowerBookshelf = new AlleleFlower("Bookshelf", new FlowerProviderBookshelf(), true);
if (ThaumcraftHelper.isActive())
{
FlowerProviderAuraNode provider = new FlowerProviderAuraNode();
Allele.flowerThaumcraft = new AlleleFlower("flowerThaumcraftPlant", new FlowerProviderThaumcraftFlower(), false);
Allele.flowerAuraNode = new AlleleFlower("flowerAuraNode", provider, true);
Allele.flowerNodePurify = new AlleleFlower("flowerAuraNodePurify", provider, false);
Allele.flowerNodeFluxify = new AlleleFlower("flowerAuraNodeFlux", provider, false);
Allele.flowerThaumcraft = new AlleleFlower("ThaumcraftPlant", new FlowerProviderThaumcraftFlower(), false);
Allele.flowerAuraNode = new AlleleFlower("AuraNode", new FlowerProviderAuraNode(), true);
Allele.spawnBrainyZombie = new AlleleEffectSpawnMob("effectBrainy", false, ThaumcraftHelper.Entity.BRAINY_ZOMBIE.entityID)
Allele.spawnBrainyZombie = new AlleleEffectSpawnMob("Brainy", false, ThaumcraftHelper.Entity.BRAINY_ZOMBIE.entityID)
.setAggrosPlayerOnSpawn().setThrottle(800).setSpawnsOnPlayerNear(null).setMaxMobsInSpawnZone(2);
Allele.spawnBats = new AlleleEffectSpawnMob("effectBatty", false, ThaumcraftHelper.Entity.FIREBAT.entityID)
Allele.spawnBats = new AlleleEffectSpawnMob("Batty", false, ThaumcraftHelper.Entity.FIREBAT.entityID)
.setThrottle(300).setSpawnsOnPlayerNear("Bat");
Allele.spawnWisp = new AlleleEffectSpawnWisp("effectWispy", false, ThaumcraftHelper.Entity.WISP.entityID, "thaumcraft.wisplive")
Allele.spawnWisp = new AlleleEffectSpawnWisp("Wispy", false, ThaumcraftHelper.Entity.WISP.entityID, "thaumcraft.wisplive")
.setThrottle(1800).setChanceToSpawn(79);
}
else
{
Allele.flowerThaumcraft = Allele.flowerAuraNode = (IAlleleFlowers)Allele.getBaseAllele("flowersVanilla");
Allele.flowerNodePurify = Allele.flowerNodeFluxify = (IAlleleFlowers)Allele.getBaseAllele("flowersVanilla");
Allele.spawnBrainyZombie = Allele.spawnBats = Allele.spawnWisp = (IAlleleEffect)Allele.getBaseAllele("effectNone");
}
@@ -81,11 +75,11 @@ public class Allele implements IAllele
{
Allele.flowerArsMagica = new AlleleFlower("flowerArsMagicaPlant", new FlowerProviderArsMagicaFlower(), false);
//String id, boolean isDominant, int throttle, String[] mobs, int[] chance
Allele.spawnManaDrainer = new AlleleEffectSpawnMobWeighted("effectManaDrainer", true, 20,
Allele.spawnManaDrainer = new AlleleEffectSpawnMobWeighted("ManaDrain", true, 20,
new String[] { "ArsMagica.MobManaCreeper", "ArsMagica.ManaVortex" },
new int[] { 60, 2 });
Allele.spawnWispOrHecate = new AlleleEffectSpawnMobWeighted("effectAMWisp", true, 20,
Allele.spawnWispOrHecate = new AlleleEffectSpawnMobWeighted("AMWisp", true, 20,
new String[] { "ArsMagica.MobWisp", "ArsMagica.MobHecate" },
new int[] { 40, 3 });
}
@@ -95,25 +89,100 @@ public class Allele implements IAllele
Allele.spawnManaDrainer = Allele.spawnWispOrHecate = (IAlleleEffect)Allele.getBaseAllele("effectNone");
}
Allele.effectNodeAttract = new AlleleEffectAuraNodeAttract("effectNodeGeneration", false, 400);
Allele.effectNodePurify = new AlleleEffectAuraNodePurify("effectNodePurify", false, 600, 150);
Allele.effectNodeFlux = new AlleleEffectAuraNodeFlux("effectNodeFlux", true, 300, 300);
Allele.effectNodeCharge = new AlleleEffectAuraNodeCharge("effectNodeCharge", true, 1200);
Allele.effectNodeAttract = new AlleleEffectAuraNodeAttract("NodeAttract", false, 400);
Allele.effectNodePurify = new AlleleEffectAuraNodePurify("NodePurify", false, 600, 150);
Allele.effectNodeFlux = new AlleleEffectAuraNodeFlux("NodeFlux", true, 300, 300);
Allele.effectNodeCharge = new AlleleEffectAuraNodeCharge("NodeCharge", true, 1200);
Allele.cleansingEffect = new AlleleEffectCure("effectCurative", false);
Allele.digSpeed = new AlleleEffectPotion("effectDigSpeed", Potion.digSpeed, 15, false);
Allele.moveSpeed = new AlleleEffectPotion("effectMoveSpeed", Potion.moveSpeed, 10, false);
Allele.slowSpeed = new AlleleEffectPotion("effectSlowSpeed", Potion.moveSlowdown, 3, false);
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.spawnGhast = new AlleleEffectSpawnMob("Ghast", false, "Ghast", "mob.ghast.moan")
Allele.spawnGhast = new AlleleEffectSpawnMob("Ghastly", false, "Ghast", "mob.ghast.moan")
.setThrottle(2060).setChanceToSpawn(10).setMaxMobsInSpawnZone(1);
Allele.spawnSpider = new AlleleEffectSpawnMob("Spider", false, "Spider", "mob.spider.step")
Allele.spawnSpider = new AlleleEffectSpawnMob("Spidery", false, "Spider", "mob.spider.step")
.setThrottle(400).setChanceToSpawn(70).setMaxMobsInSpawnZone(4);
}
private String uid;
private boolean dominant;
public static void registerDeprecatedAlleleReplacements()
{
IAlleleRegistry registry = AlleleManager.alleleRegistry;
registry.registerDeprecatedAlleleReplacement("thaumicbees.fertilityHighDominant", fertilityHighDominant);
registry.registerDeprecatedAlleleReplacement("thaumicbees.flowerflowerBookshelf", flowerBookshelf);
registry.registerDeprecatedAlleleReplacement("thaumicbees.speedBlinding", speedBlinding);
registry.registerDeprecatedAlleleReplacement("thaumicbees.effectNodeAttract", effectNodeAttract);
registry.registerDeprecatedAlleleReplacement("thaumicbees.effectNodePurify", effectNodePurify);
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.Ghast", spawnGhast);
registry.registerDeprecatedAlleleReplacement("thaumicbees.Spider", spawnSpider);
registry.registerDeprecatedAlleleReplacement("thaumicbees.speciesEsoteric", BeeSpecies.ESOTERIC);
registry.registerDeprecatedAlleleReplacement("thaumicbees.speciesMysterious", BeeSpecies.MYSTERIOUS);
registry.registerDeprecatedAlleleReplacement("thaumicbees.speciesArcane", BeeSpecies.ARCANE);
registry.registerDeprecatedAlleleReplacement("thaumicbees.speciesCharmed", BeeSpecies.CHARMED);
registry.registerDeprecatedAlleleReplacement("thaumicbees.speciesEnchanted", BeeSpecies.ENCHANTED);
registry.registerDeprecatedAlleleReplacement("thaumicbees.speciesSupernatural", BeeSpecies.SUPERNATURAL);
registry.registerDeprecatedAlleleReplacement("thaumicbees.speciesPupil", BeeSpecies.PUPIL);
registry.registerDeprecatedAlleleReplacement("thaumicbees.speciesScholarly", BeeSpecies.SCHOLARLY);
registry.registerDeprecatedAlleleReplacement("thaumicbees.speciesSavant", BeeSpecies.SAVANT);
registry.registerDeprecatedAlleleReplacement("thaumicbees.speciesAware", BeeSpecies.AWARE);
registry.registerDeprecatedAlleleReplacement("thaumicbees.speciesSpirit", BeeSpecies.SPIRIT);
registry.registerDeprecatedAlleleReplacement("thaumicbees.speciesSoul", BeeSpecies.SOUL);
registry.registerDeprecatedAlleleReplacement("thaumicbees.speciesSkulking", BeeSpecies.SKULKING);
registry.registerDeprecatedAlleleReplacement("thaumicbees.speciesGhastly", BeeSpecies.GHASTLY);
registry.registerDeprecatedAlleleReplacement("thaumicbees.speciesSpidery", BeeSpecies.SPIDERY);
registry.registerDeprecatedAlleleReplacement("thaumicbees.speciesTimely", BeeSpecies.TIMELY);
registry.registerDeprecatedAlleleReplacement("thaumicbees.speciesLordly", BeeSpecies.LORDLY);
registry.registerDeprecatedAlleleReplacement("thaumicbees.speciesDoctoral", BeeSpecies.DOCTORAL);
registry.registerDeprecatedAlleleReplacement("thaumicbees.speciesIron", BeeSpecies.IRON);
registry.registerDeprecatedAlleleReplacement("thaumicbees.speciesGold", BeeSpecies.GOLD);
registry.registerDeprecatedAlleleReplacement("thaumicbees.speciesCopper", BeeSpecies.COPPER);
registry.registerDeprecatedAlleleReplacement("thaumicbees.speciesTin", BeeSpecies.TIN);
registry.registerDeprecatedAlleleReplacement("thaumicbees.speciesSilver", BeeSpecies.SILVER);
registry.registerDeprecatedAlleleReplacement("thaumicbees.speciesLead", BeeSpecies.LEAD);
registry.registerDeprecatedAlleleReplacement("thaumicbees.speciesDiamond", BeeSpecies.DIAMOND);
registry.registerDeprecatedAlleleReplacement("thaumicbees.speciesEmerald", BeeSpecies.EMERALD);
registry.registerDeprecatedAlleleReplacement("thaumicbees.speciesApatite", BeeSpecies.APATITE);
registry.registerDeprecatedAlleleReplacement("thaumicbees.speciesStark", BeeSpecies.TC_STARK);
registry.registerDeprecatedAlleleReplacement("thaumicbees.speciesAura", BeeSpecies.TC_AIR);
registry.registerDeprecatedAlleleReplacement("thaumicbees.speciesIgnis", BeeSpecies.TC_FIRE);
registry.registerDeprecatedAlleleReplacement("thaumicbees.speciesAqua", BeeSpecies.TC_WATER);
registry.registerDeprecatedAlleleReplacement("thaumicbees.speciesSolum", BeeSpecies.TC_EARTH);
registry.registerDeprecatedAlleleReplacement("thaumicbees.speciesPraecantatio", BeeSpecies.TC_MAGIC);
registry.registerDeprecatedAlleleReplacement("thaumicbees.speciesVis", BeeSpecies.TC_VIS);
registry.registerDeprecatedAlleleReplacement("thaumicbees.speciesPure", BeeSpecies.TC_PURE);
registry.registerDeprecatedAlleleReplacement("thaumicbees.speciesFlux", BeeSpecies.TC_FLUX);
registry.registerDeprecatedAlleleReplacement("thaumicbees.speciesNode", BeeSpecies.TC_ATTRACT);
registry.registerDeprecatedAlleleReplacement("thaumicbees.speciesRejuvenating", BeeSpecies.TC_REJUVENATING);
registry.registerDeprecatedAlleleReplacement("thaumicbees.speciesBrainy", BeeSpecies.TC_BRAINY);
registry.registerDeprecatedAlleleReplacement("thaumicbees.speciesGossamer", BeeSpecies.TC_WISPY);
registry.registerDeprecatedAlleleReplacement("thaumicbees.speciesWispy", BeeSpecies.TC_WISPY);
registry.registerDeprecatedAlleleReplacement("thaumicbees.speciesBatty", BeeSpecies.TC_BATTY);
registry.registerDeprecatedAlleleReplacement("thaumicbees.speciesChicken", BeeSpecies.TC_CHICKEN);
registry.registerDeprecatedAlleleReplacement("thaumicbees.speciesBeef", BeeSpecies.TC_BEEF);
registry.registerDeprecatedAlleleReplacement("thaumicbees.speciesPork", BeeSpecies.TC_PORK);
registry.registerDeprecatedAlleleReplacement("thaumicbees.speciesMinium", BeeSpecies.EE_MINIUM);
registry.registerDeprecatedAlleleReplacement("thaumicbees.speciesEssence", BeeSpecies.AM_ESSENCE);
registry.registerDeprecatedAlleleReplacement("thaumicbees.speciesQuintessence", BeeSpecies.AM_QUINTESSENCE);
registry.registerDeprecatedAlleleReplacement("thaumicbees.speciesErde", BeeSpecies.AM_EARTH);
registry.registerDeprecatedAlleleReplacement("thaumicbees.speciesLuft", BeeSpecies.AM_AIR);
registry.registerDeprecatedAlleleReplacement("thaumicbees.speciesFeuer", BeeSpecies.AM_FIRE);
registry.registerDeprecatedAlleleReplacement("thaumicbees.speciesWasser", BeeSpecies.AM_WATER);
registry.registerDeprecatedAlleleReplacement("thaumicbees.speciesBlitz", BeeSpecies.AM_LIGHTNING);
registry.registerDeprecatedAlleleReplacement("thaumicbees.speciesStaude", BeeSpecies.AM_PLANT);
registry.registerDeprecatedAlleleReplacement("thaumicbees.speciesEis", BeeSpecies.AM_ICE);
registry.registerDeprecatedAlleleReplacement("thaumicbees.speciesMagma", BeeSpecies.AM_MAGMA);
registry.registerDeprecatedAlleleReplacement("thaumicbees.speciesArkanen", BeeSpecies.AM_ARCANE);
registry.registerDeprecatedAlleleReplacement("thaumicbees.speciesVortex", BeeSpecies.AM_VORTEX);
registry.registerDeprecatedAlleleReplacement("thaumicbees.speciesWight", BeeSpecies.AM_WIGHT);
}
public static IAlleleBeeSpecies getBaseSpecies(String name)
{
@@ -135,9 +204,12 @@ public class Allele implements IAllele
return AlleleManager.alleleRegistry.getAllele(name);
}
private String uid;
private boolean dominant;
public Allele(String id, boolean isDominant)
{
this.uid = "thaumicbees." + id;
this.uid = "magicbees." + id;
this.dominant = isDominant;
AlleleManager.alleleRegistry.registerAllele(this);
}
@@ -154,4 +226,10 @@ public class Allele implements IAllele
return this.dominant;
}
@Override
public String getName()
{
return LocalizationManager.getLocalizedString(getUID());
}
}
@@ -4,7 +4,7 @@ import java.util.List;
import cpw.mods.fml.common.registry.LanguageRegistry;
import magicbees.main.ThaumicBees;
import magicbees.main.MagicBees;
import magicbees.main.utils.LocalizationManager;
import net.minecraft.entity.Entity;
import net.minecraft.entity.player.EntityPlayer;
@@ -20,7 +20,7 @@ public abstract class AlleleEffect extends Allele implements IAlleleBeeEffect
public AlleleEffect(String id, boolean isDominant)
{
super(id, isDominant);
super("effect" + id, isDominant);
}
@Override
@@ -32,12 +32,6 @@ public abstract class AlleleEffect extends Allele implements IAlleleBeeEffect
@Override
public abstract IEffectData validateStorage(IEffectData storedData);
@Override
public String getIdentifier()
{
return LocalizationManager.getLocalizedString(getUID());
}
@Override
public abstract IEffectData doEffect(IBeeGenome genome, IEffectData storedData, IBeeHousing housing);
@@ -51,7 +45,7 @@ public abstract class AlleleEffect extends Allele implements IAlleleBeeEffect
area[1] = Math.max((int)(area[1] * mod), 1);
area[2] = Math.max((int)(area[2] * mod), 1);
ThaumicBees.proxy.drawBeeEffects(housing.getWorld(), housing.getXCoord(), housing.getYCoord(), housing.getZCoord(),
MagicBees.proxy.drawBeeEffects(housing.getWorld(), housing.getXCoord(), housing.getYCoord(), housing.getZCoord(),
genome.getPrimary().getIconColour(0), area[0], area[1], area[2]);
return storedData;
}
@@ -3,7 +3,7 @@ package magicbees.bees;
import java.util.List;
import magicbees.main.ThaumicBees;
import magicbees.main.MagicBees;
import net.minecraft.entity.Entity;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.Item;
@@ -20,7 +20,7 @@ public class AlleleEffectPotion extends AlleleEffect
public AlleleEffectPotion(String name, Potion potionApplied, int effectDuration, boolean isDominant)
{
super("effect" + name, isDominant);
super(name, isDominant);
this.potionId = potionApplied.id;
this.duration = 20 * effectDuration;
}
+296 -291
View File
@@ -10,6 +10,7 @@ import forestry.api.apiculture.EnumBeeType;
import forestry.api.core.ItemInterface;
import forestry.api.genetics.AlleleManager;
import forestry.api.genetics.IAllele;
import forestry.apiculture.genetics.BeeTemplates;
/**
* Simply a class to hold all the functions to manage species' default genomes.
@@ -19,7 +20,7 @@ import forestry.api.genetics.IAllele;
public class BeeGenomeManager
{
// Basic genome for All thaumic bees.
private static IAllele[] getTemplateBaseThaumic()
private static IAllele[] getTemplateModBase()
{
IAllele[] genome = new IAllele[EnumBeeChromosome.values().length];
@@ -39,10 +40,17 @@ public class BeeGenomeManager
return genome;
}
public static IAllele[] addRainResist(IAllele[] genome)
{
genome[EnumBeeChromosome.TOLERANT_FLYER.ordinal()] = Allele.getBaseAllele("boolTrue");
return genome;
}
public static IAllele[] getTemplateMystical()
{
IAllele[] genome = getTemplateBaseThaumic();
IAllele[] genome = getTemplateModBase();
genome[EnumBeeChromosome.SPECIES.ordinal()] = BeeSpecies.MYSTICAL;
@@ -51,7 +59,7 @@ public class BeeGenomeManager
public static IAllele[] getTemplateSorcerous()
{
IAllele[] genome = getTemplateBaseThaumic();
IAllele[] genome = getTemplateModBase();
genome[EnumBeeChromosome.SPECIES.ordinal()] = BeeSpecies.SORCEROUS;
genome[EnumBeeChromosome.FERTILITY.ordinal()] = Allele.getBaseAllele("fertilityHigh");
@@ -61,7 +69,7 @@ public class BeeGenomeManager
public static IAllele[] getTemplateUnusual()
{
IAllele[] genome = getTemplateBaseThaumic();
IAllele[] genome = getTemplateModBase();
genome[EnumBeeChromosome.SPECIES.ordinal()] = BeeSpecies.UNUSUAL;
genome[EnumBeeChromosome.TEMPERATURE_TOLERANCE.ordinal()] = Allele.getBaseAllele("toleranceBoth2");
@@ -71,7 +79,7 @@ public class BeeGenomeManager
public static IAllele[] getTemplateAttuned()
{
IAllele[] genome = getTemplateBaseThaumic();
IAllele[] genome = getTemplateModBase();
genome[EnumBeeChromosome.SPECIES.ordinal()] = BeeSpecies.ATTUNED;
genome[EnumBeeChromosome.FERTILITY.ordinal()] = Allele.getBaseAllele("fertilityHigh");
@@ -81,7 +89,7 @@ public class BeeGenomeManager
public static IAllele[] getTemplateEldritch()
{
IAllele[] genome = getTemplateBaseThaumic();
IAllele[] genome = getTemplateModBase();
genome[EnumBeeChromosome.SPECIES.ordinal()] = BeeSpecies.ELDRITCH;
genome[EnumBeeChromosome.SPEED.ordinal()] = Allele.getBaseAllele("speedSlower");
@@ -92,7 +100,7 @@ public class BeeGenomeManager
// Basic genome for Arcane branch bees.
private static IAllele[] getTemplateBaseArcane()
{
IAllele[] genome = getTemplateBaseThaumic();
IAllele[] genome = getTemplateModBase();
genome[EnumBeeChromosome.TEMPERATURE_TOLERANCE.ordinal()] = Allele.getBaseAllele("toleranceBoth1");
genome[EnumBeeChromosome.FLOWERING.ordinal()] = Allele.getBaseAllele("floweringSlow");
@@ -135,7 +143,7 @@ public class BeeGenomeManager
private static IAllele[] getTemplateBaseSupernatural()
{
IAllele[] genome = getTemplateBaseThaumic();
IAllele[] genome = getTemplateModBase();
genome[EnumBeeChromosome.NOCTURNAL.ordinal()] = Allele.getBaseAllele("boolTrue");
genome[EnumBeeChromosome.SPEED.ordinal()] = Allele.getBaseAllele("speedNorm");
@@ -176,7 +184,7 @@ public class BeeGenomeManager
public static IAllele[] getTemplateEthereal()
{
IAllele[] genome = getTemplateBaseThaumic();
IAllele[] genome = getTemplateModBase();
genome[EnumBeeChromosome.SPECIES.ordinal()] = BeeSpecies.ETHEREAL;
genome[EnumBeeChromosome.SPEED.ordinal()] = Allele.getBaseAllele("speedNorm");
@@ -188,7 +196,7 @@ public class BeeGenomeManager
private static IAllele[] getTemplateBaseScholarly()
{
IAllele[] genome = getTemplateBaseThaumic();
IAllele[] genome = getTemplateModBase();
genome[EnumBeeChromosome.SPEED.ordinal()] = Allele.getBaseAllele("speedSlow");
genome[EnumBeeChromosome.LIFESPAN.ordinal()] = Allele.getBaseAllele("lifespanElongated");
@@ -231,185 +239,48 @@ public class BeeGenomeManager
return genome;
}
private static IAllele[] getTemplateBaseElemental()
{
IAllele[] genome = getTemplateBaseThaumic();
genome[EnumBeeChromosome.FLOWER_PROVIDER.ordinal()] = AlleleFlower.flowerThaumcraft;
genome[EnumBeeChromosome.FERTILITY.ordinal()] = Allele.getBaseAllele("fertilityLow");
return genome;
}
public static IAllele[] getTemplateStark()
{
IAllele[] genome = getTemplateBaseElemental();
genome[EnumBeeChromosome.SPECIES.ordinal()] = BeeSpecies.TC_STARK;
genome[EnumBeeChromosome.FERTILITY.ordinal()] = Allele.getBaseAllele("fertilityNormal");
return genome;
}
public static IAllele[] getTemplateAir()
{
IAllele[] genome = getTemplateBaseElemental();
genome[EnumBeeChromosome.SPECIES.ordinal()] = BeeSpecies.TC_AIR;
genome[EnumBeeChromosome.SPEED.ordinal()] = Allele.getBaseAllele("speedFastest");
genome[EnumBeeChromosome.LIFESPAN.ordinal()] = Allele.getBaseAllele("lifespanShortened");
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;
return genome;
}
public static IAllele[] getTemplateFire()
{
IAllele[] genome = getTemplateBaseElemental();
genome[EnumBeeChromosome.SPECIES.ordinal()] = BeeSpecies.TC_FIRE;
genome[EnumBeeChromosome.SPEED.ordinal()] = Allele.getBaseAllele("speedFaster");
genome[EnumBeeChromosome.LIFESPAN.ordinal()] = Allele.getBaseAllele("lifespanNormal");
genome[EnumBeeChromosome.TEMPERATURE_TOLERANCE.ordinal()] = Allele.getBaseAllele("toleranceDown3");
genome[EnumBeeChromosome.HUMIDITY_TOLERANCE.ordinal()] = Allele.getBaseAllele("toleranceUp2");
genome[EnumBeeChromosome.TOLERANT_FLYER.ordinal()] = Allele.getBaseAllele("boolTrue");
genome[EnumBeeChromosome.EFFECT.ordinal()] = Allele.getBaseAllele("effectIgnition");
return genome;
}
public static IAllele[] getTemplateWater()
{
IAllele[] genome = getTemplateBaseElemental();
genome[EnumBeeChromosome.SPECIES.ordinal()] = BeeSpecies.TC_WATER;
genome[EnumBeeChromosome.SPEED.ordinal()] = Allele.getBaseAllele("speedFast");
genome[EnumBeeChromosome.LIFESPAN.ordinal()] = Allele.getBaseAllele("lifespanLong");
genome[EnumBeeChromosome.HUMIDITY_TOLERANCE.ordinal()] = Allele.getBaseAllele("toleranceDown2");
genome[EnumBeeChromosome.TOLERANT_FLYER.ordinal()] = Allele.getBaseAllele("boolTrue");
genome[EnumBeeChromosome.TERRITORY.ordinal()] = Allele.getBaseAllele("territoryLarge");
genome[EnumBeeChromosome.EFFECT.ordinal()] = Allele.cleansingEffect;
return genome;
}
public static IAllele[] getTemplateEarth()
{
IAllele[] genome = getTemplateBaseElemental();
genome[EnumBeeChromosome.SPECIES.ordinal()] = BeeSpecies.TC_EARTH;
genome[EnumBeeChromosome.SPEED.ordinal()] = Allele.getBaseAllele("speedSlow");
genome[EnumBeeChromosome.LIFESPAN.ordinal()] = Allele.getBaseAllele("lifespanLonger");
genome[EnumBeeChromosome.HUMIDITY_TOLERANCE.ordinal()] = Allele.getBaseAllele("toleranceDown1");
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;
return genome;
}
public static IAllele[] getTemplateInfused()
{
IAllele[] genome = getTemplateBaseElemental();
genome[EnumBeeChromosome.SPECIES.ordinal()] = BeeSpecies.TC_INFUSED;
genome[EnumBeeChromosome.SPEED.ordinal()] = Allele.getBaseAllele("speedNorm");
genome[EnumBeeChromosome.LIFESPAN.ordinal()] = Allele.getBaseAllele("lifespanNormal");
return genome;
}
private static IAllele[] getTemplateBaseVis()
{
IAllele[] genome = getTemplateBaseThaumic();
genome[EnumBeeChromosome.FERTILITY.ordinal()] = Allele.getBaseAllele("fertilityLow");
genome[EnumBeeChromosome.HUMIDITY_TOLERANCE.ordinal()] = Allele.getBaseAllele("toleranceBoth1");
genome[EnumBeeChromosome.TEMPERATURE_TOLERANCE.ordinal()] = Allele.getBaseAllele("toleranceBoth1");
return genome;
}
public static IAllele[] getTemplateAware()
{
IAllele[] genome = getTemplateBaseVis();
IAllele[] genome = getTemplateBaseSoul();
genome[EnumBeeChromosome.SPECIES.ordinal()] = BeeSpecies.AWARE;
genome[EnumBeeChromosome.FLOWER_PROVIDER.ordinal()] = Allele.flowerThaumcraft;
return genome;
}
public static IAllele[] getTemplateVis()
private static IAllele[] getTemplateBaseSoul()
{
IAllele[] genome = getTemplateBaseVis();
IAllele[] genome = getTemplateModBase();
genome[EnumBeeChromosome.SPECIES.ordinal()] = BeeSpecies.TC_VIS;
genome[EnumBeeChromosome.SPEED.ordinal()] = Allele.getBaseAllele("speedSlow");
genome[EnumBeeChromosome.FLOWERING.ordinal()] = Allele.getBaseAllele("floweringSlower");
genome[EnumBeeChromosome.FLOWER_PROVIDER.ordinal()] = Allele.flowerAuraNode;
return genome;
}
public static IAllele[] getTemplatePure()
{
IAllele[] genome = getTemplateBaseVis();
genome[EnumBeeChromosome.SPECIES.ordinal()] = BeeSpecies.TC_PURE;
genome[EnumBeeChromosome.HUMIDITY_TOLERANCE.ordinal()] = Allele.getBaseAllele("toleranceNone");
genome[EnumBeeChromosome.TEMPERATURE_TOLERANCE.ordinal()] = Allele.getBaseAllele("toleranceNone");
genome[EnumBeeChromosome.FLOWERING.ordinal()] = Allele.getBaseAllele("floweringAverage");
genome[EnumBeeChromosome.FLOWER_PROVIDER.ordinal()] = Allele.flowerAuraNode;
genome[EnumBeeChromosome.EFFECT.ordinal()] = Allele.effectNodePurify;
genome[EnumBeeChromosome.HUMIDITY_TOLERANCE.ordinal()] = Allele.getBaseAllele("toleranceBoth1");
genome[EnumBeeChromosome.TOLERANT_FLYER.ordinal()] = Allele.getBaseAllele("boolTrue");
return genome;
}
public static IAllele[] getTemplateFlux()
public static IAllele[] getTemplateSpirit()
{
IAllele[] genome = getTemplateBaseVis();
IAllele[] genome = getTemplateBaseSoul();
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;
genome[EnumBeeChromosome.SPECIES.ordinal()] = BeeSpecies.SPIRIT;
genome[EnumBeeChromosome.LIFESPAN.ordinal()] = Allele.getBaseAllele("lifespanShortened");
return genome;
}
public static IAllele[] getTemplateNode()
public static IAllele[] getTemplateSoul()
{
IAllele[] genome = getTemplateBaseVis();
IAllele[] genome = getTemplateBaseSoul();
genome[EnumBeeChromosome.SPECIES.ordinal()] = BeeSpecies.TC_NODE;
genome[EnumBeeChromosome.FLOWERING.ordinal()] = Allele.getBaseAllele("floweringSlowest");
genome[EnumBeeChromosome.FLOWER_PROVIDER.ordinal()] = Allele.flowerAuraNode;
genome[EnumBeeChromosome.EFFECT.ordinal()] = Allele.effectNodeAttract;
return genome;
}
public static IAllele[] getTemplateRejuvinating()
{
IAllele[] genome = getTemplateBaseVis();
genome[EnumBeeChromosome.SPECIES.ordinal()] = BeeSpecies.TC_REJUVENATING;
genome[EnumBeeChromosome.EFFECT.ordinal()] = Allele.effectNodeCharge;
genome[EnumBeeChromosome.FLOWER_PROVIDER.ordinal()] = Allele.flowerAuraNode;
genome[EnumBeeChromosome.HUMIDITY_TOLERANCE.ordinal()] = Allele.getBaseAllele("toleranceNone");
genome[EnumBeeChromosome.SPECIES.ordinal()] = BeeSpecies.SOUL;
genome[EnumBeeChromosome.LIFESPAN.ordinal()] = Allele.getBaseAllele("lifespanNormal");
return genome;
}
private static IAllele[] getTemplateBaseMalevolent()
{
IAllele[] genome = getTemplateBaseThaumic();
IAllele[] genome = getTemplateModBase();
genome[EnumBeeChromosome.SPEED.ordinal()] = Allele.getBaseAllele("speedFast");
genome[EnumBeeChromosome.FLOWERING.ordinal()] = Allele.getBaseAllele("floweringFaster");
@@ -430,52 +301,6 @@ public class BeeGenomeManager
return genome;
}
public static IAllele[] getTemplateBrainy()
{
IAllele[] genome = getTemplateBaseMalevolent();
genome[EnumBeeChromosome.SPECIES.ordinal()] = BeeSpecies.TC_BRAINY;
genome[EnumBeeChromosome.EFFECT.ordinal()] = Allele.spawnBrainyZombie;
genome[EnumBeeChromosome.FERTILITY.ordinal()] = Allele.getBaseAllele("fertilityLow");
return genome;
}
public static IAllele[] getTemplateGossamer()
{
IAllele[] genome = getTemplateBaseMalevolent();
genome[EnumBeeChromosome.SPECIES.ordinal()] = BeeSpecies.TC_GOSSAMER;
genome[EnumBeeChromosome.TOLERANT_FLYER.ordinal()] = Allele.getBaseAllele("boolTrue");
genome[EnumBeeChromosome.FLOWER_PROVIDER.ordinal()] = Allele.flowerThaumcraft;
return genome;
}
public static IAllele[] getTemplateWispy()
{
IAllele[] genome = getTemplateBaseMalevolent();
genome[EnumBeeChromosome.SPECIES.ordinal()] = BeeSpecies.TC_WISPY;
genome[EnumBeeChromosome.EFFECT.ordinal()] = Allele.spawnWisp;
genome[EnumBeeChromosome.TOLERANT_FLYER.ordinal()] = Allele.getBaseAllele("boolTrue");
genome[EnumBeeChromosome.FERTILITY.ordinal()] = Allele.getBaseAllele("fertilityLow");
genome[EnumBeeChromosome.FLOWER_PROVIDER.ordinal()] = Allele.flowerThaumcraft;
return genome;
}
public static IAllele[] getTemplateBatty()
{
IAllele[] genome = getTemplateBaseMalevolent();
genome[EnumBeeChromosome.SPECIES.ordinal()] = BeeSpecies.TC_BATTY;
genome[EnumBeeChromosome.EFFECT.ordinal()] = Allele.spawnBats;
genome[EnumBeeChromosome.TERRITORY.ordinal()] = Allele.getBaseAllele("territoryLarge");
return genome;
}
public static IAllele[] getTemplateGhastly()
{
IAllele[] genome = getTemplateBaseMalevolent();
@@ -506,7 +331,7 @@ public class BeeGenomeManager
private static IAllele[] getTemplateBaseTemporal()
{
IAllele[] genome = getTemplateBaseThaumic();
IAllele[] genome = getTemplateModBase();
genome[EnumBeeChromosome.HUMIDITY_TOLERANCE.ordinal()] = Allele.getBaseAllele("toleranceBoth1");
genome[EnumBeeChromosome.FERTILITY.ordinal()] = Allele.getBaseAllele("fertilityNormal");
@@ -555,58 +380,9 @@ public class BeeGenomeManager
return genome;
}
private static IAllele[] getTemplateBaseAlchemical()
{
IAllele[] genome = getTemplateBaseThaumic();
genome[EnumBeeChromosome.TERRITORY.ordinal()] = Allele.getBaseAllele("territoryLarge");
genome[EnumBeeChromosome.SPEED.ordinal()] = Allele.getBaseAllele("speedSlow");
return genome;
}
public static IAllele[] getTemplateMinium()
{
IAllele[] genome = getTemplateBaseAlchemical();
genome[EnumBeeChromosome.SPECIES.ordinal()] = BeeSpecies.EE_MINIUM;
return genome;
}
private static IAllele[] getTemplateBaseSoul()
{
IAllele[] genome = getTemplateBaseThaumic();
genome[EnumBeeChromosome.HUMIDITY_TOLERANCE.ordinal()] = Allele.getBaseAllele("toleranceBoth1");
genome[EnumBeeChromosome.TOLERANT_FLYER.ordinal()] = Allele.getBaseAllele("boolTrue");
return genome;
}
public static IAllele[] getTemplateSpirit()
{
IAllele[] genome = getTemplateBaseSoul();
genome[EnumBeeChromosome.SPECIES.ordinal()] = BeeSpecies.SPIRIT;
genome[EnumBeeChromosome.LIFESPAN.ordinal()] = Allele.getBaseAllele("lifespanShortened");
return genome;
}
public static IAllele[] getTemplateSoul()
{
IAllele[] genome = getTemplateBaseSoul();
genome[EnumBeeChromosome.SPECIES.ordinal()] = BeeSpecies.SOUL;
genome[EnumBeeChromosome.LIFESPAN.ordinal()] = Allele.getBaseAllele("lifespanNormal");
return genome;
}
private static IAllele[] getTemplateBaseMetallic()
{
IAllele[] genome = getTemplateBaseThaumic();
IAllele[] genome = getTemplateModBase();
genome[EnumBeeChromosome.SPEED.ordinal()] = Allele.getBaseAllele("speedSlowest");
genome[EnumBeeChromosome.FERTILITY.ordinal()] = Allele.getBaseAllele("fertilityLow");
@@ -699,7 +475,215 @@ public class BeeGenomeManager
return genome;
}
public static IAllele[] getTemplateChicken()
private static IAllele[] getTemplateTCBase()
{
IAllele[] genome = getTemplateModBase();
genome[EnumBeeChromosome.FLOWER_PROVIDER.ordinal()] = AlleleFlower.flowerThaumcraft;
genome[EnumBeeChromosome.FERTILITY.ordinal()] = Allele.getBaseAllele("fertilityLow");
return genome;
}
public static IAllele[] getTemplateTCStark()
{
IAllele[] genome = getTemplateTCBase();
genome[EnumBeeChromosome.SPECIES.ordinal()] = BeeSpecies.TC_STARK;
genome[EnumBeeChromosome.FERTILITY.ordinal()] = Allele.getBaseAllele("fertilityNormal");
return genome;
}
public static IAllele[] getTemplateTCAir()
{
IAllele[] genome = getTemplateTCBase();
genome[EnumBeeChromosome.SPECIES.ordinal()] = BeeSpecies.TC_AIR;
genome[EnumBeeChromosome.SPEED.ordinal()] = Allele.getBaseAllele("speedFastest");
genome[EnumBeeChromosome.LIFESPAN.ordinal()] = Allele.getBaseAllele("lifespanShortened");
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;
return genome;
}
public static IAllele[] getTemplateTCFire()
{
IAllele[] genome = getTemplateTCBase();
genome[EnumBeeChromosome.SPECIES.ordinal()] = BeeSpecies.TC_FIRE;
genome[EnumBeeChromosome.SPEED.ordinal()] = Allele.getBaseAllele("speedFaster");
genome[EnumBeeChromosome.LIFESPAN.ordinal()] = Allele.getBaseAllele("lifespanNormal");
genome[EnumBeeChromosome.TEMPERATURE_TOLERANCE.ordinal()] = Allele.getBaseAllele("toleranceDown3");
genome[EnumBeeChromosome.HUMIDITY_TOLERANCE.ordinal()] = Allele.getBaseAllele("toleranceUp2");
genome[EnumBeeChromosome.TOLERANT_FLYER.ordinal()] = Allele.getBaseAllele("boolTrue");
genome[EnumBeeChromosome.EFFECT.ordinal()] = Allele.getBaseAllele("effectIgnition");
return genome;
}
public static IAllele[] getTemplateTCWater()
{
IAllele[] genome = getTemplateTCBase();
genome[EnumBeeChromosome.SPECIES.ordinal()] = BeeSpecies.TC_WATER;
genome[EnumBeeChromosome.SPEED.ordinal()] = Allele.getBaseAllele("speedFast");
genome[EnumBeeChromosome.LIFESPAN.ordinal()] = Allele.getBaseAllele("lifespanLong");
genome[EnumBeeChromosome.HUMIDITY_TOLERANCE.ordinal()] = Allele.getBaseAllele("toleranceDown2");
genome[EnumBeeChromosome.TOLERANT_FLYER.ordinal()] = Allele.getBaseAllele("boolTrue");
genome[EnumBeeChromosome.TERRITORY.ordinal()] = Allele.getBaseAllele("territoryLarge");
genome[EnumBeeChromosome.EFFECT.ordinal()] = Allele.effectCleansing;
return genome;
}
public static IAllele[] getTemplateTCEarth()
{
IAllele[] genome = getTemplateTCBase();
genome[EnumBeeChromosome.SPECIES.ordinal()] = BeeSpecies.TC_EARTH;
genome[EnumBeeChromosome.SPEED.ordinal()] = Allele.getBaseAllele("speedSlow");
genome[EnumBeeChromosome.LIFESPAN.ordinal()] = Allele.getBaseAllele("lifespanLonger");
genome[EnumBeeChromosome.HUMIDITY_TOLERANCE.ordinal()] = Allele.getBaseAllele("toleranceDown1");
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;
return genome;
}
public static IAllele[] getTemplateTCMagic()
{
IAllele[] genome = getTemplateTCBase();
genome[EnumBeeChromosome.SPECIES.ordinal()] = BeeSpecies.TC_MAGIC;
genome[EnumBeeChromosome.SPEED.ordinal()] = Allele.getBaseAllele("speedNorm");
genome[EnumBeeChromosome.LIFESPAN.ordinal()] = Allele.getBaseAllele("lifespanNormal");
return genome;
}
private static IAllele[] getTemplateTCBaseVis()
{
IAllele[] genome = getTemplateTCBase();
genome[EnumBeeChromosome.FERTILITY.ordinal()] = Allele.getBaseAllele("fertilityLow");
genome[EnumBeeChromosome.HUMIDITY_TOLERANCE.ordinal()] = Allele.getBaseAllele("toleranceBoth1");
genome[EnumBeeChromosome.TEMPERATURE_TOLERANCE.ordinal()] = Allele.getBaseAllele("toleranceBoth1");
return genome;
}
public static IAllele[] getTemplateTCVis()
{
IAllele[] genome = getTemplateTCBaseVis();
genome[EnumBeeChromosome.SPECIES.ordinal()] = BeeSpecies.TC_VIS;
genome[EnumBeeChromosome.SPEED.ordinal()] = Allele.getBaseAllele("speedSlow");
genome[EnumBeeChromosome.FLOWERING.ordinal()] = Allele.getBaseAllele("floweringSlower");
genome[EnumBeeChromosome.FLOWER_PROVIDER.ordinal()] = Allele.flowerAuraNode;
return genome;
}
public static IAllele[] getTemplateTCPure()
{
IAllele[] genome = getTemplateTCBaseVis();
genome[EnumBeeChromosome.SPECIES.ordinal()] = BeeSpecies.TC_PURE;
genome[EnumBeeChromosome.HUMIDITY_TOLERANCE.ordinal()] = Allele.getBaseAllele("toleranceNone");
genome[EnumBeeChromosome.TEMPERATURE_TOLERANCE.ordinal()] = Allele.getBaseAllele("toleranceNone");
genome[EnumBeeChromosome.FLOWERING.ordinal()] = Allele.getBaseAllele("floweringAverage");
genome[EnumBeeChromosome.FLOWER_PROVIDER.ordinal()] = Allele.flowerAuraNode;
genome[EnumBeeChromosome.EFFECT.ordinal()] = Allele.effectNodePurify;
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();
genome[EnumBeeChromosome.SPECIES.ordinal()] = BeeSpecies.TC_REJUVENATING;
genome[EnumBeeChromosome.EFFECT.ordinal()] = Allele.effectNodeCharge;
genome[EnumBeeChromosome.FLOWER_PROVIDER.ordinal()] = Allele.flowerAuraNode;
genome[EnumBeeChromosome.HUMIDITY_TOLERANCE.ordinal()] = Allele.getBaseAllele("toleranceNone");
return genome;
}
public static IAllele[] getTemplateTCBrainy()
{
IAllele[] genome = getTemplateBaseMalevolent();
genome[EnumBeeChromosome.SPECIES.ordinal()] = BeeSpecies.TC_BRAINY;
genome[EnumBeeChromosome.EFFECT.ordinal()] = Allele.spawnBrainyZombie;
genome[EnumBeeChromosome.FERTILITY.ordinal()] = Allele.getBaseAllele("fertilityLow");
return genome;
}
public static IAllele[] getTemplateTCWispy()
{
IAllele[] genome = getTemplateBaseMalevolent();
genome[EnumBeeChromosome.SPECIES.ordinal()] = BeeSpecies.TC_WISPY;
genome[EnumBeeChromosome.EFFECT.ordinal()] = Allele.spawnWisp;
genome[EnumBeeChromosome.TOLERANT_FLYER.ordinal()] = Allele.getBaseAllele("boolTrue");
genome[EnumBeeChromosome.FERTILITY.ordinal()] = Allele.getBaseAllele("fertilityLow");
genome[EnumBeeChromosome.FLOWER_PROVIDER.ordinal()] = Allele.flowerThaumcraft;
return genome;
}
public static IAllele[] getTemplateTCBatty()
{
IAllele[] genome = getTemplateBaseMalevolent();
genome[EnumBeeChromosome.SPECIES.ordinal()] = BeeSpecies.TC_BATTY;
genome[EnumBeeChromosome.EFFECT.ordinal()] = Allele.spawnBats;
genome[EnumBeeChromosome.TERRITORY.ordinal()] = Allele.getBaseAllele("territoryLarge");
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();
@@ -708,7 +692,7 @@ public class BeeGenomeManager
return genome;
}
public static IAllele[] getTemplateBeef()
public static IAllele[] getTemplateTCBeef()
{
IAllele[] genome = getTemplateBaseMetallic();
@@ -717,7 +701,7 @@ public class BeeGenomeManager
return genome;
}
public static IAllele[] getTemplatePork()
public static IAllele[] getTemplateTCPork()
{
IAllele[] genome = getTemplateBaseMetallic();
@@ -726,18 +710,18 @@ public class BeeGenomeManager
return genome;
}
private static IAllele[] getTemplateBaseMagica()
private static IAllele[] getTemplateAMBase()
{
IAllele[] genome = getTemplateBaseThaumic();
IAllele[] genome = getTemplateModBase();
genome[EnumBeeChromosome.FLOWER_PROVIDER.ordinal()] = Allele.flowerArsMagica;
return genome;
}
public static IAllele[] getTemplateEssence()
public static IAllele[] getTemplateAMEssence()
{
IAllele[] genome = getTemplateBaseMagica();
IAllele[] genome = getTemplateAMBase();
genome[EnumBeeChromosome.SPECIES.ordinal()] = BeeSpecies.AM_ESSENCE;
genome[EnumBeeChromosome.SPEED.ordinal()] = Allele.getBaseAllele("speedNorm");
@@ -748,9 +732,9 @@ public class BeeGenomeManager
return genome;
}
public static IAllele[] getTemplateQuintessence()
public static IAllele[] getTemplateAMQuintessence()
{
IAllele[] genome = getTemplateEssence();
IAllele[] genome = getTemplateAMEssence();
genome[EnumBeeChromosome.SPECIES.ordinal()] = BeeSpecies.AM_QUINTESSENCE;
genome[EnumBeeChromosome.LIFESPAN.ordinal()] = Allele.getBaseAllele("lifespanElongated");
@@ -761,9 +745,9 @@ public class BeeGenomeManager
return genome;
}
public static IAllele[] getTemplateEarthAM()
public static IAllele[] getTemplateAMEarth()
{
IAllele[] genome = getTemplateBaseMagica();
IAllele[] genome = getTemplateAMBase();
genome[EnumBeeChromosome.SPECIES.ordinal()] = BeeSpecies.AM_EARTH;
genome[EnumBeeChromosome.FLOWERING.ordinal()] = Allele.getBaseAllele("floweringFaster");
@@ -774,22 +758,22 @@ public class BeeGenomeManager
return genome;
}
public static IAllele[] getTemplateAirAM()
public static IAllele[] getTemplateAMAir()
{
IAllele[] genome = getTemplateBaseMagica();
IAllele[] genome = getTemplateAMBase();
genome[EnumBeeChromosome.SPECIES.ordinal()] = BeeSpecies.AM_AIR;
genome[EnumBeeChromosome.SPEED.ordinal()] = Allele.getBaseAllele("speedFast");
genome[EnumBeeChromosome.TERRITORY.ordinal()] = Allele.getBaseAllele("territoryMaximum");
genome[EnumBeeChromosome.TERRITORY.ordinal()] = Allele.getBaseAllele("territoryLargest");
genome[EnumBeeChromosome.TOLERANT_FLYER.ordinal()] = Allele.getBaseAllele("boolTrue");
genome[EnumBeeChromosome.TEMPERATURE_TOLERANCE.ordinal()] = Allele.getBaseAllele("toleranceBoth2");
return genome;
}
public static IAllele[] getTemplateFireAM()
public static IAllele[] getTemplateAMFire()
{
IAllele[] genome = getTemplateBaseMagica();
IAllele[] genome = getTemplateAMBase();
genome[EnumBeeChromosome.SPECIES.ordinal()] = BeeSpecies.AM_FIRE;
genome[EnumBeeChromosome.SPEED.ordinal()] = Allele.getBaseAllele("speedNorm");
@@ -801,9 +785,9 @@ public class BeeGenomeManager
return genome;
}
public static IAllele[] getTemplateWaterAM()
public static IAllele[] getTemplateAMWater()
{
IAllele[] genome = getTemplateBaseMagica();
IAllele[] genome = getTemplateAMBase();
genome[EnumBeeChromosome.SPECIES.ordinal()] = BeeSpecies.AM_WATER;
genome[EnumBeeChromosome.HUMIDITY_TOLERANCE.ordinal()] = Allele.getBaseAllele("toleranceDown1");
@@ -814,13 +798,13 @@ public class BeeGenomeManager
return genome;
}
public static IAllele[] getTemplateLightning()
public static IAllele[] getTemplateAMLightning()
{
IAllele[] genome = getTemplateBaseMagica();
IAllele[] genome = getTemplateAMBase();
genome[EnumBeeChromosome.SPECIES.ordinal()] = BeeSpecies.AM_LIGHTNING;
genome[EnumBeeChromosome.LIFESPAN.ordinal()] = Allele.getBaseAllele("lifespanShortest");
genome[EnumBeeChromosome.TERRITORY.ordinal()] = Allele.getBaseAllele("territoryMaximum");
genome[EnumBeeChromosome.TERRITORY.ordinal()] = Allele.getBaseAllele("territoryLargest");
genome[EnumBeeChromosome.SPEED.ordinal()] = Allele.speedBlinding;
genome[EnumBeeChromosome.NOCTURNAL.ordinal()] = Allele.getBaseAllele("boolTrue");
@@ -832,9 +816,9 @@ public class BeeGenomeManager
return genome;
}
public static IAllele[] getTemplatePlant()
public static IAllele[] getTemplateAMPlant()
{
IAllele[] genome = getTemplateBaseMagica();
IAllele[] genome = getTemplateAMBase();
genome[EnumBeeChromosome.SPECIES.ordinal()] = BeeSpecies.AM_PLANT;
genome[EnumBeeChromosome.FLOWERING.ordinal()] = Allele.getBaseAllele("floweringFastest");
@@ -845,9 +829,9 @@ public class BeeGenomeManager
return genome;
}
public static IAllele[] getTemplateIce()
public static IAllele[] getTemplateAMIce()
{
IAllele[] genome = getTemplateBaseMagica();
IAllele[] genome = getTemplateAMBase();
genome[EnumBeeChromosome.SPECIES.ordinal()] = BeeSpecies.AM_ICE;
genome[EnumBeeChromosome.TEMPERATURE_TOLERANCE.ordinal()] = Allele.getBaseAllele("toleranceUp2");
@@ -860,9 +844,9 @@ public class BeeGenomeManager
return genome;
}
public static IAllele[] getTemplateMagma()
public static IAllele[] getTemplateAMMagma()
{
IAllele[] genome = getTemplateBaseMagica();
IAllele[] genome = getTemplateAMBase();
genome[EnumBeeChromosome.SPECIES.ordinal()] = BeeSpecies.AM_MAGMA;
genome[EnumBeeChromosome.TEMPERATURE_TOLERANCE.ordinal()] = Allele.getBaseAllele("toleranceDown2");
@@ -874,9 +858,9 @@ public class BeeGenomeManager
return genome;
}
public static IAllele[] getTemplateArcaneAM()
public static IAllele[] getTemplateAMArcane()
{
IAllele[] genome = getTemplateBaseMagica();
IAllele[] genome = getTemplateAMBase();
genome[EnumBeeChromosome.SPECIES.ordinal()] = BeeSpecies.AM_ARCANE;
genome[EnumBeeChromosome.FERTILITY.ordinal()] = Allele.getBaseAllele("fertilityLow");
@@ -887,9 +871,9 @@ public class BeeGenomeManager
return genome;
}
public static IAllele[] getTemplateVortex()
public static IAllele[] getTemplateAMVortex()
{
IAllele[] genome = getTemplateBaseMagica();
IAllele[] genome = getTemplateAMBase();
genome[EnumBeeChromosome.SPECIES.ordinal()] = BeeSpecies.AM_VORTEX;
genome[EnumBeeChromosome.NOCTURNAL.ordinal()] = Allele.getBaseAllele("boolTrue");
@@ -901,9 +885,9 @@ public class BeeGenomeManager
return genome;
}
public static IAllele[] getTemplateWight()
public static IAllele[] getTemplateAMWight()
{
IAllele[] genome = getTemplateBaseMagica();
IAllele[] genome = getTemplateAMBase();
genome[EnumBeeChromosome.SPECIES.ordinal()] = BeeSpecies.AM_WIGHT;
genome[EnumBeeChromosome.NOCTURNAL.ordinal()] = Allele.getBaseAllele("boolTrue");
@@ -955,4 +939,25 @@ public class BeeGenomeManager
selectedGene.setString("UID1", allele.getUID());
}
// ---------- Forestry templates -----------------------
public static IAllele[] getTemplateForestryValiant()
{
return BeeTemplates.getValiantTemplate();
}
public static IAllele[] getTemplateForestrySinister()
{
return BeeTemplates.getSinisterTemplate();
}
public static IAllele[] getTemplateForestrySteadfast()
{
return BeeTemplates.getSteadfastTemplate();
}
public static IAllele[] getTemplateForestryEnder()
{
return BeeTemplates.getEnderTemplate();
}
}
@@ -0,0 +1,15 @@
package magicbees.bees;
import magicbees.block.types.HiveType;
public class BeeManager
{
public static void ititializeBees()
{
Allele.setupAdditionalAlleles();
BeeSpecies.setupBeeSpecies();
Allele.registerDeprecatedAlleleReplacements();
BeeMutation.setupMutations();
HiveType.initHiveDrops();
}
}
@@ -6,8 +6,9 @@ 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.ThaumicBees;
import magicbees.main.MagicBees;
import magicbees.main.utils.MoonPhase;
import magicbees.main.utils.compat.ArsMagicaHelper;
import magicbees.main.utils.compat.EquivalentExchangeHelper;
@@ -273,4 +274,11 @@ public class BeeMutation implements IBeeMutation
return this.setAuraNodeRequired(range);
}
@Override
public Collection<String> getSpecialConditions()
{
// TODO Auto-generated method stub
return null;
}
}
+136 -115
View File
@@ -20,6 +20,7 @@ import net.minecraft.client.renderer.texture.IconRegister;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.util.Icon;
import net.minecraft.world.World;
import net.minecraftforge.oredict.OreDictionary;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
@@ -36,6 +37,7 @@ import forestry.api.core.IIconProvider;
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;
public enum BeeSpecies implements IAlleleBeeSpecies, IIconProvider
@@ -50,7 +52,7 @@ public enum BeeSpecies implements IAlleleBeeSpecies, IIconProvider
BeeClassification.VEILED, 0x0086A8, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, false, true),
ELDRITCH("Eldritch", "prodigiosus",
BeeClassification.VEILED, 0x0, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, true),
BeeClassification.VEILED, 0x8D75A0, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, true),
ESOTERIC("Esoteric", "secretiore",
BeeClassification.ARCANE, 0x001099, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, true),
@@ -127,83 +129,83 @@ public enum BeeSpecies implements IAlleleBeeSpecies, IIconProvider
BeeClassification.GEM, 0x2EA7EC, 0x001D51, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, false),
// --------- Thaumcraft Bees ---------------------------------------------------------------------------------------
TC_STARK("Stark", "torridae",
TC_STARK("TCStark", "torridae", // Stark
BeeClassification.THAUMIC, 0xCCCCCC, 0x999999, EnumTemperature.NORMAL, EnumHumidity.NORMAL, true, false),
TC_AIR("Aura", "aether",
TC_AIR("TCAir", "aether", // Aura
BeeClassification.THAUMIC, 0xD9D636, 0x999999, EnumTemperature.NORMAL, EnumHumidity.NORMAL, true, true),
TC_FIRE("Ignis", "praefervidus",
TC_FIRE("TCFire", "praefervidus", // Ignis
BeeClassification.THAUMIC, 0xE50B0B, 0x999999, EnumTemperature.HOT, EnumHumidity.ARID, true, true),
TC_WATER("Aqua", "umidus",
TC_WATER("TCWater", "umidus", // Aqua
BeeClassification.THAUMIC, 0x36CFD9, 0x999999, EnumTemperature.NORMAL, EnumHumidity.DAMP, true, true),
TC_EARTH("Solum", "sordida",
TC_EARTH("TCEarth", "sordida", // Solum
BeeClassification.THAUMIC, 0x005100, 0x999999, EnumTemperature.NORMAL, EnumHumidity.NORMAL, true, true),
TC_INFUSED("Praecantatio", "azanorius",
TC_MAGIC("TCMagic", "azanorius", //Praecantatio
BeeClassification.THAUMIC, 0xaa32fc, 0x999999, EnumTemperature.NORMAL, EnumHumidity.NORMAL, true, true),
TC_VIS("Vis", "arcanus saecula",
TC_VIS("TCVis", "arcanus saecula",
BeeClassification.THAUMIC, 0x004c99, 0x675ED1, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, false),
TC_FLUX("Flux", "arcanus labe",
TC_FLUX("TCFlux", "arcanus labe",
BeeClassification.THAUMIC, 0x004c99, 0x675ED1, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, false),
TC_ATTRACT("Attractive", "",
TC_ATTRACT("TCAttractive", "",
BeeClassification.THAUMIC, 0x0, 0x675ED1, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, true),
TC_REJUVENATING("Rejuvenating", "arcanus vitae",
TC_REJUVENATING("TCRejuvenating", "arcanus vitae",
BeeClassification.THAUMIC, 0x91D0D9, 0x675ED1, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, false),
TC_PURE("Pure", "arcanus puritatem",
TC_PURE("TCPure", "arcanus puritatem",
BeeClassification.THAUMIC, 0xb0092e, 0x675ED1, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, false),
TC_BRAINY("Brainy", "cerebrum",
TC_BRAINY("TCBrainy", "cerebrum",
BeeClassification.THAUMIC, 0x83FF70, 0xe15236, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, true),
TC_WISPY("Wispy", "umbrabilis",
TC_WISPY("TCWispy", "umbrabilis",
BeeClassification.THAUMIC, 0x9cb8d5, 0xe15236, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, false),
TC_BATTY("Batty", "chiroptera",
TC_BATTY("TCBatty", "chiroptera",
BeeClassification.THAUMIC, 0x27350d, 0xe15236, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, true),
TC_CHICKEN("Chicken", "pullus",
TC_CHICKEN("TCChicken", "pullus",
BeeClassification.FLESHY, 0x7D431E, 0xE0905E, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, true),
TC_BEEF("Beef", "bubulae",
TC_BEEF("TCBeef", "bubulae",
BeeClassification.FLESHY, 0x40221A, 0xAC6753, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, true),
TC_PORK("Pork", "porcina",
TC_PORK("TCPork", "porcina",
BeeClassification.FLESHY, 0x725D2F, 0xD2BF93, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, true),
@Deprecated
TC_NODE("Node", "conficiens",
/* @Deprecated
TC_NODE("TCNode", "conficiens",
BeeClassification.THAUMIC, 0xFFF266, 0xFF8CE9, EnumTemperature.NORMAL, EnumHumidity.NORMAL, true, false),
@Deprecated
TC_GOSSAMER("Gossamer", "perlucidus",
TC_GOSSAMER("TCGossamer", "perlucidus",
BeeClassification.THAUMIC, 0x183f66, 0xe15236, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, true),
*/
// --------- Equivalent Exchange Bees -----------------------------------------------------------------------------
EE_MINIUM("Minium", "mutabilis",
EE_MINIUM("EEMinium", "mutabilis",
BeeClassification.ALCHEMICAL, 0xac0921, 0x3a030b, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, true),
// --------- Ars Magica Bees --------------------------------------------------------------------------------------
AM_ESSENCE("Essence", "essentia",
AM_ESSENCE("AMEssence", "essentia",
BeeClassification.ESSENTIAL, 0x86BBC5, 0xE3A55B, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, true),
AM_QUINTESSENCE("Quintessence", "cor essentia",
AM_QUINTESSENCE("AMQuintessence", "cor essentia",
BeeClassification.ESSENTIAL, 0xE3A45B, 0xE3A55B, EnumTemperature.NORMAL, EnumHumidity.NORMAL, true, true),
AM_EARTH("Erde", "magica terra",
AM_EARTH("AMEarth", "magica terra",
BeeClassification.ESSENTIAL, 0xAA875E, 0xE3A55B, EnumTemperature.WARM, EnumHumidity.ARID, false, false),
AM_AIR("Luft", "magica aer",
AM_AIR("AMAir", "magica aer",
BeeClassification.ESSENTIAL, 0xD5EB9D, 0xE3A55B, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, false),
AM_FIRE("Feuer", "magica ignis",
AM_FIRE("AMFire", "magica ignis",
BeeClassification.ESSENTIAL, 0x93451E, 0xE3A55B, EnumTemperature.HOT, EnumHumidity.ARID, false, false),
AM_WATER("Wasser", "magica aqua",
AM_WATER("AMWater", "magica aqua",
BeeClassification.ESSENTIAL, 0x3B7D8C, 0xE3A55B, EnumTemperature.NORMAL, EnumHumidity.DAMP, false, false),
AM_LIGHTNING("Blitz", "magica fulgur",
AM_LIGHTNING("AMLightning", "magica fulgur",
BeeClassification.ESSENTIAL, 0xEBEFA1, 0xE3A55B, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, false),
AM_PLANT("Staude", "magica herba",
AM_PLANT("AMPlant", "magica herba",
BeeClassification.ESSENTIAL, 0x49B549, 0xE3A55B, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, false),
AM_ICE("Eis", "magica glacium",
AM_ICE("AMIce", "magica glacium",
BeeClassification.ESSENTIAL, 0x86BAC6, 0xE3A55B, EnumTemperature.COLD, EnumHumidity.NORMAL, false, false),
AM_MAGMA("Magma", "magica torrens igneus",
AM_MAGMA("AMMagma", "magica torrens igneus",
BeeClassification.ESSENTIAL, 0x932B1E, 0xE3A55B, EnumTemperature.HELLISH, EnumHumidity.ARID, false, false),
AM_ARCANE("Arkanen", "magica arcanum",
AM_ARCANE("AMArcane", "magica arcanum",
BeeClassification.ESSENTIAL, 0x76184D, 0xE3A55B, EnumTemperature.NORMAL, EnumHumidity.NORMAL, true, false),
AM_VORTEX("Vortex", "gurges",
AM_VORTEX("AMVortex", "gurges",
BeeClassification.ESSENTIAL, 0x71BBE2, 0x0B35A8, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, true),
AM_WIGHT("Wight", "vectem",
AM_WIGHT("AMWight", "vectem",
BeeClassification.ESSENTIAL, 0xB50000, 0x4C4837, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, false),
;
@@ -221,21 +223,21 @@ public enum BeeSpecies implements IAlleleBeeSpecies, IIconProvider
}
else
{
TC_INFUSED.setInactive();
TC_MAGIC.setInactive();
TC_VIS.setInactive();
TC_PURE.setInactive();
TC_FLUX.setInactive();
TC_REJUVENATING.setInactive();
TC_BRAINY.setInactive();
TC_GOSSAMER.setInactive();
TC_WISPY.setInactive();
TC_BATTY.setInactive();
TC_CHICKEN.setInactive();
TC_BEEF.setInactive();
TC_PORK.setInactive();
}
/*TC_GOSSAMER.setInactive();
// Node bee is getting phased out.
TC_NODE.setInactive();
TC_NODE.setInactive();*/
if (EquivalentExchangeHelper.isActive())
{
@@ -277,6 +279,7 @@ public enum BeeSpecies implements IAlleleBeeSpecies, IIconProvider
AM_VORTEX.setInactive();
AM_WIGHT.setInactive();
}
AlleleManager.alleleRegistry.registerDeprecatedAlleleReplacement("thaumicbees.speciesBlitz", AM_LIGHTNING);
// Oredict bees
if (OreDictionary.getOres("ingotCopper").size() <= 0)
@@ -351,25 +354,6 @@ public enum BeeSpecies implements IAlleleBeeSpecies, IIconProvider
.setGenome(BeeGenomeManager.getTemplateSavant())
.register();
TC_STARK.addProduct(Config.combs.getStackForType(CombType.TC_STARK), 10)
.setGenome(BeeGenomeManager.getTemplateStark())
.register();
TC_AIR.addProduct(Config.combs.getStackForType(CombType.TC_AIRY), 9)
.addSpecialty(new ItemStack(Item.feather), 4)
.setGenome(BeeGenomeManager.getTemplateAir())
.register();
TC_FIRE.addProduct(Config.combs.getStackForType(CombType.TC_FIREY), 15)
.addSpecialty(new ItemStack(Item.blazePowder), 4).setGenome(BeeGenomeManager.getTemplateFire())
.register();
TC_WATER.addProduct(Config.combs.getStackForType(CombType.TC_WATERY), 20)
.addSpecialty(new ItemStack(Block.ice), 1)
.setGenome(BeeGenomeManager.getTemplateWater())
.register();
TC_EARTH.addProduct(Config.combs.getStackForType(CombType.TC_EARTHY), 30)
.addSpecialty(new ItemStack(Block.obsidian), 4)
.setGenome(BeeGenomeManager.getTemplateEarth())
.register();
AWARE.addProduct(Config.combs.getStackForType(CombType.INTELLECT), 18)
.setGenome(BeeGenomeManager.getTemplateAware())
.register();
@@ -408,6 +392,7 @@ public enum BeeSpecies implements IAlleleBeeSpecies, IIconProvider
.addSpecialty(new ItemStack(Config.jellyBaby), 7)
.setGenome(BeeGenomeManager.getTemplateDoctoral())
.register();
IRON.addProduct(new ItemStack(Config.fBeeComb, 1, ForestryHelper.Comb.HONEY.ordinal()), 10)
.addSpecialty(Config.nuggets.getStackForType(NuggetType.IRON), 8)
.setGenome(BeeGenomeManager.getTemplateIron())
@@ -444,93 +429,111 @@ public enum BeeSpecies implements IAlleleBeeSpecies, IIconProvider
.addSpecialty(Config.nuggets.getStackForType(NuggetType.APATITE), 2)
.setGenome(BeeGenomeManager.getTemplateApatite())
.register();
TC_INFUSED.addProduct(Config.combs.getStackForType(CombType.TC_INFUSED), 20)
.setGenome(BeeGenomeManager.getTemplateInfused())
TC_STARK.addProduct(Config.combs.getStackForType(CombType.TC_STARK), 10)
.setGenome(BeeGenomeManager.getTemplateTCStark())
.register();
TC_VIS.addProduct(Config.combs.getStackForType(CombType.INTELLECT), 25)
.setGenome(BeeGenomeManager.getTemplateVis())
TC_AIR.addProduct(Config.combs.getStackForType(CombType.TC_AIRY), 9)
.addSpecialty(new ItemStack(Item.feather), 4)
.setGenome(BeeGenomeManager.getTemplateTCAir())
.register();
TC_PURE.addProduct(Config.combs.getStackForType(CombType.INTELLECT), 20)
.setGenome(BeeGenomeManager.getTemplatePure())
TC_FIRE.addProduct(Config.combs.getStackForType(CombType.TC_FIREY), 15)
.addSpecialty(new ItemStack(Item.blazePowder), 4)
.setGenome(BeeGenomeManager.getTemplateTCFire())
.register();
TC_FLUX.addProduct(Config.combs.getStackForType(CombType.INTELLECT), 20)
.setGenome(BeeGenomeManager.getTemplateFlux())
TC_WATER.addProduct(Config.combs.getStackForType(CombType.TC_WATERY), 20)
.addSpecialty(new ItemStack(Block.ice), 1)
.setGenome(BeeGenomeManager.getTemplateTCWater())
.register();
TC_NODE.addProduct(Config.combs.getStackForType(CombType.INTELLECT), 20)
.setGenome(BeeGenomeManager.getTemplateNode())
TC_EARTH.addProduct(Config.combs.getStackForType(CombType.TC_EARTHY), 30)
.addSpecialty(new ItemStack(Block.obsidian), 4)
.setGenome(BeeGenomeManager.getTemplateTCEarth())
.register();
TC_REJUVENATING.addProduct(Config.combs.getStackForType(CombType.INTELLECT), 20)
.setGenome(BeeGenomeManager.getTemplateRejuvinating())
.register();
TC_BRAINY.addProduct(Config.combs.getStackForType(CombType.SKULKING), 10)
.addProduct(new ItemStack(Item.rottenFlesh), 6)
.setGenome(BeeGenomeManager.getTemplateBrainy())
.register();
TC_BATTY.addProduct(Config.combs.getStackForType(CombType.SKULKING), 10)
.addSpecialty(new ItemStack(Item.gunpowder), 4)
.setGenome(BeeGenomeManager.getTemplateBatty())
.register();
TC_GOSSAMER.addProduct(new ItemStack(Config.fBeeComb, 1, ForestryHelper.Comb.SILKY.ordinal()), 15)
.setGenome(BeeGenomeManager.getTemplateGossamer())
.register();
TC_WISPY.addProduct(new ItemStack(Config.fBeeComb, 1, ForestryHelper.Comb.SILKY.ordinal()), 22)
.addSpecialty(new ItemStack(Config.fCraftingResource, 1, ForestryHelper.CraftingMaterial.SILK_WISP.ordinal()), 4)
.setGenome(BeeGenomeManager.getTemplateWispy())
.register();
TC_CHICKEN.addProduct(new ItemStack(Config.fBeeComb, 1, ForestryHelper.Comb.HONEY.ordinal()), 10)
.setGenome(BeeGenomeManager.getTemplateChicken())
.register();
TC_BEEF.addProduct(new ItemStack(Config.fBeeComb, 1, ForestryHelper.Comb.HONEY.ordinal()), 10)
.setGenome(BeeGenomeManager.getTemplateBeef())
.register();
TC_PORK.addProduct(new ItemStack(Config.fBeeComb, 1, ForestryHelper.Comb.HONEY.ordinal()), 10)
.setGenome(BeeGenomeManager.getTemplatePork())
.register();
EE_MINIUM.addProduct(Config.combs.getStackForType(CombType.OCCULT), 16)
.setGenome(BeeGenomeManager.getTemplateMinium())
TC_MAGIC.addProduct(Config.combs.getStackForType(CombType.TC_INFUSED), 20)
.setGenome(BeeGenomeManager.getTemplateTCMagic())
.register();
TC_VIS.addProduct(Config.combs.getStackForType(CombType.INTELLECT), 25)
.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)
.setGenome(BeeGenomeManager.getTemplateTCFlux())
.register();
TC_REJUVENATING.addProduct(Config.combs.getStackForType(CombType.INTELLECT), 20)
.setGenome(BeeGenomeManager.getTemplateTCRejuvinating())
.register();
TC_BRAINY.addProduct(Config.combs.getStackForType(CombType.SKULKING), 10)
.addProduct(new ItemStack(Item.rottenFlesh), 6)
.setGenome(BeeGenomeManager.getTemplateTCBrainy())
.register();
TC_BATTY.addProduct(Config.combs.getStackForType(CombType.SKULKING), 10)
.addSpecialty(new ItemStack(Item.gunpowder), 4)
.setGenome(BeeGenomeManager.getTemplateTCBatty())
.register();
TC_WISPY.addProduct(new ItemStack(Config.fBeeComb, 1, ForestryHelper.Comb.SILKY.ordinal()), 22)
.addSpecialty(new ItemStack(Config.fCraftingResource, 1, ForestryHelper.CraftingMaterial.SILK_WISP.ordinal()), 4)
.setGenome(BeeGenomeManager.getTemplateTCWispy())
.register();
TC_CHICKEN.addProduct(new ItemStack(Config.fBeeComb, 1, ForestryHelper.Comb.HONEY.ordinal()), 10)
.setGenome(BeeGenomeManager.getTemplateTCChicken())
.register();
TC_BEEF.addProduct(new ItemStack(Config.fBeeComb, 1, ForestryHelper.Comb.HONEY.ordinal()), 10)
.setGenome(BeeGenomeManager.getTemplateTCBeef())
.register();
TC_PORK.addProduct(new ItemStack(Config.fBeeComb, 1, ForestryHelper.Comb.HONEY.ordinal()), 10)
.setGenome(BeeGenomeManager.getTemplateTCPork())
.register();
EE_MINIUM.addProduct(Config.combs.getStackForType(CombType.OCCULT), 16)
.setGenome(BeeGenomeManager.getTemplateEEMinium())
.register();
AM_ESSENCE.addProduct(Config.combs.getStackForType(CombType.AM_ESSENCE), 12)
.setGenome(BeeGenomeManager.getTemplateEssence())
.setGenome(BeeGenomeManager.getTemplateAMEssence())
.register();
AM_QUINTESSENCE.addProduct(Config.combs.getStackForType(CombType.AM_ESSENCE), 23)
.setGenome(BeeGenomeManager.getTemplateQuintessence())
.setGenome(BeeGenomeManager.getTemplateAMQuintessence())
.register();
AM_EARTH.addProduct(Config.combs.getStackForType(CombType.AM_POTENT), 12)
.setGenome(BeeGenomeManager.getTemplateEarthAM())
.setGenome(BeeGenomeManager.getTemplateAMEarth())
.register();
AM_AIR.addProduct(Config.combs.getStackForType(CombType.AM_POTENT), 12)
.setGenome(BeeGenomeManager.getTemplateAirAM())
.setGenome(BeeGenomeManager.getTemplateAMAir())
.register();
AM_FIRE.addProduct(Config.combs.getStackForType(CombType.AM_POTENT), 12)
.setGenome(BeeGenomeManager.getTemplateFireAM())
.setGenome(BeeGenomeManager.getTemplateAMFire())
.register();
AM_WATER.addProduct(Config.combs.getStackForType(CombType.AM_POTENT), 12)
.setGenome(BeeGenomeManager.getTemplateWaterAM())
.setGenome(BeeGenomeManager.getTemplateAMWater())
.register();
AM_LIGHTNING.addProduct(Config.combs.getStackForType(CombType.AM_POTENT), 12)
.setGenome(BeeGenomeManager.getTemplateLightning())
.setGenome(BeeGenomeManager.getTemplateAMLightning())
.register();
AM_PLANT.addProduct(Config.combs.getStackForType(CombType.AM_POTENT), 12)
.setGenome(BeeGenomeManager.getTemplatePlant())
.setGenome(BeeGenomeManager.getTemplateAMPlant())
.register();
AM_ICE.addProduct(Config.combs.getStackForType(CombType.AM_POTENT), 12)
.setGenome(BeeGenomeManager.getTemplateIce())
.setGenome(BeeGenomeManager.getTemplateAMIce())
.register();
AM_MAGMA.addProduct(Config.combs.getStackForType(CombType.AM_POTENT), 12)
.setGenome(BeeGenomeManager.getTemplateMagma())
.setGenome(BeeGenomeManager.getTemplateAMMagma())
.register();
AM_ARCANE.addProduct(Config.combs.getStackForType(CombType.AM_POTENT), 19)
.setGenome(BeeGenomeManager.getTemplateArcaneAM())
.setGenome(BeeGenomeManager.getTemplateAMArcane())
.register();
AM_VORTEX.addProduct(Config.combs.getStackForType(CombType.AM_ESSENCE), 10)
.setGenome(BeeGenomeManager.getTemplateVortex())
.setGenome(BeeGenomeManager.getTemplateAMVortex())
.register();
AM_WIGHT.addProduct(Config.combs.getStackForType(CombType.SOUL), 30)
.addProduct(Config.combs.getStackForType(CombType.SKULKING), 10)
.setGenome(BeeGenomeManager.getTemplateWight())
.setGenome(BeeGenomeManager.getTemplateAMWight())
.register();
}
@@ -580,7 +583,7 @@ public enum BeeSpecies implements IAlleleBeeSpecies, IIconProvider
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)
{
this.uid = "thaumicbees.species" + speciesName;
this.uid = "magicbees.species" + speciesName;
this.dominant = isSpeciesDominant;
AlleleManager.alleleRegistry.registerAllele(this);
binomial = genusName;
@@ -778,7 +781,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_GOSSAMER, TC_WISPY, TC_BATTY, AM_VORTEX, TC_WISPY };
private static final BeeSpecies[] skulkingIconBees = { SKULKING, GHASTLY, SPIDERY, TC_BRAINY, TC_WISPY, TC_BATTY, AM_VORTEX, TC_WISPY };
public void registerItemIcons(IconRegister itemMap)
{
@@ -806,7 +809,7 @@ public enum BeeSpecies implements IAlleleBeeSpecies, IIconProvider
switch (this)
{
case SKULKING: case GHASTLY: case SPIDERY:
case TC_BRAINY: case TC_GOSSAMER: case TC_WISPY: case TC_BATTY:
case TC_BRAINY: case TC_WISPY: case TC_BATTY:
case AM_VORTEX: case AM_WIGHT:
value = VersionInfo.ModName.toLowerCase() + ":bees/skulking/";
break;
@@ -831,4 +834,22 @@ public enum BeeSpecies implements IAlleleBeeSpecies, IIconProvider
@Override
@SideOnly(Side.CLIENT)
public void registerTerrainIcons(IconRegister terrainMap) { }
@Override
public int getComplexity()
{
return 0;
}
@Override
public float getResearchSuitability(ItemStack itemstack)
{
return 0;
}
@Override
public ItemStack[] getResearchBounty(World world, String researcher, IIndividual individual, int bountyLevel)
{
return null;
}
}
@@ -4,8 +4,8 @@ import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import magicbees.client.gui.UIScreens;
import magicbees.main.CommonProxy;
import magicbees.main.ThaumicBees;
import magicbees.main.utils.TabThaumicBees;
import magicbees.main.MagicBees;
import magicbees.main.utils.TabMagicBees;
import magicbees.tileentity.TileEntityEffectJar;
import net.minecraft.block.Block;
import net.minecraft.block.BlockContainer;
@@ -22,8 +22,8 @@ public class BlockEffectJar extends BlockContainer
public BlockEffectJar(int id)
{
super(id, Material.glass);
this.setCreativeTab(TabThaumicBees.tabThaumicBees);
this.setUnlocalizedName("tb.effectJar");
this.setCreativeTab(TabMagicBees.tabMagicBees);
this.setUnlocalizedName("effectJar");
this.setBlockBounds(0.25f, 0f, 0.25f, 0.75f, 0.81f, 0.74f);
this.setHardness(0.1f);
this.setResistance(1.5f);
@@ -36,7 +36,7 @@ public class BlockEffectJar extends BlockContainer
if (!player.isSneaking())
{
player.openGui(ThaumicBees.object, UIScreens.EFFECT_JAR.ordinal(), world, x, y, z);
player.openGui(MagicBees.object, UIScreens.EFFECT_JAR.ordinal(), world, x, y, z);
activate = true;
}
+5 -12
View File
@@ -15,9 +15,11 @@ import net.minecraft.util.Icon;
import net.minecraft.util.MovingObjectPosition;
import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
import net.minecraftforge.common.MinecraftForge;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import forestry.api.core.Tabs;
import forestry.core.config.ForestryBlock;
public class BlockHive extends Block
{
@@ -27,7 +29,7 @@ public class BlockHive extends Block
this.setLightValue(0.8f);
setHardness(1f);
setCreativeTab(Tabs.tabApiculture);
setUnlocalizedName("tb.hive");
setUnlocalizedName("hive");
}
@Override
@@ -68,17 +70,8 @@ public class BlockHive extends Block
@Override
public ArrayList<ItemStack> getBlockDropped(World world, int x, int y, int z, int metadata, int fortune)
{
ArrayList<ItemStack> toDrop = new ArrayList<ItemStack>();
// Grab a princess
// Maybe grab a drone
// Maybe grab an item
return toDrop;
{
return HiveType.getHiveFromMeta(metadata).getDrops(world, x, y, z, fortune);
}
@Override
@@ -3,7 +3,7 @@ package magicbees.block;
import java.util.List;
import magicbees.block.types.PlankType;
import magicbees.main.ThaumicBees;
import magicbees.main.MagicBees;
import magicbees.main.utils.VersionInfo;
import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
@@ -27,7 +27,7 @@ public class BlockPlanks extends Block
this.setHardness(2.5f);
this.setResistance(6.0f);
this.setCreativeTab(CreativeTabs.tabBlock);
if (ThaumicBees.getConfig().AreMagicPlanksFlammable)
if (MagicBees.getConfig().AreMagicPlanksFlammable)
{
Block.setBurnProperties(id, 5, 20);
}
@@ -5,7 +5,7 @@ import java.util.Random;
import magicbees.block.types.PlankType;
import magicbees.main.Config;
import magicbees.main.ThaumicBees;
import magicbees.main.MagicBees;
import magicbees.main.utils.VersionInfo;
import net.minecraft.block.Block;
import net.minecraft.block.BlockHalfSlab;
@@ -33,7 +33,7 @@ public class BlockWoodSlab extends BlockHalfSlab
this.setUnlocalizedName("tb.slab.wood");
this.setCreativeTab(CreativeTabs.tabBlock);
this.setLightOpacity(doubleSlab ? 255 : 0);
if (ThaumicBees.getConfig().AreMagicPlanksFlammable)
if (MagicBees.getConfig().AreMagicPlanksFlammable)
{
Block.setBurnProperties(id, 5, 20);
}
+157 -11
View File
@@ -1,26 +1,48 @@
package magicbees.block.types;
import java.util.ArrayList;
import java.util.Random;
import net.minecraft.client.renderer.texture.IconRegister;
import net.minecraft.item.ItemStack;
import net.minecraft.util.Icon;
import magicbees.bees.BeeGenomeManager;
import magicbees.bees.BeeSpecies;
import magicbees.bees.HiveDrop;
import magicbees.item.types.CombType;
import magicbees.main.Config;
import magicbees.main.utils.VersionInfo;
import magicbees.main.utils.compat.ForestryHelper;
import magicbees.world.feature.FeatureHive;
import net.minecraft.client.renderer.texture.IconRegister;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.util.Icon;
import net.minecraft.world.World;
import net.minecraft.world.biome.BiomeGenBase;
import net.minecraftforge.common.BiomeDictionary;
import net.minecraftforge.common.BiomeDictionary.Type;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import forestry.api.apiculture.IHiveDrop;
public enum HiveType
{
CURIOUS("curious", 12, true),
UNUSUAL("unusual", 12, true),
DEEP("deep", 12, true),
INFERNAL("infernal", 15, false),
END("end", 7, false),
CURIOUS("curious", 12, true,
new BiomeDictionary.Type[] {Type.FOREST, Type.HILLS, Type.MOUNTAIN},
new int[] {80, 30, 15}),
UNUSUAL("unusual", 12, true,
new BiomeDictionary.Type[] {Type.PLAINS, Type.JUNGLE, Type.HILLS},
new int[] {90, 60, 20}),
RESONANT("resonant", 12, true,
new BiomeDictionary.Type[] {Type.MAGICAL, Type.HILLS},
new int[] {95, 50}),
DEEP("deep", 4, true,
new BiomeDictionary.Type[] {Type.HILLS, Type.MOUNTAIN, Type.MUSHROOM},
new int[] {40, 60, 50}),
INFERNAL("infernal", 15, true,
new BiomeDictionary.Type[] {Type.NETHER, Type.MAGICAL},
new int[] {98, 10}),
OBLIVION("oblivion", 7, true,
new BiomeDictionary.Type[] {Type.END, Type.MAGICAL},
new int[] {98, 6}),
;
private static String[] nameList;
@@ -29,6 +51,8 @@ public enum HiveType
public boolean show;
private int lightLevel;
private ArrayList<IHiveDrop> drops;
private BiomeDictionary.Type[] validBiomes;
private int[] rarity;
@SideOnly(Side.CLIENT)
private Icon[] icons;
@@ -46,16 +70,47 @@ public enum HiveType
public static void initHiveDrops()
{
CURIOUS.drops.add(new HiveDrop(BeeSpecies.MYSTICAL.getGenome(), new ItemStack[] {Config.combs.getStackForType(CombType.MUNDANE)}, 55));
CURIOUS.drops.add(new HiveDrop(BeeSpecies.SORCEROUS.getGenome(), new ItemStack[] {Config.combs.getStackForType(CombType.MUNDANE)}, 40));
ItemStack[] combs = new ItemStack[] {Config.combs.getStackForType(CombType.MUNDANE)};
HiveDrop valiantDrop = new HiveDrop(BeeGenomeManager.addRainResist(BeeGenomeManager.getTemplateForestryValiant()), combs, 5);
CURIOUS.drops.add(new HiveDrop(BeeSpecies.MYSTICAL.getGenome(), combs, 80));
CURIOUS.drops.add(new HiveDrop(BeeGenomeManager.addRainResist(BeeSpecies.MYSTICAL.getGenome()), combs, 15));
CURIOUS.drops.add(valiantDrop);
UNUSUAL.drops.add(new HiveDrop(BeeSpecies.UNUSUAL.getGenome(), combs, 80));
UNUSUAL.drops.add(new HiveDrop(BeeGenomeManager.addRainResist(BeeSpecies.UNUSUAL.getGenome()), combs, 15));
UNUSUAL.drops.add(valiantDrop);
RESONANT.drops.add(new HiveDrop(BeeSpecies.ATTUNED.getGenome(), combs, 80));
RESONANT.drops.add(new HiveDrop(BeeGenomeManager.addRainResist(BeeSpecies.ATTUNED.getGenome()), combs, 20));
RESONANT.drops.add(valiantDrop);
DEEP.drops.add(new HiveDrop(BeeSpecies.SORCEROUS.getGenome(), combs, 80));
DEEP.drops.add(new HiveDrop(BeeGenomeManager.addRainResist(BeeSpecies.SORCEROUS.getGenome()), combs, 20));
DEEP.drops.add(valiantDrop);
combs = new ItemStack[] {new ItemStack(Config.fBeeComb, 1, ForestryHelper.Comb.SIMMERING.ordinal()), new ItemStack(Item.lightStoneDust, 6)};
INFERNAL.drops.add(new HiveDrop(BeeGenomeManager.getTemplateForestrySinister(), combs, 80));
INFERNAL.drops.add(new HiveDrop(BeeSpecies.ELDRITCH.getGenome(), combs, 10));
INFERNAL.drops.add(new HiveDrop(BeeGenomeManager.getTemplateForestrySteadfast(), combs, 5));
combs = new ItemStack[] {new ItemStack(Config.fBeeComb, 3, ForestryHelper.Comb.MYSTERIOUS.ordinal()), new ItemStack(Item.enderPearl, 2)};
OBLIVION.drops.add(new HiveDrop(BeeGenomeManager.getTemplateForestryEnder(), combs, 80));
OBLIVION.drops.add(new HiveDrop(BeeGenomeManager.getTemplateForestrySteadfast(), combs, 5));
}
private HiveType(String hiveName, int light, boolean visible)
private HiveType(String hiveName, int light, boolean visible, BiomeDictionary.Type[] biomes, int[] rarity)
{
this.name = hiveName;
this.lightLevel = light;
this.show = visible;
this.drops = new ArrayList<IHiveDrop>();
this.validBiomes = biomes;
this.rarity = rarity;
assert this.validBiomes.length == this.rarity.length;
}
@SideOnly(Side.CLIENT)
@@ -97,6 +152,42 @@ public enum HiveType
{
return this.lightLevel;
}
public ArrayList<ItemStack> getDrops(World world, int x, int y, int z, int fortune)
{
ArrayList<ItemStack> hiveDrops = new ArrayList<ItemStack>();
int dart;
// Get a princess.
int throttle = 0;
while (hiveDrops.size() <= 0 && throttle < 10)
{
++throttle;
dart = world.rand.nextInt(100);
for (IHiveDrop drop : drops)
{
if (dart <= drop.getChance(world, x, y, z))
{
hiveDrops.add(drop.getPrincess(world, x, y, z, fortune));
break;
}
}
}
// Get a drone, maybe.
dart = world.rand.nextInt(100);
for (IHiveDrop drop : drops)
{
if (dart <= drop.getChance(world, x, y, z))
{
hiveDrops.addAll(drop.getDrones(world, x, y, z, fortune));
hiveDrops.addAll(drop.getAdditional(world, x, y, z, fortune));
break;
}
}
return hiveDrops;
}
public static String[] getAllNames()
{
@@ -112,4 +203,59 @@ public enum HiveType
}
return names;
}
public void generateHive(World world, Random random, int chunkX, int chunkZ, boolean initialGen)
{
BiomeDictionary.Type[] biomeType = BiomeDictionary.getTypesForBiome(world.getBiomeGenForCoordsBody(chunkX, chunkZ));
int maxRarity = 0;
for (int i = 0; i < biomeType.length; ++i)
{
int rarity = this.getRarityForBiome(biomeType[i]);
if (rarity > maxRarity)
{
maxRarity = rarity;
}
}
if (world.rand.nextInt(100) < maxRarity)
{
switch (this)
{
default:
case CURIOUS:
FeatureHive.generateHiveCurious(world, random, chunkX, chunkZ, initialGen);
break;
case UNUSUAL:
FeatureHive.generateHiveUnusual(world, random, chunkX, chunkZ, initialGen);
break;
case RESONANT:
FeatureHive.generateHiveResonant(world, random, chunkX, chunkZ, initialGen);
break;
case DEEP:
FeatureHive.generateHiveDeep(world, random, chunkX, chunkZ, initialGen);
break;
case INFERNAL:
FeatureHive.generateHiveInfernal(world, random, chunkX, chunkZ, initialGen);
break;
case OBLIVION:
FeatureHive.generateHiveOblivion(world, random, chunkX, chunkZ, initialGen);
break;
}
}
}
public int getRarityForBiome(BiomeDictionary.Type biomeType)
{
int rarity = 0;
for (int i = 0; i < this.validBiomes.length; ++i)
{
if (this.validBiomes[i].equals(biomeType))
{
rarity = this.rarity[i];
break;
}
}
return rarity;
}
}
@@ -11,8 +11,8 @@ import magicbees.block.types.PlankType;
import magicbees.item.types.CapsuleType;
import magicbees.item.types.LiquidType;
import magicbees.main.CommonProxy;
import magicbees.main.ThaumicBees;
import magicbees.main.utils.TabThaumicBees;
import magicbees.main.MagicBees;
import magicbees.main.utils.TabMagicBees;
import magicbees.main.utils.VersionInfo;
import net.minecraft.block.Block;
import net.minecraft.client.renderer.texture.IconRegister;
@@ -37,11 +37,11 @@ public class ItemCapsule extends Item
{
super(itemId);
this.capsuleType = type;
this.setCreativeTab(TabThaumicBees.tabThaumicBees);
this.setCreativeTab(TabMagicBees.tabMagicBees);
this.setHasSubtypes(true);
this.setMaxStackSize(maxStackSize);
this.setUnlocalizedName("tb.capsule." + type.toString().toLowerCase());
GameRegistry.registerItem(this, "tb.capsule." + type.toString().toLowerCase());
this.setUnlocalizedName("capsule." + type.toString().toLowerCase());
GameRegistry.registerItem(this, "capsule." + type.toString().toLowerCase());
}
public CapsuleType getType()
+3 -3
View File
@@ -8,7 +8,7 @@ import cpw.mods.fml.relauncher.SideOnly;
import forestry.api.core.Tabs;
import magicbees.item.types.CombType;
import magicbees.main.CommonProxy;
import magicbees.main.ThaumicBees;
import magicbees.main.MagicBees;
import magicbees.main.utils.VersionInfo;
import magicbees.main.utils.compat.ForestryHelper;
import net.minecraft.client.renderer.texture.IconRegister;
@@ -24,8 +24,8 @@ public class ItemComb extends Item
super(itemID);
this.setCreativeTab(Tabs.tabApiculture);
this.setHasSubtypes(true);
this.setUnlocalizedName("tb.comb");
GameRegistry.registerItem(this, "tb.comb");
this.setUnlocalizedName("comb");
GameRegistry.registerItem(this, "comb");
}
public ItemStack getStackForType(CombType type)
@@ -9,9 +9,9 @@ import cpw.mods.fml.relauncher.SideOnly;
import forestry.api.core.Tabs;
import thaumcraft.api.EnumTag;
import magicbees.main.CommonProxy;
import magicbees.main.ThaumicBees;
import magicbees.main.MagicBees;
import magicbees.main.utils.LocalizationManager;
import magicbees.main.utils.TabThaumicBees;
import magicbees.main.utils.TabMagicBees;
import magicbees.main.utils.VersionInfo;
import magicbees.main.utils.compat.ForestryHelper;
import net.minecraft.client.renderer.texture.IconRegister;
@@ -24,7 +24,7 @@ public class ItemCrystalAspect extends Item
public ItemCrystalAspect(int itemId)
{
super(itemId);
this.setCreativeTab(TabThaumicBees.tabThaumicBees);
this.setCreativeTab(TabMagicBees.tabMagicBees);
this.setHasSubtypes(true);
this.setUnlocalizedName("crystalAspect");
GameRegistry.registerItem(this, "crystalAspect");
@@ -60,6 +60,6 @@ public class ItemCrystalAspect extends Item
@Override
public String getItemDisplayName(ItemStack stack)
{
return String.format(LocalizationManager.getLocalizedString("tb.resource.crystalAspect"), EnumTag.get(stack.getItemDamage()).name);
return String.format(LocalizationManager.getLocalizedString("resource.crystalAspect"), EnumTag.get(stack.getItemDamage()).name);
}
}
+3 -3
View File
@@ -10,7 +10,7 @@ import forestry.api.core.Tabs;
import magicbees.item.types.DropType;
import magicbees.item.types.PropolisType;
import magicbees.main.CommonProxy;
import magicbees.main.ThaumicBees;
import magicbees.main.MagicBees;
import magicbees.main.utils.compat.ForestryHelper;
import net.minecraft.client.renderer.texture.IconRegister;
import net.minecraft.creativetab.CreativeTabs;
@@ -25,8 +25,8 @@ public class ItemDrop extends Item
super(itemID);
this.setCreativeTab(Tabs.tabApiculture);
this.setHasSubtypes(true);
this.setUnlocalizedName("tb.drop");
GameRegistry.registerItem(this, "tb.drop");
this.setUnlocalizedName("drop");
GameRegistry.registerItem(this, "drop");
}
public ItemStack getStackForType(DropType type)
@@ -2,7 +2,7 @@ package magicbees.item;
import magicbees.item.types.HiveFrameType;
import magicbees.main.Config;
import magicbees.main.utils.TabThaumicBees;
import magicbees.main.utils.TabMagicBees;
import magicbees.main.utils.VersionInfo;
import magicbees.main.utils.compat.ThaumcraftHelper;
import net.minecraft.client.renderer.texture.IconRegister;
@@ -29,7 +29,7 @@ public class ItemMagicHiveFrame extends Item implements IHiveFrame
this.type = frameType;
this.setMaxDamage(this.type.maxDamage);
this.setMaxStackSize(1);
this.setCreativeTab(TabThaumicBees.tabThaumicBees);
this.setCreativeTab(TabMagicBees.tabMagicBees);
this.setUnlocalizedName("frame" + frameType.getName());
GameRegistry.registerItem(this, "frame" + frameType.getName());
}
@@ -52,51 +52,6 @@ public class ItemMagicHiveFrame extends Item implements IHiveFrame
{
int damage = wear;
if (ThaumcraftHelper.isActive())
{
int fluxMod = 1;
// This throttles back the amount of aura consumed by the frame by storing a smidge of data on the item stack.
if (this.type.auraPerUse > 0)
{
NBTTagCompound tag;
if (frame.hasTagCompound())
{
tag = frame.getTagCompound();
}
else
{
tag = new NBTTagCompound();
tag.setByte("wearTicks", (byte)0);
frame.setTagCompound(tag);
}
int wearTicks = tag.getByte("wearTicks") + 1;
if (wearTicks == this.type.wearTicksPerAura)
{
// Attempt to use aura for the frame.
if (!ThaumcraftApi.decreaseClosestAura(w, x, y, z, this.type.auraPerUse, true))
{
// Insufficient aura, or no nearby node.
damage = wear + this.type.auraPerUse * this.type.wearTicksPerAura;
fluxMod = 1 + w.rand.nextInt(this.type.wearTicksPerAura);
}
wearTicks = 0;
for (int i = 0; i < fluxMod; ++i)
{
ThaumcraftHelper.doFluxEffect(this.type, w, x, y, z);
}
}
tag.setByte("wearTicks", (byte)wearTicks);
}
}
else
{
damage += 2;
}
frame.setItemDamage(frame.getItemDamage() + damage);
if (frame.getItemDamage() >= frame.getMaxDamage())
@@ -8,8 +8,8 @@ import cpw.mods.fml.relauncher.SideOnly;
import forestry.api.core.Tabs;
import magicbees.item.types.ResourceType;
import magicbees.main.CommonProxy;
import magicbees.main.ThaumicBees;
import magicbees.main.utils.TabThaumicBees;
import magicbees.main.MagicBees;
import magicbees.main.utils.TabMagicBees;
import magicbees.main.utils.VersionInfo;
import magicbees.main.utils.compat.ForestryHelper;
import net.minecraft.client.renderer.texture.IconRegister;
@@ -25,10 +25,10 @@ public class ItemMiscResources extends Item
public ItemMiscResources(int ID)
{
super(ID);
this.setCreativeTab(TabThaumicBees.tabThaumicBees);
this.setCreativeTab(TabMagicBees.tabMagicBees);
this.setHasSubtypes(true);
this.setUnlocalizedName("tb.miscResources");
GameRegistry.registerItem(this, "tb.miscResources");
this.setUnlocalizedName("miscResources");
GameRegistry.registerItem(this, "miscResources");
}
public ItemStack getStackForType(ResourceType type)
@@ -7,9 +7,9 @@ import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import magicbees.item.types.PollenType;
import magicbees.main.Config;
import magicbees.main.ThaumicBees;
import magicbees.main.MagicBees;
import magicbees.main.utils.MoonPhase;
import magicbees.main.utils.TabThaumicBees;
import magicbees.main.utils.TabMagicBees;
import magicbees.main.utils.VersionInfo;
import magicbees.main.utils.compat.ForestryHelper;
import net.minecraft.client.renderer.texture.IconRegister;
@@ -27,9 +27,9 @@ public class ItemMoonDial extends Item
public ItemMoonDial(int id)
{
super(id);
this.setCreativeTab(TabThaumicBees.tabThaumicBees);
this.setUnlocalizedName("tb.moonDial");
GameRegistry.registerItem(this, "tb.moonDial");
this.setCreativeTab(TabMagicBees.tabMagicBees);
this.setUnlocalizedName("moonDial");
GameRegistry.registerItem(this, "moonDial");
}
@SideOnly(Side.CLIENT)
@@ -54,7 +54,9 @@ public class ItemMoonDial extends Item
@SideOnly(Side.CLIENT)
public void addInformation(ItemStack itemStack, EntityPlayer entityPlayer, List infoList, boolean par4)
{
if (ThaumicBees.getConfig().MoonDialShowsPhaseInText && entityPlayer.getCurrentEquippedItem().getItem() == this)
if (MagicBees.getConfig().MoonDialShowsPhaseInText &&
entityPlayer.getCurrentEquippedItem() != null &&
entityPlayer.getCurrentEquippedItem().getItem() == this)
{
infoList.add("\u00A77" + MoonPhase.getMoonPhaseFromTime(entityPlayer.worldObj.getWorldTime()).getLocalizedName());
}
+3 -3
View File
@@ -8,7 +8,7 @@ import cpw.mods.fml.relauncher.SideOnly;
import forestry.api.core.Tabs;
import magicbees.item.types.PollenType;
import magicbees.main.CommonProxy;
import magicbees.main.ThaumicBees;
import magicbees.main.MagicBees;
import magicbees.main.utils.compat.ForestryHelper;
import net.minecraft.client.renderer.texture.IconRegister;
import net.minecraft.creativetab.CreativeTabs;
@@ -23,8 +23,8 @@ public class ItemPollen extends Item
super(itemID);
this.setCreativeTab(Tabs.tabApiculture);
this.setHasSubtypes(true);
this.setUnlocalizedName("tb.pollen");
GameRegistry.registerItem(this, "tb.pollen");
this.setUnlocalizedName("pollen");
GameRegistry.registerItem(this, "pollen");
}
public ItemStack getStackForType(PollenType type)
{
@@ -22,8 +22,8 @@ public class ItemPropolis extends Item
super(id);
this.setCreativeTab(Tabs.tabApiculture);
this.setHasSubtypes(true);
this.setUnlocalizedName("tb.propolis");
GameRegistry.registerItem(this, "tb.propolis");
this.setUnlocalizedName("propolis");
GameRegistry.registerItem(this, "propolis");
}
public ItemStack getStackForType(PropolisType type)
@@ -103,15 +103,10 @@ public class ItemThaumiumGrafter extends Item implements IVisRepairable, IToolGr
{
if (stack.getItemDamage() > 0)
{
if (ThaumcraftApi.decreaseClosestAura(e.worldObj, e.posX, e.posY, e.posZ, 5, true))
if (ThaumcraftApi.decreaseClosestAura(e.worldObj, e.posX, e.posY, e.posZ, 2, true))
{
stack.damageItem(-1, (EntityLiving)e);
}
if (e instanceof EntityPlayer)
{
EntityPlayer p = (EntityPlayer)e;
p.addPotionEffect(new PotionEffect(Potion.digSlowdown.id, 600));
}
}
}
}
@@ -1,19 +1,18 @@
package magicbees.item;
import cpw.mods.fml.common.registry.GameRegistry;
import thaumcraft.api.IVisRepairable;
import thaumcraft.api.ThaumcraftApi;
import magicbees.main.CommonProxy;
import net.minecraft.block.Block;
import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityLiving;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.item.ItemTool;
import net.minecraft.world.World;
import net.minecraftforge.common.ForgeHooks;
import thaumcraft.api.IVisRepairable;
import thaumcraft.api.ThaumcraftApi;
import cpw.mods.fml.common.registry.GameRegistry;
import forestry.api.core.IToolScoop;
public class ItemThaumiumScoop extends Item implements IVisRepairable
public class ItemThaumiumScoop extends Item implements IVisRepairable, IToolScoop
{
public ItemThaumiumScoop(int itemID)
{
+2 -2
View File
@@ -24,8 +24,8 @@ public class ItemWax extends Item
super(itemID);
this.setCreativeTab(Tabs.tabApiculture);
this.setHasSubtypes(true);
this.setUnlocalizedName("tb.wax");
GameRegistry.registerItem(this, "tb.wax");
this.setUnlocalizedName("wax");
GameRegistry.registerItem(this, "wax");
}
public ItemStack getStackForType(WaxType type)
@@ -26,6 +26,6 @@ public enum CapsuleType
public String getLocalizedName()
{
return LocalizationManager.getLocalizedString("tb.capsule." + name);
return LocalizationManager.getLocalizedString("capsule." + name);
}
}
@@ -39,6 +39,6 @@ public enum CombType
public String getName()
{
return LocalizationManager.getLocalizedString("tb.comb." + this.name);
return LocalizationManager.getLocalizedString("comb." + this.name);
}
}
@@ -21,6 +21,6 @@ public enum DropType
public String getName()
{
return LocalizationManager.getLocalizedString("tb.drop." + this.name);
return LocalizationManager.getLocalizedString("drop." + this.name);
}
}
@@ -4,29 +4,26 @@ import magicbees.main.utils.LocalizationManager;
public enum HiveFrameType
{
MAGIC("Magic", 32, 240, 1f, 1f, 1f, 2f, 2, 5),
RESILIENT("Resilient", 33, 840, 1f, 1f, 1f, 2f, 2, 5),
GENTLE("Gentle", 34, 200, 1f, 0.7f, 1.5f, 1.4f, 1, 5),
METABOLIC("Metabolic", 35, 120, 1f, 1.8f, 1f, 1.2f, 5, 5),
NECROTIC("Necrotic", 36, 290, 1f, 1f, 0.3f, 0.75f, 1, 5),
TEMPORAL("Temporal", 37, 300, 1f, 1f, 2.5f, 1f, 1, 5 ),
OBLIVION("Oblivion", 38, 60, 1f, 1f, 0.0001f, 0f, 15, 1),
MAGIC("Magic", 240, 1f, 1f, 1f, 2f),
RESILIENT("Resilient", 800, 1f, 1f, 1f, 2f),
GENTLE("Gentle", 200, 1f, 0.7f, 1.5f, 1.4f),
METABOLIC("Metabolic", 120, 1f, 1.8f, 1f, 1.2f),
NECROTIC("Necrotic", 290, 1f, 1f, 0.3f, 0.75f),
TEMPORAL("Temporal", 300, 1f, 1f, 2.5f, 1f),
OBLIVION("Oblivion", 60, 1f, 1f, 0.0001f, 0f),
;
private HiveFrameType(String name, int icon, int damage,
float territory, float mutation, float lifespan, float production,
int auraUse, int wearTicks)
private HiveFrameType(String name, int damage,
float territory, float mutation, float lifespan, float production)
{
this(name, icon, damage, territory, mutation, lifespan, production, 1f, false, false, false, false, auraUse, wearTicks);
this(name, damage, territory, mutation, lifespan, production, 1f, false, false, false, false);
}
private HiveFrameType(String name, int icon, int damage,
private HiveFrameType(String name, int damage,
float territory, float mutation, float lifespan, float production, float flowering,
boolean sealed, boolean lit, boolean sunlit, boolean hellish,
int auraUse, int wearTicks)
boolean sealed, boolean lit, boolean sunlit, boolean hellish)
{
this.frameName = name;
this.iconIdx = icon;
this.maxDamage = damage;
this.territoryMod = territory;
@@ -38,13 +35,9 @@ public enum HiveFrameType
this.isLit = lit;
this.isSunlit = sunlit;
this.isHellish = hellish;
this.auraPerUse = auraUse;
this.wearTicksPerAura = wearTicks;
}
private String frameName;
public int iconIdx;
public int maxDamage;
public float territoryMod;
@@ -57,9 +50,6 @@ public enum HiveFrameType
public boolean isSunlit;
public boolean isHellish;
public int auraPerUse;
public int wearTicksPerAura;
public String getName()
{
return this.frameName;
@@ -67,6 +57,6 @@ public enum HiveFrameType
public String getLocalizedName()
{
return LocalizationManager.getLocalizedString("tb.frame." + this.frameName);
return LocalizationManager.getLocalizedString("frame." + this.frameName);
}
}
@@ -53,6 +53,6 @@ public enum LiquidType
public String getDisplayName()
{
return LocalizationManager.getLocalizedString("tb.liquid." + liquidID);
return LocalizationManager.getLocalizedString("liquid." + liquidID);
}
}
@@ -45,6 +45,6 @@ public enum NuggetType
public String getName()
{
return LocalizationManager.getLocalizedString("tb.nugget." + this.toString().toLowerCase());
return LocalizationManager.getLocalizedString("nugget." + this.toString().toLowerCase());
}
}
@@ -21,6 +21,6 @@ public enum PollenType
public String getName()
{
return LocalizationManager.getLocalizedString("tb.pollen." + this.name);
return LocalizationManager.getLocalizedString("pollen." + this.name);
}
}
@@ -24,6 +24,6 @@ public enum PropolisType
public String getName()
{
return LocalizationManager.getLocalizedString("tb.propolis." + this.name);
return LocalizationManager.getLocalizedString("propolis." + this.name);
}
}
@@ -30,6 +30,6 @@ public enum ResourceType
public String getLocalizedName()
{
return LocalizationManager.getLocalizedString("tb.resource." + this.name);
return LocalizationManager.getLocalizedString("resource." + this.name);
}
}
@@ -22,6 +22,6 @@ public enum WaxType
public String getName()
{
return LocalizationManager.getLocalizedString("tb.wax." + this.name);
return LocalizationManager.getLocalizedString("wax." + this.name);
}
}
@@ -17,9 +17,9 @@ public class ClientProxy extends CommonProxy
public ClientProxy() { }
@Override
public void registerTileEntities()
public void registerRenderers()
{
super.registerTileEntities();
super.registerRenderers();
RenderIdEffectJar = RenderingRegistry.getNextAvailableRenderId();
MinecraftForgeClient.registerItemRenderer(Config.effectJar.blockID, EffectJarRenderer.instance);
@@ -30,7 +30,7 @@ public class ClientProxy extends CommonProxy
public void drawBeeEffects(World world, double xPos, double yPos, double zPos, int colour, int rangeX, int rangeY, int rangeZ)
{
// drawParticleEffects flag pulled from Forestry after configs
if (ThaumicBees.getConfig().DrawParticleEffects)
if (MagicBees.getConfig().DrawParticleEffects)
{
double spawnX;
double spawnY;
@@ -8,10 +8,10 @@ import net.minecraft.world.World;
public class CommonProxy
{
public static final String TEXTURE_PATH = "/mods/thaumicbees/textures/";
public static final String MODEL_PATH = "/mods/thaumicbees/model/";
public static final String TCBEES_RESEARCH = "/research/thaumicbees/";
public static final String TCBEES_LOCDIR = "/lang/thaumicbees/";
public static final String TEXTURE_PATH = "/mods/magicbees/textures/";
public static final String MODEL_PATH = "/mods/magicbees/model/";
public static final String TCBEES_RESEARCH = "/research/magicbees/";
public static final String TCBEES_LOCDIR = "/lang/magicbees/";
public static String FORESTRY_GFX_ITEMS;
public static String FORESTRY_GFX_BEEEFFECTS;
@@ -23,11 +23,6 @@ public class CommonProxy
public CommonProxy() { }
public void registerTileEntities()
{
GameRegistry.registerTileEntity(TileEntityEffectJar.class, "tb.entity.effectJar");
}
public void drawBeeEffects(World world, double xPos, double yPos, double zPos, int colour, int rangeX, int rangeY, int rangeZ)
{
// Does nothing in common.
+83 -74
View File
@@ -26,11 +26,13 @@ import magicbees.item.types.HiveFrameType;
import magicbees.item.types.NuggetType;
import magicbees.item.types.ResourceType;
import magicbees.main.utils.LocalizationManager;
import magicbees.main.utils.VersionInfo;
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 magicbees.storage.BackpackDefinition;
import magicbees.tileentity.TileEntityEffectJar;
import net.minecraft.block.Block;
import net.minecraft.item.Item;
import net.minecraft.item.ItemFood;
@@ -58,15 +60,16 @@ import forestry.api.storage.EnumBackpackType;
*/
public class Config
{
public boolean DrawParticleEffects;
public boolean BeeInfusionsAdded;
public boolean AddThaumcraftItemsToBackpacks;
public boolean DisableUpdateCheck;
public boolean AreMagicPlanksFlammable;
public boolean UseImpregnatedStickInTools;
public boolean MoonDialShowsPhaseInText;
public String ThaumaturgeExtraItems;
public int CapsuleStackSizeMax;
public boolean DrawParticleEffects;
public boolean BeeInfusionsAdded;
public boolean AddThaumcraftItemsToBackpacks;
public boolean DisableUpdateNotification;
public boolean AreMagicPlanksFlammable;
public boolean UseImpregnatedStickInTools;
public boolean MoonDialShowsPhaseInText;
public String ThaumaturgeExtraItems;
public int CapsuleStackSizeMax;
public boolean DoHiveRetrogen;
public static BlockPlanks planksWood;
public static BlockWoodSlab slabWoodHalf;
@@ -151,19 +154,19 @@ public class Config
//----- Config State info ----------------------------------
private Configuration tbConfig;
private Configuration configuration;
public Config(File configFile)
{
this.tbConfig = new Configuration(configFile);
this.configuration = new Configuration(configFile);
this.tbConfig.load();
this.configuration.load();
this.doMiscConfig();
}
public void saveConfigs()
{
this.tbConfig.save();
this.configuration.save();
}
public void setupBlocks()
@@ -176,27 +179,27 @@ public class Config
int blockIdBase = 1750;
{
int plankId = tbConfig.getBlock("planksTC", blockIdBase++).getInt();
int slabFullId = tbConfig.getBlock("slabFull", blockIdBase++).getInt();
int slabHalfId = tbConfig.getBlock("slabHalf", blockIdBase++).getInt();
int plankId = configuration.getBlock("planksTC", blockIdBase++).getInt();
int slabFullId = configuration.getBlock("slabFull", blockIdBase++).getInt();
int slabHalfId = configuration.getBlock("slabHalf", blockIdBase++).getInt();
if (ThaumcraftHelper.isActive())
{
planksWood = new BlockPlanks(plankId);
planksWood.setUnlocalizedName("tb.planks");
planksWood.setUnlocalizedName("planks");
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", ThaumicBees.getConfig().planksWood.blockID + "@" + PlankType.GREATWOOD.ordinal());
FMLInterModComms.sendMessage("BuildCraft|Transport", "add-facade", ThaumicBees.getConfig().planksWood.blockID + "@" + PlankType.SILVERWOOD.ordinal());
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());
slabWoodFull = new BlockWoodSlab(slabFullId, true);
slabWoodHalf = new BlockWoodSlab(slabHalfId, false);
slabWoodFull.setUnlocalizedName("tb.planks");
slabWoodHalf.setUnlocalizedName("tb.planks");
slabWoodFull.setUnlocalizedName("planks");
slabWoodHalf.setUnlocalizedName("planks");
Item.itemsList[slabWoodHalf.blockID] = null;
Item.itemsList[slabWoodHalf.blockID] = new ItemSlab(slabWoodHalf.blockID - 256, slabWoodHalf, slabWoodFull, false);
@@ -207,11 +210,17 @@ public class Config
}
}
effectJar = new BlockEffectJar(tbConfig.getBlock("effectJar", blockIdBase++).getInt());
GameRegistry.registerBlock(effectJar, "tb.effectJar");
effectJar = new BlockEffectJar(configuration.getBlock("effectJar", blockIdBase++).getInt());
GameRegistry.registerBlock(effectJar, "effectJar");
GameRegistry.registerTileEntity(TileEntityEffectJar.class, TileEntityEffectJar.entityName);
hive = new BlockHive(tbConfig.getBlock("hives", blockIdBase++).getInt());
GameRegistry.registerBlock(hive, "tb.hive");
hive = new BlockHive(configuration.getBlock("hives", blockIdBase++).getInt());
GameRegistry.registerBlock(hive, "hive");
for (HiveType t : HiveType.values())
{
MinecraftForge.setBlockHarvestLevel(hive, t.ordinal(), "scoop", 0);
}
Item.itemsList[hive.blockID] = null;
Item.itemsList[hive.blockID] = new ItemMultiTextureTile(hive.blockID - 256, hive, HiveType.getAllNames());
@@ -226,61 +235,61 @@ public class Config
int itemIDBase = 26090;
combs= new ItemComb(tbConfig.getItem("combs", itemIDBase++).getInt());
wax = new ItemWax(tbConfig.getItem("wax", itemIDBase++).getInt());
propolis = new ItemPropolis(tbConfig.getItem("propolis", itemIDBase++).getInt());
drops = new ItemDrop(tbConfig.getItem("drop", itemIDBase++).getInt());
miscResources = new ItemMiscResources(tbConfig.getItem("miscResources", itemIDBase++).getInt());
combs= new ItemComb(configuration.getItem("combs", 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);
// Make Aromatic Lumps a swarmer inducer. Chance is /1000.
BeeManager.inducers.put(miscResources.getStackForType(ResourceType.AROMATIC_LUMP), 80);
BeeManager.inducers.put(miscResources.getStackForType(ResourceType.AROMATIC_LUMP), 95);
{
int tier1 = tbConfig.getItem("thaumaturgePack1", itemIDBase++).getInt();
int tier2 = tbConfig.getItem("thaumaturgePack2", itemIDBase++).getInt();
int tier1 = configuration.getItem("thaumaturgePack1", itemIDBase++).getInt() - 256;
int tier2 = configuration.getItem("thaumaturgePack2", itemIDBase++).getInt() - 256;
if (ThaumcraftHelper.isActive())
{
try
{
// 0x8700C6 = purpleish.
String backpackName = LocalizationManager.getLocalizedString("tb.backpack.thaumaturge");
String backpackName = LocalizationManager.getLocalizedString("backpack.thaumaturge");
BackpackDefinition def = new BackpackDefinition("thaumaturge", backpackName, 0x8700C6);
thaumaturgeBackpackT1 = BackpackManager.backpackInterface.addBackpack(tier1, def, EnumBackpackType.T1);
thaumaturgeBackpackT2 = BackpackManager.backpackInterface.addBackpack(tier2, def, EnumBackpackType.T2);
// Add additional items from configs to backpack.
if (ThaumicBees.getConfig().ThaumaturgeExtraItems.length() > 0)
if (MagicBees.getConfig().ThaumaturgeExtraItems.length() > 0)
{
FMLLog.info("Attempting to add extra items to Thaumaturge's backpack! If you get an error, check your ThaumicBees.conf.");
FMLInterModComms.sendMessage("Forestry", "add-backpack-items", "thaumaturge@" + ThaumicBees.getConfig().ThaumaturgeExtraItems);
FMLLog.info("Attempting to add extra items to Thaumaturge's backpack. If you get an error, check your MagicBees.conf.");
FMLInterModComms.sendMessage("Forestry", "add-backpack-items", "thaumaturge@" + MagicBees.getConfig().ThaumaturgeExtraItems);
}
}
catch (Exception e)
{
FMLLog.severe("ThaumicBees encountered a problem during loading!");
FMLLog.severe("MagicBees encountered a problem during loading!");
FMLLog.severe("Could not register backpacks via Forestry. Check your FML Client log and see if Forestry crashed silently.");
}
}
}
magicCapsule = new ItemCapsule(CapsuleType.MAGIC, tbConfig.getItem("magicCapsule", itemIDBase++).getInt(), this.CapsuleStackSizeMax);
pollen = new ItemPollen(tbConfig.getItem("pollen", itemIDBase++).getInt());
magicCapsule = new ItemCapsule(CapsuleType.MAGIC, configuration.getItem("magicCapsule", itemIDBase++).getInt() - 256, this.CapsuleStackSizeMax);
pollen = new ItemPollen(configuration.getItem("pollen", itemIDBase++).getInt() - 256);
{
int crystalId = tbConfig.getItem("fluxCrystal", itemIDBase++).getInt();
int crystalId = configuration.getItem("fluxCrystal", itemIDBase++).getInt() - 256;
if (ThaumcraftHelper.isActive())
{
solidFlux = new ItemCrystalAspect(crystalId);
}
}
hiveFrameMagic = new ItemMagicHiveFrame(tbConfig.getItem("frameMagic", itemIDBase++).getInt(), HiveFrameType.MAGIC);
hiveFrameResilient = new ItemMagicHiveFrame(tbConfig.getItem("frameResilient", itemIDBase++).getInt(), HiveFrameType.RESILIENT);
hiveFrameGentle = new ItemMagicHiveFrame(tbConfig.getItem("frameGentle", itemIDBase++).getInt(), HiveFrameType.GENTLE);
hiveFrameMetabolic = new ItemMagicHiveFrame(tbConfig.getItem("frameMetabolic", itemIDBase++).getInt(), HiveFrameType.METABOLIC);
hiveFrameNecrotic = new ItemMagicHiveFrame(tbConfig.getItem("frameNecrotic", itemIDBase++).getInt(), HiveFrameType.NECROTIC);
hiveFrameTemporal = new ItemMagicHiveFrame(tbConfig.getItem("frameTemporal", itemIDBase++).getInt(), HiveFrameType.TEMPORAL);
hiveFrameOblivion = new ItemMagicHiveFrame(tbConfig.getItem("frameOblivion", itemIDBase++).getInt(), HiveFrameType.OBLIVION);
hiveFrameMagic = new ItemMagicHiveFrame(configuration.getItem("frameMagic", itemIDBase++).getInt() - 256, HiveFrameType.MAGIC);
hiveFrameResilient = new ItemMagicHiveFrame(configuration.getItem("frameResilient", itemIDBase++).getInt() - 256, HiveFrameType.RESILIENT);
hiveFrameGentle = new ItemMagicHiveFrame(configuration.getItem("frameGentle", itemIDBase++).getInt() - 256, HiveFrameType.GENTLE);
hiveFrameMetabolic = new ItemMagicHiveFrame(configuration.getItem("frameMetabolic", itemIDBase++).getInt() - 256, HiveFrameType.METABOLIC);
hiveFrameNecrotic = new ItemMagicHiveFrame(configuration.getItem("frameNecrotic", itemIDBase++).getInt() - 256, HiveFrameType.NECROTIC);
hiveFrameTemporal = new ItemMagicHiveFrame(configuration.getItem("frameTemporal", itemIDBase++).getInt() - 256, HiveFrameType.TEMPORAL);
hiveFrameOblivion = new ItemMagicHiveFrame(configuration.getItem("frameOblivion", itemIDBase++).getInt() - 256, HiveFrameType.OBLIVION);
// Future frames, so they all are clumped together.
itemIDBase++;
itemIDBase++;
@@ -294,27 +303,27 @@ public class Config
ChestGenHooks.addItem(ChestGenHooks.STRONGHOLD_CORRIDOR, new WeightedRandomChestContent(new ItemStack(hiveFrameOblivion), 1, 1, 18));
ChestGenHooks.addItem(ChestGenHooks.STRONGHOLD_LIBRARY, new WeightedRandomChestContent(new ItemStack(hiveFrameOblivion), 1, 3, 23));
jellyBaby = new ItemFood(tbConfig.getItem("jellyBabies", itemIDBase++).getInt(), 1, false).setAlwaysEdible()
jellyBaby = new ItemFood(configuration.getItem("jellyBabies", itemIDBase++).getInt() - 256, 1, false).setAlwaysEdible()
.setPotionEffect(Potion.moveSpeed.id, 5, 1, 1f);
jellyBaby.setUnlocalizedName("thaumicbees:jellyBabies");
GameRegistry.registerItem(jellyBaby, "thaumicbees:jellyBabies");
jellyBaby.setUnlocalizedName("magicbees:jellyBabies");
GameRegistry.registerItem(jellyBaby, "magicbees:jellyBabies");
voidCapsule = new ItemCapsule(CapsuleType.VOID, tbConfig.getItem("voidCapsule", itemIDBase++).getInt(), this.CapsuleStackSizeMax);
voidCapsule = new ItemCapsule(CapsuleType.VOID, configuration.getItem("voidCapsule", itemIDBase++).getInt() - 256, this.CapsuleStackSizeMax);
{
int scoopID = tbConfig.getItem("thaumiumScoop", itemIDBase++).getInt();
int grafterID = tbConfig.getItem("thaumiumGrafter", itemIDBase++).getInt();
int scoopID = configuration.getItem("thaumiumScoop", itemIDBase++).getInt() - 256;
int grafterID = configuration.getItem("thaumiumGrafter", itemIDBase++).getInt() - 256;
if (ThaumcraftHelper.isActive())
{
try {
// Reflecting avoids the need to directly include the Thaumcraft API in the jar. BAM!
Constructor ctor1 = Class.forName("thaumicbees.item.ItemThaumiumScoop").getConstructor(int.class);
Constructor ctor1 = Class.forName("magicbees.item.ItemThaumiumScoop").getConstructor(int.class);
thaumiumScoop = (Item)ctor1.newInstance(scoopID);
MinecraftForge.setToolClass(thaumiumScoop, "scoop", 3);
GameRegistry.registerItem(thaumiumScoop, thaumiumScoop.getUnlocalizedName());
Constructor ctor2 = Class.forName("thaumicbees.item.ItemThaumiumGrafter").getConstructor(int.class);
Constructor ctor2 = Class.forName("magicbees.item.ItemThaumiumGrafter").getConstructor(int.class);
thaumiumGrafter = (Item)ctor2.newInstance(grafterID);
MinecraftForge.setToolClass(thaumiumGrafter, "grafter", 3);
GameRegistry.registerItem(thaumiumGrafter, thaumiumGrafter.getUnlocalizedName());
@@ -322,15 +331,11 @@ public class Config
}
}
moonDial = new ItemMoonDial(tbConfig.getItem("moonDial", itemIDBase++).getInt());
moonDial = new ItemMoonDial(configuration.getItem("moonDial", itemIDBase++).getInt() - 256);
// Other tools I might need in the future
itemIDBase++;
nuggets = new ItemNugget(configuration.getItem("beeNuggets", itemIDBase++).getInt() - 256);
nuggets = new ItemNugget(tbConfig.getItem("beeNuggets", itemIDBase++).getInt());
OreDictionary.registerOre("beeComb", new ItemStack(combs, 1, -1));
OreDictionary.registerOre("beeComb", new ItemStack(combs, 1, OreDictionary.WILDCARD_VALUE));
OreDictionary.registerOre("nuggetIron", nuggets.getStackForType(NuggetType.IRON));
OreDictionary.registerOre("nuggetCopper", nuggets.getStackForType(NuggetType.COPPER));
OreDictionary.registerOre("nuggetTin", nuggets.getStackForType(NuggetType.TIN));
@@ -356,36 +361,40 @@ public class Config
e.printStackTrace();
}
p = tbConfig.get("general", "backpack.thaumaturge.additionalItems", "");
p = configuration.get("general", "backpack.thaumaturge.additionalItems", "");
p.comment = "Add additional items to the Thaumaturge's Backpack." +
"\n Format is the same as Forestry's: id:meta;id;id:meta (etc)";
this.ThaumaturgeExtraItems = p.getString();
p = tbConfig.get("general", "backpack.forestry.addThaumcraftItems", true);
p.comment = "Set to true if you want ThaumicBees to add several Thaumcraft blocks & items to Forestry backpacks." +
p = configuration.get("general", "backpack.forestry.addThaumcraftItems", true);
p.comment = "Set to true if you want MagicBees to add several Thaumcraft blocks & items to Forestry backpacks." +
"\n Set to false to disable.";
this.AddThaumcraftItemsToBackpacks = p.getBoolean(true);
p = tbConfig.get("general", "capsuleStackSize", 64);
p.comment = "Allows you to edit the stack size of the capsules in ThaumicBees if using GregTech, \n" +
p = configuration.get("general", "capsuleStackSize", 64);
p.comment = "Allows you to edit the stack size of the capsules in MagicBees if using GregTech, \n" +
"or the reduced capsule size in Forestry & Railcraft. Default: 64";
this.CapsuleStackSizeMax = p.getInt();
p = tbConfig.get("general", "disableVersionCheck", false);
p.comment = "Set to true to stop ThaumicBees from checking for updates.";
this.DisableUpdateCheck = p.getBoolean(false);
p = configuration.get("general", "disableVersionNotification", false);
p.comment = "Set to true to stop ThaumicBees from notifying you when new updates are available. (Does not supress critical updates)";
this.DisableUpdateNotification = p.getBoolean(false);
p = tbConfig.get("general", "areMagicPlanksFlammable", false);
p = configuration.get("general", "areMagicPlanksFlammable", false);
p.comment = "Set to true to allow Greatwood & Silverwood planks to burn in a fire.";
this.AreMagicPlanksFlammable = p.getBoolean(false);
p = tbConfig.get("general", "useImpregnatedStickInTools", false);
p = configuration.get("general", "useImpregnatedStickInTools", false);
p.comment = "Set to true to make Thaumium Grafter & Scoop require impregnated sticks in the recipe.";
this.UseImpregnatedStickInTools = p.getBoolean(false);
p = tbConfig.get("general", "moonDialShowText", false);
p = configuration.get("general", "moonDialShowText", false);
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.comment = "Set to true to enable retroactive worldgen of Magic Bees hives.";
this.DoHiveRetrogen = p.getBoolean(false);
}
}
@@ -1,5 +1,6 @@
package magicbees.main;
import magicbees.bees.BeeManager;
import magicbees.client.gui.GUIHandler;
import magicbees.main.utils.CompatabilityManager;
import magicbees.main.utils.CraftingManager;
@@ -9,7 +10,7 @@ import magicbees.main.utils.compat.ArsMagicaHelper;
import magicbees.main.utils.compat.EquivalentExchangeHelper;
import magicbees.main.utils.compat.ExtraBeesHelper;
import magicbees.main.utils.compat.ThaumcraftHelper;
import cpw.mods.fml.common.FMLLog;
import magicbees.world.WorldHandler;
import cpw.mods.fml.common.Mod;
import cpw.mods.fml.common.SidedProxy;
import cpw.mods.fml.common.event.FMLInitializationEvent;
@@ -17,28 +18,30 @@ import cpw.mods.fml.common.event.FMLPostInitializationEvent;
import cpw.mods.fml.common.event.FMLPreInitializationEvent;
import cpw.mods.fml.common.network.NetworkMod;
import cpw.mods.fml.common.network.NetworkRegistry;
import cpw.mods.fml.common.registry.GameRegistry;
@Mod(
modid=VersionInfo.ModName,
name="Thaumic Bees",
name="Magic Bees",
useMetadata=true,
acceptedMinecraftVersions=VersionInfo.MCVersion,
version=VersionInfo.Version + " - " + VersionInfo.Build,
dependencies=VersionInfo.Depends
)
@NetworkMod(serverSideRequired=false, clientSideRequired=true)
public class ThaumicBees
public class MagicBees
{
@Mod.Instance(value="ThaumicBees")
public static ThaumicBees object;
@Mod.Instance(VersionInfo.ModName)
public static MagicBees object;
@SidedProxy(serverSide="thaumicbees.main.CommonProxy", clientSide="thaumicbees.main.ClientProxy")
@SidedProxy(serverSide="magicbees.main.CommonProxy", clientSide="magicbees.main.ClientProxy")
public static CommonProxy proxy;
public GUIHandler guiHandler;
private String configsPath;
private Config modConfig;
private WorldHandler worldHandler;
@Mod.PreInit
public void preInit(FMLPreInitializationEvent event)
@@ -59,10 +62,11 @@ public class ThaumicBees
public void init(FMLInitializationEvent event)
{
this.modConfig.setupBlocks();
this.proxy.registerTileEntities();
this.modConfig.setupItems();
CompatabilityManager.setupBackpacks();
GameRegistry.registerWorldGenerator(worldHandler = new WorldHandler());
}
@Mod.PostInit
@@ -70,10 +74,8 @@ public class ThaumicBees
{
this.guiHandler = new GUIHandler();
NetworkRegistry.instance().registerGuiHandler(this, this.guiHandler);
magicbees.bees.Allele.setupAdditionalAlleles();
magicbees.bees.BeeSpecies.setupBeeSpecies();
magicbees.bees.BeeMutation.setupMutations();
BeeManager.ititializeBees();
this.modConfig.saveConfigs();
@@ -6,7 +6,7 @@ import cpw.mods.fml.client.FMLClientHandler;
import magicbees.main.CommonProxy;
import magicbees.main.ThaumicBees;
import magicbees.main.MagicBees;
import net.minecraft.client.particle.EntityFX;
import net.minecraft.client.renderer.Tessellator;
import net.minecraft.world.World;
@@ -97,7 +97,7 @@ public class BeeRenderEffect extends EntityFX
GL11.glDepthMask(true);
GL11.glPopMatrix();
GL11.glBindTexture(3553 /* GL_TEXTURE_2D *//* GL_TEXTURE_2D */, ThaumicBees.proxy.getClientInstance().renderEngine.getTexture("/particles.png"));
GL11.glBindTexture(3553 /* GL_TEXTURE_2D *//* GL_TEXTURE_2D */, MagicBees.proxy.getClientInstance().renderEngine.getTexture("/particles.png"));
tessellator.startDrawingQuads();
}
@@ -0,0 +1,17 @@
package magicbees.main.utils;
import net.minecraft.world.chunk.Chunk;
public class ChunkCoords
{
public int dimension;
public int xCoord;
public int zCoord;
public ChunkCoords(Chunk chunk)
{
this.dimension = chunk.worldObj.provider.dimensionId;
this.xCoord = chunk.xPosition;
this.zCoord = chunk.zPosition;
}
}
@@ -34,7 +34,7 @@ import magicbees.item.types.ResourceType;
import magicbees.item.types.WaxType;
import magicbees.main.CommonProxy;
import magicbees.main.Config;
import magicbees.main.ThaumicBees;
import magicbees.main.MagicBees;
import magicbees.main.utils.compat.ExtraBeesHelper;
import magicbees.main.utils.compat.ForestryHelper;
import magicbees.main.utils.compat.ThaumcraftHelper;
@@ -28,7 +28,7 @@ import magicbees.item.types.PropolisType;
import magicbees.item.types.ResourceType;
import magicbees.item.types.WaxType;
import magicbees.main.Config;
import magicbees.main.ThaumicBees;
import magicbees.main.MagicBees;
import magicbees.main.utils.compat.ArsMagicaHelper;
import magicbees.main.utils.compat.ForestryHelper;
import magicbees.main.utils.compat.ShapelessBeeInfusionCraftingRecipe;
@@ -110,13 +110,13 @@ public class CraftingManager
'B', Item.glassBottle
});
GameRegistry.addRecipe(new ItemStack(Block.slowSand, 0, 4), new Object[] {
GameRegistry.addRecipe(new ItemStack(Block.slowSand, 4), new Object[] {
"SwS", "wDw", "SwS",
'S', Block.sand,
'D', Block.dirt,
'w', Config.wax.getStackForType(WaxType.SOUL)
});
GameRegistry.addRecipe(new ItemStack(Block.slowSand, 0, 4), new Object[] {
GameRegistry.addRecipe(new ItemStack(Block.slowSand, 4), new Object[] {
"wSw", "SDS", "wSw",
'S', Block.sand,
'D', Block.dirt,
@@ -3,22 +3,22 @@ package magicbees.main.utils;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import magicbees.item.types.ResourceType;
import magicbees.main.ThaumicBees;
import magicbees.main.MagicBees;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
public class TabThaumicBees extends CreativeTabs
public class TabMagicBees extends CreativeTabs
{
public static TabThaumicBees tabThaumicBees = new TabThaumicBees();
public static TabMagicBees tabMagicBees = new TabMagicBees();
public TabThaumicBees()
public TabMagicBees()
{
super(getNextID(), "thaumicBees");
super(getNextID(), "magicBees");
}
public ItemStack getIconItemStack()
{
return ThaumicBees.getConfig().miscResources.getStackForType(ResourceType.RESEARCH_BEEINFUSION);
return MagicBees.getConfig().miscResources.getStackForType(ResourceType.RESEARCH_BEEINFUSION);
}
}
@@ -3,6 +3,7 @@ package magicbees.main.utils;
import java.util.ArrayList;
import java.util.EnumSet;
import magicbees.main.MagicBees;
import net.minecraft.entity.player.EntityPlayer;
import cpw.mods.fml.common.IScheduledTickHandler;
import cpw.mods.fml.common.TickType;
@@ -54,7 +55,7 @@ public class TickHandlerVersion implements IScheduledTickHandler
{
VersionInfo anInfo = modVersionInfo.get(modIndex);
if (anInfo.isNewVersionAvailable())
if ((!MagicBees.getConfig().DisableUpdateNotification || anInfo.isCriticalUpdate()) && anInfo.isNewVersionAvailable())
{
EntityPlayer player = (EntityPlayer) tickData[0];
player.sendChatToPlayer("[" + anInfo.modName + "] A new version is available: " + anInfo.getLatestVersion());
@@ -8,7 +8,7 @@ import java.util.ArrayList;
import java.util.logging.Level;
import java.util.logging.Logger;
import magicbees.main.ThaumicBees;
import magicbees.main.MagicBees;
import cpw.mods.fml.common.FMLLog;
@@ -22,13 +22,13 @@ import cpw.mods.fml.relauncher.Side;
*/
public class VersionInfo
{
public static final String ModName = "ThaumicBees";
public static final String ModName = "MagicBees";
public static final String Version = "@VERSION@";
public static final String Build = "@BUILD_NUMBER@";
public static final String MCVersion = "@MCVERSION@";
public static final String VersionURL = "http://bit.ly/thaumicbeeversion";
public static final String VersionURL = "http://bit.ly/magicbeesVersionInfo";
public static final String Logo = "/gfx/thaumicbees/logo.png";
public static final String Logo = "/gfx/magicbees/logo.png";
public static final String Depends = "required-after:Forestry;after:Thaumcraft;after:ExtraBees;after:EE3;after:ArsMagica";
@@ -241,15 +241,12 @@ public class VersionInfo
public static void doVersionCheck()
{
if (!ThaumicBees.getConfig().DisableUpdateCheck)
{
VersionInfo main = new VersionInfo("ThaumicBees", Version, VersionURL);
TickHandlerVersion.registerModVersionInfo(main);
TickHandlerVersion.initialize();
TickRegistry.registerScheduledTickHandler(TickHandlerVersion.instance, Side.CLIENT);
VersionCheckThread thread = main.new VersionCheckThread();
thread.start();
}
VersionInfo main = new VersionInfo(ModName, Version, VersionURL);
TickHandlerVersion.registerModVersionInfo(main);
TickHandlerVersion.initialize();
TickRegistry.registerScheduledTickHandler(TickHandlerVersion.instance, Side.CLIENT);
VersionCheckThread thread = main.new VersionCheckThread();
thread.start();
}
}
@@ -16,7 +16,7 @@ import magicbees.item.types.ResourceType;
import magicbees.item.types.WaxType;
import magicbees.main.CommonProxy;
import magicbees.main.Config;
import magicbees.main.ThaumicBees;
import magicbees.main.MagicBees;
import net.minecraft.block.Block;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
@@ -121,8 +121,6 @@ public class ThaumcraftHelper
private static boolean isThaumcraftPresent = false;
public static final String Name = "Thaumcraft";
private static HashMap<HiveFrameType, Object> fluxData;
public static boolean isActive()
{
@@ -136,15 +134,6 @@ public class ThaumcraftHelper
isThaumcraftPresent = true;
registerResearchXML();
fluxData = new HashMap<HiveFrameType, Object>();
fluxData.put(HiveFrameType.MAGIC, null);
fluxData.put(HiveFrameType.RESILIENT, new ObjectTags().add(EnumTag.ARMOR, 1));
fluxData.put(HiveFrameType.GENTLE, new ObjectTags().add(EnumTag.HEAL, 1).add(EnumTag.LIFE, 1));
fluxData.put(HiveFrameType.METABOLIC, new ObjectTags().add(EnumTag.EXCHANGE, 1).add(EnumTag.MOTION, 1));
fluxData.put(HiveFrameType.NECROTIC, new ObjectTags().add(EnumTag.DEATH, 3).add(EnumTag.POISON, 2));
fluxData.put(HiveFrameType.TEMPORAL, new ObjectTags().add(EnumTag.TIME, 5));
fluxData.put(HiveFrameType.OBLIVION, new ObjectTags().add(EnumTag.TIME, 5).add(EnumTag.ELDRITCH, 5));
}
}
@@ -182,7 +171,7 @@ public class ThaumcraftHelper
public static void addItemsToBackpack()
{
if (isActive() && ThaumicBees.getConfig().AddThaumcraftItemsToBackpacks)
if (isActive() && MagicBees.getConfig().AddThaumcraftItemsToBackpacks)
{
// Add all shards and Thaumium to miner's backpack
String ids = Config.tcShard.itemID + ":" + -1 + ";"
@@ -638,7 +627,7 @@ public class ThaumcraftHelper
ItemStack input;
ItemStack output;
if (ThaumicBees.getConfig().UseImpregnatedStickInTools)
if (MagicBees.getConfig().UseImpregnatedStickInTools)
{
input = ItemInterface.getItem("stickImpregnated");
}
@@ -766,20 +755,11 @@ public class ThaumcraftHelper
100, tags, BeeSpecies.TC_STARK, EnumBeeChromosome.SPECIES);
tags = new ObjectTags().add(EnumTag.MAGIC, 40).add(EnumTag.FLUX, 24);
ShapelessBeeInfusionCraftingRecipe.createNewRecipe(researchKey, "BEEINFUSION9", BeeSpecies.TC_INFUSED.getBeeItem(EnumBeeType.DRONE), new Object[]
ShapelessBeeInfusionCraftingRecipe.createNewRecipe(researchKey, "BEEINFUSION9", BeeSpecies.TC_MAGIC.getBeeItem(EnumBeeType.DRONE), new Object[]
{ drone, new ItemStack(Config.tcShard, 1, ThaumcraftHelper.ShardType.MAGIC.ordinal()) },
100, tags, BeeSpecies.TC_STARK, EnumBeeChromosome.SPECIES);
ShapelessBeeInfusionCraftingRecipe.createNewRecipe(researchKey, "BEEINFUSION0", BeeSpecies.TC_INFUSED.getBeeItem(EnumBeeType.PRINCESS), new Object[]
ShapelessBeeInfusionCraftingRecipe.createNewRecipe(researchKey, "BEEINFUSION0", BeeSpecies.TC_MAGIC.getBeeItem(EnumBeeType.PRINCESS), new Object[]
{ princess, new ItemStack(Config.tcShard, 1, ThaumcraftHelper.ShardType.MAGIC.ordinal()) },
100, tags, BeeSpecies.TC_STARK, EnumBeeChromosome.SPECIES);
}
public static void doFluxEffect(HiveFrameType frameType, World w, int x, int y, int z)
{
ObjectTags flux = (ObjectTags)(fluxData.get(frameType));
if (flux != null && w.rand.nextInt(5) <= 1)
{
ThaumcraftApi.addFluxToClosest(w, x, y, z, flux);
}
}
}
@@ -14,6 +14,8 @@ import forestry.api.genetics.IEffectData;
public class TileEntityEffectJar extends TileEntity implements IInventory
{
public static final String entityName = "tileEntity.effectJar";
private String ownerName;
private EffectJarHousing housingLogic;
@@ -0,0 +1,83 @@
package magicbees.world;
import java.util.LinkedList;
import java.util.Random;
import magicbees.main.MagicBees;
import magicbees.main.utils.ChunkCoords;
import magicbees.world.feature.FeatureHive;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.world.World;
import net.minecraft.world.chunk.IChunkProvider;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.event.ForgeSubscribe;
import net.minecraftforge.event.world.ChunkDataEvent;
import cpw.mods.fml.common.IWorldGenerator;
import cpw.mods.fml.common.registry.TickRegistry;
import cpw.mods.fml.relauncher.Side;
public class WorldHandler implements IWorldGenerator
{
public WorldTicker ticker;
public WorldHandler()
{
this.ticker = new WorldTicker(this);
TickRegistry.registerTickHandler(this.ticker, Side.SERVER);
MinecraftForge.EVENT_BUS.register(this);
FeatureHive.initialize();
}
@ForgeSubscribe
public void chunkSaveEventHandler(ChunkDataEvent.Save event)
{
NBTTagCompound tag = new NBTTagCompound();
if (MagicBees.getConfig().DoHiveRetrogen)
{
tag.setBoolean("hiveRetrogen", true);
}
event.getData().setTag("MagicBees", tag);
}
@ForgeSubscribe
public void chunkLoadEventHandler(ChunkDataEvent.Load event)
{
boolean doRetrogen = false;
NBTTagCompound tag = (NBTTagCompound)event.getData().getTag("MagicBees");
if (tag == null)
{
doRetrogen = true;
}
if (doRetrogen)
{
ChunkCoords coords = new ChunkCoords(event.getChunk());
ticker.queueChunkCoords(coords);
}
}
@Override
public void generate(Random random, int chunkX, int chunkZ, World world, IChunkProvider chunkGenerator, IChunkProvider chunkProvider)
{
generateWorld(world, random, chunkX, chunkZ, true);
}
public void generateWorld(World world, Random random, int chunkX, int chunkZ, boolean initialGen)
{
boolean modified = false;
if (initialGen || MagicBees.getConfig().DoHiveRetrogen)
{
FeatureHive.generateHives(world, random, chunkX, chunkZ, initialGen);
modified = true;
}
if (!initialGen && modified)
{
world.getChunkFromChunkCoords(chunkX, chunkZ).setChunkModified();
}
}
}
@@ -0,0 +1,77 @@
package magicbees.world;
import java.util.ArrayList;
import java.util.EnumSet;
import java.util.HashMap;
import java.util.LinkedList;
import java.util.Random;
import magicbees.main.utils.ChunkCoords;
import magicbees.main.utils.VersionInfo;
import net.minecraft.world.World;
import cpw.mods.fml.common.ITickHandler;
import cpw.mods.fml.common.TickType;
public class WorldTicker implements ITickHandler
{
private WorldHandler parent;
private HashMap<Integer, LinkedList<ChunkCoords>> chunkRegenList;
public WorldTicker(WorldHandler p)
{
this.parent = p;
this.chunkRegenList = new HashMap<Integer, LinkedList<ChunkCoords>>();
}
@Override
public void tickStart(EnumSet<TickType> type, Object... tickData) { }
@Override
public void tickEnd(EnumSet<TickType> type, Object... tickData)
{
World world = (World)tickData[0];
int dimensionID = world.provider.dimensionId;
LinkedList<ChunkCoords> chunkList = chunkRegenList.get(dimensionID);
if (chunkList != null && chunkList.size() > 0)
{
ChunkCoords coords = chunkList.removeFirst();
// This bit is from FML's GameRegistry.generateWorld where the seed is constructed.
long worldSeed = world.getSeed();
Random random = new Random(worldSeed);
long xSeed = random.nextLong() >> 2 + 1L;
long zSeed = random.nextLong() >> 2 + 1L;
random.setSeed((xSeed * coords.xCoord + zSeed * coords.zCoord) ^ worldSeed);
parent.generateWorld(world, random, coords.xCoord, coords.zCoord, false);
}
}
@Override
public EnumSet<TickType> ticks()
{
return EnumSet.of(TickType.WORLD);
}
@Override
public String getLabel()
{
return VersionInfo.ModName.toLowerCase() + ".world";
}
public void queueChunkCoords(ChunkCoords coords)
{
if (!chunkRegenList.containsKey(coords.dimension))
{
chunkRegenList.put(coords.dimension, new LinkedList<ChunkCoords>());
}
chunkRegenList.get(coords.dimension).addLast(coords);
}
public LinkedList<ChunkCoords> getChunksToGen(int dimensionId)
{
return chunkRegenList.get(dimensionId);
}
}
@@ -0,0 +1,220 @@
package magicbees.world.feature;
import java.util.Random;
import magicbees.block.types.HiveType;
import magicbees.main.Config;
import net.minecraft.block.Block;
import net.minecraft.world.World;
import net.minecraft.world.WorldProviderEnd;
import net.minecraft.world.WorldType;
import net.minecraft.world.gen.feature.WorldGenMinable;
import forestry.api.core.GlobalManager;
public class FeatureHive
{
private static WorldGenMinable redstoneGen;
private static WorldGenMinable glowStoneGen;
public static void initialize()
{
redstoneGen = new WorldGenMinable(Block.oreRedstone.blockID, 10);
glowStoneGen = new WorldGenMinable(Block.glowStone.blockID, 16, Block.netherrack.blockID);
}
public static void generateHives(World world, Random random, int chunkX, int chunkZ, boolean initialGen)
{
if (world.provider.terrainType != WorldType.FLAT)
{
for (HiveType type : HiveType.values())
{
type.generateHive(world, random, chunkX, chunkZ, initialGen);
}
}
}
public static void generateHiveCurious(World world, Random random, int chunkX, int chunkZ, boolean initialGen)
{
// 1 per gen
int coordX = random.nextInt(16) + chunkX;
int coordZ = random.nextInt(16) + chunkZ;
int coordY = world.getHeight() - 1;
boolean doSpawn = false;
do
{
--coordY;
if (world.isAirBlock(coordX, coordY - 1, coordZ) && world.isAirBlock(coordX, coordY, coordZ) &&
GlobalManager.leafBlockIds.contains(world.getBlockId(coordX, coordY + 1, coordZ)) )
{
doSpawn = true;
}
}
while (!doSpawn && coordY > 1);
if (doSpawn)
{
world.setBlock(coordX, coordY, coordZ, Config.hive.blockID, HiveType.CURIOUS.ordinal(), 2);
}
}
public static void generateHiveUnusual(World world, Random random, int chunkX, int chunkZ, boolean initialGen)
{
// 1 per gen
int coordX = random.nextInt(16) + chunkX;
int coordZ = random.nextInt(16) + chunkZ;
int coordY = world.provider.getAverageGroundLevel() - 10;
// For sanity
if (coordY <= 0)
{
coordY = 0;
}
boolean doSpawn = false;
do
{
++coordY;
if (world.isAirBlock(coordX, coordY + 1, coordZ) && world.isAirBlock(coordX, coordY, coordZ) &&
GlobalManager.dirtBlockIds.contains(world.getBlockId(coordX, coordY - 1, coordZ)) )
{
doSpawn = true;
}
}
while (!doSpawn && coordY < world.getHeight());
if (doSpawn)
{
world.setBlock(coordX, coordY, coordZ, Config.hive.blockID, HiveType.UNUSUAL.ordinal(), 2);
}
}
public static void generateHiveResonant(World world, Random random, int chunkX, int chunkZ, boolean initialGen)
{
// 1 per gen
int coordX = random.nextInt(16) + chunkX;
int coordZ = random.nextInt(16) + chunkZ;
int coordY = world.provider.getAverageGroundLevel() - 10;
}
public static void generateHiveDeep(World world, Random random, int chunkX, int chunkZ, boolean initialGen)
{
// 1 or 2 per gen
int count = random.nextInt(1) + 1;
for (int i = 0; i < count; ++i)
{
int coordX = random.nextInt(16) + chunkX;
int coordZ = random.nextInt(16) + chunkZ;
int coordY = random.nextInt(16) + 17;
boolean doSpawn = false;
do
{
--coordY;
int blockId = world.getBlockId(coordX, coordY, coordZ);
if (blockId == Block.stone.blockID)
{
doSpawn = true;
}
}
while (!doSpawn && coordY > 4);
if (doSpawn)
{
world.setBlock(coordX, coordY, coordZ, Config.hive.blockID, HiveType.DEEP.ordinal(), 2);
// Spawn some redstone around it
redstoneGen.generate(world, random, coordX, coordY, coordZ);
for (int y = 0; y < 64; ++y)
{
for (int z = 0; z < 16; ++z)
{
for (int x = 0; x < 16; ++x)
{
if (world.getBlockId(x + chunkX, y, z + chunkX) == Block.stone.blockID ||
world.getBlockId(x + chunkX, y, z + chunkX) == Block.dirt.blockID ||
world.getBlockId(x + chunkX, y, z + chunkX) == Block.dirt.blockID)
{
world.setBlock(x + chunkX, y, z + chunkX, Block.glass.blockID, 0, 2);
}
}
}
}
}
}
}
public static void generateHiveInfernal(World world, Random random, int chunkX, int chunkZ, boolean initialGen)
{
// 2 or 3 per gen
int count = random.nextInt(3) + 1;
for (int i = 0; i < count; ++i)
{
int coordX = random.nextInt(16) + chunkX;
int coordZ = random.nextInt(16) + chunkZ;
int coordY = random.nextInt(60 / count) + i * (120 / count) + 5;
boolean doSpawn = false;
do
{
--coordY;
int blockId = world.getBlockId(coordX, coordY, coordZ);
if (world.isAirBlock(coordX, coordY, coordZ) || blockId == Block.netherrack.blockID)
{
doSpawn = true;
}
}
while (!doSpawn && coordY > 4 && coordY < 126);
if (doSpawn)
{
world.setBlock(coordX, coordY, chunkZ, Config.hive.blockID, HiveType.INFERNAL.ordinal(), 2);
glowStoneGen.generate(world, random, coordX, coordY, coordZ);
}
}
}
public static void generateHiveOblivion(World world, Random random, int chunkX, int chunkZ, boolean initialGen)
{
// 1 per gen
boolean doSpawn = false;
int coordX = 0;
int coordZ = 0;
int coordY = 0;
coordX = random.nextInt(16) + chunkX;
coordZ = random.nextInt(16) + chunkZ;
coordY = 8;
do
{
++coordY;
if (world.isAirBlock(coordX, coordY - 2, coordZ) &&
world.getBlockId(coordX, coordY - 1, coordZ) == Block.whiteStone.blockID &&
world.getBlockId(coordX, coordY, coordZ) == Block.whiteStone.blockID)
{
doSpawn = true;
}
}
while (!doSpawn && coordY < 90);
if (doSpawn)
{
world.setBlock(coordX, coordY, chunkZ, Config.hive.blockID, HiveType.OBLIVION.ordinal(), 2);
int obsidianSpikeHeight = random.nextInt(4) + 2;
for (int i = 1; i < obsidianSpikeHeight && coordY - i > 0; ++i)
{
world.setBlock(coordX, coordY - i, chunkZ, Block.obsidian.blockID, 0, 2);
}
}
}
}