diff --git a/src/main/java/magicbees/bees/BeeMutation.java b/src/main/java/magicbees/bees/BeeMutation.java index 8777450..ab15fd5 100644 --- a/src/main/java/magicbees/bees/BeeMutation.java +++ b/src/main/java/magicbees/bees/BeeMutation.java @@ -3,7 +3,6 @@ package magicbees.bees; import java.util.ArrayList; import java.util.Collection; -import magicbees.main.Config; import magicbees.main.utils.LocalizationManager; import magicbees.main.utils.LogHelper; import magicbees.main.utils.MoonPhase; @@ -243,6 +242,20 @@ public class BeeMutation implements IBeeMutation { new BeeMutation(BeeSpecies.ETHEREAL, BeeSpecies.SUPERNATURAL, BeeSpecies.TC_CHAOS, 8) .setBlockAndMetaRequired(ThaumcraftHelper.crystal, ThaumcraftHelper.ShardType.CHAOS.ordinal()); + new BeeMutation(BeeSpecies.ETHEREAL, BeeSpecies.INFERNAL, BeeSpecies.TC_VIS, 9) + .setMoonPhaseRestricted(MoonPhase.WAXING_HALF, MoonPhase.WANING_HALF); + new BeeMutation(BeeSpecies.ATTUNED, BeeSpecies.TC_VIS, BeeSpecies.TC_REJUVENATING, 8); + new BeeMutation(BeeSpecies.TC_VIS, BeeSpecies.TC_REJUVENATING, BeeSpecies.TC_EMPOWERING, 6) + .setMoonPhaseBonus(MoonPhase.FULL, MoonPhase.FULL, 1.322f); + new BeeMutation(BeeSpecies.TC_REJUVENATING, BeeSpecies.TC_EMPOWERING, BeeSpecies.TC_NEXUS, 10) + .setBiomeRequired(Type.MAGICAL) + .setBlockAndMetaRequired(ThaumcraftHelper.airy, ThaumcraftHelper.AiryBlockType.NODE.ordinal()); + + new BeeMutation(BeeSpecies.TRANSMUTING, BeeSpecies.TC_EMPOWERING, BeeSpecies.TC_TAINT, 11); + new BeeMutation(BeeSpecies.TRANSMUTING, BeeSpecies.TC_REJUVENATING, BeeSpecies.TC_PURE, 8) + .setBiomeRequired(Type.MAGICAL); + new BeeMutation(BeeSpecies.BIGBAD, BeeSpecies.TC_VIS, BeeSpecies.TC_HUNGRY, 20); + new BeeMutation(BeeSpecies.SKULKING, BeeSpecies.WINDY, BeeSpecies.TC_BATTY, 9); new BeeMutation(BeeSpecies.SKULKING, BeeSpecies.PUPIL, BeeSpecies.TC_BRAINY, 9); new BeeMutation(BeeSpecies.ETHEREAL, BeeSpecies.GHASTLY, BeeSpecies.TC_WISPY, 9) @@ -435,7 +448,7 @@ public class BeeMutation implements IBeeMutation { blockMeta = housing.getWorld().getBlockMetadata(housing.getXCoord(), housing.getYCoord() - i, housing.getZCoord()); ++i; } - while (blockBelow != null && (blockBelow instanceof IBeeHousing || blockBelow == Config.fAlvearyBlock)); + while (blockBelow != null && (blockBelow instanceof IBeeHousing || blockBelow == ForestryHelper.alvearyBlock)); if (this.requiredBlockOreDictEntry != null) { int[] dicId = OreDictionary.getOreIDs(new ItemStack(blockBelow, 1, blockMeta)); diff --git a/src/main/java/magicbees/bees/BeeProductHelper.java b/src/main/java/magicbees/bees/BeeProductHelper.java index ab731db..601197f 100644 --- a/src/main/java/magicbees/bees/BeeProductHelper.java +++ b/src/main/java/magicbees/bees/BeeProductHelper.java @@ -106,16 +106,16 @@ public class BeeProductHelper { APATITE.addProduct(ForestryHelper.itemHoneycomb, 0.10f) .addSpecialty(Config.nuggets.getStackForType(NuggetType.APATITE), 0.10f); - MUTABLE.addProduct(new ItemStack(Config.fBeeComb, 1, ForestryHelper.Comb.PARCHED.ordinal()), 0.30f) + MUTABLE.addProduct(new ItemStack(ForestryHelper.beeComb, 1, ForestryHelper.Comb.PARCHED.ordinal()), 0.30f) .addProduct(Config.combs.getStackForType(CombType.TRANSMUTED), 0.10f); - TRANSMUTING.addProduct(new ItemStack(Config.fBeeComb, 1, ForestryHelper.Comb.PARCHED.ordinal()), 0.10f) + TRANSMUTING.addProduct(new ItemStack(ForestryHelper.beeComb, 1, ForestryHelper.Comb.PARCHED.ordinal()), 0.10f) .addProduct(Config.combs.getStackForType(CombType.TRANSMUTED), 0.30f) - .addProduct(new ItemStack(Config.fBeeComb, 1, ForestryHelper.Comb.SILKY.ordinal()), 0.5f) - .addProduct(new ItemStack(Config.fBeeComb, 1, ForestryHelper.Comb.SIMMERING.ordinal()), 0.5f); - CRUMBLING.addProduct(new ItemStack(Config.fBeeComb, 1, ForestryHelper.Comb.PARCHED.ordinal()), 0.10f) + .addProduct(new ItemStack(ForestryHelper.beeComb, 1, ForestryHelper.Comb.SILKY.ordinal()), 0.5f) + .addProduct(new ItemStack(ForestryHelper.beeComb, 1, ForestryHelper.Comb.SIMMERING.ordinal()), 0.5f); + CRUMBLING.addProduct(new ItemStack(ForestryHelper.beeComb, 1, ForestryHelper.Comb.PARCHED.ordinal()), 0.10f) .addProduct(Config.combs.getStackForType(CombType.TRANSMUTED), 0.30f) - .addProduct(new ItemStack(Config.fBeeComb, 1, ForestryHelper.Comb.POWDERY.ordinal()), 0.10f) - .addProduct(new ItemStack(Config.fBeeComb, 1, ForestryHelper.Comb.COCOA.ordinal()), 0.15f); + .addProduct(new ItemStack(ForestryHelper.beeComb, 1, ForestryHelper.Comb.POWDERY.ordinal()), 0.10f) + .addProduct(new ItemStack(ForestryHelper.beeComb, 1, ForestryHelper.Comb.COCOA.ordinal()), 0.15f); INVISIBLE.addProduct(Config.combs.getStackForType(CombType.MUNDANE), 0.35f); @@ -249,20 +249,23 @@ public class BeeProductHelper { TC_VIS.addProduct(Config.combs.getStackForType(CombType.INTELLECT), 0.10f); TC_REJUVENATING.addProduct(Config.combs.getStackForType(CombType.INTELLECT), 0.18f); TC_EMPOWERING.addProduct(Config.combs.getStackForType(CombType.INTELLECT), 0.14f); - TC_EMPOWERING.addSpecialty(new ItemStack(Config.fPollen, 1, ForestryHelper.Pollen.CRYSTALLINE.ordinal()), 0.2f); + TC_EMPOWERING.addSpecialty(new ItemStack(ForestryHelper.pollen, 1, ForestryHelper.Pollen.CRYSTALLINE.ordinal()), 0.2f); TC_NEXUS.addProduct(Config.combs.getStackForType(CombType.INTELLECT), 0.25f); TC_NEXUS.addProduct(Config.combs.getStackForType(CombType.TEMPORAL), 0.12f); - TC_NEXUS.addSpecialty(new ItemStack(Config.fPollen, 1, ForestryHelper.Pollen.CRYSTALLINE.ordinal()), 0.2f); + TC_NEXUS.addSpecialty(new ItemStack(ForestryHelper.pollen, 1, ForestryHelper.Pollen.CRYSTALLINE.ordinal()), 0.2f); TC_TAINT.addProduct(Config.combs.getStackForType(CombType.INTELLECT), 0.18f); + TC_TAINT.addProduct(new ItemStack(ForestryHelper.craftingResource, 1 , ForestryHelper.Propolis.STICKY.ordinal()), 0.213f); TC_PURE.addProduct(Config.combs.getStackForType(CombType.INTELLECT), 0.16f); + TC_PURE.addSpecialty(Config.combs.getStackForType(CombType.SOUL), 0.19f); TC_HUNGRY.addProduct(Config.combs.getStackForType(CombType.INTELLECT), 0.28f); + TC_HUNGRY.addSpecialty(Config.combs.getStackForType(CombType.TEMPORAL), 0.195f); TC_BRAINY.addProduct(Config.combs.getStackForType(CombType.FURTIVE), 0.10f) .addProduct(new ItemStack(Items.rotten_flesh), 0.6f); TC_BATTY.addProduct(Config.combs.getStackForType(CombType.FURTIVE), 0.10f) .addSpecialty(new ItemStack(Items.gunpowder), 0.4f); - TC_WISPY.addProduct(new ItemStack(Config.fBeeComb, 1, ForestryHelper.Comb.SILKY.ordinal()), 0.22f) - .addSpecialty(new ItemStack(Config.fCraftingResource, 1, ForestryHelper.CraftingMaterial.SILK_WISP.ordinal()), 0.4f); + TC_WISPY.addProduct(new ItemStack(ForestryHelper.beeComb, 1, ForestryHelper.Comb.SILKY.ordinal()), 0.22f) + .addSpecialty(new ItemStack(ForestryHelper.craftingResource, 1, ForestryHelper.CraftingMaterial.SILK_WISP.ordinal()), 0.4f); TC_CHICKEN.addProduct(ForestryHelper.itemHoneycomb, 0.10f); TC_BEEF.addProduct(ForestryHelper.itemHoneycomb, 0.10f); TC_PORK.addProduct(ForestryHelper.itemHoneycomb, 0.10f); @@ -339,13 +342,13 @@ public class BeeProductHelper { TE_WINSOME.addProduct(Config.combs.getStackForType(CombType.FURTIVE), 0.10f) .addProduct(Config.combs.getStackForType(CombType.TE_ENDEARING), 0.5f) .addSpecialty(new ItemStack(Items.ender_pearl), 0.5f); - TE_ENDEARING.addProduct(new ItemStack(Config.fBeeComb, 1, ForestryHelper.Comb.MYSTERIOUS.ordinal()), 0.10f) + TE_ENDEARING.addProduct(new ItemStack(ForestryHelper.beeComb, 1, ForestryHelper.Comb.MYSTERIOUS.ordinal()), 0.10f) .addProduct(Config.combs.getStackForType(CombType.TE_ENDEARING), 0.5f); TE_COAL.addProduct(ForestryHelper.itemHoneycomb, 0.10f) .addProduct(Config.combs.getStackForType(CombType.TE_CARBON), 0.5f) .addSpecialty(new ItemStack(Items.coal), 0.5f); - TE_BLIZZY.addProduct(new ItemStack(Config.fBeeComb, 1, ForestryHelper.Comb.FROZEN.ordinal()), 0.10f); - TE_GELID.addProduct(new ItemStack(Config.fBeeComb, 1, ForestryHelper.Comb.FROZEN.ordinal()), 0.10f); + TE_BLIZZY.addProduct(new ItemStack(ForestryHelper.beeComb, 1, ForestryHelper.Comb.FROZEN.ordinal()), 0.10f); + TE_GELID.addProduct(new ItemStack(ForestryHelper.beeComb, 1, ForestryHelper.Comb.FROZEN.ordinal()), 0.10f); if (ThermalExpansionHelper.isActive()) { LogHelper.info("Thermal Expansion bees active"); diff --git a/src/main/java/magicbees/bees/BeeSpecies.java b/src/main/java/magicbees/bees/BeeSpecies.java index 062a26d..0e3be09 100644 --- a/src/main/java/magicbees/bees/BeeSpecies.java +++ b/src/main/java/magicbees/bees/BeeSpecies.java @@ -852,11 +852,11 @@ public enum BeeSpecies implements IAlleleBeeSpecies, IIconProvider } } - if (itemStack.getItem() == Config.fHoneyDrop) { + if (itemStack.getItem() == ForestryHelper.honeyDrop) { return 0.5f; - } else if (itemStack.getItem() == Config.fHoneydew) { + } else if (itemStack.getItem() == ForestryHelper.honeydew) { return 0.7f; - } else if (itemStack.getItem() == Config.fBeeComb || itemStack.getItem() == Config.combs) { + } else if (itemStack.getItem() == ForestryHelper.beeComb || itemStack.getItem() == Config.combs) { return 0.4f; } else if (getRoot().isMember(itemStack)) { return 1.0f; diff --git a/src/main/java/magicbees/main/Config.java b/src/main/java/magicbees/main/Config.java index 6841e6a..36dbcd6 100644 --- a/src/main/java/magicbees/main/Config.java +++ b/src/main/java/magicbees/main/Config.java @@ -148,15 +148,6 @@ public class Config public static Item thaumaturgeBackpackT2; public static BackpackDefinition thaumaturgeBackpackDef; - //----- Forestry Blocks ------------------------------------ - public static Block fHiveBlock; - public static Block fAlvearyBlock; - public static Block fApicultureBlock; - //----- Forestry Items ------------------------------------- - public static Item fBeeComb; - public static Item fHoneydew; - public static Item fHoneyDrop; - public static Item fPollen; //----- Equivalent Exchange Blocks ------------------------- //----- Equivalent Exchange Items -------------------------- public static Item eeMinuimShard; @@ -194,7 +185,6 @@ public class Config //----- Config State info ---------------------------------- public static Configuration configuration; - public static Item fCraftingResource; public Config(File configFile) { diff --git a/src/main/java/magicbees/main/utils/CraftingManager.java b/src/main/java/magicbees/main/utils/CraftingManager.java index 3375c23..8491400 100644 --- a/src/main/java/magicbees/main/utils/CraftingManager.java +++ b/src/main/java/magicbees/main/utils/CraftingManager.java @@ -259,7 +259,7 @@ public class CraftingManager { GameRegistry.addShapelessRecipe(output, Config.pollen.getStackForType(PollenType.UNUSUAL, 2), Config.drops.getStackForType(DropType.ENCHANTED, 2), - new ItemStack(Config.fApicultureBlock, 1, ForestryHelper.ApicultureBlock.APIARY.ordinal()) + new ItemStack(ForestryHelper.apicultureBlock, 1, ForestryHelper.ApicultureBlock.APIARY.ordinal()) ); GameRegistry.addRecipe(new ItemStack(Config.enchantedEarth), @@ -469,7 +469,7 @@ public class CraftingManager { output = newMap(); output.put(Config.wax.getStackForType(WaxType.MAGIC), 1f); output.put(Config.pollen.getStackForType(PollenType.PHASED), 0.055f); - output.put(new ItemStack(Config.fHoneydew, 1), 0.6f); + output.put(new ItemStack(ForestryHelper.honeydew, 1), 0.6f); RecipeManagers.centrifugeManager.addRecipe(20, Config.combs.getStackForType(CombType.TEMPORAL), output); output = newMap(); diff --git a/src/main/java/magicbees/main/utils/compat/ForestryHelper.java b/src/main/java/magicbees/main/utils/compat/ForestryHelper.java index 282988b..9a68932 100644 --- a/src/main/java/magicbees/main/utils/compat/ForestryHelper.java +++ b/src/main/java/magicbees/main/utils/compat/ForestryHelper.java @@ -8,6 +8,8 @@ import magicbees.main.Config; import magicbees.main.utils.BlockInterface; import magicbees.main.utils.ItemInterface; import magicbees.main.utils.VersionInfo; +import net.minecraft.block.Block; +import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; @@ -102,7 +104,19 @@ public class ForestryHelper } public static final String Name = "Forestry"; - + + + //----- Forestry Blocks ------------------------------------ + public static Block hiveBlock; + public static Block alvearyBlock; + public static Block apicultureBlock; + //----- Forestry Items ------------------------------------- + public static Item beeComb; + public static Item honeydew; + public static Item honeyDrop; + public static Item propolis; + public static Item pollen; + public static Item craftingResource; public static ItemStack itemHoneycomb; public static void preInit() @@ -139,20 +153,21 @@ public class ForestryHelper private static void getBlocks() { - Config.fAlvearyBlock = BlockInterface.getBlock("alveary"); - Config.fHiveBlock = BlockInterface.getBlock("beehives"); - Config.fApicultureBlock = BlockInterface.getBlock("apiculture"); + alvearyBlock = BlockInterface.getBlock("alveary"); + hiveBlock = BlockInterface.getBlock("beehives"); + apicultureBlock = BlockInterface.getBlock("apiculture"); } private static void getItems() { - Config.fBeeComb = ItemInterface.getItem("beeCombs"); - Config.fPollen = ItemInterface.getItem("pollen"); - Config.fCraftingResource = ItemInterface.getItem("craftingMaterial"); - Config.fHoneyDrop = ItemInterface.getItem("honeyDrop"); - Config.fHoneydew = ItemInterface.getItem("honeydew"); + beeComb = ItemInterface.getItem("beeCombs"); + pollen = ItemInterface.getItem("pollen"); + ForestryHelper.craftingResource = ItemInterface.getItem("craftingMaterial"); + honeyDrop = ItemInterface.getItem("honeyDrop"); + propolis = ItemInterface.getItem("propolis"); + honeydew = ItemInterface.getItem("honeydew"); // Caching a single item stack. Turns out it's used a LOT. - itemHoneycomb = new ItemStack(Config.fBeeComb, 1, ForestryHelper.Comb.HONEY.ordinal()); + itemHoneycomb = new ItemStack(beeComb, 1, Comb.HONEY.ordinal()); } public static IAllele[] getTemplateForestryForSpecies(String speciesName) diff --git a/src/main/java/magicbees/main/utils/compat/ThaumcraftHelper.java b/src/main/java/magicbees/main/utils/compat/ThaumcraftHelper.java index 28b18ae..8c697d2 100644 --- a/src/main/java/magicbees/main/utils/compat/ThaumcraftHelper.java +++ b/src/main/java/magicbees/main/utils/compat/ThaumcraftHelper.java @@ -583,7 +583,7 @@ public class ThaumcraftHelper { } list = new AspectList().add(Aspect.ORDER, 5).add(Aspect.ARMOR, 2).add(Aspect.BEAST, 1); - item = new ItemStack(Config.fHiveBlock); + item = new ItemStack(ForestryHelper.hiveBlock); ThaumcraftApi.registerObjectTag(item, list); ThaumcraftApi.registerObjectTag(new ItemStack(Config.hive), list);