diff --git a/magicbees_res/build.xml b/magicbees_res/build.xml index 6d7c0dd..7ff2afa 100644 --- a/magicbees_res/build.xml +++ b/magicbees_res/build.xml @@ -131,7 +131,8 @@ - + + diff --git a/magicbees_res/mods/magicbees/lang/en_US.xml b/magicbees_res/mods/magicbees/lang/en_US.xml index df42f7e..f4ea91d 100644 --- a/magicbees_res/mods/magicbees/lang/en_US.xml +++ b/magicbees_res/mods/magicbees/lang/en_US.xml @@ -251,6 +251,15 @@ 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 + Aluminum + Crinkly, shiny, and extremely malleable.|Apinomicon + Ardite + Fond of yellowish-orange material found in hellish areas.|Apinomicon + Cobalt + The unstable properties of this material seem to not affect the bees in the slightest.|Apinomicon + Manyullyn + "Doot doo-dee-doot doot!" + Diamandi Crystalline, glittering, and harder than dragon's teeth. These bees are none of those.|Apinomicon Esmeraldi diff --git a/magicbees_src/magicbees/bees/BeeGenomeManager.java b/magicbees_src/magicbees/bees/BeeGenomeManager.java index cfbac89..847cb6e 100644 --- a/magicbees_src/magicbees/bees/BeeGenomeManager.java +++ b/magicbees_src/magicbees/bees/BeeGenomeManager.java @@ -653,6 +653,42 @@ public class BeeGenomeManager return genome; } + public static IAllele[] getTemplateAluminum() + { + IAllele[] genome = getTemplateBaseMetallic(); + + genome[EnumBeeChromosome.SPECIES.ordinal()] = BeeSpecies.ALUMINUM; + + return genome; + } + + public static IAllele[] getTemplateArdite() + { + IAllele[] genome = getTemplateBaseMetallic(); + + genome[EnumBeeChromosome.SPECIES.ordinal()] = BeeSpecies.ARDITE; + + return genome; + } + + public static IAllele[] getTemplateCobalt() + { + IAllele[] genome = getTemplateBaseMetallic(); + + genome[EnumBeeChromosome.SPECIES.ordinal()] = BeeSpecies.COBALT; + + return genome; + } + + public static IAllele[] getTemplateManyullyn() + { + IAllele[] genome = getTemplateBaseMetallic(); + + genome[EnumBeeChromosome.SPECIES.ordinal()] = BeeSpecies.MANYULLYN; + + return genome; + } + public static IAllele[] getTemplateDiamond() { IAllele[] genome = getTemplateBaseMetallic(); diff --git a/magicbees_src/magicbees/bees/BeeMutation.java b/magicbees_src/magicbees/bees/BeeMutation.java index 8a214c2..e18ec4d 100644 --- a/magicbees_src/magicbees/bees/BeeMutation.java +++ b/magicbees_src/magicbees/bees/BeeMutation.java @@ -149,6 +149,28 @@ public class BeeMutation implements IBeeMutation baseB = (BeeSpecies.LEAD.isActive()) ? BeeSpecies.LEAD : BeeSpecies.IRON; new BeeMutation(baseA, baseB, BeeSpecies.GOLD, 8) .setBlockRequired(Block.blockGold); + + if (BeeSpecies.ALUMINUM.isActive()) + { + new BeeMutation(Allele.getBaseSpecies("Industrious"), Allele.getBaseSpecies("Cultivated"), BeeSpecies.ALUMINUM, 10) + .setBlockRequired("blockNaturalAluminum"); + } + if (BeeSpecies.ARDITE.isActive()) + { + new BeeMutation(Allele.getBaseSpecies("Industrious"), BeeSpecies.INFERNAL, BeeSpecies.ARDITE, 9) + .setBlockRequired("blockArdite"); + } + if (BeeSpecies.COBALT.isActive()) + { + new BeeMutation(Allele.getBaseSpecies("Imperial"), BeeSpecies.INFERNAL, BeeSpecies.COBALT, 9) + .setBlockRequired("blockCobalt"); + } + if (BeeSpecies.MANYULLYN.isActive()) + { + new BeeMutation(BeeSpecies.ARDITE, BeeSpecies.COBALT, BeeSpecies.MANYULLYN, 9) + .setBlockRequired("blockManyullyn"); + } + new BeeMutation(Allele.getBaseSpecies("Austere"), BeeSpecies.GOLD, BeeSpecies.DIAMOND, 7) .setBlockRequired(Block.blockDiamond); baseA = (BeeSpecies.SILVER.isActive()) ? BeeSpecies.SILVER : Allele.getBaseSpecies("Imperial"); diff --git a/magicbees_src/magicbees/bees/BeeSpecies.java b/magicbees_src/magicbees/bees/BeeSpecies.java index 581b57d..b2eeafa 100644 --- a/magicbees_src/magicbees/bees/BeeSpecies.java +++ b/magicbees_src/magicbees/bees/BeeSpecies.java @@ -144,6 +144,14 @@ public enum BeeSpecies implements IAlleleBeeSpecies, IIconProvider BeeClassification.METALLIC, 0x747C81, 0x96BFC4, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, false), LEAD("Lead", "plumbeus", BeeClassification.METALLIC, 0x96BFC4, 0x91A9F3, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, true), + ALUMINUM("Aluminum", "aluminium", + BeeClassification.METALLIC, 0xEDEDED, 0x767676, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, true), + ARDITE("Ardite", "aurantiaco", + BeeClassification.METALLIC, 0x720000, 0xFF9E00, EnumTemperature.HOT, EnumHumidity.ARID, false, false), + COBALT("Cobalt", "caeruleo", + BeeClassification.METALLIC, 0x03265F, 0x59AAEF, EnumTemperature.HOT, EnumHumidity.ARID, false, false), + MANYULLYN("Manyullyn", "manahmanah", + BeeClassification.METALLIC, 0x481D6D, 0xBD92F1, EnumTemperature.HOT, EnumHumidity.ARID, true, false), DIAMOND("Diamond", "diamond", BeeClassification.GEM, 0x209581, 0x8DF5E3, EnumTemperature.NORMAL, EnumHumidity.NORMAL, true, false), @@ -326,6 +334,22 @@ public enum BeeSpecies implements IAlleleBeeSpecies, IIconProvider { LEAD.setInactive(); } + if (OreDictionary.getOres("ingotNaturalAluminum").size() <= 0) + { + ALUMINUM.setInactive(); + } + if (OreDictionary.getOres("ingotArdite").size() <= 0) + { + ARDITE.setInactive(); + } + if (OreDictionary.getOres("ingotCobalt").size() <= 0) + { + COBALT.setInactive(); + } + if (OreDictionary.getOres("ingotManyullyn").size() <= 0) + { + MANYULLYN.setInactive(); + } MYSTICAL.addProduct(Config.combs.getStackForType(CombType.MUNDANE), 15) .setGenome(BeeGenomeManager.getTemplateMystical()) @@ -491,6 +515,36 @@ public enum BeeSpecies implements IAlleleBeeSpecies, IIconProvider .addSpecialty(Config.nuggets.getStackForType(NuggetType.LEAD), 17) .setGenome(BeeGenomeManager.getTemplateLead()) .register(); + + ALUMINUM.addProduct(new ItemStack(Config.fBeeComb, 1, ForestryHelper.Comb.HONEY.ordinal()), 10) + .setGenome(BeeGenomeManager.getTemplateAluminum()); + if (OreDictionary.getOres("nuggetNaturalAluminum").size() > 0) + { + ALUMINUM.addSpecialty(OreDictionary.getOres("nuggetNaturalAluminum").get(0), 20); + } + ALUMINUM.register(); + ARDITE.addProduct(new ItemStack(Config.fBeeComb, 1, ForestryHelper.Comb.HONEY.ordinal()), 10) + .setGenome(BeeGenomeManager.getTemplateArdite()); + if (OreDictionary.getOres("nuggetArdite").size() > 0) + { + ARDITE.addSpecialty(OreDictionary.getOres("nuggetArdite").get(0), 18); + } + ARDITE.register(); + COBALT.addProduct(new ItemStack(Config.fBeeComb, 1, ForestryHelper.Comb.HONEY.ordinal()), 10) + .setGenome(BeeGenomeManager.getTemplateCobalt()); + if (OreDictionary.getOres("ingotCobalt").size() > 0) + { + COBALT.addSpecialty(OreDictionary.getOres("ingotCobalt").get(0), 18); + } + COBALT.register(); + MANYULLYN.addProduct(new ItemStack(Config.fBeeComb, 1, ForestryHelper.Comb.HONEY.ordinal()), 10) + .setGenome(BeeGenomeManager.getTemplateManyullyn()); + if (OreDictionary.getOres("nuggetManyullyn").size() > 0) + { + ALUMINUM.addSpecialty(OreDictionary.getOres("nuggetManyullyn").get(0), 16); + } + MANYULLYN.register(); + DIAMOND.addProduct(new ItemStack(Config.fBeeComb, 1, ForestryHelper.Comb.HONEY.ordinal()), 10) .addSpecialty(Config.nuggets.getStackForType(NuggetType.DIAMOND), 6) .setGenome(BeeGenomeManager.getTemplateDiamond()) diff --git a/magicbees_src/magicbees/main/utils/VersionInfo.java b/magicbees_src/magicbees/main/utils/VersionInfo.java index 880906c..37a1979 100644 --- a/magicbees_src/magicbees/main/utils/VersionInfo.java +++ b/magicbees_src/magicbees/main/utils/VersionInfo.java @@ -30,7 +30,7 @@ public class VersionInfo public static final String Logo = "/gfx/magicbees/logo.png"; - public static final String Depends = "required-after:Forestry;after:Thaumcraft;after:ExtraBees;after:EE3;after:ArsMagica"; + public static final String Depends = "required-after:Forestry;after:Thaumcraft;after:ExtraBees;after:EE3;after:ArsMagica;after:TConstruct"; boolean criticalUpdate; boolean newVersion;