Remove blood frame from BM (reinvented in magic bees)

src/main/java/WayofTime/alchemicalWizardry/AlchemicalWizardry.java

@@ -36,10 +36,6 @@
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
-import thaumcraft.api.ItemApi;
-import thaumcraft.api.ThaumcraftApi;
-import thaumcraft.api.aspects.Aspect;
-import thaumcraft.api.aspects.AspectList;
 import WayofTime.alchemicalWizardry.api.BlockStack;
 import WayofTime.alchemicalWizardry.api.alchemy.AlchemicalPotionCreationHandler;
 import WayofTime.alchemicalWizardry.api.alchemy.AlchemyRecipeRegistry;
@@ -118,7 +114,6 @@
 import WayofTime.alchemicalWizardry.common.items.ItemMailOrderCatalogue;
 import WayofTime.alchemicalWizardry.common.items.ItemRitualDiviner;
 import WayofTime.alchemicalWizardry.common.items.armour.OmegaArmour;
-import WayofTime.alchemicalWizardry.common.items.forestry.ItemBloodFrame;
 import WayofTime.alchemicalWizardry.common.items.sigil.holding.HoldingPacketHandler;
 import WayofTime.alchemicalWizardry.common.items.thaumcraft.ItemSanguineArmour;
 import WayofTime.alchemicalWizardry.common.omega.OmegaParadigmEarth;
@@ -297,6 +292,10 @@
 import cpw.mods.fml.common.network.NetworkRegistry;
 import cpw.mods.fml.common.registry.EntityRegistry;
 import cpw.mods.fml.common.registry.GameRegistry;
+import thaumcraft.api.ItemApi;
+import thaumcraft.api.ThaumcraftApi;
+import thaumcraft.api.aspects.Aspect;
+import thaumcraft.api.aspects.AspectList;
 
 @Mod(
         modid = "AWWayofTime",
@@ -3279,27 +3278,6 @@ public void postInit(FMLPostInitializationEvent event) {
             registerBMBook();
         }
 
-        if (Loader.isModLoaded("Forestry")) {
-            isForestryLoaded = true;
-
-            ModItems.itemBloodFrame = new ItemBloodFrame().setUnlocalizedName("bloodFrame");
-
-            ItemStack provenFrame = GameRegistry.findItemStack("Forestry", "frameImpregnated", 1);
-
-            if (provenFrame != null) {
-                AltarRecipeRegistry.registerAltarRecipe(
-                        new ItemStack(ModItems.itemBloodFrame),
-                        provenFrame,
-                        3,
-                        30000,
-                        20,
-                        20,
-                        false);
-            }
-        } else {
-            isForestryLoaded = false;
-        }
-
         if (Loader.isModLoaded("harvestcraft")) {
             PamHarvestCompatRegistry.registerPamHandlers();
             AlchemicalWizardry.logger.info("Loaded Harvestcraft Handlers!");

src/main/java/WayofTime/alchemicalWizardry/common/AlchemicalWizardryEventHooks.java

@@ -34,7 +34,6 @@
 import net.minecraftforge.event.entity.living.LivingSpawnEvent.CheckSpawn;
 import net.minecraftforge.event.entity.player.EntityInteractEvent;
 
-import vazkii.botania.api.internal.IManaBurst;
 import WayofTime.alchemicalWizardry.AlchemicalWizardry;
 import WayofTime.alchemicalWizardry.BloodMagicConfiguration;
 import WayofTime.alchemicalWizardry.api.BlockStack;
@@ -59,6 +58,7 @@
 import cpw.mods.fml.common.eventhandler.EventPriority;
 import cpw.mods.fml.common.eventhandler.SubscribeEvent;
 import cpw.mods.fml.common.gameevent.PlayerEvent.PlayerRespawnEvent;
+import vazkii.botania.api.internal.IManaBurst;
 
 public class AlchemicalWizardryEventHooks {
 

src/main/java/WayofTime/alchemicalWizardry/common/bloodAltarUpgrade/CompatChecks.java

@@ -1,11 +1,11 @@
 package WayofTime.alchemicalWizardry.common.bloodAltarUpgrade;
 
-import WayofTime.alchemicalWizardry.api.BlockStack;
-
 import com.cricketcraft.chisel.api.carving.CarvingUtils;
 import com.cricketcraft.chisel.api.carving.ICarvingGroup;
 import com.google.common.base.Strings;
 
+import WayofTime.alchemicalWizardry.api.BlockStack;
+
 public class CompatChecks {
 
     public static boolean checkChiselBlock(BlockStack blockStack, String groupName) {

src/main/java/WayofTime/alchemicalWizardry/common/demonVillage/tileEntity/TEDemonPortal.java

@@ -26,6 +26,9 @@
 import net.minecraftforge.common.util.Constants;
 import net.minecraftforge.common.util.ForgeDirection;
 
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+
 import WayofTime.alchemicalWizardry.AlchemicalWizardry;
 import WayofTime.alchemicalWizardry.api.Int3;
 import WayofTime.alchemicalWizardry.common.block.BlockTeleposer;
@@ -40,9 +43,6 @@
 import WayofTime.alchemicalWizardry.common.demonVillage.demonHoard.DemonType;
 import WayofTime.alchemicalWizardry.common.demonVillage.demonHoard.demon.IHoardDemon;
 
-import com.google.gson.Gson;
-import com.google.gson.GsonBuilder;
-
 public class TEDemonPortal extends TileEntity {
 
     public DemonType type = DemonType.FIRE;

src/main/java/WayofTime/alchemicalWizardry/common/items/BoundAxe.java

@@ -19,13 +19,12 @@
 import net.minecraft.world.World;
 import net.minecraftforge.common.ForgeHooks;
 
+import com.google.common.collect.HashMultiset;
+
 import WayofTime.alchemicalWizardry.AlchemicalWizardry;
 import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable;
 import WayofTime.alchemicalWizardry.common.ItemType;
 import WayofTime.alchemicalWizardry.common.spell.complex.effect.SpellHelper;
-
-import com.google.common.collect.HashMultiset;
-
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 

src/main/java/WayofTime/alchemicalWizardry/common/items/BoundPickaxe.java

@@ -19,14 +19,13 @@
 import net.minecraft.world.World;
 import net.minecraftforge.common.ForgeHooks;
 
+import com.google.common.collect.HashMultiset;
+import com.google.common.collect.Multiset;
+
 import WayofTime.alchemicalWizardry.AlchemicalWizardry;
 import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable;
 import WayofTime.alchemicalWizardry.common.ItemType;
 import WayofTime.alchemicalWizardry.common.spell.complex.effect.SpellHelper;
-
-import com.google.common.collect.HashMultiset;
-import com.google.common.collect.Multiset;
-
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 

src/main/java/WayofTime/alchemicalWizardry/common/items/BoundShovel.java

@@ -20,14 +20,13 @@
 import net.minecraft.world.World;
 import net.minecraftforge.common.ForgeHooks;
 
+import com.google.common.collect.HashMultiset;
+import com.google.common.collect.Multimap;
+
 import WayofTime.alchemicalWizardry.AlchemicalWizardry;
 import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable;
 import WayofTime.alchemicalWizardry.common.ItemType;
 import WayofTime.alchemicalWizardry.common.spell.complex.effect.SpellHelper;
-
-import com.google.common.collect.HashMultiset;
-import com.google.common.collect.Multimap;
-
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 

src/main/java/WayofTime/alchemicalWizardry/common/items/DaggerOfSacrifice.java

@@ -17,14 +17,13 @@
 import net.minecraft.util.StatCollector;
 import net.minecraft.world.World;
 
+import com.google.common.collect.Multimap;
+
 import WayofTime.alchemicalWizardry.AlchemicalWizardry;
 import WayofTime.alchemicalWizardry.api.tile.IBloodAltar;
 import WayofTime.alchemicalWizardry.common.IDemon;
 import WayofTime.alchemicalWizardry.common.demonVillage.demonHoard.demon.IHoardDemon;
 import WayofTime.alchemicalWizardry.common.spell.complex.effect.SpellHelper;
-
-import com.google.common.collect.Multimap;
-
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 

src/main/java/WayofTime/alchemicalWizardry/common/items/armour/BoundArmour.java

@@ -20,9 +20,6 @@
 import net.minecraftforge.common.ISpecialArmor;
 import net.minecraftforge.common.util.Constants;
 
-import thaumcraft.api.IGoggles;
-import thaumcraft.api.IRunicArmor;
-import thaumcraft.api.nodes.IRevealer;
 import WayofTime.alchemicalWizardry.AlchemicalWizardry;
 import WayofTime.alchemicalWizardry.ModItems;
 import WayofTime.alchemicalWizardry.api.alchemy.energy.IAlchemyGoggles;
@@ -36,6 +33,9 @@
 import cpw.mods.fml.common.Optional.Interface;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
+import thaumcraft.api.IGoggles;
+import thaumcraft.api.IRunicArmor;
+import thaumcraft.api.nodes.IRevealer;
 
 @Optional.InterfaceList(
         value = { @Interface(iface = "thaumcraft.api.nodes.IRevealer", modid = "Thaumcraft"),

src/main/java/WayofTime/alchemicalWizardry/common/items/armour/OmegaArmourEarth.java

@@ -10,12 +10,11 @@
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.IIcon;
 
-import WayofTime.alchemicalWizardry.ModItems;
-import WayofTime.alchemicalWizardry.common.renderer.model.ModelOmegaEarth;
-
 import com.google.common.collect.HashMultimap;
 import com.google.common.collect.Multimap;
 
+import WayofTime.alchemicalWizardry.ModItems;
+import WayofTime.alchemicalWizardry.common.renderer.model.ModelOmegaEarth;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 

src/main/java/WayofTime/alchemicalWizardry/common/items/armour/OmegaArmourFire.java

@@ -12,12 +12,11 @@
 import net.minecraft.util.IIcon;
 import net.minecraft.world.biome.BiomeGenBase;
 
-import WayofTime.alchemicalWizardry.ModItems;
-import WayofTime.alchemicalWizardry.common.renderer.model.ModelOmegaFire;
-
 import com.google.common.collect.HashMultimap;
 import com.google.common.collect.Multimap;
 
+import WayofTime.alchemicalWizardry.ModItems;
+import WayofTime.alchemicalWizardry.common.renderer.model.ModelOmegaFire;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 

src/main/java/WayofTime/alchemicalWizardry/common/items/armour/OmegaArmourWater.java

@@ -11,12 +11,11 @@
 import net.minecraft.util.IIcon;
 import net.minecraft.world.biome.BiomeGenBase;
 
-import WayofTime.alchemicalWizardry.ModItems;
-import WayofTime.alchemicalWizardry.common.renderer.model.ModelOmegaWater;
-
 import com.google.common.collect.HashMultimap;
 import com.google.common.collect.Multimap;
 
+import WayofTime.alchemicalWizardry.ModItems;
+import WayofTime.alchemicalWizardry.common.renderer.model.ModelOmegaWater;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 

src/main/java/WayofTime/alchemicalWizardry/common/items/armour/OmegaArmourWind.java

@@ -10,12 +10,11 @@
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.IIcon;
 
-import WayofTime.alchemicalWizardry.ModItems;
-import WayofTime.alchemicalWizardry.common.renderer.model.ModelOmegaWind;
-
 import com.google.common.collect.HashMultimap;
 import com.google.common.collect.Multimap;
 
+import WayofTime.alchemicalWizardry.ModItems;
+import WayofTime.alchemicalWizardry.common.renderer.model.ModelOmegaWind;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;