diff --git a/magicbees_res/changelog.txt b/magicbees_res/changelog.txt index c28e4a1..40a6559 100644 --- a/magicbees_res/changelog.txt +++ b/magicbees_res/changelog.txt @@ -1,3 +1,6 @@ +2.1.7 +Some non-bee bug removals. + 2.1.6 How about not crashing because I forgot a colour tuple? >.> Presenting a new bee species: You can't see it though, because it's invisible. >_> diff --git a/magicbees_src/magicbees/item/types/HiveFrameType.java b/magicbees_src/magicbees/item/types/HiveFrameType.java index bceaf87..8564245 100644 --- a/magicbees_src/magicbees/item/types/HiveFrameType.java +++ b/magicbees_src/magicbees/item/types/HiveFrameType.java @@ -4,13 +4,13 @@ import magicbees.main.utils.LocalizationManager; public enum HiveFrameType { - MAGIC("Magic", 240, 1f, 1f, 1f, 2f, 0.5f), + MAGIC("Magic", 240, 1f, 1f, 1f, 2f, 0.6f), RESILIENT("Resilient", 800, 1f, 1f, 1f, 2f, 0.5f), - GENTLE("Gentle", 200, 1f, 0.7f, 1.5f, 1.4f, 0.1f), + GENTLE("Gentle", 200, 1f, 0.7f, 1.5f, 1.4f, 0.01f), METABOLIC("Metabolic", 130, 1f, 1.8f, 1f, 1.2f, 1f), - NECROTIC("Necrotic", 280, 1f, 1f, 0.3f, 0.75f, 0.8f), + NECROTIC("Necrotic", 280, 1f, 1f, 0.3f, 0.75f, 1.2f), TEMPORAL("Temporal", 300, 1f, 1f, 2.5f, 1f, 0.8f), - OBLIVION("Oblivion", 50, 1f, 1f, 0.0001f, 0f, 0.8f), + OBLIVION("Oblivion", 50, 1f, 1f, 0.0001f, 0f, 1f), ; private HiveFrameType(String name, int damage, diff --git a/magicbees_src/magicbees/main/utils/CraftingManager.java b/magicbees_src/magicbees/main/utils/CraftingManager.java index d637c42..ee2c782 100644 --- a/magicbees_src/magicbees/main/utils/CraftingManager.java +++ b/magicbees_src/magicbees/main/utils/CraftingManager.java @@ -240,13 +240,10 @@ public class CraftingManager input, Config.pollen.getStackForType(PollenType.PHASED) }); - if (!ThaumcraftHelper.isActive()) - { - GameRegistry.addShapelessRecipe(new ItemStack(Config.hiveFrameOblivion), new Object[] { - Config.miscResources.getStackForType(ResourceType.ESSENCE_SCORNFUL_OBLIVION), - ItemInterface.getItem("frameProven") - }); - } + GameRegistry.addShapelessRecipe(new ItemStack(Config.hiveFrameOblivion), new Object[] { + Config.miscResources.getStackForType(ResourceType.ESSENCE_SCORNFUL_OBLIVION), + ItemInterface.getItem("frameProven") + }); if (OreDictionary.getOres("ingotCopper").size() <= 0) { diff --git a/magicbees_src/magicbees/main/utils/compat/ThaumcraftHelper.java b/magicbees_src/magicbees/main/utils/compat/ThaumcraftHelper.java index c1d0732..54a6abb 100644 --- a/magicbees_src/magicbees/main/utils/compat/ThaumcraftHelper.java +++ b/magicbees_src/magicbees/main/utils/compat/ThaumcraftHelper.java @@ -282,12 +282,6 @@ public class ThaumcraftHelper 'C', new ItemStack(Config.tcMiscResource, 1, MiscResource.ENCHANTED_FABRIC.ordinal()) }); - frameOblivion = ThaumcraftApi.addShapelessArcaneCraftingRecipe("MB_EssenceOblivion", new ItemStack(Config.hiveFrameOblivion), - new AspectList().add(Aspect.ORDER, 10).add(Aspect.ENTROPY, 5), new Object[] { - Config.miscResources.getStackForType(ResourceType.ESSENCE_SCORNFUL_OBLIVION), - ItemInterface.getItem("frameProven") - }); - essenceLife = ThaumcraftApi.addCrucibleRecipe("MB_EssenceLife", Config.miscResources.getStackForType(ResourceType.ESSENCE_FALSE_LIFE), new ItemStack(Block.plantRed), new AspectList().add(Aspect.EXCHANGE, 4).add(Aspect.PLANT, 4)); @@ -327,7 +321,6 @@ public class ThaumcraftHelper } private static Object frameMagic; - private static Object frameOblivion; private static Object thaumScoop; private static Object thaumGrafter; private static Object singularityA;