diff --git a/src/main/java/magicbees/bees/BeeProductHelper.java b/src/main/java/magicbees/bees/BeeProductHelper.java index d414b4e..c62c267 100644 --- a/src/main/java/magicbees/bees/BeeProductHelper.java +++ b/src/main/java/magicbees/bees/BeeProductHelper.java @@ -211,6 +211,22 @@ public class BeeProductHelper { else { OSMIUM.setInactive(); } + + CERTUS.addProduct(ForestryHelper.itemHoneycomb, 10); + if (OreDictionary.getOres("crystalCertusQuartz").size() > 0) { + CERTUS.addSpecialty(OreDictionary.getOres("crystalCertusQuartz").get(0), 16); + } + else { + CERTUS.setInactive(); + } + + SILICON.addProduct(ForestryHelper.itemHoneycomb, 10); + if (OreDictionary.getOres("crystalCertusQuartz").size() > 0) { + SILICON.addSpecialty(OreDictionary.getOres("crystalCertusQuartz").get(0), 16); + } + else { + SILICON.setInactive(); + } } public static void initThaumcraftProducts() { diff --git a/src/main/java/magicbees/bees/BeeSpecies.java b/src/main/java/magicbees/bees/BeeSpecies.java index 710462f..adcc33b 100644 --- a/src/main/java/magicbees/bees/BeeSpecies.java +++ b/src/main/java/magicbees/bees/BeeSpecies.java @@ -160,12 +160,16 @@ public enum BeeSpecies implements IAlleleBeeSpecies, IIconProvider OSMIUM("Osmium", "hyacintho", BeeClassification.METALLIC, 0x374B5B, 0x6C7B89, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, false), - DIAMOND("Diamond", "diamond", BeeClassification.GEM, + DIAMOND("Diamond", "diamond", 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), + CERTUS("Certus", "", BeeClassification.GEM, + 0xffffff, 0xffffff, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, true), + SILICON("Silicon", "", BeeClassification.GEM, + 0xffffff, 0xffffff, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, false), MUTABLE("Mutable", "mutable", BeeClassification.TRANSMUTING, 0xDBB24C, 0xE0D5A6, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, false), diff --git a/src/main/java/magicbees/main/Config.java b/src/main/java/magicbees/main/Config.java index 31d14e3..76a70af 100644 --- a/src/main/java/magicbees/main/Config.java +++ b/src/main/java/magicbees/main/Config.java @@ -96,6 +96,7 @@ public class Config public static boolean thaumcraftActive; public static boolean thermalExpansionActive; public static boolean botaniaActive; + public static boolean ae2Active; public static float magnetBaseRange; public static float magnetLevelMultiplier; @@ -348,6 +349,9 @@ public class Config p = configuration.get(CATEGORY_MODULES, "Botania", true); botaniaActive = p.getBoolean(); BotaniaHelper.doBotaniaModuleConfigs(configuration); + + p = configuration.get(CATEGORY_MODULES, "AppliedEnergistics2", true); + ae2Active = p.getBoolean(); } private void doGeneralConfigs() {