Adding Osmium bees using Ore Dictionary queries for products.

Add compatability for non-TCons Cobalt to Cobalt bee.
This commit is contained in:
MysteriousAges committed 2015-06-19 14:02:44 -07:00
1 parent e5f296cf83
commit 8e7767d4ba
4 files changed
+43 -4

No files matched your search

@@ -638,6 +638,15 @@ public class BeeGenomeManager {
return genome;
}
public static IAllele[] getTemplateOsmium() {
IAllele[] genome = getTemplateBaseMetallic();
genome[EnumBeeChromosome.SPECIES.ordinal()] = BeeSpecies.OSMIUM;
genome[EnumBeeChromosome.LIFESPAN.ordinal()] = Allele.getBaseAllele("lifespanLonger");
return genome;
}
public static IAllele[] getTemplateDiamond() {
IAllele[] genome = getTemplateBaseMetallic();
+17 -2
View File
@@ -172,8 +172,14 @@ public class BeeMutation implements IBeeMutation
}
if (BeeSpecies.COBALT.isActive())
{
new BeeMutation(Allele.getBaseSpecies("Imperial"), BeeSpecies.INFERNAL, BeeSpecies.COBALT, 9)
.setBlockRequired("blockCobalt");
mutation = new BeeMutation(Allele.getBaseSpecies("Imperial"), BeeSpecies.INFERNAL, BeeSpecies.COBALT, 9);
if (OreDictionary.getOres("nuggetCobalt").size() > 0 && OreDictionary.getOres("blockCobalt").size() > 0) {
mutation.setBlockRequired("blockCobalt");
}
mutation = new BeeMutation(Allele.getBaseSpecies("Imperial"), BeeSpecies.INFERNAL, BeeSpecies.COBALT, 13);
if (OreDictionary.getOres("nuggetNaturalCobalt").size() > 0 && OreDictionary.getOres("blockNaturalCobalt").size() > 0) {
mutation.setBlockRequired("blockNaturalCobalt");
}
}
if (BeeSpecies.MANYULLYN.isActive())
{
@@ -181,6 +187,15 @@ public class BeeMutation implements IBeeMutation
.setBlockRequired("blockManyullyn");
}
if (BeeSpecies.OSMIUM.isActive()) {
baseA = (BeeSpecies.SILVER.isActive()) ? BeeSpecies.SILVER : Allele.getBaseSpecies("Imperial");
baseB = (BeeSpecies.COBALT.isActive()) ? BeeSpecies.COBALT : BeeSpecies.INFERNAL;
mutation = new BeeMutation(baseA, baseB, BeeSpecies.OSMIUM, 11);
if (OreDictionary.getOres("blockOsmium").size() > 0) {
mutation.setBlockRequired("blockOsmium");
}
}
new BeeMutation(Allele.getBaseSpecies("Austere"), BeeSpecies.GOLD, BeeSpecies.DIAMOND, 7)
.setBlockRequired(Blocks.diamond_block);
baseA = (BeeSpecies.SILVER.isActive()) ? BeeSpecies.SILVER : Allele.getBaseSpecies("Imperial");
@@ -167,7 +167,11 @@ public class BeeProductHelper {
COBALT.addProduct(ForestryHelper.itemHoneycomb, 10);
if (OreDictionary.getOres("nuggetCobalt").size() > 0) {
COBALT.addSpecialty(OreDictionary.getOres("nuggetCobalt").get(0), 18);
} else {
}
if (OreDictionary.getOres("nuggetNaturalCobalt").size() > 0) {
COBALT.addSpecialty(OreDictionary.getOres("nuggetNaturalCobalt").get(0), 24);
}
if (COBALT.getSpecialty().size() <= 0) {
COBALT.setInactive();
}
@@ -198,6 +202,14 @@ public class BeeProductHelper {
} else {
MANYULLYN.setInactive();
}
OSMIUM.addProduct(ForestryHelper.itemHoneycomb, 15);
if (OreDictionary.getOres("nuggetOsmium").size() > 0) {
OSMIUM.addSpecialty(OreDictionary.getOres("nuggetOsmium").get(0), 16);
}
else {
OSMIUM.setInactive();
}
}
public static void initThaumcraftProducts() {
+4 -1
View File
@@ -157,6 +157,8 @@ public enum BeeSpecies implements IAlleleBeeSpecies, IIconProvider
0x03265F, 0x59AAEF, EnumTemperature.HOT, EnumHumidity.ARID, false, false),
MANYULLYN("Manyullyn", "manahmanah", BeeClassification.METALLIC,
0x481D6D, 0xBD92F1, EnumTemperature.HOT, EnumHumidity.ARID, true, false),
OSMIUM("Osmium", "hyacintho", BeeClassification.METALLIC,
0x374B5B, 0x6C7B89, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, false),
DIAMOND("Diamond", "diamond", BeeClassification.GEM,
0x209581, 0x8DF5E3, EnumTemperature.NORMAL, EnumHumidity.NORMAL, true, false),
@@ -373,7 +375,8 @@ public enum BeeSpecies implements IAlleleBeeSpecies, IIconProvider
ALUMINUM.registerGenomeTemplate(BeeGenomeManager.getTemplateAluminum());
ARDITE.registerGenomeTemplate(BeeGenomeManager.getTemplateArdite());
COBALT.registerGenomeTemplate(BeeGenomeManager.getTemplateCobalt());
MANYULLYN.registerGenomeTemplate(BeeGenomeManager.getTemplateManyullyn());
MANYULLYN.registerGenomeTemplate(BeeGenomeManager.getTemplateManyullyn());
OSMIUM.registerGenomeTemplate(BeeGenomeManager.getTemplateOsmium());
DIAMOND.registerGenomeTemplate(BeeGenomeManager.getTemplateDiamond());
EMERALD.registerGenomeTemplate(BeeGenomeManager.getTemplateEmerald());
APATITE.registerGenomeTemplate(BeeGenomeManager.getTemplateApatite());