diff --git a/thaumicbees_res/build.xml b/thaumicbees_res/build.xml index 53090ac..1c9b2fb 100644 --- a/thaumicbees_res/build.xml +++ b/thaumicbees_res/build.xml @@ -16,8 +16,8 @@ - - + + diff --git a/thaumicbees_res/changelog.txt b/thaumicbees_res/changelog.txt index c1fae5b..24fde96 100644 --- a/thaumicbees_res/changelog.txt +++ b/thaumicbees_res/changelog.txt @@ -1,3 +1,10 @@ +Adding Apatite bees. + +1.4.6 +Ars Magica integration! 13 new bee species to help you research & cast spells. +Changing mutations around, because I'm still not happy with them. (Again.) +Many icon & texture fixes. (derp!) + 1.4.5a Repaired Thaumcraft 3 integration for 3.0.4a. Fixed Biofuel capsules being shown as "Empty x Capsule" diff --git a/thaumicbees_res/lang/thaumicbees/en_US.xml b/thaumicbees_res/lang/thaumicbees/en_US.xml index b14f8ab..00cf080 100644 --- a/thaumicbees_res/lang/thaumicbees/en_US.xml +++ b/thaumicbees_res/lang/thaumicbees/en_US.xml @@ -26,6 +26,8 @@ Memory Comb Furtive Comb Soul Comb + Essence Comb + Potent Comb Magic Wax @@ -41,12 +43,14 @@ Iron Nugget + Steel Nugget Copper Nugget Tin Nugget Silver Nugget Lead Nugget - Diamond Nugget - Emerald Nugget + Diamond Shard + Emerald Shard + Apatite Shard Dull Propolis @@ -126,10 +130,6 @@ These bees walk the line between this world and the unseen.|Apinomicon Pupil "What does that bee want with my paper?!|Yorae, Librarian - Scholarly - "I can't be sure, but I think they might be smarter than me..."|Yorae, Librarian - Savant - lim(x^(i / pi)/ log(e * 7 - ln(32/x^-pi))). Solve for honey.|Note found on Yorae's desk Stark "These are unusually attracted to shards. This warrents further investigation."|Azanor, Master Thaumaturge Aura @@ -140,40 +140,20 @@ "I tried to breed them once, but that was a wash."|MysteriousAges, Apprentice Thaumaturge Solum "You're really gonna dig these bees, but watch out - they bore quite easily."|MysteriousAges, Apprentice Comedian - Praecantatio - Beekeeping is magic!|Apinomicon, Preface Aware "They can see into your soul!"|Florastar, Expert Beekeeper - Vis - "They can feel changes in the aura, but are not yet able to affect it."|Azanor, research notes - Pure - "It's like a bee janitor!"|MysteriousAges, Thaumaturge - Flux - "I thought they would help clean up, but it only makes things worse!"|Kreicus, Apprentice Thaumaturge - Node - Having undergone a freak mutation, these bees now attract magic to them.|Apinomicon - Rejuvenating - The hum of the hive is magical, and over time is absorbed by nearby nodes.|Apinomicon Skulking These bees have become xenophobic and bad-tempered. Use caution.|Apinomicon - Brainy - Their combs may be fetid and foul-smelling, but their intelligence is well-developed.|Apinomicon - Gossamer - As they work, they seem to fade out from light for brief moments.|Apinomicon - Wispy - Their language is garbled and unintelligible. It is probable they are speaking to unnatural beings.|Apinomicon - Batty - They tend to attract bats to their hives through means unknown.|Apinomicon Ghastly "*sigh*... Really, Myst?"|Taveria, irritated Apiarist + Spidery + Spiderbee; n. Does whatever a spider-bee does.|Unknown Timely "An apiarist is never late. He arrives precisely when he means to!"|Sengir, Mad Apiarist Lordly They live in peace, within the sight of the Eye of Harmony|Tattered Remains of ancient Apinomicon Doctoral "Would you like a Jelly Baby?"|Passing stranger with a great scarf and a blue box - Minium - "They're the least of your concern. Like, the Minium concern! ... get it?"|MysteriousAges, Former Comedian Spirit It is said these bees are able to contact the dead.|Apinomicon Soul @@ -194,12 +174,74 @@ Crystalline, glittering, and harder than dragon's teeth. These bees are none of those.|Apinomicon Esmeraldi It is said they have been to a land ruled by a Great Wizard, and have taken the aspect of his city.|Apinomicon + Apatine + 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 + + Scholarly + "I can't be sure, but I think they might be smarter than me..."|Yorae, Librarian + Savant + lim(x^(i / pi)/ log(e * 7 - ln(32/x^-pi))). Solve for honey.|Note found on Yorae's desk + Praecantatio + Beekeeping is magic!|Apinomicon, Preface + Vis + "They can feel changes in the aura, but are not yet able to affect it."|Azanor, research notes + Pure + "It's like a bee janitor!"|MysteriousAges, Thaumaturge + Flux + "I thought they would help clean up, but it only makes things worse!"|Kreicus, Apprentice Thaumaturge + Node + Having undergone a freak mutation, these bees now attract magic to them.|Apinomicon + Rejuvenating + The hum of the hive is magical, and over time is absorbed by nearby nodes.|Apinomicon + Brainy + Their combs may be fetid and foul-smelling, but their intelligence is well-developed.|Apinomicon + Gossamer + As they work, they seem to fade out from light for brief moments.|Apinomicon + Wispy + Their language is garbled and unintelligible. It is probable they are speaking to unnatural beings.|Apinomicon + Batty + They tend to attract bats to their hives through means unknown.|Apinomicon Poultry "Cluck. Cluck cluck! ... You heard me."|Confused bee Beefy "Moo, moo, moo. Wait, what?"|Confused bee Porcine "Oink, oink. Er.... bzzz?"|Confused bee + + Minium + It may be possible to exploit their mercurial and changeable nature.|Apinomicon + + Essence + Drawing from motes of dust in the air and ground, they concentrate the energy + Quintessential + The heart of magic lies dormant in all things.|Apinomicon, preface + Erde + Empowered by the Earth, their produce is infused with its essence.|Apinomicon + Luft + Swift as the wind, and lighter than air.|Apinomicon + Feuer + Their colony can reach temperatures that boil water and melt metals.|Apinomicon + Wasser + Through prolonged exposure to liquids, their combs are quite wet and heavy.|Apinomicon + Blitz + They can travel vast distances in a blink, and are known for starting many wildfires.|Apinomicon + Staude + They have an affinity for all that is green and grows.|Apinomicon + Eis + "They keep stealing stuff from me, and I never see them. They're far too slippery."|MysteriousAges, incorrigible punster + Magma + As they fly by, they sear the surface of the landscape, eventually scouring all plants and fragile minerals away.|Apinomicon + Arkanen + "Curious creatures, though their produce is quite useful."|Mithion, Adept + Vortex + Ravenous for mana, they may be dangerous for any caster.|Apinomicon + Wight + "They attract magical spirits; not always docile."|Mithion, Adept + + Cleansing @@ -214,34 +256,39 @@ Batty Wispy Ghastly + Vortex + Spiritual Books - Magic Flowers + Thaumic Flowers + Exotic Flowers Node Arcane - + These bees have inexplicable affinity for magic.|Apinomicon Supernatural - + No longer ordinary bees, they have been associated with many odd occurances.|Apinomicon Scholarly - - Thaumic - + The caste of bees which have great intellect and deductive ability.|Apinomicon Skulking - - Aware - + Unpleasant and malicious. Treat this group with caution.|Apinomicon + Aware + It is unclear whether they are sentient, but they have suprising awareness of their surroundings.|Apinomicon Time - + Though clever use of time travel, these bees accomplish twice as much in one day.|Apinomicon Soulful - - Alchemical - + It would be eerie to think that they collected the souls of the deceased.|Apinomicon Metallic - + They collect fragments of metal and combine them into larger portions.|Apinomicon Gem - + They collect fragments of precious gems in their combs.|Apinomicon + Thaumic + These bees have an increased affinity to magic and aura.|Apinomicon Fleshy - + Through an unknown mechanism, these bees accrue chunks of animal flesh. Somehow, it's still edible.|Apinomicon + Alchemical + These bees have a changeable nature.|Apinomicon + Essential + These bees have an increased affinity for aspected magic.|Apinomicon \ No newline at end of file diff --git a/thaumicbees_res/mods/thaumicbees/textures/items/bees/skulking/body1.png b/thaumicbees_res/mods/thaumicbees/textures/items/bees/skulking/body1.png new file mode 100644 index 0000000..6b18999 Binary files /dev/null and b/thaumicbees_res/mods/thaumicbees/textures/items/bees/skulking/body1.png differ diff --git a/thaumicbees_res/mods/thaumicbees/textures/items/bees/skulking/drone.body2.png b/thaumicbees_res/mods/thaumicbees/textures/items/bees/skulking/drone.body2.png new file mode 100644 index 0000000..3faa0d5 Binary files /dev/null and b/thaumicbees_res/mods/thaumicbees/textures/items/bees/skulking/drone.body2.png differ diff --git a/thaumicbees_res/mods/thaumicbees/textures/items/bees/skulking/drone.body2.txt b/thaumicbees_res/mods/thaumicbees/textures/items/bees/skulking/drone.body2.txt new file mode 100644 index 0000000..1ec9414 --- /dev/null +++ b/thaumicbees_res/mods/thaumicbees/textures/items/bees/skulking/drone.body2.txt @@ -0,0 +1,8 @@ +0*64 +1*2 +2*2 +1*2 +0*96 +3*4 +0*128 +4*2 diff --git a/thaumicbees_res/mods/thaumicbees/textures/items/bees/skulking/drone.outline.png b/thaumicbees_res/mods/thaumicbees/textures/items/bees/skulking/drone.outline.png new file mode 100644 index 0000000..ad6b4a8 Binary files /dev/null and b/thaumicbees_res/mods/thaumicbees/textures/items/bees/skulking/drone.outline.png differ diff --git a/thaumicbees_res/mods/thaumicbees/textures/items/bees/skulking/drone.outline.txt b/thaumicbees_res/mods/thaumicbees/textures/items/bees/skulking/drone.outline.txt new file mode 100644 index 0000000..1ec9414 --- /dev/null +++ b/thaumicbees_res/mods/thaumicbees/textures/items/bees/skulking/drone.outline.txt @@ -0,0 +1,8 @@ +0*64 +1*2 +2*2 +1*2 +0*96 +3*4 +0*128 +4*2 diff --git a/thaumicbees_res/mods/thaumicbees/textures/items/bees/skulking/princess.body2.png b/thaumicbees_res/mods/thaumicbees/textures/items/bees/skulking/princess.body2.png new file mode 100644 index 0000000..55ae681 Binary files /dev/null and b/thaumicbees_res/mods/thaumicbees/textures/items/bees/skulking/princess.body2.png differ diff --git a/thaumicbees_res/mods/thaumicbees/textures/items/bees/skulking/princess.body2.txt b/thaumicbees_res/mods/thaumicbees/textures/items/bees/skulking/princess.body2.txt new file mode 100644 index 0000000..1ec9414 --- /dev/null +++ b/thaumicbees_res/mods/thaumicbees/textures/items/bees/skulking/princess.body2.txt @@ -0,0 +1,8 @@ +0*64 +1*2 +2*2 +1*2 +0*96 +3*4 +0*128 +4*2 diff --git a/thaumicbees_res/mods/thaumicbees/textures/items/bees/skulking/princess.outline.png b/thaumicbees_res/mods/thaumicbees/textures/items/bees/skulking/princess.outline.png new file mode 100644 index 0000000..ad6b4a8 Binary files /dev/null and b/thaumicbees_res/mods/thaumicbees/textures/items/bees/skulking/princess.outline.png differ diff --git a/thaumicbees_res/mods/thaumicbees/textures/items/bees/skulking/princess.outline.txt b/thaumicbees_res/mods/thaumicbees/textures/items/bees/skulking/princess.outline.txt new file mode 100644 index 0000000..1ec9414 --- /dev/null +++ b/thaumicbees_res/mods/thaumicbees/textures/items/bees/skulking/princess.outline.txt @@ -0,0 +1,8 @@ +0*64 +1*2 +2*2 +1*2 +0*96 +3*4 +0*128 +4*2 diff --git a/thaumicbees_res/mods/thaumicbees/textures/items/bees/skulking/queen.body2.png b/thaumicbees_res/mods/thaumicbees/textures/items/bees/skulking/queen.body2.png new file mode 100644 index 0000000..673211a Binary files /dev/null and b/thaumicbees_res/mods/thaumicbees/textures/items/bees/skulking/queen.body2.png differ diff --git a/thaumicbees_res/mods/thaumicbees/textures/items/bees/skulking/queen.body2.txt b/thaumicbees_res/mods/thaumicbees/textures/items/bees/skulking/queen.body2.txt new file mode 100644 index 0000000..1ec9414 --- /dev/null +++ b/thaumicbees_res/mods/thaumicbees/textures/items/bees/skulking/queen.body2.txt @@ -0,0 +1,8 @@ +0*64 +1*2 +2*2 +1*2 +0*96 +3*4 +0*128 +4*2 diff --git a/thaumicbees_res/mods/thaumicbees/textures/items/bees/skulking/queen.outline.png b/thaumicbees_res/mods/thaumicbees/textures/items/bees/skulking/queen.outline.png new file mode 100644 index 0000000..ad6b4a8 Binary files /dev/null and b/thaumicbees_res/mods/thaumicbees/textures/items/bees/skulking/queen.outline.png differ diff --git a/thaumicbees_res/mods/thaumicbees/textures/items/bees/skulking/queen.outline.txt b/thaumicbees_res/mods/thaumicbees/textures/items/bees/skulking/queen.outline.txt new file mode 100644 index 0000000..1ec9414 --- /dev/null +++ b/thaumicbees_res/mods/thaumicbees/textures/items/bees/skulking/queen.outline.txt @@ -0,0 +1,8 @@ +0*64 +1*2 +2*2 +1*2 +0*96 +3*4 +0*128 +4*2 diff --git a/thaumicbees_res/mods/thaumicbees/textures/items/nuggetApatite.png b/thaumicbees_res/mods/thaumicbees/textures/items/nuggetApatite.png new file mode 100644 index 0000000..c23eb28 Binary files /dev/null and b/thaumicbees_res/mods/thaumicbees/textures/items/nuggetApatite.png differ diff --git a/thaumicbees_res/mods/thaumicbees/textures/items/wax.0.png b/thaumicbees_res/mods/thaumicbees/textures/items/wax.0.png index 0f1e4f9..0e0803a 100644 Binary files a/thaumicbees_res/mods/thaumicbees/textures/items/wax.0.png and b/thaumicbees_res/mods/thaumicbees/textures/items/wax.0.png differ diff --git a/thaumicbees_res/mods/thaumicbees/textures/items/wax.0.txt b/thaumicbees_res/mods/thaumicbees/textures/items/wax.0.txt new file mode 100644 index 0000000..ab58032 --- /dev/null +++ b/thaumicbees_res/mods/thaumicbees/textures/items/wax.0.txt @@ -0,0 +1,8 @@ +0*3 +1*3 +2*3 +3*3 +4*3 +5*3 +6*3 +7*3 \ No newline at end of file diff --git a/thaumicbees_src/thaumicbees/bees/Allele.java b/thaumicbees_src/thaumicbees/bees/Allele.java index 4902085..82547ad 100644 --- a/thaumicbees_src/thaumicbees/bees/Allele.java +++ b/thaumicbees_src/thaumicbees/bees/Allele.java @@ -1,40 +1,50 @@ package thaumicbees.bees; import net.minecraft.potion.Potion; +import thaumicbees.main.utils.compat.ArsMagicaHelper; import thaumicbees.main.utils.compat.ThaumcraftHelper; import forestry.api.apiculture.IAlleleBeeSpecies; import forestry.api.apiculture.IAlleleFlowers; import forestry.api.genetics.AlleleManager; import forestry.api.genetics.IAllele; +import forestry.api.genetics.IAlleleEffect; public class Allele implements IAllele { public static AlleleInteger fertilityHighDominant; + public static AlleleFloat speedBlinding; public static IAlleleFlowers flowerBookshelf; public static IAlleleFlowers flowerThaumcraft; + public static IAlleleFlowers flowerArsMagica; public static IAlleleFlowers flowerAuraNode; @Deprecated public static IAlleleFlowers flowerNodePurify; @Deprecated public static IAlleleFlowers flowerNodeFluxify; - public static AlleleEffectCure cleansingEffect; - public static AlleleEffectPotion digSpeed; - public static AlleleEffectPotion moveSpeed; - public static AlleleEffectPotion slowSpeed; - public static AlleleEffectSpawnMob spawnBrainyZombie; - public static AlleleEffectSpawnMob spawnWisp; - public static AlleleEffectSpawnMob spawnBats; - public static AlleleEffectSpawnMob spawnGhast; - public static AlleleEffectAuraNodeAttract effectNodeAttract; - public static AlleleEffectAuraNodePurify effectNodePurify; - public static AlleleEffectAuraNodeFlux effectNodeFlux; - public static AlleleEffectAuraNodeCharge effectNodeCharge; + public static IAlleleEffect cleansingEffect; + public static IAlleleEffect digSpeed; + public static IAlleleEffect moveSpeed; + public static IAlleleEffect slowSpeed; + + public static IAlleleEffect spawnBrainyZombie; + public static IAlleleEffect spawnWisp; + public static IAlleleEffect spawnBats; + public static IAlleleEffect spawnGhast; + public static IAlleleEffect spawnSpider; + public static IAlleleEffect spawnManaDrainer; + public static IAlleleEffect spawnWispOrHecate; + + public static IAlleleEffect effectNodeAttract; + public static IAlleleEffect effectNodePurify; + public static IAlleleEffect effectNodeFlux; + public static IAlleleEffect effectNodeCharge; public static void setupAdditionalAlleles() { Allele.fertilityHighDominant = new AlleleInteger("fertilityHighDominant", 3, true); + Allele.speedBlinding = new AlleleFloat("speedBlinding", 2f, false); Allele.flowerBookshelf = new AlleleFlower("flowerBookshelf", new FlowerProviderBookshelf(), true); if (ThaumcraftHelper.isActive()) @@ -44,13 +54,40 @@ public class Allele implements IAllele Allele.flowerAuraNode = new AlleleFlower("flowerAuraNode", provider, true); Allele.flowerNodePurify = new AlleleFlower("flowerAuraNodePurify", provider, false); Allele.flowerNodeFluxify = new AlleleFlower("flowerAuraNodeFlux", provider, false); + + Allele.spawnBrainyZombie = new AlleleEffectSpawnMob("effectBrainy", false, ThaumcraftHelper.Entity.BRAINY_ZOMBIE.entityID) + .setAggrosPlayerOnSpawn().setThrottle(800).setSpawnsOnPlayerNear(null).setMaxMobsInSpawnZone(2); + + Allele.spawnBats = new AlleleEffectSpawnMob("effectBatty", false, ThaumcraftHelper.Entity.FIREBAT.entityID) + .setThrottle(300).setSpawnsOnPlayerNear("Bat"); + + Allele.spawnWisp = new AlleleEffectSpawnWisp("effectWispy", false, ThaumcraftHelper.Entity.WISP.entityID, "thaumcraft.wisplive") + .setThrottle(1800).setChanceToSpawn(79); } else { - Allele.flowerThaumcraft = (IAlleleFlowers)Allele.getBaseAllele("flowersVanilla"); - Allele.flowerAuraNode = (IAlleleFlowers)Allele.getBaseAllele("flowersVanilla"); - Allele.flowerNodePurify = (IAlleleFlowers)Allele.getBaseAllele("flowersVanilla"); - Allele.flowerNodeFluxify = (IAlleleFlowers)Allele.getBaseAllele("flowersVanilla"); + 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"); + } + + if (ArsMagicaHelper.isActive()) + { + 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, + new String[] { "ArsMagica.MobManaCreeper", "ArsMagica.ManaVortex" }, + new int[] { 60, 2 }); + + Allele.spawnWispOrHecate = new AlleleEffectSpawnMobWeighted("effectAMWisp", true, 20, + new String[] { "ArsMagica.MobWisp", "ArsMagica.MobHecate" }, + new int[] { 40, 3 }); + } + else + { + Allele.flowerArsMagica = (IAlleleFlowers)Allele.getBaseAllele("flowersVanilla"); + Allele.spawnManaDrainer = Allele.spawnWispOrHecate = (IAlleleEffect)Allele.getBaseAllele("effectNone"); } Allele.effectNodeAttract = new AlleleEffectAuraNodeAttract("effectNodeGeneration", false, 400); @@ -63,17 +100,11 @@ public class Allele implements IAllele Allele.moveSpeed = new AlleleEffectPotion("effectMoveSpeed", Potion.moveSpeed, 10, false); Allele.slowSpeed = new AlleleEffectPotion("effectSlowSpeed", Potion.moveSlowdown, 3, false); - Allele.spawnBrainyZombie = new AlleleEffectSpawnMob("effectBrainy", false, ThaumcraftHelper.Entity.BRAINY_ZOMBIE.entityID); - Allele.spawnBrainyZombie.setAggrosPlayerOnSpawn().setThrottle(800).setSpawnsOnPlayerNear(null).setMaxMobsInSpawnZone(2); - - Allele.spawnBats = new AlleleEffectSpawnMob("effectBatty", false, ThaumcraftHelper.Entity.FIREBAT.entityID); - Allele.spawnBats.setThrottle(300).setSpawnsOnPlayerNear("Bat"); - - Allele.spawnWisp = new AlleleEffectSpawnWisp("effectWispy", false, ThaumcraftHelper.Entity.WISP.entityID, "thaumcraft.wisplive"); - Allele.spawnWisp.setThrottle(1800).setChanceToSpawn(79); - - Allele.spawnGhast = new AlleleEffectSpawnMob("Ghast", false, "Ghast", "mob.ghast.moan"); - Allele.spawnGhast.setThrottle(2060).setChanceToSpawn(10).setMaxMobsInSpawnZone(1); + Allele.spawnGhast = new AlleleEffectSpawnMob("Ghast", false, "Ghast", "mob.ghast.moan") + .setThrottle(2060).setChanceToSpawn(10).setMaxMobsInSpawnZone(1); + + Allele.spawnSpider = new AlleleEffectSpawnMob("Spider", false, "Spider", "mob.spider.step") + .setThrottle(400).setChanceToSpawn(70).setMaxMobsInSpawnZone(4); } private String uid; @@ -94,6 +125,11 @@ public class Allele implements IAllele return AlleleManager.alleleRegistry.getAllele("forestry." + name); } + public static IAllele getAllele(String name) + { + return AlleleManager.alleleRegistry.getAllele(name); + } + public Allele(String id, boolean isDominant) { this.uid = "thaumicbees." + id; diff --git a/thaumicbees_src/thaumicbees/bees/AlleleEffectSpawnMob.java b/thaumicbees_src/thaumicbees/bees/AlleleEffectSpawnMob.java index 39fc71f..088557d 100644 --- a/thaumicbees_src/thaumicbees/bees/AlleleEffectSpawnMob.java +++ b/thaumicbees_src/thaumicbees/bees/AlleleEffectSpawnMob.java @@ -161,16 +161,13 @@ public class AlleleEffectSpawnMob extends AlleleEffect if (entitiesCount < this.maxMobsInArea && mob.getCanSpawnHere()) { - if (mob.getCanSpawnHere()) + spawnedFlag = world.spawnEntityInWorld(mob); + if (this.aggosOnPlayer && player != null) { - spawnedFlag = world.spawnEntityInWorld(mob); - if (this.aggosOnPlayer && player != null) + if (ItemArmorApiarist.getNumberPiecesWorn(player) < 4) { - if (ItemArmorApiarist.getNumberPiecesWorn(player) < 4) - { - // Protect fully suited player from initial murder intent. - mob.setAttackTarget(player); - } + // Protect fully suited player from initial murder intent. + mob.setAttackTarget(player); } } } diff --git a/thaumicbees_src/thaumicbees/bees/AlleleEffectSpawnMobWeighted.java b/thaumicbees_src/thaumicbees/bees/AlleleEffectSpawnMobWeighted.java new file mode 100644 index 0000000..3974e08 --- /dev/null +++ b/thaumicbees_src/thaumicbees/bees/AlleleEffectSpawnMobWeighted.java @@ -0,0 +1,103 @@ +package thaumicbees.bees; + +import net.minecraft.entity.EntityList; +import net.minecraft.entity.Entity; +import net.minecraft.entity.EntityLiving; +import net.minecraft.world.World; +import forestry.api.apiculture.IAlleleBeeEffect; +import forestry.api.apiculture.IBeeGenome; +import forestry.api.apiculture.IBeeHousing; +import forestry.api.genetics.IEffectData; + +public class AlleleEffectSpawnMobWeighted extends AlleleEffect +{ + private int throttle; + private String[] entityNames; + private int[] spawnChance; + + public AlleleEffectSpawnMobWeighted(String id, boolean isDominant, int throttle, String[] mobs, int[] chance) + { + super(id, isDominant); + this.throttle = throttle; + if (mobs.length != chance.length) + { + throw new IllegalArgumentException("Array lengths must be equal!"); + } + this.entityNames = mobs; + this.spawnChance = chance; + } + + @Override + public IEffectData validateStorage(IEffectData storedData) + { + if (storedData == null) + { + storedData = new EffectData(1, 0, 0); + } + return storedData; + } + + @Override + public IEffectData doEffect(IBeeGenome genome, IEffectData storedData, IBeeHousing housing) + { + int value = storedData.getInteger(0); + + if (value >= this.throttle) + { + if (this.spawnMob(genome, housing)) + { + storedData.setInteger(0, 0); + } + } + else + { + storedData.setInteger(0, value + 1); + } + + return storedData; + } + + protected boolean spawnMob(IBeeGenome genome, IBeeHousing housing) + { + boolean flag = false; + + World w = housing.getWorld(); + int roll = 0; + + for (int i = 0; i < this.spawnChance.length && !flag; ++i) + { + roll = 100 - w.rand.nextInt(100)+1; + if (roll < this.spawnChance[i]) + { + flag = true; + Entity mob = EntityList.createEntityByName(this.entityNames[i], w); + double[] coords = this.randomMobSpawnCoords(w, genome, housing); + + mob.setPositionAndRotation(coords[0], coords[1], coords[2], w.rand.nextFloat() * 360f, 0f); + if (mob instanceof EntityLiving) + { + if (((EntityLiving)mob).getCanSpawnHere()) + { + w.spawnEntityInWorld(mob); + } + } + else + { + w.spawnEntityInWorld(mob); + } + } + } + + return flag; + } + + protected double[] randomMobSpawnCoords(World world, IBeeGenome bee, IBeeHousing housing) + { + double pos[] = new double[3]; + pos[0] = housing.getXCoord() + world.rand.nextDouble() * (bee.getTerritory()[0] * housing.getTerritoryModifier(bee, 1f)) - bee.getTerritory()[0] / 2; + pos[1] = housing.getYCoord() + world.rand.nextDouble() * (bee.getTerritory()[1] * housing.getTerritoryModifier(bee, 1f)) - bee.getTerritory()[1] / 2; + pos[2] = housing.getZCoord() + world.rand.nextDouble() * (bee.getTerritory()[2] * housing.getTerritoryModifier(bee, 1f)) - bee.getTerritory()[2] / 2; + return pos; + } + +} diff --git a/thaumicbees_src/thaumicbees/bees/AlleleFloat.java b/thaumicbees_src/thaumicbees/bees/AlleleFloat.java new file mode 100644 index 0000000..27c6dbb --- /dev/null +++ b/thaumicbees_src/thaumicbees/bees/AlleleFloat.java @@ -0,0 +1,21 @@ +package thaumicbees.bees; + +import forestry.api.genetics.IAlleleFloat; + +public class AlleleFloat extends Allele implements IAlleleFloat +{ + private float value; + + public AlleleFloat(String id, float val, boolean isDominant) + { + super(id, isDominant); + this.value = val; + } + + @Override + public float getValue() + { + return this.value; + } + +} diff --git a/thaumicbees_src/thaumicbees/bees/BeeClassification.java b/thaumicbees_src/thaumicbees/bees/BeeClassification.java index ace2e54..dca406b 100644 --- a/thaumicbees_src/thaumicbees/bees/BeeClassification.java +++ b/thaumicbees_src/thaumicbees/bees/BeeClassification.java @@ -15,15 +15,16 @@ public enum BeeClassification implements IClassification ARCANE("Arcane", "Arcanus"), SUPERNATURAL("Supernatural", "Occultus"), SCHOLARLY("Scholarly", "Docto"), - THAUMIC("Thaumic", "Thaumis"), SKULKING("Skulking", "Malevolens"), - VIS("Vis", "Vis"), + MAGICAL("Magic", "Magica"), TIME("Time", "Tempestivus"), SOUL("Soul", "Animus"), - ALCHEMICAL("Alchemical", "Alchimia"), METALLIC("Metallic", "Metallicis"), GEM("Gem", "Lapidi"), + THAUMIC("Thaumic", "Thaumis"), FLESHY("Fleshy", "Carnosa"), + ALCHEMICAL("Alchemical", "Alchimia"), + ESSENTIAL("Essential", "Essentia"), ; private String uID; diff --git a/thaumicbees_src/thaumicbees/bees/BeeGenomeManager.java b/thaumicbees_src/thaumicbees/bees/BeeGenomeManager.java index abbb0f8..e3a84b6 100644 --- a/thaumicbees_src/thaumicbees/bees/BeeGenomeManager.java +++ b/thaumicbees_src/thaumicbees/bees/BeeGenomeManager.java @@ -1,5 +1,6 @@ package thaumicbees.bees; +import thaumicbees.main.utils.compat.ExtraBeesHelper; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; @@ -429,6 +430,19 @@ public class BeeGenomeManager return genome; } + public static IAllele[] getTemplateSpidery() + { + IAllele[] genome = getTemplateBaseMalevolent(); + + genome[EnumBeeChromosome.SPECIES.ordinal()] = BeeSpecies.SPIDERY; + genome[EnumBeeChromosome.CAVE_DWELLING.ordinal()] = Allele.getBaseAllele("boolTrue"); + genome[EnumBeeChromosome.NOCTURNAL.ordinal()] = Allele.getBaseAllele("boolTrue"); + genome[EnumBeeChromosome.TERRITORY.ordinal()] = Allele.getBaseAllele("territoryLarger"); + genome[EnumBeeChromosome.EFFECT.ordinal()] = Allele.spawnSpider; + + return genome; + } + private static IAllele[] getTemplateBaseTemporal() { IAllele[] genome = getTemplateBaseThaumic(); @@ -613,6 +627,17 @@ public class BeeGenomeManager return genome; } + public static IAllele[] getTemplateApatite() + { + IAllele[] genome = getTemplateBaseMetallic(); + + genome[EnumBeeChromosome.SPECIES.ordinal()] = BeeSpecies.APATITE; + genome[EnumBeeChromosome.SPEED.ordinal()] = Allele.getBaseAllele("speedNorm"); + genome[EnumBeeChromosome.LIFESPAN.ordinal()] = Allele.getBaseAllele("lifespanNormal"); + + return genome; + } + public static IAllele[] getTemplateChicken() { IAllele[] genome = getTemplateBaseMetallic(); @@ -639,6 +664,194 @@ public class BeeGenomeManager return genome; } + + private static IAllele[] getTemplateBaseMagica() + { + IAllele[] genome = getTemplateBaseThaumic(); + + genome[EnumBeeChromosome.FLOWER_PROVIDER.ordinal()] = Allele.flowerArsMagica; + + return genome; + } + + public static IAllele[] getTemplateEssence() + { + IAllele[] genome = getTemplateBaseMagica(); + + genome[EnumBeeChromosome.SPECIES.ordinal()] = BeeSpecies.ESSENCE; + genome[EnumBeeChromosome.SPEED.ordinal()] = Allele.getBaseAllele("speedNorm"); + genome[EnumBeeChromosome.FERTILITY.ordinal()] = Allele.getBaseAllele("fertilityHigh"); + genome[EnumBeeChromosome.TEMPERATURE_TOLERANCE.ordinal()] = Allele.getBaseAllele("toleranceBoth1"); + genome[EnumBeeChromosome.FLOWERING.ordinal()] = Allele.getBaseAllele("floweringSlow"); + + return genome; + } + + public static IAllele[] getTemplateQuintessence() + { + IAllele[] genome = getTemplateEssence(); + + genome[EnumBeeChromosome.SPECIES.ordinal()] = BeeSpecies.QUINTESSENCE; + genome[EnumBeeChromosome.LIFESPAN.ordinal()] = Allele.getBaseAllele("lifespanElongated"); + genome[EnumBeeChromosome.FERTILITY.ordinal()] = Allele.getBaseAllele("fertilityHigh"); + genome[EnumBeeChromosome.FLOWERING.ordinal()] = Allele.getBaseAllele("floweringAverage"); + genome[EnumBeeChromosome.EFFECT.ordinal()] = Allele.getBaseAllele("effectMisanthrope"); + + return genome; + } + + public static IAllele[] getTemplateEarthAM() + { + IAllele[] genome = getTemplateBaseMagica(); + + genome[EnumBeeChromosome.SPECIES.ordinal()] = BeeSpecies.EARTH_AM; + genome[EnumBeeChromosome.FLOWERING.ordinal()] = Allele.getBaseAllele("floweringFaster"); + genome[EnumBeeChromosome.CAVE_DWELLING.ordinal()] = Allele.getBaseAllele("boolTrue"); + genome[EnumBeeChromosome.LIFESPAN.ordinal()] = Allele.getBaseAllele("lifespanLongest"); + genome[EnumBeeChromosome.FERTILITY.ordinal()] = Allele.getBaseAllele("fertilityHigh"); + + return genome; + } + + public static IAllele[] getTemplateAirAM() + { + IAllele[] genome = getTemplateBaseMagica(); + + genome[EnumBeeChromosome.SPECIES.ordinal()] = BeeSpecies.AIR_AM; + genome[EnumBeeChromosome.SPEED.ordinal()] = Allele.getBaseAllele("speedFast"); + genome[EnumBeeChromosome.TERRITORY.ordinal()] = Allele.getBaseAllele("territoryMaximum"); + genome[EnumBeeChromosome.TOLERANT_FLYER.ordinal()] = Allele.getBaseAllele("boolTrue"); + genome[EnumBeeChromosome.TEMPERATURE_TOLERANCE.ordinal()] = Allele.getBaseAllele("toleranceBoth2"); + + return genome; + } + + public static IAllele[] getTemplateFireAM() + { + IAllele[] genome = getTemplateBaseMagica(); + + genome[EnumBeeChromosome.SPECIES.ordinal()] = BeeSpecies.FIRE_AM; + genome[EnumBeeChromosome.SPEED.ordinal()] = Allele.getBaseAllele("speedNorm"); + genome[EnumBeeChromosome.CAVE_DWELLING.ordinal()] = Allele.getBaseAllele("boolTrue"); + genome[EnumBeeChromosome.NOCTURNAL.ordinal()] = Allele.getBaseAllele("boolTrue"); + genome[EnumBeeChromosome.FLOWERING.ordinal()] = Allele.getBaseAllele("floweringFast"); + genome[EnumBeeChromosome.EFFECT.ordinal()] = Allele.getBaseAllele("effectIgnition"); + + return genome; + } + + public static IAllele[] getTemplateWaterAM() + { + IAllele[] genome = getTemplateBaseMagica(); + + genome[EnumBeeChromosome.SPECIES.ordinal()] = BeeSpecies.WATER_AM; + genome[EnumBeeChromosome.HUMIDITY_TOLERANCE.ordinal()] = Allele.getBaseAllele("toleranceDown1"); + genome[EnumBeeChromosome.CAVE_DWELLING.ordinal()] = Allele.getBaseAllele("boolTrue"); + genome[EnumBeeChromosome.TOLERANT_FLYER.ordinal()] = Allele.getBaseAllele("boolTrue"); + genome[EnumBeeChromosome.LIFESPAN.ordinal()] = Allele.getBaseAllele("lifespanElongated"); + + return genome; + } + + public static IAllele[] getTemplateLightning() + { + IAllele[] genome = getTemplateBaseMagica(); + + genome[EnumBeeChromosome.SPECIES.ordinal()] = BeeSpecies.LIGHTNING; + genome[EnumBeeChromosome.LIFESPAN.ordinal()] = Allele.getBaseAllele("lifespanShortest"); + genome[EnumBeeChromosome.TERRITORY.ordinal()] = Allele.getBaseAllele("territoryMaximum"); + genome[EnumBeeChromosome.SPEED.ordinal()] = Allele.speedBlinding; + genome[EnumBeeChromosome.NOCTURNAL.ordinal()] = Allele.getBaseAllele("boolTrue"); + + if (ExtraBeesHelper.isActive()) + { + genome[EnumBeeChromosome.EFFECT.ordinal()] = Allele.getAllele("extrabees.effect.lightning"); + } + + return genome; + } + + public static IAllele[] getTemplatePlant() + { + IAllele[] genome = getTemplateBaseMagica(); + + genome[EnumBeeChromosome.SPECIES.ordinal()] = BeeSpecies.PLANT; + genome[EnumBeeChromosome.FLOWERING.ordinal()] = Allele.getBaseAllele("floweringFastest"); + genome[EnumBeeChromosome.SPEED.ordinal()] = Allele.getBaseAllele("speedNorm"); + genome[EnumBeeChromosome.CAVE_DWELLING.ordinal()] = Allele.getBaseAllele("boolTrue"); + genome[EnumBeeChromosome.HUMIDITY_TOLERANCE.ordinal()] = Allele.getBaseAllele("toleranceBoth1"); + + return genome; + } + + public static IAllele[] getTemplateIce() + { + IAllele[] genome = getTemplateBaseMagica(); + + genome[EnumBeeChromosome.SPECIES.ordinal()] = BeeSpecies.ICE; + genome[EnumBeeChromosome.TEMPERATURE_TOLERANCE.ordinal()] = Allele.getBaseAllele("toleranceUp2"); + genome[EnumBeeChromosome.HUMIDITY_TOLERANCE.ordinal()] = Allele.getBaseAllele("toleranceDown2"); + genome[EnumBeeChromosome.TOLERANT_FLYER.ordinal()] = Allele.getBaseAllele("boolTrue"); + genome[EnumBeeChromosome.SPEED.ordinal()] = Allele.getBaseAllele("speedSlowest"); + genome[EnumBeeChromosome.LIFESPAN.ordinal()] = Allele.getBaseAllele("lifespanLongest"); + genome[EnumBeeChromosome.EFFECT.ordinal()] = Allele.getBaseAllele("effectGlacial"); + + return genome; + } + + public static IAllele[] getTemplateMagma() + { + IAllele[] genome = getTemplateBaseMagica(); + + genome[EnumBeeChromosome.SPECIES.ordinal()] = BeeSpecies.MAGMA; + genome[EnumBeeChromosome.TEMPERATURE_TOLERANCE.ordinal()] = Allele.getBaseAllele("toleranceDown2"); + genome[EnumBeeChromosome.TOLERANT_FLYER.ordinal()] = Allele.getBaseAllele("boolTrue"); + genome[EnumBeeChromosome.CAVE_DWELLING.ordinal()] = Allele.getBaseAllele("boolTrue"); + genome[EnumBeeChromosome.LIFESPAN.ordinal()] = Allele.getBaseAllele("lifespanElongated"); + genome[EnumBeeChromosome.EFFECT.ordinal()] = Allele.getBaseAllele("effectIgnition"); + + return genome; + } + + public static IAllele[] getTemplateArcaneAM() + { + IAllele[] genome = getTemplateBaseMagica(); + + genome[EnumBeeChromosome.SPECIES.ordinal()] = BeeSpecies.ARCANE_AM; + genome[EnumBeeChromosome.FERTILITY.ordinal()] = Allele.getBaseAllele("fertilityLow"); + genome[EnumBeeChromosome.TEMPERATURE_TOLERANCE.ordinal()] = Allele.getBaseAllele("toleranceBoth2"); + genome[EnumBeeChromosome.HUMIDITY_TOLERANCE.ordinal()] = Allele.getBaseAllele("toleranceBoth1"); + genome[EnumBeeChromosome.NOCTURNAL.ordinal()] = Allele.getBaseAllele("boolTrue"); + + return genome; + } + + public static IAllele[] getTemplateVortex() + { + IAllele[] genome = getTemplateBaseMagica(); + + genome[EnumBeeChromosome.SPECIES.ordinal()] = BeeSpecies.VORTEX; + genome[EnumBeeChromosome.NOCTURNAL.ordinal()] = Allele.getBaseAllele("boolTrue"); + genome[EnumBeeChromosome.LIFESPAN.ordinal()] = Allele.getBaseAllele("lifespanLonger"); + genome[EnumBeeChromosome.FERTILITY.ordinal()] = Allele.getBaseAllele("fertilityHigh"); + genome[EnumBeeChromosome.TERRITORY.ordinal()] = Allele.getBaseAllele("territoryLarger"); + genome[EnumBeeChromosome.EFFECT.ordinal()] = Allele.spawnManaDrainer; + + return genome; + } + + public static IAllele[] getTemplateWight() + { + IAllele[] genome = getTemplateBaseMagica(); + + genome[EnumBeeChromosome.SPECIES.ordinal()] = BeeSpecies.WIGHT; + genome[EnumBeeChromosome.NOCTURNAL.ordinal()] = Allele.getBaseAllele("boolTrue"); + genome[EnumBeeChromosome.CAVE_DWELLING.ordinal()] = Allele.getBaseAllele("boolTrue"); + genome[EnumBeeChromosome.SPEED.ordinal()] = Allele.getBaseAllele("speedFast"); + genome[EnumBeeChromosome.EFFECT.ordinal()] = Allele.spawnWispOrHecate; + + return genome; + } public static ItemStack getBeeNBTForSpecies(BeeSpecies species, EnumBeeType beeType) { diff --git a/thaumicbees_src/thaumicbees/bees/BeeMutation.java b/thaumicbees_src/thaumicbees/bees/BeeMutation.java index 42b0e7c..32ca89e 100644 --- a/thaumicbees_src/thaumicbees/bees/BeeMutation.java +++ b/thaumicbees_src/thaumicbees/bees/BeeMutation.java @@ -1,10 +1,16 @@ package thaumicbees.bees; import forestry.api.apiculture.*; +import forestry.api.core.BlockInterface; +import forestry.api.core.ItemInterface; import forestry.api.genetics.IAllele; import forestry.api.genetics.IGenome; import java.util.ArrayList; +import net.minecraft.block.Block; +import net.minecraft.item.ItemStack; +import net.minecraftforge.oredict.OreDictionary; + import cpw.mods.fml.common.FMLLog; import thaumcraft.api.ThaumcraftApi; @@ -12,8 +18,10 @@ import thaumcraft.api.aura.AuraNode; import thaumcraft.api.aura.EnumNodeType; import thaumicbees.main.ThaumicBees; import thaumicbees.main.utils.MoonPhase; +import thaumicbees.main.utils.compat.ArsMagicaHelper; import thaumicbees.main.utils.compat.EquivalentExchangeHelper; import thaumicbees.main.utils.compat.ExtraBeesHelper; +import thaumicbees.main.utils.compat.ForestryHelper; import thaumicbees.main.utils.compat.ThaumcraftHelper; public class BeeMutation implements IBeeMutation @@ -21,10 +29,13 @@ public class BeeMutation implements IBeeMutation private static BeeMutation Esoteric; private static BeeMutation Esoteric1; private static BeeMutation Mysterious; + private static BeeMutation Mysterious2; private static BeeMutation Mysterious1; private static BeeMutation Arcane; private static BeeMutation Charmed; + private static BeeMutation Charmed1; private static BeeMutation Enchanted; + private static BeeMutation Enchanted1; private static BeeMutation Supernatural; private static BeeMutation Stark; private static BeeMutation Fire; @@ -33,26 +44,15 @@ public class BeeMutation implements IBeeMutation private static BeeMutation Scholarly; private static BeeMutation Savant; private static BeeMutation Aware; - private static BeeMutation Vis; - private static BeeMutation Vis1; - private static BeeMutation Pure; - private static BeeMutation Flux; - private static BeeMutation Node; - private static BeeMutation Node1; - private static BeeMutation Rejuvination; private static BeeMutation Skulking; - private static BeeMutation Brainy; - private static BeeMutation Gossamer; - private static BeeMutation Wispy; - private static BeeMutation Batty; private static BeeMutation Ghastly; + private static BeeMutation Spidery; private static BeeMutation Timely; private static BeeMutation Lordly; private static BeeMutation Doctoral; private static BeeMutation Spirit; private static BeeMutation Spirit1; private static BeeMutation Soul; - private static BeeMutation Minium; private static BeeMutation Iron; private static BeeMutation Gold; private static BeeMutation Copper; @@ -61,13 +61,39 @@ public class BeeMutation implements IBeeMutation private static BeeMutation Lead; private static BeeMutation Diamond; private static BeeMutation Emerald; - private static BeeMutation Lead1; - private static BeeMutation Lead2; + private static BeeMutation Apatite; + + private static BeeMutation Vis; + private static BeeMutation Vis1; + private static BeeMutation Pure; + private static BeeMutation Flux; + private static BeeMutation Node; + private static BeeMutation Node1; + private static BeeMutation Rejuvination; + private static BeeMutation Rejuvination1; + private static BeeMutation Brainy; + private static BeeMutation Gossamer; + private static BeeMutation Wispy; + private static BeeMutation Batty; private static BeeMutation Beef; private static BeeMutation Chicken; private static BeeMutation Pork; - private static BeeMutation Aura; - private static BeeMutation Aura1; + + private static BeeMutation Minium; + + private static BeeMutation Essence; + private static BeeMutation Quintessence; + private static BeeMutation EarthAM; + private static BeeMutation AirAM; + private static BeeMutation FireAM; + private static BeeMutation WaterAM; + private static BeeMutation Lightning; + private static BeeMutation Ice; + private static BeeMutation Plant; + private static BeeMutation Magma; + private static BeeMutation ArcaneAM; + private static BeeMutation Vortex; + private static BeeMutation Wight; public static void setupMutations() { @@ -77,130 +103,147 @@ public class BeeMutation implements IBeeMutation BeeMutation.Esoteric1 = new BeeMutation(Allele.getBaseSpecies("Heroic"), Allele.getBaseSpecies("Demonic"), BeeSpecies.ESOTERIC, 25); BeeMutation.Mysterious = new BeeMutation(Allele.getBaseSpecies("Ended"), BeeSpecies.ESOTERIC, BeeSpecies.MYSTERIOUS, 15); BeeMutation.Mysterious1 = new BeeMutation(Allele.getBaseSpecies("Demonic"), BeeSpecies.ESOTERIC, BeeSpecies.MYSTERIOUS, 4); + BeeMutation.Mysterious2 = new BeeMutation(Allele.getBaseSpecies("Monastic"), BeeSpecies.ESOTERIC, BeeSpecies.MYSTERIOUS, 9); BeeMutation.Arcane = new BeeMutation(BeeSpecies.ESOTERIC, BeeSpecies.MYSTERIOUS, BeeSpecies.ARCANE, 8) .setMoonPhaseBonus(MoonPhase.WANING_CRESCENT, MoonPhase.WAXING_CRESCENT, 1.5f); - BeeMutation.Charmed = new BeeMutation(Allele.getBaseSpecies("Diligent"), Allele.getBaseSpecies("Valiant"), BeeSpecies.CHARMED, 20); + + BeeMutation.Charmed = new BeeMutation(Allele.getBaseSpecies("Diligent"), Allele.getBaseSpecies("Valiant"), BeeSpecies.CHARMED, 12); + BeeMutation.Charmed1 = new BeeMutation(Allele.getBaseSpecies("Diligent"), Allele.getBaseSpecies("Monastic"), BeeSpecies.CHARMED, 18); BeeMutation.Enchanted = new BeeMutation(BeeSpecies.CHARMED, Allele.getBaseSpecies("Valiant"), BeeSpecies.ENCHANTED, 8); - BeeMutation.Supernatural = new BeeMutation(BeeSpecies.CHARMED, BeeSpecies.ENCHANTED, BeeSpecies.SUPERNATURAL, 10) + BeeMutation.Enchanted1 = new BeeMutation(BeeSpecies.CHARMED, Allele.getBaseSpecies("Monastic"), BeeSpecies.ENCHANTED, 8); + BeeMutation.Supernatural = new BeeMutation(BeeSpecies.CHARMED, BeeSpecies.ENCHANTED, BeeSpecies.SUPERNATURAL, 6) .setMoonPhaseBonus(MoonPhase.WAXING_GIBBOUS, MoonPhase.WANING_GIBBOUS, 1.5f); - BeeMutation.Pupil = new BeeMutation(BeeSpecies.ARCANE, BeeSpecies.ENCHANTED, BeeSpecies.PUPIL, 10); + + BeeMutation.Pupil = new BeeMutation(Allele.getBaseSpecies("Hermitic"), BeeSpecies.ENCHANTED, BeeSpecies.PUPIL, 10); + + BeeMutation.Ghastly = new BeeMutation(BeeSpecies.SKULKING, BeeSpecies.SOUL, BeeSpecies.GHASTLY, 13); BeeMutation.Stark = new BeeMutation(BeeSpecies.ARCANE, BeeSpecies.SUPERNATURAL, BeeSpecies.STARK, 8); + + BeeMutation.Spidery = new BeeMutation(BeeSpecies.SKULKING, Allele.getBaseSpecies("Tropical"), BeeSpecies.SPIDERY, 10); + + BeeMutation.Aware = new BeeMutation(Allele.getBaseSpecies("Demonic"), Allele.getBaseSpecies("Edenic"), BeeSpecies.AWARE, 12); BeeMutation.Timely = new BeeMutation(Allele.getBaseSpecies("Industrious"), BeeSpecies.ENCHANTED, BeeSpecies.TIMELY, 10); BeeMutation.Lordly = new BeeMutation(BeeSpecies.TIMELY, Allele.getBaseSpecies("Imperial"), BeeSpecies.LORDLY, 9); BeeMutation.Doctoral = new BeeMutation(BeeSpecies.TIMELY, BeeSpecies.LORDLY, BeeSpecies.DOCTORAL, 7); - BeeMutation.Minium = new BeeMutation(Allele.getBaseSpecies("Sinister"), BeeSpecies.MYSTERIOUS, BeeSpecies.MINIUM, 11); - - BeeMutation.Spirit = new BeeMutation(Allele.getBaseSpecies("Fiendish"), BeeSpecies.ENCHANTED, BeeSpecies.SPIRIT, 12); - BeeMutation.Spirit1 = new BeeMutation(Allele.getBaseSpecies("Fiendish"), Allele.getBaseSpecies("Ended"), BeeSpecies.SPIRIT, 20); + BeeMutation.Spirit = new BeeMutation(Allele.getBaseSpecies("Fiendish"), BeeSpecies.ENCHANTED, BeeSpecies.SPIRIT, 8); + BeeMutation.Spirit1 = new BeeMutation(Allele.getBaseSpecies("Fiendish"), Allele.getBaseSpecies("Ended"), BeeSpecies.SPIRIT, 13); BeeMutation.Soul = new BeeMutation(Allele.getBaseSpecies("Fiendish"), BeeSpecies.SPIRIT, BeeSpecies.SOUL, 11); - BeeMutation.Iron = new BeeMutation(Allele.getBaseSpecies("Industrious"), Allele.getBaseSpecies("Diligent"), BeeSpecies.IRON, 10); + BeeMutation.Iron = new BeeMutation(Allele.getBaseSpecies("Industrious"), Allele.getBaseSpecies("Common"), BeeSpecies.IRON, 8) + .setBlockRequired(Block.blockIron); baseA = (BeeSpecies.MINIUM.isActive()) ? BeeSpecies.MINIUM : Allele.getBaseSpecies("Imperial"); baseB = (BeeSpecies.LEAD.isActive()) ? BeeSpecies.LEAD : BeeSpecies.IRON; - BeeMutation.Gold = new BeeMutation(baseA, baseB, BeeSpecies.GOLD, 8); + BeeMutation.Gold = new BeeMutation(baseA, baseB, BeeSpecies.GOLD, 5) + .setBlockRequired(Block.blockGold); if (BeeSpecies.COPPER.isActive()) { - BeeMutation.Copper = new BeeMutation(Allele.getBaseSpecies("Industrious"), Allele.getBaseSpecies("Meadows"), BeeSpecies.COPPER, 12); + BeeMutation.Copper = new BeeMutation(Allele.getBaseSpecies("Industrious"), Allele.getBaseSpecies("Meadows"), BeeSpecies.COPPER, 10); + if (OreDictionary.getOres("blockCopper").size() > 0) + { + Copper.setBlockRequired("blockCopper"); + } } if (BeeSpecies.TIN.isActive()) { - BeeMutation.Tin = new BeeMutation(Allele.getBaseSpecies("Industrious"), Allele.getBaseSpecies("Forest"), BeeSpecies.TIN, 12); + BeeMutation.Tin = new BeeMutation(Allele.getBaseSpecies("Industrious"), Allele.getBaseSpecies("Forest"), BeeSpecies.TIN, 9); + if (OreDictionary.getOres("blockTin").size() > 0) + { + Tin.setBlockRequired("blockTin"); + } } if (BeeSpecies.SILVER.isActive()) { - BeeMutation.Silver = new BeeMutation(Allele.getBaseSpecies("Imperial"), Allele.getBaseSpecies("Modest"), BeeSpecies.SILVER, 10); + BeeMutation.Silver = new BeeMutation(Allele.getBaseSpecies("Imperial"), Allele.getBaseSpecies("Modest"), BeeSpecies.SILVER, 8); + if (OreDictionary.getOres("blockSilver").size() > 0) + { + Silver.setBlockRequired("blockSilver"); + } } if (BeeSpecies.LEAD.isActive()) { - if (BeeSpecies.COPPER.isActive()) - { - BeeMutation.Lead = new BeeMutation(Allele.getBaseSpecies("Industrious"), BeeSpecies.COPPER, BeeSpecies.LEAD, 13); - } if (BeeSpecies.TIN.isActive()) { - BeeMutation.Lead1 = new BeeMutation(Allele.getBaseSpecies("Industrious"), BeeSpecies.TIN, BeeSpecies.LEAD, 13); + baseA = BeeSpecies.TIN; + } + else if (BeeSpecies.COPPER.isActive()) + { + baseA = BeeSpecies.COPPER; + } + else + { + baseA = BeeSpecies.IRON; + } + BeeMutation.Lead = new BeeMutation(baseA, Allele.getBaseSpecies("Common"), BeeSpecies.LEAD, 8); + + if (OreDictionary.getOres("blockLead").size() > 0) + { + Lead.setBlockRequired("blockLead"); } - BeeMutation.Lead2 = new BeeMutation(Allele.getBaseSpecies("Industrious"), Allele.getBaseSpecies("Common"), BeeSpecies.LEAD, 9); } - BeeMutation.Diamond = new BeeMutation(Allele.getBaseSpecies("Austere"), BeeSpecies.GOLD, BeeSpecies.DIAMOND, 6); + BeeMutation.Diamond = new BeeMutation(Allele.getBaseSpecies("Austere"), BeeSpecies.GOLD, BeeSpecies.DIAMOND, 4) + .setBlockRequired(Block.blockDiamond); + baseA = (BeeSpecies.SILVER.isActive()) ? BeeSpecies.SILVER : Allele.getBaseSpecies("Imperial"); - BeeMutation.Emerald = new BeeMutation(Allele.getBaseSpecies("Austere"), baseA, BeeSpecies.EMERALD, 6); + BeeMutation.Emerald = new BeeMutation(Allele.getBaseSpecies("Austere"), baseA, BeeSpecies.EMERALD, 4) + .setBlockRequired(Block.blockEmerald); - if (BeeSpecies.BEEF.isActive()) - { - BeeMutation.Beef = new BeeMutation(Allele.getBaseSpecies("Common"), BeeSpecies.SKULKING, BeeSpecies.BEEF, 10); - } - if (BeeSpecies.CHICKEN.isActive()) - { - BeeMutation.Chicken = new BeeMutation(Allele.getBaseSpecies("Common"), BeeSpecies.SKULKING, BeeSpecies.CHICKEN, 10); - } - if (BeeSpecies.PORK.isActive()) - { - BeeMutation.Pork = new BeeMutation(Allele.getBaseSpecies("Common"), BeeSpecies.SKULKING, BeeSpecies.PORK, 10); - } + BeeMutation.Apatite = new BeeMutation(BeeSpecies.EARTH, Allele.getBaseSpecies("Rural"), BeeSpecies.APATITE, 6) + .setBlockAndMetaRequired(BlockInterface.getBlock("resources").itemID, ForestryHelper.BlockResource.APATITE.ordinal()); - // Now we get into a little bit of branching... - if (ExtraBeesHelper.isActive()) - { - BeeMutation.Skulking = new BeeMutation(BeeSpecies.MYSTERIOUS, Allele.getExtraSpecies("desolate"), BeeSpecies.SKULKING, 10); - BeeMutation.Ghastly = new BeeMutation(BeeSpecies.SKULKING, Allele.getExtraSpecies("creeper"), BeeSpecies.GHASTLY, 13); - } - else - { - BeeMutation.Skulking = new BeeMutation(BeeSpecies.MYSTERIOUS, Allele.getBaseSpecies("Modest"), BeeSpecies.SKULKING, 10); - BeeMutation.Ghastly = new BeeMutation(BeeSpecies.SKULKING, Allele.getBaseSpecies("Austere"), BeeSpecies.GHASTLY, 13); - } + baseA = (ExtraBeesHelper.isActive()) ? Allele.getExtraSpecies("desolate") : Allele.getBaseSpecies("Modest"); + BeeMutation.Skulking = new BeeMutation(BeeSpecies.MYSTERIOUS, baseA, BeeSpecies.SKULKING, 10); if (ThaumcraftHelper.isActive()) { - BeeMutation.Scholarly = new BeeMutation(BeeSpecies.PUPIL, BeeSpecies.ARCANE, BeeSpecies.SCHOLARLY, 8); + BeeMutation.Scholarly = new BeeMutation(BeeSpecies.PUPIL, Allele.getBaseSpecies("Hermitic"), BeeSpecies.SCHOLARLY, 8); BeeMutation.Savant = new BeeMutation(BeeSpecies.PUPIL, BeeSpecies.SCHOLARLY, BeeSpecies.SAVANT, 6); - - BeeMutation.Aware = new BeeMutation(Allele.getBaseSpecies("Demonic"), Allele.getBaseSpecies("Edenic"), BeeSpecies.AWARE, 12); + BeeMutation.Vis = new BeeMutation(BeeSpecies.AWARE, BeeSpecies.ARCANE, BeeSpecies.VIS, 9) - .setAuraNodeRequired(40); + .setAuraNodeRequired(40); BeeMutation.Vis1 = new BeeMutation(BeeSpecies.AWARE, BeeSpecies.STARK, BeeSpecies.VIS, 12) - .setAuraNodeRequired(80); + .setAuraNodeRequired(80); BeeMutation.Pure = new BeeMutation(BeeSpecies.VIS, Allele.getBaseSpecies("Edenic"), BeeSpecies.PURE, 7) .setAuraNodeTypeRequired(5, EnumNodeType.PURE).setMoonPhaseBonus(MoonPhase.NEW, MoonPhase.NEW, 1.6f); BeeMutation.Flux = new BeeMutation(BeeSpecies.VIS, Allele.getBaseSpecies("Edenic"), BeeSpecies.FLUX, 7) .setAuraNodeTypeRequired(30, EnumNodeType.UNSTABLE).setMoonPhaseBonus(MoonPhase.FULL, MoonPhase.FULL, 1.6f); - BeeMutation.Node = new BeeMutation(BeeSpecies.PURE, BeeSpecies.FLUX, BeeSpecies.NODE, 2) + BeeMutation.Node = new BeeMutation(BeeSpecies.VIS, Allele.getBaseSpecies("Hermitic"), BeeSpecies.NODE, 2) .setAuraNodeRequired(4).setMoonPhaseRestricted(MoonPhase.WANING_HALF, MoonPhase.WANING_HALF); - BeeMutation.Node1 = new BeeMutation(BeeSpecies.PURE, BeeSpecies.FLUX, BeeSpecies.NODE, 2) + BeeMutation.Node1 = new BeeMutation(BeeSpecies.VIS, Allele.getBaseSpecies("Hermitic"), BeeSpecies.NODE, 2) .setAuraNodeRequired(4).setMoonPhaseRestricted(MoonPhase.WAXING_HALF, MoonPhase.WAXING_HALF); - - BeeMutation.Rejuvination = new BeeMutation(BeeSpecies.VIS, BeeSpecies.AWARE, BeeSpecies.REJUVENATING, 1) - .setAuraNodeRequired(15).setMoonPhaseRestricted(MoonPhase.WAXING_HALF, MoonPhase.WANING_HALF) - .setMoonPhaseBonus(MoonPhase.FULL, MoonPhase.FULL, 6); + + BeeMutation.Beef = new BeeMutation(Allele.getBaseSpecies("Common"), BeeSpecies.SKULKING, BeeSpecies.BEEF, 10); + BeeMutation.Chicken = new BeeMutation(Allele.getBaseSpecies("Common"), BeeSpecies.SKULKING, BeeSpecies.CHICKEN, 10); + BeeMutation.Pork = new BeeMutation(Allele.getBaseSpecies("Common"), BeeSpecies.SKULKING, BeeSpecies.PORK, 10); if (ExtraBeesHelper.isActive()) { BeeMutation.Brainy = new BeeMutation(BeeSpecies.SKULKING, Allele.getExtraSpecies("rotten"), BeeSpecies.BRAINY, 12); BeeMutation.Gossamer = new BeeMutation(BeeSpecies.SKULKING, Allele.getExtraSpecies("ancient"), BeeSpecies.GOSSAMER, 10); BeeMutation.Batty = new BeeMutation(BeeSpecies.SKULKING, Allele.getExtraSpecies("rock"), BeeSpecies.BATTY, 14); - BeeMutation.Aura = new BeeMutation(BeeSpecies.VIS, Allele.getExtraSpecies("energetic"), BeeSpecies.REJUVENATING, 3); - BeeMutation.Aura1 = new BeeMutation(BeeSpecies.VIS, Allele.getExtraSpecies("energetic"), BeeSpecies.REJUVENATING, 3); + BeeMutation.Rejuvination = new BeeMutation(BeeSpecies.VIS, Allele.getExtraSpecies("energetic"), BeeSpecies.REJUVENATING, 3); + BeeMutation.Rejuvination1 = new BeeMutation(BeeSpecies.VIS, Allele.getExtraSpecies("energetic"), BeeSpecies.REJUVENATING, 3); } else { BeeMutation.Brainy = new BeeMutation(BeeSpecies.SKULKING, Allele.getBaseSpecies("Sinister"), BeeSpecies.BRAINY, 10); BeeMutation.Gossamer = new BeeMutation(BeeSpecies.SKULKING, BeeSpecies.SUPERNATURAL, BeeSpecies.GOSSAMER, 10); BeeMutation.Batty = new BeeMutation(BeeSpecies.SKULKING, Allele.getBaseSpecies("Frugal"), BeeSpecies.BATTY, 11); - BeeMutation.Aura = new BeeMutation(BeeSpecies.VIS, Allele.getBaseSpecies("Industrious"), BeeSpecies.REJUVENATING, 3); - BeeMutation.Aura1 = new BeeMutation(BeeSpecies.VIS, Allele.getBaseSpecies("Industrious"), BeeSpecies.REJUVENATING, 3); + BeeMutation.Rejuvination = new BeeMutation(BeeSpecies.VIS, Allele.getBaseSpecies("Industrious"), BeeSpecies.REJUVENATING, 3); + BeeMutation.Rejuvination1 = new BeeMutation(BeeSpecies.VIS, Allele.getBaseSpecies("Industrious"), BeeSpecies.REJUVENATING, 3); } BeeMutation.Gossamer.setMoonPhaseRestricted(MoonPhase.FULL, MoonPhase.WANING_CRESCENT); - BeeMutation.Wispy = new BeeMutation(BeeSpecies.GOSSAMER, Allele.getBaseSpecies("Cultivated"), BeeSpecies.WISPY, 8); - BeeMutation.Aura.setMoonPhaseRestricted(MoonPhase.WANING_CRESCENT, MoonPhase.WANING_CRESCENT); - BeeMutation.Aura1.setMoonPhaseRestricted(MoonPhase.WAXING_CRESCENT, MoonPhase.WAXING_CRESCENT); + BeeMutation.Wispy = new BeeMutation(BeeSpecies.GOSSAMER, BeeSpecies.SOUL, BeeSpecies.WISPY, 8); + BeeMutation.Rejuvination.setAuraNodeRequired(15).setMoonPhaseRestricted(MoonPhase.WAXING_HALF, MoonPhase.WANING_HALF) + .setMoonPhaseBonus(MoonPhase.FULL, MoonPhase.FULL, 6); + BeeMutation.Rejuvination1.setAuraNodeRequired(15).setMoonPhaseRestricted(MoonPhase.WAXING_HALF, MoonPhase.WANING_HALF) + .setMoonPhaseBonus(MoonPhase.FULL, MoonPhase.FULL, 6); } else { @@ -220,6 +263,35 @@ public class BeeMutation implements IBeeMutation { BeeMutation.Minium = new BeeMutation(Allele.getBaseSpecies("Frugal"), BeeSpecies.PUPIL, BeeSpecies.MINIUM, 10); } + + if (ArsMagicaHelper.isActive()) + { + BeeMutation.Essence = new BeeMutation(BeeSpecies.ESOTERIC, BeeSpecies.CHARMED, BeeSpecies.ESSENCE, 15); + BeeMutation.Quintessence = new BeeMutation(BeeSpecies.ESSENCE, Allele.getBaseSpecies("Austere"), BeeSpecies.QUINTESSENCE, 7); + + BeeMutation.EarthAM = new BeeMutation(BeeSpecies.ESSENCE, BeeSpecies.EARTH, BeeSpecies.EARTH_AM, 12); + BeeMutation.AirAM = new BeeMutation(BeeSpecies.ESSENCE, BeeSpecies.AIR, BeeSpecies.AIR_AM, 12); + BeeMutation.FireAM = new BeeMutation(BeeSpecies.ESSENCE, BeeSpecies.FIRE, BeeSpecies.FIRE_AM, 12); + BeeMutation.WaterAM = new BeeMutation(BeeSpecies.ESSENCE, BeeSpecies.WATER, BeeSpecies.WATER_AM, 12); + + BeeMutation.Lightning = new BeeMutation(BeeSpecies.AIR_AM, BeeSpecies.FIRE_AM, BeeSpecies.LIGHTNING, 8); + BeeMutation.Ice = new BeeMutation(BeeSpecies.WATER_AM, Allele.getBaseSpecies("Icy"), BeeSpecies.ICE, 8); + BeeMutation.Plant = new BeeMutation(BeeSpecies.EARTH_AM, BeeSpecies.WATER_AM, BeeSpecies.PLANT, 8); + BeeMutation.Magma = new BeeMutation(BeeSpecies.FIRE_AM, BeeSpecies.EARTH_AM, BeeSpecies.MAGMA, 8); + + BeeMutation.ArcaneAM = new BeeMutation(BeeSpecies.QUINTESSENCE, Allele.getBaseSpecies("Hermitic"), BeeSpecies.ARCANE_AM, 6); + + BeeMutation.Wight = new BeeMutation(BeeSpecies.SOUL, BeeSpecies.SKULKING, BeeSpecies.WIGHT, 10); + + if (ExtraBeesHelper.isActive()) + { + BeeMutation.Vortex = new BeeMutation(BeeSpecies.QUINTESSENCE, Allele.getExtraSpecies("creeper"), BeeSpecies.VORTEX, 12); + } + else + { + BeeMutation.Vortex = new BeeMutation(BeeSpecies.QUINTESSENCE, Allele.getBaseSpecies("Austere"), BeeSpecies.VORTEX, 12); + } + } } private IAllele parent1; @@ -234,6 +306,10 @@ public class BeeMutation implements IBeeMutation private boolean nodeRequired; private EnumNodeType nodeType; private double nodeRange; + private boolean requiresBlock; + private int requiredBlockId; + private int requiredBlockMeta; + private String requiredBlockOreDictEntry; public BeeMutation(IAlleleBeeSpecies species0, IAlleleBeeSpecies species1, BeeSpecies resultSpecies, int percentChance) { @@ -245,6 +321,9 @@ public class BeeMutation implements IBeeMutation this.isMoonRestricted = false; this.moonPhaseMutationBonus = -1f; this.nodeType = null; + this.requiresBlock = false; + this.requiredBlockMeta = OreDictionary.WILDCARD_VALUE; + this.requiredBlockOreDictEntry = null; BeeManager.breedingManager.registerBeeMutation(this); } @@ -296,6 +375,32 @@ public class BeeMutation implements IBeeMutation } } + if (this.requiresBlock) + { + int blockId = housing.getWorld().getBlockId(housing.getXCoord(), housing.getYCoord() - 1, housing.getZCoord()); + int blockMeta = housing.getWorld().getBlockMetadata(housing.getXCoord(), housing.getYCoord() - 1, housing.getZCoord()); + + if (this.requiredBlockOreDictEntry != null) + { + int dicId = OreDictionary.getOreID(new ItemStack(blockId, 1, blockMeta)); + if (dicId != -1) + { + if (!OreDictionary.getOreName(dicId).equals(this.requiredBlockOreDictEntry)) + { + chance = 0; + } + } + else + { + chance = 0; + } + } + else if (this.requiredBlockId != blockId || (this.requiredBlockMeta != OreDictionary.WILDCARD_VALUE && this.requiredBlockMeta != blockMeta)) + { + chance = 0; + } + } + finalChance = Math.round(chance * housing.getMutationModifier((IBeeGenome) genome0, (IBeeGenome) genome1, chance) @@ -358,6 +463,48 @@ public class BeeMutation implements IBeeMutation return isSecret; } + public BeeMutation setBlockRequired(int blockId) + { + this.requiresBlock = true; + this.requiredBlockId = blockId; + + return this; + } + + public BeeMutation setBlockRequired(Block block) + { + this.requiresBlock = true; + this.requiredBlockId = block.blockID; + + return this; + } + + public BeeMutation setBlockAndMetaRequired(int blockId, int meta) + { + this.requiresBlock = true; + this.requiredBlockId = blockId; + this.requiredBlockMeta = meta; + + return this; + } + + public BeeMutation setBlockAndMetaRequired(Block block, int meta) + { + this.requiresBlock = true; + this.requiredBlockId = block.blockID; + this.requiredBlockMeta = meta; + + return this; + } + + public BeeMutation setBlockRequired(String oreDictEntry) + { + this.requiresBlock = true; + this.requiredBlockOreDictEntry = oreDictEntry; + + return this; + } + public BeeMutation setMoonPhaseRestricted(MoonPhase begin, MoonPhase end) { this.isMoonRestricted = true; diff --git a/thaumicbees_src/thaumicbees/bees/BeeSpecies.java b/thaumicbees_src/thaumicbees/bees/BeeSpecies.java index e109b76..68e2eb6 100644 --- a/thaumicbees_src/thaumicbees/bees/BeeSpecies.java +++ b/thaumicbees_src/thaumicbees/bees/BeeSpecies.java @@ -16,6 +16,8 @@ import thaumicbees.item.types.PollenType; import thaumicbees.item.types.ResourceType; import thaumicbees.main.Config; import thaumicbees.main.utils.LocalizationManager; +import thaumicbees.main.utils.VersionInfo; +import thaumicbees.main.utils.compat.ArsMagicaHelper; import thaumicbees.main.utils.compat.EquivalentExchangeHelper; import thaumicbees.main.utils.compat.ForestryHelper; import thaumicbees.main.utils.compat.ThaumcraftHelper; @@ -49,54 +51,30 @@ public enum BeeSpecies implements IAlleleBeeSpecies, IIconProvider BeeClassification.SUPERNATURAL, 0x005614, EnumTemperature.NORMAL, EnumHumidity.NORMAL, true, true), PUPIL("Pupil", "disciplina", BeeClassification.SCHOLARLY, 0xFFFF00, EnumTemperature.NORMAL, EnumHumidity.ARID, false, true), - SCHOLARLY("Scholarly", "studiosis", - BeeClassification.SCHOLARLY, 0x6E0000, EnumTemperature.NORMAL, EnumHumidity.ARID, false, false), - SAVANT("Savant", "philologus", - BeeClassification.SCHOLARLY, 0x6E1C6D, EnumTemperature.NORMAL, EnumHumidity.ARID, true, false), STARK("Stark", "torridae", - BeeClassification.THAUMIC, 0xCCCCCC, 0x999999, EnumTemperature.NORMAL, EnumHumidity.NORMAL, true, false), + BeeClassification.MAGICAL, 0xCCCCCC, 0x999999, EnumTemperature.NORMAL, EnumHumidity.NORMAL, true, false), AIR("Aura", "ventosa", - BeeClassification.THAUMIC, 0xD9D636, 0xA19E10, EnumTemperature.NORMAL, EnumHumidity.NORMAL, true, true), + BeeClassification.MAGICAL, 0xD9D636, 0xA19E10, EnumTemperature.NORMAL, EnumHumidity.NORMAL, true, true), FIRE("Ignis", "praefervidus", - BeeClassification.THAUMIC, 0xE50B0B, 0x95132F, EnumTemperature.HOT, EnumHumidity.ARID, true, true), + BeeClassification.MAGICAL, 0xE50B0B, 0x95132F, EnumTemperature.HOT, EnumHumidity.ARID, true, true), WATER("Aqua", "umidus", - BeeClassification.THAUMIC, 0x36CFD9, 0x1054A1, EnumTemperature.NORMAL, EnumHumidity.DAMP, true, true), + BeeClassification.MAGICAL, 0x36CFD9, 0x1054A1, EnumTemperature.NORMAL, EnumHumidity.DAMP, true, true), EARTH("Solum", "sordida", - BeeClassification.THAUMIC, 0x005100, 0x00a000, EnumTemperature.NORMAL, EnumHumidity.NORMAL, true, true), - INFUSED("Praecantatio", "azanorius", - BeeClassification.THAUMIC, 0xaa32fc, 0x7A489E, EnumTemperature.NORMAL, EnumHumidity.NORMAL, true, true), + BeeClassification.MAGICAL, 0x005100, 0x00a000, EnumTemperature.NORMAL, EnumHumidity.NORMAL, true, true), AWARE("Aware", "sensibilis", - BeeClassification.VIS, 0xb0092e9, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, false), - VIS("Vis", "arcanus saecula", - BeeClassification.VIS, 0x004c99, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, false), - PURE("Pure", "arcanus puritatem", - BeeClassification.VIS, 0xb0092e9, EnumTemperature.NORMAL, EnumHumidity.NORMAL, true, false), - FLUX("Flux", "arcanus labe", - BeeClassification.VIS, 0x004c99, EnumTemperature.NORMAL, EnumHumidity.NORMAL, true, false), - NODE("Node", "conficiens", - BeeClassification.VIS, 0xFFF266, 0xFF8CE9, EnumTemperature.NORMAL, EnumHumidity.NORMAL, true, false), - REJUVENATING("Rejuvenating", "arcanus vitae", - BeeClassification.VIS, 0x91D0D9, EnumTemperature.NORMAL, EnumHumidity.NORMAL, true, false), + BeeClassification.MAGICAL, 0xb0092e9, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, false), SKULKING("Skulking", "malevolens", BeeClassification.SKULKING, 0x524827, 0xe15236, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, true), - BRAINY("Brainy", "cerebrum", - BeeClassification.SKULKING, 0x83FF70, 0xe15236, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, true), - GOSSAMER("Gossamer", "perlucidus", - BeeClassification.SKULKING, 0x183f66, 0xe15236, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, true), - WISPY("Wispy", "umbrabilis", - BeeClassification.SKULKING, 0x9cb8d5, 0xe15236, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, false), - BATTY("Batty", "chiroptera", - BeeClassification.SKULKING, 0x27350d, 0xe15236, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, true), GHASTLY("Ghastly", "pallens", BeeClassification.SKULKING, 0xccccee, 0xbf877c, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, false), + SPIDERY("Spidery", "araneolus", + BeeClassification.SKULKING, 0x0888888, 0x222222, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, true), TIMELY("Timely", "gallifreis", BeeClassification.TIME, 0xC6AF86, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, true), LORDLY("Lordly", "rassilonis", BeeClassification.TIME, 0xC6AF86, 0x8E0213, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, false), DOCTORAL("Doctoral", "medicus qui", BeeClassification.TIME, 0xDDE5FC, 0x4B6E8C, EnumTemperature.NORMAL, EnumHumidity.NORMAL, true, false), - MINIUM("Minium", "mutabilis", - BeeClassification.ALCHEMICAL, 0xac0921, 0x3a030b, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, true), SPIRIT("Spirit", "larva", BeeClassification.SOUL, 0xb2964b, EnumTemperature.WARM, EnumHumidity.NORMAL, false, true), SOUL("Soul", "anima", @@ -117,12 +95,72 @@ public enum BeeSpecies implements IAlleleBeeSpecies, IIconProvider BeeClassification.GEM, 0x209581, 0x8DF5E3, EnumTemperature.NORMAL, EnumHumidity.NORMAL, true, false), EMERALD("Emerald", "prasinus", BeeClassification.GEM, 0x005300, 0x17DD62, EnumTemperature.NORMAL, EnumHumidity.NORMAL, true, false), + APATITE("Apatite", "apatite", + BeeClassification.GEM, 0x2EA7EC, 0x001D51, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, false), + + // --------- Thaumcraft Bees --------------------------------------------------------------------------------------- + SCHOLARLY("Scholarly", "studiosis", + BeeClassification.SCHOLARLY, 0x6E0000, EnumTemperature.NORMAL, EnumHumidity.ARID, false, false), + SAVANT("Savant", "philologus", + BeeClassification.SCHOLARLY, 0x6E1C6D, EnumTemperature.NORMAL, EnumHumidity.ARID, true, false), + INFUSED("Praecantatio", "azanorius", + BeeClassification.THAUMIC, 0xaa32fc, 0x7A489E, EnumTemperature.NORMAL, EnumHumidity.NORMAL, true, true), + VIS("Vis", "arcanus saecula", + BeeClassification.THAUMIC, 0x004c99, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, false), + PURE("Pure", "arcanus puritatem", + BeeClassification.THAUMIC, 0xb0092e9, EnumTemperature.NORMAL, EnumHumidity.NORMAL, true, false), + FLUX("Flux", "arcanus labe", + BeeClassification.THAUMIC, 0x004c99, EnumTemperature.NORMAL, EnumHumidity.NORMAL, true, false), + NODE("Node", "conficiens", + BeeClassification.THAUMIC, 0xFFF266, 0xFF8CE9, EnumTemperature.NORMAL, EnumHumidity.NORMAL, true, false), + REJUVENATING("Rejuvenating", "arcanus vitae", + BeeClassification.THAUMIC, 0x91D0D9, EnumTemperature.NORMAL, EnumHumidity.NORMAL, true, false), + BRAINY("Brainy", "cerebrum", + BeeClassification.THAUMIC, 0x83FF70, 0xe15236, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, true), + GOSSAMER("Gossamer", "perlucidus", + BeeClassification.THAUMIC, 0x183f66, 0xe15236, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, true), + WISPY("Wispy", "umbrabilis", + BeeClassification.THAUMIC, 0x9cb8d5, 0xe15236, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, false), + BATTY("Batty", "chiroptera", + BeeClassification.THAUMIC, 0x27350d, 0xe15236, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, true), CHICKEN("Chicken", "pullus", BeeClassification.FLESHY, 0x7D431E, 0xE0905E, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, true), BEEF("Beef", "bubulae", BeeClassification.FLESHY, 0x40221A, 0xAC6753, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, true), PORK("Pork", "porcina", BeeClassification.FLESHY, 0x725D2F, 0xD2BF93, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, true), + + // --------- Equivalent Exchange Bees ----------------------------------------------------------------------------- + MINIUM("Minium", "mutabilis", + BeeClassification.ALCHEMICAL, 0xac0921, 0x3a030b, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, true), + + // --------- Ars Magica Bees -------------------------------------------------------------------------------------- + ESSENCE("Essence", "essentia", + BeeClassification.ESSENTIAL, 0x86BBC5, 0xE3A55B, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, true), + QUINTESSENCE("Quintessence", "cor essentia", + BeeClassification.ESSENTIAL, 0xE3A45B, 0xE3A55B, EnumTemperature.NORMAL, EnumHumidity.NORMAL, true, true), + EARTH_AM("Erde", "magica terra", + BeeClassification.ESSENTIAL, 0xAA875E, 0xE3A55B, EnumTemperature.WARM, EnumHumidity.ARID, false, false), + AIR_AM("Luft", "magica aer", + BeeClassification.ESSENTIAL, 0xD5EB9D, 0xE3A55B, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, false), + FIRE_AM("Feuer", "magica ignis", + BeeClassification.ESSENTIAL, 0x93451E, 0xE3A55B, EnumTemperature.HOT, EnumHumidity.ARID, false, false), + WATER_AM("Wasser", "magica aqua", + BeeClassification.ESSENTIAL, 0x3B7D8C, 0xE3A55B, EnumTemperature.NORMAL, EnumHumidity.DAMP, false, false), + LIGHTNING("Blitz", "magica fulgur", + BeeClassification.ESSENTIAL, 0xEBEFA1, 0xE3A55B, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, false), + PLANT("Staude", "magica herba", + BeeClassification.ESSENTIAL, 0x49B549, 0xE3A55B, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, false), + ICE("Eis", "magica glacium", + BeeClassification.ESSENTIAL, 0x86BAC6, 0xE3A55B, EnumTemperature.COLD, EnumHumidity.NORMAL, false, false), + MAGMA("Magma", "magica torrens igneus", + BeeClassification.ESSENTIAL, 0x932B1E, 0xE3A55B, EnumTemperature.HELLISH, EnumHumidity.ARID, false, false), + ARCANE_AM("Arkanen", "magica arcanum", + BeeClassification.ESSENTIAL, 0x76184D, 0xE3A55B, EnumTemperature.NORMAL, EnumHumidity.NORMAL, true, false), + VORTEX("Vortex", "gurges", + BeeClassification.ESSENTIAL, 0x71BBE2, 0x0B35A8, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, true), + WIGHT("Wight", "vectem", + BeeClassification.ESSENTIAL, 0xB50000, 0x4C4837, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, false), ; public static void setupBeeSpecies() @@ -141,9 +179,8 @@ public enum BeeSpecies implements IAlleleBeeSpecies, IIconProvider { SCHOLARLY.setInactive(); SAVANT.setInactive(); - AIR.setInactive(); - EARTH.setInactive(); INFUSED.setInactive(); + VIS.setInactive(); PURE.setInactive(); FLUX.setInactive(); NODE.setInactive(); @@ -166,6 +203,38 @@ public enum BeeSpecies implements IAlleleBeeSpecies, IIconProvider MINIUM.setInactive(); } + if (ArsMagicaHelper.isActive()) + { + QUINTESSENCE.addSpecialty(new ItemStack(Config.amArcaneCompound), 5); + EARTH_AM.addSpecialty(new ItemStack(Config.amEssenceEarth), 7); + AIR_AM.addSpecialty(new ItemStack(Config.amEssenceAir), 7); + FIRE_AM.addSpecialty(new ItemStack(Config.amEssenceFire), 7); + WATER_AM.addSpecialty(new ItemStack(Config.amEssenceWater), 7); + LIGHTNING.addSpecialty(new ItemStack(Config.amEssenceLightning), 7); + PLANT.addSpecialty(new ItemStack(Config.amEssencePlant), 7); + ICE.addSpecialty(new ItemStack(Config.amEssenceIce), 7); + MAGMA.addSpecialty(new ItemStack(Config.amEssenceMagma), 7); + ARCANE_AM.addSpecialty(new ItemStack(Config.amEssenceArcane), 11); + VORTEX.addSpecialty(new ItemStack(Config.amArcaneCompound), 15); + WIGHT.addSpecialty(new ItemStack(Item.enderPearl), 11); + } + else + { + ESSENCE.setInactive(); + QUINTESSENCE.setInactive(); + EARTH_AM.setInactive(); + AIR_AM.setInactive(); + FIRE_AM.setInactive(); + WATER_AM.setInactive(); + LIGHTNING.setInactive(); + PLANT.setInactive(); + ICE.setInactive(); + MAGMA.setInactive(); + ARCANE_AM.setInactive(); + VORTEX.setInactive(); + WIGHT.setInactive(); + } + // Oredict bees if (OreDictionary.getOres("ingotCopper").size() <= 0) { @@ -184,7 +253,6 @@ public enum BeeSpecies implements IAlleleBeeSpecies, IIconProvider LEAD.setInactive(); } - ESOTERIC.addProduct(Config.combs.getStackForType(CombType.OCCULT), 20) .setGenome(BeeGenomeManager.getTemplateEsoteric()) .register(); @@ -220,62 +288,35 @@ public enum BeeSpecies implements IAlleleBeeSpecies, IIconProvider .setGenome(BeeGenomeManager.getTemplateStark()) .register(); AIR.addProduct(Config.combs.getStackForType(CombType.AIRY), 9) + .addSpecialty(new ItemStack(Item.feather), 4) .setGenome(BeeGenomeManager.getTemplateAir()) - .register(); + .register(); FIRE.addProduct(Config.combs.getStackForType(CombType.FIREY), 15) .addSpecialty(new ItemStack(Item.blazePowder), 4).setGenome(BeeGenomeManager.getTemplateFire()) .register(); WATER.addProduct(Config.combs.getStackForType(CombType.WATERY), 20) .addSpecialty(new ItemStack(Block.ice), 1) - .addSpecialty(new ItemStack(Config.fPollen, 1, ForestryHelper.Pollen.CRYSTALLINE.ordinal()), 5) .setGenome(BeeGenomeManager.getTemplateWater()) .register(); EARTH.addProduct(Config.combs.getStackForType(CombType.EARTHY), 30) + .addSpecialty(new ItemStack(Block.obsidian), 4) .setGenome(BeeGenomeManager.getTemplateEarth()) .register(); - INFUSED.addProduct(Config.combs.getStackForType(CombType.INFUSED), 20) - .setGenome(BeeGenomeManager.getTemplateInfused()) - .register(); AWARE.addProduct(Config.combs.getStackForType(CombType.INTELLECT), 18) .setGenome(BeeGenomeManager.getTemplateAware()) .register(); - VIS.addProduct(Config.combs.getStackForType(CombType.INTELLECT), 25) - .setGenome(BeeGenomeManager.getTemplateVis()) - .register(); - PURE.addProduct(Config.combs.getStackForType(CombType.INTELLECT), 20) - .setGenome(BeeGenomeManager.getTemplatePure()) - .register(); - FLUX.addProduct(Config.combs.getStackForType(CombType.INTELLECT), 20) - .setGenome(BeeGenomeManager.getTemplateFlux()) - .register(); - NODE.addProduct(Config.combs.getStackForType(CombType.INTELLECT), 20) - .setGenome(BeeGenomeManager.getTemplateNode()) - .register(); - REJUVENATING.addProduct(Config.combs.getStackForType(CombType.INTELLECT), 20) - .setGenome(BeeGenomeManager.getTemplateRejuvinating()) - .register(); SKULKING.addProduct(Config.combs.getStackForType(CombType.SKULKING), 10) .setGenome(BeeGenomeManager.getTemplateSkulking()) - .register(); - BRAINY.addProduct(Config.combs.getStackForType(CombType.SKULKING), 10) - .addProduct(new ItemStack(Item.rottenFlesh), 6) - .setGenome(BeeGenomeManager.getTemplateBrainy()) - .register(); - BATTY.addProduct(Config.combs.getStackForType(CombType.SKULKING), 10) - .addSpecialty(new ItemStack(Item.gunpowder), 4) - .setGenome(BeeGenomeManager.getTemplateBatty()) .register(); - GOSSAMER.addProduct(new ItemStack(Config.fBeeComb, 1, ForestryHelper.Comb.SILKY.ordinal()), 15) - .setGenome(BeeGenomeManager.getTemplateGossamer()) - .register(); - 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(); GHASTLY.addProduct(Config.combs.getStackForType(CombType.SKULKING), 8) .addSpecialty(new ItemStack(Item.ghastTear), 2) .setGenome(BeeGenomeManager.getTemplateGhastly()) - .register(); + .register(); + SPIDERY.addProduct(Config.combs.getStackForType(CombType.SKULKING), 13) + .addProduct(new ItemStack(Item.silk), 8) + .addSpecialty(new ItemStack(Item.spiderEye), 8) + .setGenome(BeeGenomeManager.getTemplateSpidery()) + .register(); TIMELY.addProduct(new ItemStack(Config.fBeeComb, 1, ForestryHelper.Comb.DRIPPING.ordinal()), 25) .addProduct(Config.pollen.getStackForType(PollenType.PHASED), 10) .setGenome(BeeGenomeManager.getTemplateTimely()) @@ -291,9 +332,6 @@ public enum BeeSpecies implements IAlleleBeeSpecies, IIconProvider .addSpecialty(new ItemStack(Config.jellyBaby), 7) .setGenome(BeeGenomeManager.getTemplateDoctoral()) .register(); - MINIUM.addProduct(Config.combs.getStackForType(CombType.OCCULT), 16) - .setGenome(BeeGenomeManager.getTemplateMinium()) - .register(); SPIRIT.addProduct(Config.combs.getStackForType(CombType.SOUL), 13) .setGenome(BeeGenomeManager.getTemplateSpirit()) .register(); @@ -303,11 +341,11 @@ public enum BeeSpecies implements IAlleleBeeSpecies, IIconProvider IRON.addProduct(new ItemStack(Config.fBeeComb, 1, ForestryHelper.Comb.HONEY.ordinal()), 10) .addSpecialty(Config.nuggets.getStackForType(NuggetType.IRON), 8) .setGenome(BeeGenomeManager.getTemplateIron()) - .register(); + .register(); GOLD.addProduct(new ItemStack(Config.fBeeComb, 1, ForestryHelper.Comb.HONEY.ordinal()), 10) .addSpecialty(new ItemStack(Item.goldNugget, 1), 6) .setGenome(BeeGenomeManager.getTemplateGold()) - .register(); + .register(); COPPER.addProduct(new ItemStack(Config.fBeeComb, 1, ForestryHelper.Comb.HONEY.ordinal()), 10) .addSpecialty(Config.nuggets.getStackForType(NuggetType.COPPER), 9) .setGenome(BeeGenomeManager.getTemplateCopper()) @@ -332,6 +370,44 @@ public enum BeeSpecies implements IAlleleBeeSpecies, IIconProvider .addSpecialty(Config.nuggets.getStackForType(NuggetType.EMERALD), 2) .setGenome(BeeGenomeManager.getTemplateEmerald()) .register(); + APATITE.addProduct(new ItemStack(Config.fBeeComb, 1, ForestryHelper.Comb.HONEY.ordinal()), 10) + .addSpecialty(Config.nuggets.getStackForType(NuggetType.APATITE), 2) + .setGenome(BeeGenomeManager.getTemplateApatite()) + .register(); + + INFUSED.addProduct(Config.combs.getStackForType(CombType.INFUSED), 20) + .setGenome(BeeGenomeManager.getTemplateInfused()) + .register(); + VIS.addProduct(Config.combs.getStackForType(CombType.INTELLECT), 25) + .setGenome(BeeGenomeManager.getTemplateVis()) + .register(); + PURE.addProduct(Config.combs.getStackForType(CombType.INTELLECT), 20) + .setGenome(BeeGenomeManager.getTemplatePure()) + .register(); + FLUX.addProduct(Config.combs.getStackForType(CombType.INTELLECT), 20) + .setGenome(BeeGenomeManager.getTemplateFlux()) + .register(); + NODE.addProduct(Config.combs.getStackForType(CombType.INTELLECT), 20) + .setGenome(BeeGenomeManager.getTemplateNode()) + .register(); + REJUVENATING.addProduct(Config.combs.getStackForType(CombType.INTELLECT), 20) + .setGenome(BeeGenomeManager.getTemplateRejuvinating()) + .register(); + BRAINY.addProduct(Config.combs.getStackForType(CombType.SKULKING), 10) + .addProduct(new ItemStack(Item.rottenFlesh), 6) + .setGenome(BeeGenomeManager.getTemplateBrainy()) + .register(); + BATTY.addProduct(Config.combs.getStackForType(CombType.SKULKING), 10) + .addSpecialty(new ItemStack(Item.gunpowder), 4) + .setGenome(BeeGenomeManager.getTemplateBatty()) + .register(); + GOSSAMER.addProduct(new ItemStack(Config.fBeeComb, 1, ForestryHelper.Comb.SILKY.ordinal()), 15) + .setGenome(BeeGenomeManager.getTemplateGossamer()) + .register(); + 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(); CHICKEN.addProduct(new ItemStack(Config.fBeeComb, 1, ForestryHelper.Comb.HONEY.ordinal()), 10) .setGenome(BeeGenomeManager.getTemplateChicken()) .register(); @@ -341,6 +417,51 @@ public enum BeeSpecies implements IAlleleBeeSpecies, IIconProvider PORK.addProduct(new ItemStack(Config.fBeeComb, 1, ForestryHelper.Comb.HONEY.ordinal()), 10) .setGenome(BeeGenomeManager.getTemplatePork()) .register(); + + MINIUM.addProduct(Config.combs.getStackForType(CombType.OCCULT), 16) + .setGenome(BeeGenomeManager.getTemplateMinium()) + .register(); + + ESSENCE.addProduct(Config.combs.getStackForType(CombType.ESSENCE), 12) + .setGenome(BeeGenomeManager.getTemplateEssence()) + .register(); + QUINTESSENCE.addProduct(Config.combs.getStackForType(CombType.ESSENCE), 23) + .setGenome(BeeGenomeManager.getTemplateQuintessence()) + .register(); + EARTH_AM.addProduct(Config.combs.getStackForType(CombType.POTENT), 12) + .setGenome(BeeGenomeManager.getTemplateEarthAM()) + .register(); + AIR_AM.addProduct(Config.combs.getStackForType(CombType.POTENT), 12) + .setGenome(BeeGenomeManager.getTemplateAirAM()) + .register(); + FIRE_AM.addProduct(Config.combs.getStackForType(CombType.POTENT), 12) + .setGenome(BeeGenomeManager.getTemplateFireAM()) + .register(); + WATER_AM.addProduct(Config.combs.getStackForType(CombType.POTENT), 12) + .setGenome(BeeGenomeManager.getTemplateWaterAM()) + .register(); + LIGHTNING.addProduct(Config.combs.getStackForType(CombType.POTENT), 12) + .setGenome(BeeGenomeManager.getTemplateLightning()) + .register(); + PLANT.addProduct(Config.combs.getStackForType(CombType.POTENT), 12) + .setGenome(BeeGenomeManager.getTemplatePlant()) + .register(); + ICE.addProduct(Config.combs.getStackForType(CombType.POTENT), 12) + .setGenome(BeeGenomeManager.getTemplateIce()) + .register(); + MAGMA.addProduct(Config.combs.getStackForType(CombType.POTENT), 12) + .setGenome(BeeGenomeManager.getTemplateMagma()) + .register(); + ARCANE_AM.addProduct(Config.combs.getStackForType(CombType.POTENT), 19) + .setGenome(BeeGenomeManager.getTemplateArcaneAM()) + .register(); + VORTEX.addProduct(Config.combs.getStackForType(CombType.ESSENCE), 10) + .setGenome(BeeGenomeManager.getTemplateVortex()) + .register(); + WIGHT.addProduct(Config.combs.getStackForType(CombType.SOUL), 30) + .addProduct(Config.combs.getStackForType(CombType.SKULKING), 10) + .setGenome(BeeGenomeManager.getTemplateWight()) + .register(); } private String binomial; @@ -563,22 +684,47 @@ public enum BeeSpecies implements IAlleleBeeSpecies, IIconProvider { return icons[type.ordinal()][Math.min(renderPass, 2)]; } + + private static final BeeSpecies[] skulkingIconBees = { SKULKING, GHASTLY, SPIDERY, BRAINY, GOSSAMER, WISPY, BATTY, VORTEX, WISPY }; public void registerItemIcons(IconRegister itemMap) { this.icons = new Icon[EnumBeeType.values().length][3]; - Icon outline = itemMap.registerIcon(ForestryHelper.Name.toLowerCase() + ":bees/outline"); - Icon body1 = itemMap.registerIcon(ForestryHelper.Name.toLowerCase() + ":bees/outline"); + + String root = this.getIconPath(); + + Icon body1 = itemMap.registerIcon(root + "body1"); - for (int i = 0; i < EnumBeeType.values().length; i++) { + for (int i = 0; i < EnumBeeType.values().length; i++) + { if(EnumBeeType.values()[i] == EnumBeeType.NONE) continue; - icons[i][0] = outline; + icons[i][0] = itemMap.registerIcon(root + EnumBeeType.values()[i].toString().toLowerCase(Locale.ENGLISH) + ".outline"); icons[i][1] = body1; - icons[i][2] = itemMap.registerIcon(ForestryHelper.Name.toLowerCase() + ":bees/" + EnumBeeType.values()[i].toString().toLowerCase(Locale.ENGLISH) + ".body2"); + icons[i][2] = itemMap.registerIcon(root + EnumBeeType.values()[i].toString().toLowerCase(Locale.ENGLISH) + ".body2"); } } + + private String getIconPath() + { + String value; + + switch (this) + { + case SKULKING: case GHASTLY: case SPIDERY: + case BRAINY: case GOSSAMER: case WISPY: case BATTY: + case VORTEX: case WIGHT: + value = VersionInfo.ModName.toLowerCase() + ":bees/skulking/"; + break; + + default: + value = ForestryHelper.Name.toLowerCase() + ":bees/default/"; + break; + } + + return value; + } /// --------- Unused Functions --------------------------------------------- diff --git a/thaumicbees_src/thaumicbees/bees/FlowerProviderArsMagicaFlower.java b/thaumicbees_src/thaumicbees/bees/FlowerProviderArsMagicaFlower.java new file mode 100644 index 0000000..c61b076 --- /dev/null +++ b/thaumicbees_src/thaumicbees/bees/FlowerProviderArsMagicaFlower.java @@ -0,0 +1,74 @@ +package thaumicbees.bees; + +import thaumicbees.main.Config; +import thaumicbees.main.utils.LocalizationManager; +import thaumicbees.main.utils.compat.ThaumcraftHelper; +import net.minecraft.block.Block; +import net.minecraft.item.ItemStack; +import net.minecraft.world.World; +import forestry.api.apiculture.IBeeGenome; +import forestry.api.apiculture.IFlowerProvider; +import forestry.api.genetics.IPollinatable; + +public class FlowerProviderArsMagicaFlower implements IFlowerProvider +{ + private ItemStack[] flowers = {new ItemStack(Config.amBlackOrchid), new ItemStack(Config.amDesertNova) }; + + @Override + public boolean isAcceptedFlower(World world, IBeeGenome genome, int x, int y, int z) + { + boolean flag = false; + int id = world.getBlockId(x, y, z); + if (id == Config.amBlackOrchid.blockID || id == Config.amDesertNova.blockID) + { + flag = true; + } + return flag; + } + + @Override + public boolean growFlower(World world, IBeeGenome genome, int x, int y, int z) + { + boolean flag = false; + int blockDown = world.getBlockId(x, y - 1, z); + if (world.getBlockId(x, y, z) == 0) + { + if (blockDown == Block.dirt.blockID || blockDown == Block.grass.blockID) + { + world.setBlock(x, y, z, Config.amBlackOrchid.blockID); + flag = true; + } + else if (blockDown == Block.sand.blockID) + { + world.setBlock(x, y, z, Config.amDesertNova.blockID); + flag = true; + } + } + return flag; + } + + @Override + public String getDescription() + { + return LocalizationManager.getLocalizedString("tb.bees.flower.arsmagica"); + } + + @Override + public ItemStack[] affectProducts(World world, IBeeGenome genome, int x, int y, int z, ItemStack[] products) + { + return products; + } + + @Override + public ItemStack[] getItemStacks() + { + return this.flowers; + } + + @Override + public boolean isAcceptedPollinatable(World world, IPollinatable pollinatable) + { + return pollinatable.getPlantType().size() > 1; + } + +} diff --git a/thaumicbees_src/thaumicbees/bees/FlowerProviderThaumcraftFlower.java b/thaumicbees_src/thaumicbees/bees/FlowerProviderThaumcraftFlower.java index dde532d..815a753 100644 --- a/thaumicbees_src/thaumicbees/bees/FlowerProviderThaumcraftFlower.java +++ b/thaumicbees_src/thaumicbees/bees/FlowerProviderThaumcraftFlower.java @@ -38,7 +38,7 @@ public class FlowerProviderThaumcraftFlower implements IFlowerProvider { boolean flag = false; int blockDown = world.getBlockId(x, y - 1, z); - if (world.isAirBlock(x, y, z)) + if (world.getBlockId(x, y, z) == 0) { if (blockDown == Block.dirt.blockID || blockDown == Block.grass.blockID) { diff --git a/thaumicbees_src/thaumicbees/item/ItemMoonDial.java b/thaumicbees_src/thaumicbees/item/ItemMoonDial.java index bd5d3d7..553d8ac 100644 --- a/thaumicbees_src/thaumicbees/item/ItemMoonDial.java +++ b/thaumicbees_src/thaumicbees/item/ItemMoonDial.java @@ -38,7 +38,7 @@ public class ItemMoonDial extends Item { this.icons[i] = par1IconRegister.registerIcon(VersionInfo.ModName.toLowerCase() + ":moonDial." + i); } - this.itemIcon = this.icons[0]; + this.itemIcon = this.icons[4]; } @Override @@ -52,16 +52,9 @@ public class ItemMoonDial extends Item @SideOnly(Side.CLIENT) public void addInformation(ItemStack itemStack, EntityPlayer entityPlayer, List infoList, boolean par4) { - if (ThaumicBees.getConfig().MoonDialShowsPhaseInText) + if (ThaumicBees.getConfig().MoonDialShowsPhaseInText && entityPlayer.getCurrentEquippedItem().getItem() == this) { infoList.add("\u00A77" + MoonPhase.getMoonPhaseFromTime(entityPlayer.worldObj.getWorldTime()).getLocalizedName()); } } - - @Override - @SideOnly(Side.CLIENT) - public Icon getIconFromDamage(int damage) - { - return this.icons[5]; - } } diff --git a/thaumicbees_src/thaumicbees/item/types/CombType.java b/thaumicbees_src/thaumicbees/item/types/CombType.java index 2b9a624..4e51b52 100644 --- a/thaumicbees_src/thaumicbees/item/types/CombType.java +++ b/thaumicbees_src/thaumicbees/item/types/CombType.java @@ -17,6 +17,8 @@ public enum CombType INTELLECT("aware", 0xb0092e9, 0x618fff, false), SKULKING("furtive", 0xcda6cd, 0x545454, true), SOUL("soul", 0x8A4500, 0x3C1E00, true), + ESSENCE("essence", 0x03E1DE, 0x015352, false), + POTENT("potent", 0xBFA330, 0x41046F, false), ; private CombType(String pName, int colourA, int colourB, boolean show) diff --git a/thaumicbees_src/thaumicbees/item/types/NuggetType.java b/thaumicbees_src/thaumicbees/item/types/NuggetType.java index 3039884..57c7138 100644 --- a/thaumicbees_src/thaumicbees/item/types/NuggetType.java +++ b/thaumicbees_src/thaumicbees/item/types/NuggetType.java @@ -12,6 +12,7 @@ public enum NuggetType LEAD, DIAMOND, EMERALD, + APATITE, ; private Item targetIngot; diff --git a/thaumicbees_src/thaumicbees/main/Config.java b/thaumicbees_src/thaumicbees/main/Config.java index bf915d6..731e0a9 100644 --- a/thaumicbees_src/thaumicbees/main/Config.java +++ b/thaumicbees_src/thaumicbees/main/Config.java @@ -38,6 +38,7 @@ import thaumicbees.item.types.NuggetType; import thaumicbees.item.types.PlankType; import thaumicbees.item.types.ResourceType; import thaumicbees.main.utils.LocalizationManager; +import thaumicbees.main.utils.compat.ArsMagicaHelper; import thaumicbees.main.utils.compat.EquivalentExchangeHelper; import thaumicbees.main.utils.compat.ForestryHelper; import thaumicbees.main.utils.compat.ThaumcraftHelper; @@ -60,7 +61,7 @@ public class Config public boolean DrawParticleEffects; public boolean BeeInfusionsAdded; public boolean AddThaumcraftItemsToBackpacks; - public boolean SkipUpdateCheck; + public boolean DisableUpdateCheck; public boolean AreMagicPlanksFlammable; public boolean UseImpregnatedStickInTools; public boolean MoonDialShowsPhaseInText; @@ -128,8 +129,24 @@ public class Config public static Item tcNuggetChicken; public static Item tcNuggetBeef; public static Item tcNuggetPork; + //----- Equivalent Exchange Blocks ------------------------- //----- Equivalent Exchange Items -------------------------- public static Item eeMinuimShard; + //----- Ars Magica Blocks ---------------------------------- + public static Block amBlackOrchid; + public static Block amDesertNova; + //----- Ars Magica Items ----------------------------------- + public static Item amVinteumDust; + public static Item amArcaneCompound; + public static Item amEssenceArcane; + public static Item amEssenceEarth; + public static Item amEssenceWater; + public static Item amEssenceFire; + public static Item amEssenceAir; + public static Item amEssenceMagma; + public static Item amEssencePlant; + public static Item amEssenceIce; + public static Item amEssenceLightning; //----- Config State info ---------------------------------- @@ -153,6 +170,7 @@ public class Config ThaumcraftHelper.getBlocks(); ForestryHelper.getBlocks(); EquivalentExchangeHelper.getBlocks(); + ArsMagicaHelper.getBlocks(); int blockIdBase = 1750; @@ -168,7 +186,7 @@ public class Config Item item = new ItemMultiTextureTile(planksWood.blockID - 256, planksWood, PlankType.getAllNames()); Item.itemsList[planksWood.blockID] = item; - + 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()); @@ -203,6 +221,7 @@ public class Config ThaumcraftHelper.getItems(); ForestryHelper.getItems(); EquivalentExchangeHelper.getItems(); + ArsMagicaHelper.getItems(); int itemIDBase = 26090; @@ -347,7 +366,7 @@ public class Config p = tbConfig.get("general", "disableVersionCheck", false); p.comment = "Set to true to stop ThaumicBees from checking for updates."; - this.SkipUpdateCheck = p.getBoolean(false); + this.DisableUpdateCheck = p.getBoolean(false); p = tbConfig.get("general", "areMagicPlanksFlammable", false); p.comment = "Set to true to allow Greatwood & Silverwood planks to burn in a fire."; diff --git a/thaumicbees_src/thaumicbees/main/ThaumicBees.java b/thaumicbees_src/thaumicbees/main/ThaumicBees.java index 954d33d..ede9d22 100644 --- a/thaumicbees_src/thaumicbees/main/ThaumicBees.java +++ b/thaumicbees_src/thaumicbees/main/ThaumicBees.java @@ -5,6 +5,7 @@ import thaumicbees.main.utils.CompatabilityManager; import thaumicbees.main.utils.CraftingManager; import thaumicbees.main.utils.LocalizationManager; import thaumicbees.main.utils.VersionInfo; +import thaumicbees.main.utils.compat.ArsMagicaHelper; import thaumicbees.main.utils.compat.EquivalentExchangeHelper; import thaumicbees.main.utils.compat.ExtraBeesHelper; import thaumicbees.main.utils.compat.ThaumcraftHelper; @@ -49,6 +50,7 @@ public class ThaumicBees ThaumcraftHelper.init(); ExtraBeesHelper.init(); EquivalentExchangeHelper.init(); + ArsMagicaHelper.init(); } @Mod.Init diff --git a/thaumicbees_src/thaumicbees/main/utils/CraftingManager.java b/thaumicbees_src/thaumicbees/main/utils/CraftingManager.java index 2aff30c..fb15e04 100644 --- a/thaumicbees_src/thaumicbees/main/utils/CraftingManager.java +++ b/thaumicbees_src/thaumicbees/main/utils/CraftingManager.java @@ -21,6 +21,7 @@ import thaumicbees.item.types.ResourceType; import thaumicbees.item.types.WaxType; import thaumicbees.main.Config; import thaumicbees.main.ThaumicBees; +import thaumicbees.main.utils.compat.ArsMagicaHelper; import thaumicbees.main.utils.compat.ForestryHelper; import thaumicbees.main.utils.compat.ShapelessBeeInfusionCraftingRecipe; import thaumicbees.main.utils.compat.ThaumcraftHelper; @@ -188,6 +189,11 @@ public class CraftingManager "xxx", "xxx", "xxx", 'x', "shardEmerald" })); + + GameRegistry.addRecipe(new ShapedOreRecipe(ItemInterface.getItem("apatite"), new Object[] { + "xxx", "xxx", "xxx", + 'x', Config.nuggets.getStackForType(NuggetType.APATITE) + })); if (ThaumcraftHelper.isActive()) { @@ -248,6 +254,16 @@ public class CraftingManager } } } + + if (ArsMagicaHelper.isActive()) + { + input = ItemInterface.getItem("apatite"); + output = Config.miscResources.getStackForType(ResourceType.EXTENDED_FERTILIZER, 4); + GameRegistry.addShapelessRecipe(output, new Object[] { + new ItemStack(Config.amEssenceEarth), new ItemStack(Config.amEssencePlant), + input, input + }); + } } private static void setupCentrifugeRecipes() @@ -312,6 +328,16 @@ public class CraftingManager new ItemStack[] {new ItemStack(Config.tcShard, 1, ThaumcraftHelper.ShardType.MAGIC.ordinal())}, new int[] { 10 }); } + + if (ArsMagicaHelper.isActive()) + { + RecipeManagers.centrifugeManager.addRecipe(20, Config.combs.getStackForType(CombType.ESSENCE), + new ItemStack[] {Config.wax.getStackForType(WaxType.MAGIC), new ItemStack(Config.amVinteumDust), new ItemStack(Config.amVinteumDust) }, + new int[] { 85, 10, 2 } ); + RecipeManagers.centrifugeManager.addRecipe(20, Config.combs.getStackForType(CombType.POTENT), + new ItemStack[] {ItemInterface.getItem("beeswax"), ItemInterface.getItem("refractoryWax"), ItemInterface.getItem("honeydew") }, + new int[] { 50, 50, 65 } ); + } } private static void setupSqueezerRecipes() @@ -321,10 +347,10 @@ public class CraftingManager { RecipeManagers.squeezerManager.addRecipe(20, new ItemStack[] {Config.propolis.getStackForType(PropolisType.FIRE) }, new LiquidStack(Block.lavaStill, 250), - new ItemStack(Config.tcShard, 1, ThaumcraftHelper.ShardType.FIRE.ordinal()), 10); + new ItemStack(Config.tcShard, 1, ThaumcraftHelper.ShardType.FIRE.ordinal()), 8); RecipeManagers.squeezerManager.addRecipe(20, new ItemStack[] {Config.propolis.getStackForType(PropolisType.WATER) }, new LiquidStack(Block.waterStill, 500), - new ItemStack(Config.tcShard, 1, ThaumcraftHelper.ShardType.WATER.ordinal()), 10); + new ItemStack(Config.tcShard, 1, ThaumcraftHelper.ShardType.WATER.ordinal()), 8); } } diff --git a/thaumicbees_src/thaumicbees/main/utils/VersionInfo.java b/thaumicbees_src/thaumicbees/main/utils/VersionInfo.java index a95c3f4..05dd700 100644 --- a/thaumicbees_src/thaumicbees/main/utils/VersionInfo.java +++ b/thaumicbees_src/thaumicbees/main/utils/VersionInfo.java @@ -29,7 +29,7 @@ public class VersionInfo public static final String Logo = "/gfx/thaumicbees/logo.png"; - public static final String Depends = "required-after:Forestry;after:Thaumcraft@[3.0.3,);after:ExtraBees"; + public static final String Depends = "required-after:Forestry;after:Thaumcraft;after:ExtraBees;after:EE3;after:ArsMagica"; boolean criticalUpdate; boolean newVersion; @@ -240,7 +240,7 @@ public class VersionInfo public static void doVersionCheck() { - if (!ThaumicBees.getConfig().SkipUpdateCheck) + if (!ThaumicBees.getConfig().DisableUpdateCheck) { VersionInfo main = new VersionInfo("ThaumicBees", Version, VersionURL); TickHandlerVersion.registerModVersionInfo(main); diff --git a/thaumicbees_src/thaumicbees/main/utils/compat/ArsMagicaHelper.java b/thaumicbees_src/thaumicbees/main/utils/compat/ArsMagicaHelper.java new file mode 100644 index 0000000..65e333e --- /dev/null +++ b/thaumicbees_src/thaumicbees/main/utils/compat/ArsMagicaHelper.java @@ -0,0 +1,67 @@ +package thaumicbees.main.utils.compat; + +import net.minecraft.block.Block; +import net.minecraft.item.Item; +import thaumicbees.main.Config; +import cpw.mods.fml.common.Loader; + +public class ArsMagicaHelper +{ + private static boolean isArsMagicaPresent = false; + + public static boolean isActive() + { + return isArsMagicaPresent; + } + + public static void init() + { + if (Loader.isModLoaded("ArsMagica")) + { + isArsMagicaPresent = true; + } + } + + public static void getBlocks() + { + if (isActive()) + { + try + { + Class clazz = Class.forName("mithion.arsmagica.blocks.ArsMagicaBlocksCommonProxy"); + Config.amBlackOrchid = (Block)(clazz.getField("blueOrchid").get(null)); + Config.amDesertNova = (Block)(clazz.getField("desertNova").get(null)); + } + catch (Exception e) + { + + } + } + } + + public static void getItems() + { + if (isActive()) + { + try + { + Class clazz = Class.forName("mithion.arsmagica.items.ArsMagicaItemsCommonProxy"); + Config.amVinteumDust = (Item)(clazz.getField("vinteumDust").get(null)); + Config.amArcaneCompound = (Item)(clazz.getField("arcaneCompound").get(null)); + Config.amEssenceAir = (Item)(clazz.getField("airEssence").get(null)); + Config.amEssenceArcane = (Item)(clazz.getField("arcaneEssence").get(null)); + Config.amEssenceEarth = (Item)(clazz.getField("earthEssence").get(null)); + Config.amEssenceFire = (Item)(clazz.getField("fireEssence").get(null)); + Config.amEssenceIce = (Item)(clazz.getField("iceEssence").get(null)); + Config.amEssenceLightning = (Item)(clazz.getField("lightningEssence").get(null)); + Config.amEssenceMagma = (Item)(clazz.getField("magmaEssence").get(null)); + Config.amEssencePlant = (Item)(clazz.getField("plantEssence").get(null)); + Config.amEssenceWater = (Item)(clazz.getField("waterEssence").get(null)); + } + catch (Exception e) + { + + } + } + } +} diff --git a/thaumicbees_src/thaumicbees/main/utils/compat/ForestryHelper.java b/thaumicbees_src/thaumicbees/main/utils/compat/ForestryHelper.java index aec5ea1..0ebcba4 100644 --- a/thaumicbees_src/thaumicbees/main/utils/compat/ForestryHelper.java +++ b/thaumicbees_src/thaumicbees/main/utils/compat/ForestryHelper.java @@ -7,7 +7,15 @@ import forestry.api.core.ItemInterface; import thaumicbees.main.Config; public class ForestryHelper -{ +{ + public enum BlockResource + { + APATITE, + COPPER, + TIN, + ; + } + public enum CraftingMaterial { PULSATING_DUST, // unused diff --git a/thaumicbees_src/thaumicbees/main/utils/compat/ThaumcraftHelper.java b/thaumicbees_src/thaumicbees/main/utils/compat/ThaumcraftHelper.java index 99dd560..820dbb9 100644 --- a/thaumicbees_src/thaumicbees/main/utils/compat/ThaumcraftHelper.java +++ b/thaumicbees_src/thaumicbees/main/utils/compat/ThaumcraftHelper.java @@ -219,7 +219,7 @@ public class ThaumcraftHelper ObjectTags tags; ItemStack itemStack; - tags = new ObjectTags().add(EnumTag.WOOD, 2); + tags = new ObjectTags().add(EnumTag.WOOD, 1); ThaumcraftApi.registerObjectTag(Config.planksWood.blockID, -1, tags); tags = new ObjectTags().add(EnumTag.MAGIC, 2);