From dbc6acb9c9f32cfc1e7c7e27d84951a413a9bd62 Mon Sep 17 00:00:00 2001 From: MysteriousAges Date: Mon, 17 Jun 2013 16:46:05 -0700 Subject: [PATCH] Wither/Slow effects respect api armor Nugget production adjustments --- magicbees_res/changelog.txt | 4 + magicbees_res/mods/magicbees/lang/en_US.xml | 247 ++++++------------ magicbees_src/magicbees/bees/Allele.java | 4 +- .../bees/AlleleEffectAuraNodeCharge.java | 7 - .../magicbees/bees/AlleleEffectPotion.java | 24 +- magicbees_src/magicbees/bees/BeeMutation.java | 6 +- magicbees_src/magicbees/bees/BeeSpecies.java | 20 +- magicbees_src/magicbees/main/Config.java | 1 + 8 files changed, 124 insertions(+), 189 deletions(-) diff --git a/magicbees_res/changelog.txt b/magicbees_res/changelog.txt index f7b445b..77f3cab 100644 --- a/magicbees_res/changelog.txt +++ b/magicbees_res/changelog.txt @@ -1,3 +1,7 @@ +Adjusting the production rates on some nugget-producing bees. +Withering bee species now requires arid rather than normal humidity, to conform with the rest of the Infernal line. +Withering and Slow Effects should now correctly be reduced while wearing Apiarist's Armor or other protective gear. + 2.0.1 Modifying mutation class to allow block-requiring mutations to work in Alvearies/other multiblock hive structures. Tweaking hive gen diff --git a/magicbees_res/mods/magicbees/lang/en_US.xml b/magicbees_res/mods/magicbees/lang/en_US.xml index fa2a4d7..896dfd1 100644 --- a/magicbees_res/mods/magicbees/lang/en_US.xml +++ b/magicbees_res/mods/magicbees/lang/en_US.xml @@ -149,197 +149,142 @@ Mystical - Common in many parts of the world, these bees have a - little extra whimsy about them.|Apinomicon + Common in many parts of the world, these bees have a little extra whimsy about them.|Apinomicon Sorcerous Unusual - "A curious specimen for my collection!"|Junior - Apiarist + "A curious specimen for my collection!"|Junior Apiarist Attuned - They fly as though guided by unseen threads through - the air.|Apinomicon + They fly as though guided by unseen threads through the air.|Apinomicon Eldritch - The potential that was locked within this bee's - ancestors has now come to the fore.|Apinomicon + The potential that was locked within this bee's ancestors has now come to the fore.|Apinomicon Esoteric - An unusual crossbreed which seems to have magical - properties.|Apinomicon + An unusual crossbreed which seems to have magical properties.|Apinomicon Mysterious - These bees have been to the end of the world and back, - and their power has grown.|Apinomicon + These bees have been to the end of the world and back, and their power has grown.|Apinomicon Arcane - "Their produce is charged with magic."|Azanor, Master - Thaumaturge + "Their produce is charged with magic."|Azanor, Master Thaumaturge Charmed - Your first experiments in Thaumaturgical Apiculture - have yielded fruit. Buzzing fruit.|Apinomicon + Your first experiments in Thaumaturgical Apiculture have yielded fruit. Buzzing fruit.|Apinomicon Enchanted - Successive generations of Charmed bees have reinforced - their connection to the unknown.|Apinomicon + Successive generations of Charmed bees have reinforced their connection to the unknown.|Apinomicon Supernatural - These bees walk the line between this world and the - unseen.|Apinomicon + These bees walk the line between this world and the unseen.|Apinomicon Ethereal - Ghostly, and charged with energy from - beyond.|Apinomicon + Ghostly, and charged with energy from beyond.|Apinomicon Watery Fond of damp spots and flowing water.|Apinomicon Earthen - They have an iron-strong connection with stone and - dirt.|Apinomicon + They have an iron-strong connection with stone and dirt.|Apinomicon Firey - As close as you can get to living flame without - involving candescence.|Apinomicon + As close as you can get to living flame without involving candescence.|Apinomicon Windy - Rarely seen in flat, wide open spaces. Their - territories are vast.|Apinomicon + Rarely seen in flat, wide open spaces. Their territories are vast.|Apinomicon Pupil - "What does that bee want with my paper?!"|Yorae, - Librarian + "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 + "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 + lim(x^(i / pi)/ log(e * 7 - ln(32/x^-pi))). Solve for honey.|Note found on Yorae's desk Aware - "They can see into your soul!"|Florastar, Expert - Beekeeper + "They can see into your soul!"|Florastar, Expert Beekeeper Spirit - It is said these bees are able to contact the - dead.|Apinomicon + It is said these bees are able to contact the dead.|Apinomicon Soul - "The Dread Pirate Roberts has come for your - SOOOOOOULS!"|Dread Pirate Roberts + "The Dread Pirate Roberts has come for your SOOOOOOULS!"|Dread Pirate Roberts Skulking - These bees have become xenophobic and bad-tempered. - Use caution.|Apinomicon + These bees have become xenophobic and bad-tempered. Use caution.|Apinomicon Ghastly "*sigh*... Really, Myst?"|Taveria, irritated Apiarist Spidery Spiderbee; n. Does whatever a spider-bee does.|Unknown Smouldering - The Skulking bees have become alight with the fire of - the ever-burning Blazes.|Apinomicon + The Skulking bees have become alight with the fire of the ever-burning Blazes.|Apinomicon Timely - "An apiarist is never late. He arrives precisely when - he means to!"|Sengir, Mad Apiarist + "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 + 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 + "Would you like a Jelly Baby?"|Passing stranger with a great scarf and a blue box Infernal - Spawned deep within the hellish realm, none have - survived long enough to determine their abilities.|Apinomicon + Spawned deep within the hellish realm, none have survived long enough to determine their abilities.|Apinomicon Hateful |Apinomicon Spiteful - They guard their territory fiercely, with the zeal of - fiends, and welts of fire.|Apinomicon + They guard their territory fiercely, with the zeal of fiends, and welts of fire.|Apinomicon Withering - Their mere passing causes life to fail, slowly drawing - all energy from their territory.|Apinomicon + Their mere passing causes life to fail, slowly drawing all energy from their territory.|Apinomicon Oblivion - It is unclear whether these bees are native to this - world, or some other.|Apinomicon + It is unclear whether these bees are native to this world, or some other.|Apinomicon Nameless - "Other naturalists have refused to study these bees. I - must know why."|Tattered Research Notes + "Other naturalists have refused to study these bees. I must know why."|Tattered Research Notes Abandoned - "The more I study these bees, the more I feel they do - not belong here, or anywhere else."|Tattered Research Notes + "The more I study these bees, the more I feel they do not belong here, or anywhere else."|Tattered Research Notes Forlorn - "I am now convinced they were left in our universe on - purpose by some unknowable beings."|Tattered Research Notes + "I am now convinced they were left in our universe on purpose by some unknowable beings."|Tattered Research Notes Draconic - "With a fel sound, they erupted from their hive. That - was the last we ever saw of Gerald."|Tattered Research Notes + "With a fel sound, they erupted from their hive. That was the last we ever saw of Gerald."|Tattered Research Notes Ferrous - Having absorbed some of the base metal, these bees can - concentrate the essence of iron from the region.|Apinomicon + Having absorbed some of the base metal, these bees can concentrate the essence of iron from the region.|Apinomicon Auric Not all that glitters is gold.|Ancient Aphorism Cuprum - A base metal common in many applications; these bees - are helpful for resource-starved magicians.|Apinomicon + A base metal common in many applications; these bees are helpful for resource-starved magicians.|Apinomicon Stannum - While metalic, these bees are suprisingly - fragile.|Apinomicon + While metalic, these bees are suprisingly fragile.|Apinomicon Argentum - While they do not recieve as much attention as Golden - bees, they are nonetheless valuable.|Apinomicon + While they do not recieve as much attention as Golden bees, they are nonetheless valuable.|Apinomicon Plumbum - A favourite of amateur alchemists, they believe they - can transform these bees into gold.|Apinomicon + A favourite of amateur alchemists, they believe they can transform these bees into gold.|Apinomicon Diamandi - Crystalline, glittering, and harder than dragon's - teeth. These bees are none of those.|Apinomicon + 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 + 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 + 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 Stark - "These are unusually attracted to shards. This - warrents further investigation."|Azanor, Master Thaumaturge + "These are unusually attracted to shards. This warrents further investigation."|Azanor, Master Thaumaturge Aura - "They work so fast it's breathtaking."|Sengir, Mad - Apiarist + "They work so fast it's breathtaking."|Sengir, Mad Apiarist Ignis - Caution: Contents of hive extremely hot.|Warning label - on Azanor's apiary + Caution: Contents of hive extremely hot.|Warning label on Azanor's apiary Aqua - "I tried to breed them once, but that was a - wash."|MysteriousAges, Apprentice Thaumaturge + "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 + "You're really gonna dig these bees, but watch out - they bore quite easily."|MysteriousAges, Apprentice Comedian 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 + "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 + "I thought they would help clean up, but it only makes things worse!"|Kreicus, Apprentice Thaumaturge Attractive - Having undergone a freak mutation, these bees now - attract magic to them.|Apinomicon + 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 + 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 + Their combs may be fetid and foul-smelling, but their intelligence is well-developed.|Apinomicon Wispy - Their language is garbled and unintelligible. It is - probable they are speaking to unnatural beings.|Apinomicon + 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 + They tend to attract bats to their hives through means unknown.|Apinomicon Poultry "Cluck. Cluck cluck! ... You heard me."|Confused bee @@ -349,52 +294,38 @@ "Oink, oink. Er.... bzzz?"|Confused bee Minium - It may be possible to exploit their mercurial and - changeable nature.|Apinomicon + 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 + 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 + The heart of magic lies dormant in all things.|Apinomicon, preface Erde - Empowered by the Earth, their produce is infused with - its essence.|Apinomicon + 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 + 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 + 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 + 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 + 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 + "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 + 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 + "Curious creatures, though their produce is quite useful."|Mithion, Adept Vortex - Ravenous for mana, they may be dangerous for any - caster.|Apinomicon + Ravenous for mana, they may be dangerous for any caster.|Apinomicon Wight - "They attract magical spirits; not always - docile."|Mithion, Adept + "They attract magical spirits; not always docile."|Mithion, Adept @@ -424,52 +355,36 @@ Veiled - The curious species found scattered through the world - may have abilities beyond one's reasoning.|Apinomicon + The curious species found scattered through the world may have abilities beyond one's reasoning.|Apinomicon Arcane - These bees have inexplicable affinity for - magic.|Apinomicon + These bees have inexplicable affinity for magic.|Apinomicon Supernatural - No longer ordinary bees, they have been associated - with many odd occurances.|Apinomicon + No longer ordinary bees, they have been associated with many odd occurances.|Apinomicon Scholarly - The caste of bees which have great intellect and - deductive ability.|Apinomicon + The caste of bees which have great intellect and deductive ability.|Apinomicon Skulking - Unpleasant and malicious. Treat this group with - caution.|Apinomicon + 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 + 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 + Though clever use of time travel, these bees accomplish twice as much in one day.|Apinomicon Soulful - It would be eerie to think that they collected the - souls of the deceased.|Apinomicon + It would be eerie to think that they collected the souls of the deceased.|Apinomicon Abominable - Spawned in the firey depths of the Nether, there is - nothing pleasant about these creatures.|Apinomicon + Spawned in the firey depths of the Nether, there is nothing pleasant about these creatures.|Apinomicon Extrinsic - It is unknown whether these creatures gave rise to the - family Apidae in this universe, or if these evolved - seperately.|Apinomicon + It is unknown whether these creatures gave rise to the family Apidae in this universe, or if these evolved seperately.|Apinomicon Metallic - They collect fragments of metal and combine them into - larger portions.|Apinomicon + They collect fragments of metal and combine them into larger portions.|Apinomicon Gem - They collect fragments of precious gems in their - combs.|Apinomicon + They collect fragments of precious gems in their combs.|Apinomicon Thaumic - These bees have an increased affinity to magic and - aura.|Apinomicon + 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 + 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 + These bees have an increased affinity for aspected magic.|Apinomicon diff --git a/magicbees_src/magicbees/bees/Allele.java b/magicbees_src/magicbees/bees/Allele.java index d1efc74..393135e 100644 --- a/magicbees_src/magicbees/bees/Allele.java +++ b/magicbees_src/magicbees/bees/Allele.java @@ -93,8 +93,8 @@ public class Allele implements IAllele Allele.effectCleansing = new AlleleEffectCure("Curative", false); Allele.effectDigSpeed = new AlleleEffectPotion("DigSpeed", Potion.digSpeed, 15, false); Allele.effectMoveSpeed = new AlleleEffectPotion("MoveSpeed", Potion.moveSpeed, 10, false); - Allele.effectSlowSpeed = new AlleleEffectPotion("SlowSpeed", Potion.moveSlowdown, 3, false); - Allele.effectWithering = new AlleleEffectPotion("Withering", Potion.wither, 10, false); + Allele.effectSlowSpeed = new AlleleEffectPotion("SlowSpeed", Potion.moveSlowdown, 3, false).setMalicious(); + Allele.effectWithering = new AlleleEffectPotion("Withering", Potion.wither, 10, false).setMalicious(); Allele.spawnGhast = new AlleleEffectSpawnMob("Ghastly", false, "Ghast", "mob.ghast.moan") .setThrottle(2060).setChanceToSpawn(10).setMaxMobsInSpawnZone(1); diff --git a/magicbees_src/magicbees/bees/AlleleEffectAuraNodeCharge.java b/magicbees_src/magicbees/bees/AlleleEffectAuraNodeCharge.java index f0c47a7..a5aa75a 100644 --- a/magicbees_src/magicbees/bees/AlleleEffectAuraNodeCharge.java +++ b/magicbees_src/magicbees/bees/AlleleEffectAuraNodeCharge.java @@ -34,13 +34,6 @@ public class AlleleEffectAuraNodeCharge extends AlleleEffect int y = housing.getYCoord(); int z = housing.getZCoord(); - EnumTag tag; - do - { - tag = EnumTag.values()[world.rand.nextInt(EnumTag.values().length)]; - } - while (tag == EnumTag.UNKNOWN || tag == EnumTag.WEATHER); - if (world.rand.nextBoolean()) { ThaumcraftApi.increaseLowestAura(world, x, y, z, 1); diff --git a/magicbees_src/magicbees/bees/AlleleEffectPotion.java b/magicbees_src/magicbees/bees/AlleleEffectPotion.java index 7e917ae..cc1f6cf 100644 --- a/magicbees_src/magicbees/bees/AlleleEffectPotion.java +++ b/magicbees_src/magicbees/bees/AlleleEffectPotion.java @@ -2,6 +2,7 @@ package magicbees.bees; import java.util.List; +import magicbees.item.ItemArmorApiarist; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.potion.Potion; @@ -17,12 +18,21 @@ public class AlleleEffectPotion extends AlleleEffect { private int potionId; private int duration; + private boolean isMalicious; public AlleleEffectPotion(String name, Potion potionApplied, int effectDuration, boolean isDominant) { super(name, isDominant, 200); this.potionId = potionApplied.id; this.duration = 20 * effectDuration; + this.isMalicious = false; + } + + public AlleleEffectPotion setMalicious() + { + this.isMalicious = true; + + return this; } @Override @@ -45,7 +55,19 @@ public class AlleleEffectPotion extends AlleleEffect if (e instanceof EntityPlayer) { EntityPlayer player = (EntityPlayer)e; - player.addPotionEffect(new PotionEffect(this.potionId, this.duration, 0)); + if (this.isMalicious) + { + int armorPieces = ItemArmorApiarist.getNumberPiecesWorn(player); + int finalDuration = this.duration / 4 * (4 - armorPieces); + if (finalDuration > 0) + { + player.addPotionEffect(new PotionEffect(this.potionId, finalDuration, 0)); + } + } + else + { + player.addPotionEffect(new PotionEffect(this.potionId, this.duration, 0)); + } } } storedData.setInteger(0, 0); diff --git a/magicbees_src/magicbees/bees/BeeMutation.java b/magicbees_src/magicbees/bees/BeeMutation.java index 2b59f6b..d434458 100644 --- a/magicbees_src/magicbees/bees/BeeMutation.java +++ b/magicbees_src/magicbees/bees/BeeMutation.java @@ -447,12 +447,12 @@ public class BeeMutation implements IBeeMutation { if (this.nodeType != null) { - conditions.add(LocalizationManager.getLocalizedString("research.requiresNode")); + conditions.add(String.format(LocalizationManager.getLocalizedString("research.requiresNodeSpecific"), + LocalizationManager.getLocalizedString("research.node." + this.nodeType.name().toLowerCase()))); } else { - conditions.add(String.format(LocalizationManager.getLocalizedString("research.requiresNodeSpecific"), - LocalizationManager.getLocalizedString("research.node." + this.nodeType.name().toLowerCase()))); + conditions.add(LocalizationManager.getLocalizedString("research.requiresNode")); } } if (this.requiresBlock) diff --git a/magicbees_src/magicbees/bees/BeeSpecies.java b/magicbees_src/magicbees/bees/BeeSpecies.java index 850d9c2..581b57d 100644 --- a/magicbees_src/magicbees/bees/BeeSpecies.java +++ b/magicbees_src/magicbees/bees/BeeSpecies.java @@ -119,7 +119,7 @@ public enum BeeSpecies implements IAlleleBeeSpecies, IIconProvider SPITEFUL("Spiteful", "maligna", BeeClassification.ABOMINABLE, 0x5FCC00, 0x960F00, EnumTemperature.HELLISH, EnumHumidity.ARID, true, false), WITHERING("Withering", "vietus", - BeeClassification.ABOMINABLE, 0x5B5B5B, 0x960F00, EnumTemperature.HELLISH, EnumHumidity.NORMAL, true, false), + BeeClassification.ABOMINABLE, 0x5B5B5B, 0x960F00, EnumTemperature.HELLISH, EnumHumidity.ARID, true, false), OBLIVION("Oblivion", "oblivioni", BeeClassification.EXTRINSIC, 0xD5C3E5, 0xF696FF, EnumTemperature.COLD, EnumHumidity.NORMAL, false, false), @@ -468,39 +468,39 @@ public enum BeeSpecies implements IAlleleBeeSpecies, IIconProvider .register(); IRON.addProduct(new ItemStack(Config.fBeeComb, 1, ForestryHelper.Comb.HONEY.ordinal()), 10) - .addSpecialty(Config.nuggets.getStackForType(NuggetType.IRON), 8) + .addSpecialty(Config.nuggets.getStackForType(NuggetType.IRON), 18) .setGenome(BeeGenomeManager.getTemplateIron()) .register(); GOLD.addProduct(new ItemStack(Config.fBeeComb, 1, ForestryHelper.Comb.HONEY.ordinal()), 10) - .addSpecialty(new ItemStack(Item.goldNugget, 1), 6) + .addSpecialty(new ItemStack(Item.goldNugget, 1), 16) .setGenome(BeeGenomeManager.getTemplateGold()) .register(); COPPER.addProduct(new ItemStack(Config.fBeeComb, 1, ForestryHelper.Comb.HONEY.ordinal()), 10) - .addSpecialty(Config.nuggets.getStackForType(NuggetType.COPPER), 9) + .addSpecialty(Config.nuggets.getStackForType(NuggetType.COPPER), 20) .setGenome(BeeGenomeManager.getTemplateCopper()) .register(); TIN.addProduct(new ItemStack(Config.fBeeComb, 1, ForestryHelper.Comb.HONEY.ordinal()), 10) - .addSpecialty(Config.nuggets.getStackForType(NuggetType.TIN), 9) + .addSpecialty(Config.nuggets.getStackForType(NuggetType.TIN), 20) .setGenome(BeeGenomeManager.getTemplateTin()) .register(); SILVER.addProduct(new ItemStack(Config.fBeeComb, 1, ForestryHelper.Comb.HONEY.ordinal()), 10) - .addSpecialty(Config.nuggets.getStackForType(NuggetType.SILVER), 6) + .addSpecialty(Config.nuggets.getStackForType(NuggetType.SILVER), 16) .setGenome(BeeGenomeManager.getTemplateSilver()) .register(); LEAD.addProduct(new ItemStack(Config.fBeeComb, 1, ForestryHelper.Comb.HONEY.ordinal()), 10) - .addSpecialty(Config.nuggets.getStackForType(NuggetType.LEAD), 7) + .addSpecialty(Config.nuggets.getStackForType(NuggetType.LEAD), 17) .setGenome(BeeGenomeManager.getTemplateLead()) .register(); DIAMOND.addProduct(new ItemStack(Config.fBeeComb, 1, ForestryHelper.Comb.HONEY.ordinal()), 10) - .addSpecialty(Config.nuggets.getStackForType(NuggetType.DIAMOND), 3) + .addSpecialty(Config.nuggets.getStackForType(NuggetType.DIAMOND), 6) .setGenome(BeeGenomeManager.getTemplateDiamond()) .register(); EMERALD.addProduct(new ItemStack(Config.fBeeComb, 1, ForestryHelper.Comb.HONEY.ordinal()), 10) - .addSpecialty(Config.nuggets.getStackForType(NuggetType.EMERALD), 2) + .addSpecialty(Config.nuggets.getStackForType(NuggetType.EMERALD), 4) .setGenome(BeeGenomeManager.getTemplateEmerald()) .register(); APATITE.addProduct(new ItemStack(Config.fBeeComb, 1, ForestryHelper.Comb.HONEY.ordinal()), 10) - .addSpecialty(Config.nuggets.getStackForType(NuggetType.APATITE), 2) + .addSpecialty(Config.nuggets.getStackForType(NuggetType.APATITE), 10) .setGenome(BeeGenomeManager.getTemplateApatite()) .register(); diff --git a/magicbees_src/magicbees/main/Config.java b/magicbees_src/magicbees/main/Config.java index 640efcb..f9086c6 100644 --- a/magicbees_src/magicbees/main/Config.java +++ b/magicbees_src/magicbees/main/Config.java @@ -350,6 +350,7 @@ public class Config OreDictionary.registerOre("nuggetLead", nuggets.getStackForType(NuggetType.LEAD)); OreDictionary.registerOre("shardDiamond", nuggets.getStackForType(NuggetType.DIAMOND)); OreDictionary.registerOre("shardEmerald", nuggets.getStackForType(NuggetType.EMERALD)); + OreDictionary.registerOre("shardApatite", nuggets.getStackForType(NuggetType.APATITE)); } private void doMiscConfig()