package-info upd- I mean 1.9.4 update

These are now "required" thanks to Mojang giving us some annotations. Yay..?

build.gradle

@@ -5,7 +5,7 @@ buildscript {
         maven { url "https://oss.sonatype.org/content/repositories/snapshots/" }
     }
     dependencies {
-		classpath 'net.minecraftforge.gradle:ForgeGradle:2.1-SNAPSHOT'
+		classpath 'net.minecraftforge.gradle:ForgeGradle:2.2-SNAPSHOT'
         classpath 'org.ajoberstar:gradle-git:0.10.1'
     }
 }

gradle.properties

@@ -1,13 +1,13 @@
 mod_name=BloodMagic
 package_group=com.wayoftime.bloodmagic
 mod_version=2.0.0
-mc_version=1.9
-forge_version=12.16.0.1865-1.9
+mc_version=1.9.4
+forge_version=12.17.0.1909-1.9.4
 curse_id=224791
 
-mappings_version=snapshot_20160424
+mappings_version=snapshot_20160518
 
-jei_version=3.3.2.196
+jei_version=3.4.0.204
 waila_version=1.7.0-B2
 thaumcraft_version=5.1.5
 baubles_version=1.1.3.0

src/main/java/WayofTime/bloodmagic/alchemyArray/package-info.java

@@ -0,0 +1,7 @@
+@ParametersAreNonnullByDefault
+@MethodsReturnNonnullByDefault
+package WayofTime.bloodmagic.alchemyArray;
+
+import mcp.MethodsReturnNonnullByDefault;
+
+import javax.annotation.ParametersAreNonnullByDefault;

src/main/java/WayofTime/bloodmagic/altar/BloodAltar.java

@@ -339,7 +339,7 @@ public class BloodAltar implements IFluidHandler
             {
                 BlockPos newPos = pos.offset(facing);
                 IBlockState block = world.getBlockState(newPos);
-                block.getBlock().onNeighborBlockChange(world, newPos, block, block.getBlock());
+                block.getBlock().neighborChanged(block, world, newPos, block.getBlock());
             }
         }
         if (internalCounter % (Math.max(20 - this.accelerationUpgrades, 1)) == 0)

src/main/java/WayofTime/bloodmagic/altar/package-info.java

@@ -0,0 +1,7 @@
+@ParametersAreNonnullByDefault
+@MethodsReturnNonnullByDefault
+package WayofTime.bloodmagic.altar;
+
+import mcp.MethodsReturnNonnullByDefault;
+
+import javax.annotation.ParametersAreNonnullByDefault;

src/main/java/WayofTime/bloodmagic/api/alchemyCrafting/package-info.java

@@ -0,0 +1,7 @@
+@ParametersAreNonnullByDefault
+@MethodsReturnNonnullByDefault
+package WayofTime.bloodmagic.api.alchemyCrafting;
+
+import mcp.MethodsReturnNonnullByDefault;
+
+import javax.annotation.ParametersAreNonnullByDefault;

src/main/java/WayofTime/bloodmagic/api/altar/package-info.java

@@ -0,0 +1,7 @@
+@ParametersAreNonnullByDefault
+@MethodsReturnNonnullByDefault
+package WayofTime.bloodmagic.api.altar;
+
+import mcp.MethodsReturnNonnullByDefault;
+
+import javax.annotation.ParametersAreNonnullByDefault;

src/main/java/WayofTime/bloodmagic/api/compress/package-info.java

@@ -0,0 +1,7 @@
+@ParametersAreNonnullByDefault
+@MethodsReturnNonnullByDefault
+package WayofTime.bloodmagic.api.compress;
+
+import mcp.MethodsReturnNonnullByDefault;
+
+import javax.annotation.ParametersAreNonnullByDefault;

src/main/java/WayofTime/bloodmagic/api/event/package-info.java

@@ -0,0 +1,7 @@
+@ParametersAreNonnullByDefault
+@MethodsReturnNonnullByDefault
+package WayofTime.bloodmagic.api.event;
+
+import mcp.MethodsReturnNonnullByDefault;
+
+import javax.annotation.ParametersAreNonnullByDefault;

src/main/java/WayofTime/bloodmagic/api/iface/package-info.java

@@ -0,0 +1,7 @@
+@ParametersAreNonnullByDefault
+@MethodsReturnNonnullByDefault
+package WayofTime.bloodmagic.api.iface;
+
+import mcp.MethodsReturnNonnullByDefault;
+
+import javax.annotation.ParametersAreNonnullByDefault;

src/main/java/WayofTime/bloodmagic/api/impl/package-info.java

@@ -0,0 +1,7 @@
+@ParametersAreNonnullByDefault
+@MethodsReturnNonnullByDefault
+package WayofTime.bloodmagic.api.impl;
+
+import mcp.MethodsReturnNonnullByDefault;
+
+import javax.annotation.ParametersAreNonnullByDefault;

src/main/java/WayofTime/bloodmagic/api/incense/package-info.java

@@ -0,0 +1,7 @@
+@ParametersAreNonnullByDefault
+@MethodsReturnNonnullByDefault
+package WayofTime.bloodmagic.api.incense;
+
+import mcp.MethodsReturnNonnullByDefault;
+
+import javax.annotation.ParametersAreNonnullByDefault;

src/main/java/WayofTime/bloodmagic/api/livingArmour/package-info.java

@@ -0,0 +1,7 @@
+@ParametersAreNonnullByDefault
+@MethodsReturnNonnullByDefault
+package WayofTime.bloodmagic.api.livingArmour;
+
+import mcp.MethodsReturnNonnullByDefault;
+
+import javax.annotation.ParametersAreNonnullByDefault;

src/main/java/WayofTime/bloodmagic/api/network/SoulNetwork.java

@@ -48,10 +48,11 @@ public class SoulNetwork extends WorldSavedData
     }
 
     @Override
-    public void writeToNBT(NBTTagCompound nbttagcompound)
+    public NBTTagCompound writeToNBT(NBTTagCompound nbttagcompound)
     {
         nbttagcompound.setInteger(Constants.NBT.CURRENT_ESSENCE, currentEssence);
         nbttagcompound.setInteger(Constants.NBT.ORB_TIER, orbTier);
+        return nbttagcompound;
     }
 
     public int addLifeEssence(int toAdd, int maximum)

src/main/java/WayofTime/bloodmagic/api/network/package-info.java

@@ -0,0 +1,7 @@
+@ParametersAreNonnullByDefault
+@MethodsReturnNonnullByDefault
+package WayofTime.bloodmagic.api.network;
+
+import mcp.MethodsReturnNonnullByDefault;
+
+import javax.annotation.ParametersAreNonnullByDefault;

src/main/java/WayofTime/bloodmagic/api/orb/package-info.java

@@ -0,0 +1,7 @@
+@ParametersAreNonnullByDefault
+@MethodsReturnNonnullByDefault
+package WayofTime.bloodmagic.api.orb;
+
+import mcp.MethodsReturnNonnullByDefault;
+
+import javax.annotation.ParametersAreNonnullByDefault;

src/main/java/WayofTime/bloodmagic/api/package-info.java

@@ -1,5 +1,10 @@
 @API(owner = "BloodMagic", provides = "BloodMagic|API", apiVersion = "@VERSION@")
+@MethodsReturnNonnullByDefault
+@ParametersAreNonnullByDefault
 package WayofTime.bloodmagic.api;
 
+import mcp.MethodsReturnNonnullByDefault;
 import net.minecraftforge.fml.common.API;
 
+import javax.annotation.ParametersAreNonnullByDefault;
+

src/main/java/WayofTime/bloodmagic/api/recipe/package-info.java

@@ -0,0 +1,7 @@
+@ParametersAreNonnullByDefault
+@MethodsReturnNonnullByDefault
+package WayofTime.bloodmagic.api.recipe;
+
+import mcp.MethodsReturnNonnullByDefault;
+
+import javax.annotation.ParametersAreNonnullByDefault;

src/main/java/WayofTime/bloodmagic/api/registry/package-info.java

@@ -0,0 +1,7 @@
+@ParametersAreNonnullByDefault
+@MethodsReturnNonnullByDefault
+package WayofTime.bloodmagic.api.registry;
+
+import mcp.MethodsReturnNonnullByDefault;
+
+import javax.annotation.ParametersAreNonnullByDefault;

src/main/java/WayofTime/bloodmagic/api/ritual/imperfect/package-info.java

@@ -0,0 +1,7 @@
+@ParametersAreNonnullByDefault
+@MethodsReturnNonnullByDefault
+package WayofTime.bloodmagic.api.ritual.imperfect;
+
+import mcp.MethodsReturnNonnullByDefault;
+
+import javax.annotation.ParametersAreNonnullByDefault;

src/main/java/WayofTime/bloodmagic/api/ritual/package-info.java

@@ -0,0 +1,7 @@
+@ParametersAreNonnullByDefault
+@MethodsReturnNonnullByDefault
+package WayofTime.bloodmagic.api.ritual;
+
+import mcp.MethodsReturnNonnullByDefault;
+
+import javax.annotation.ParametersAreNonnullByDefault;

src/main/java/WayofTime/bloodmagic/api/soul/package-info.java

@@ -0,0 +1,7 @@
+@ParametersAreNonnullByDefault
+@MethodsReturnNonnullByDefault
+package WayofTime.bloodmagic.api.soul;
+
+import mcp.MethodsReturnNonnullByDefault;
+
+import javax.annotation.ParametersAreNonnullByDefault;

src/main/java/WayofTime/bloodmagic/api/teleport/package-info.java

@@ -0,0 +1,7 @@
+@ParametersAreNonnullByDefault
+@MethodsReturnNonnullByDefault
+package WayofTime.bloodmagic.api.teleport;
+
+import mcp.MethodsReturnNonnullByDefault;
+
+import javax.annotation.ParametersAreNonnullByDefault;

src/main/java/WayofTime/bloodmagic/api/util/helper/NetworkHelper.java

@@ -38,7 +38,7 @@ public class NetworkHelper
             return new SoulNetwork(uuid);
         }
 
-        SoulNetwork network = (SoulNetwork) world.getMapStorage().loadData(SoulNetwork.class, uuid);
+        SoulNetwork network = (SoulNetwork) world.getMapStorage().getOrLoadData(SoulNetwork.class, uuid);
 
         if (network == null)
         {

src/main/java/WayofTime/bloodmagic/api/util/helper/package-info.java

@@ -0,0 +1,7 @@
+@ParametersAreNonnullByDefault
+@MethodsReturnNonnullByDefault
+package WayofTime.bloodmagic.api.util.helper;
+
+import mcp.MethodsReturnNonnullByDefault;
+
+import javax.annotation.ParametersAreNonnullByDefault;

src/main/java/WayofTime/bloodmagic/block/BlockAlchemyTable.java

@@ -152,7 +152,7 @@ public class BlockAlchemyTable extends BlockContainer
     }
 
     @Override
-    public void onNeighborBlockChange(World world, BlockPos pos, IBlockState state, Block neighborBlock)
+    public void neighborChanged(IBlockState state, World world, BlockPos pos, Block neighborBlock)
     {
         TileAlchemyTable tile = (TileAlchemyTable) world.getTileEntity(pos);
         if (tile != null)

src/main/java/WayofTime/bloodmagic/block/BlockBloodLight.java

@@ -8,6 +8,7 @@ import net.minecraft.block.material.Material;
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.entity.EntityPlayerSP;
+import net.minecraft.client.particle.ParticleManager;
 import net.minecraft.entity.Entity;
 import net.minecraft.util.BlockRenderLayer;
 import net.minecraft.util.EnumParticleTypes;
@@ -76,12 +77,12 @@ public class BlockBloodLight extends Block
 
     @Override
     @SideOnly(Side.CLIENT)
-    public boolean addDestroyEffects(World world, BlockPos pos, net.minecraft.client.particle.EffectRenderer effectRenderer)
+    public boolean addDestroyEffects(World world, BlockPos pos, ParticleManager particleManager)
     {
         if (world.getBlockState(pos).getBlock() == this)
         {
             Random random = new Random();
-            effectRenderer.spawnEffectParticle(EnumParticleTypes.REDSTONE.getParticleID(), pos.getX() + 0.5D + random.nextGaussian() / 8, pos.getY() + 0.5D, pos.getZ() + 0.5D + random.nextGaussian() / 8, 0, 0, 0);
+            particleManager.spawnEffectParticle(EnumParticleTypes.REDSTONE.getParticleID(), pos.getX() + 0.5D + random.nextGaussian() / 8, pos.getY() + 0.5D, pos.getZ() + 0.5D + random.nextGaussian() / 8, 0, 0, 0);
         }
         return true;
     }

src/main/java/WayofTime/bloodmagic/block/BlockDemonCrystal.java

@@ -60,7 +60,7 @@ public class BlockDemonCrystal extends BlockContainer
     }
 
     @Override
-    public void onNeighborBlockChange(World world, BlockPos pos, IBlockState state, Block neighborBlock)
+    public void neighborChanged(IBlockState state, World world, BlockPos pos, Block neighborBlock)
     {
         TileDemonCrystal tile = (TileDemonCrystal) world.getTileEntity(pos);
         EnumFacing placement = tile.getPlacement();

src/main/java/WayofTime/bloodmagic/block/base/BlockIntegerContainer.java

@@ -29,9 +29,9 @@ public abstract class BlockIntegerContainer extends BlockInteger implements ITil
     }
 
     @Override
-    public boolean onBlockEventReceived(World worldIn, BlockPos pos, IBlockState state, int eventID, int eventParam)
+    public boolean eventReceived(IBlockState state, World worldIn, BlockPos pos, int eventID, int eventParam)
     {
-        super.onBlockEventReceived(worldIn, pos, state, eventID, eventParam);
+        super.eventReceived(state, worldIn, pos, eventID, eventParam);
         TileEntity tileentity = worldIn.getTileEntity(pos);
         return tileentity != null && tileentity.receiveClientEvent(eventID, eventParam);
     }

src/main/java/WayofTime/bloodmagic/block/base/BlockStringContainer.java

@@ -29,9 +29,9 @@ public abstract class BlockStringContainer extends BlockString implements ITileE
     }
 
     @Override
-    public boolean onBlockEventReceived(World worldIn, BlockPos pos, IBlockState state, int eventID, int eventParam)
+    public boolean eventReceived(IBlockState state, World worldIn, BlockPos pos, int eventID, int eventParam)
     {
-        super.onBlockEventReceived(worldIn, pos, state, eventID, eventParam);
+        super.eventReceived(state, worldIn, pos, eventID, eventParam);
         TileEntity tileentity = worldIn.getTileEntity(pos);
         return tileentity != null && tileentity.receiveClientEvent(eventID, eventParam);
     }

src/main/java/WayofTime/bloodmagic/block/base/package-info.java

@@ -0,0 +1,7 @@
+@ParametersAreNonnullByDefault
+@MethodsReturnNonnullByDefault
+package WayofTime.bloodmagic.block.base;
+
+import mcp.MethodsReturnNonnullByDefault;
+
+import javax.annotation.ParametersAreNonnullByDefault;

src/main/java/WayofTime/bloodmagic/block/package-info.java

@@ -0,0 +1,7 @@
+@ParametersAreNonnullByDefault
+@MethodsReturnNonnullByDefault
+package WayofTime.bloodmagic.block;
+
+import mcp.MethodsReturnNonnullByDefault;
+
+import javax.annotation.ParametersAreNonnullByDefault;

src/main/java/WayofTime/bloodmagic/block/property/package-info.java

@@ -0,0 +1,7 @@
+@ParametersAreNonnullByDefault
+@MethodsReturnNonnullByDefault
+package WayofTime.bloodmagic.block.property;
+
+import mcp.MethodsReturnNonnullByDefault;
+
+import javax.annotation.ParametersAreNonnullByDefault;

src/main/java/WayofTime/bloodmagic/client/gui/config/package-info.java

@@ -0,0 +1,7 @@
+@ParametersAreNonnullByDefault
+@MethodsReturnNonnullByDefault
+package WayofTime.bloodmagic.client.gui.config;
+
+import mcp.MethodsReturnNonnullByDefault;
+
+import javax.annotation.ParametersAreNonnullByDefault;

src/main/java/WayofTime/bloodmagic/client/gui/package-info.java

@@ -0,0 +1,7 @@
+@ParametersAreNonnullByDefault
+@MethodsReturnNonnullByDefault
+package WayofTime.bloodmagic.client.gui;
+
+import mcp.MethodsReturnNonnullByDefault;
+
+import javax.annotation.ParametersAreNonnullByDefault;

src/main/java/WayofTime/bloodmagic/client/helper/package-info.java

@@ -0,0 +1,7 @@
+@ParametersAreNonnullByDefault
+@MethodsReturnNonnullByDefault
+package WayofTime.bloodmagic.client.helper;
+
+import mcp.MethodsReturnNonnullByDefault;
+
+import javax.annotation.ParametersAreNonnullByDefault;

src/main/java/WayofTime/bloodmagic/client/mesh/package-info.java

@@ -0,0 +1,7 @@
+@ParametersAreNonnullByDefault
+@MethodsReturnNonnullByDefault
+package WayofTime.bloodmagic.client.mesh;
+
+import mcp.MethodsReturnNonnullByDefault;
+
+import javax.annotation.ParametersAreNonnullByDefault;

src/main/java/WayofTime/bloodmagic/client/package-info.java

@@ -0,0 +1,7 @@
+@ParametersAreNonnullByDefault
+@MethodsReturnNonnullByDefault
+package WayofTime.bloodmagic.client;
+
+import mcp.MethodsReturnNonnullByDefault;
+
+import javax.annotation.ParametersAreNonnullByDefault;

src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/package-info.java

@@ -0,0 +1,7 @@
+@ParametersAreNonnullByDefault
+@MethodsReturnNonnullByDefault
+package WayofTime.bloodmagic.client.render.alchemyArray;
+
+import mcp.MethodsReturnNonnullByDefault;
+
+import javax.annotation.ParametersAreNonnullByDefault;

src/main/java/WayofTime/bloodmagic/client/render/entity/package-info.java

@@ -0,0 +1,7 @@
+@ParametersAreNonnullByDefault
+@MethodsReturnNonnullByDefault
+package WayofTime.bloodmagic.client.render.entity;
+
+import mcp.MethodsReturnNonnullByDefault;
+
+import javax.annotation.ParametersAreNonnullByDefault;

src/main/java/WayofTime/bloodmagic/client/render/package-info.java

@@ -0,0 +1,7 @@
+@ParametersAreNonnullByDefault
+@MethodsReturnNonnullByDefault
+package WayofTime.bloodmagic.client.render;
+
+import mcp.MethodsReturnNonnullByDefault;
+
+import javax.annotation.ParametersAreNonnullByDefault;

src/main/java/WayofTime/bloodmagic/command/package-info.java

@@ -0,0 +1,7 @@
+@ParametersAreNonnullByDefault
+@MethodsReturnNonnullByDefault
+package WayofTime.bloodmagic.command;
+
+import mcp.MethodsReturnNonnullByDefault;
+
+import javax.annotation.ParametersAreNonnullByDefault;

src/main/java/WayofTime/bloodmagic/command/sub/package-info.java

@@ -0,0 +1,7 @@
+@ParametersAreNonnullByDefault
+@MethodsReturnNonnullByDefault
+package WayofTime.bloodmagic.command.sub;
+
+import mcp.MethodsReturnNonnullByDefault;
+
+import javax.annotation.ParametersAreNonnullByDefault;

src/main/java/WayofTime/bloodmagic/compat/direwolf/CompatibilityDirewolf.java

@@ -0,0 +1,59 @@
+package WayofTime.bloodmagic.compat.direwolf;
+
+import WayofTime.bloodmagic.api.Constants;
+import WayofTime.bloodmagic.api.altar.EnumAltarTier;
+import WayofTime.bloodmagic.api.event.AltarCraftedEvent;
+import WayofTime.bloodmagic.api.registry.AltarRecipeRegistry;
+import WayofTime.bloodmagic.compat.ICompatibility;
+import WayofTime.bloodmagic.util.helper.TextHelper;
+import net.minecraft.init.Items;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraftforge.common.MinecraftForge;
+import net.minecraftforge.event.entity.player.ItemTooltipEvent;
+import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
+
+public class CompatibilityDirewolf implements ICompatibility
+{
+    @Override
+    public void loadCompatibility(InitializationPhase phase)
+    {
+        if (phase == InitializationPhase.POST_INIT)
+        {
+            AltarRecipeRegistry.registerRecipe(new AltarRecipeRegistry.AltarRecipe(new ItemStack(Items.BREAD), new ItemStack(Items.BREAD), EnumAltarTier.ONE, 10, 1, 0));
+            MinecraftForge.EVENT_BUS.register(this);
+        }
+    }
+
+    @Override
+    public String getModId()
+    {
+        return Constants.Mod.MODID;
+    }
+
+    @Override
+    public boolean enableCompat()
+    {
+        return true;
+    }
+
+    @SubscribeEvent
+    public void onAltarCrafted(AltarCraftedEvent event)
+    {
+        if (event.getOutput().getItem() == Items.BREAD)
+        {
+            event.getOutput().setTagCompound(new NBTTagCompound());
+            event.getOutput().setStackDisplayName(TextHelper.localizeEffect("secret.BloodMagic.bread.bloody"));
+            event.getOutput().getTagCompound().setBoolean("bloody", true);
+        }
+    }
+
+    @SubscribeEvent
+    public void onTooltip(ItemTooltipEvent event)
+    {
+        if (event.getItemStack().getItem() == Items.BREAD)
+            if (event.getItemStack().hasTagCompound())
+                if (event.getItemStack().getTagCompound().hasKey("bloody"))
+                    event.getToolTip().add(TextHelper.localizeEffect("secret.BloodMagic.bread.bloody.desc"));
+    }
+}

src/main/java/WayofTime/bloodmagic/compat/direwolf/package-info.java

@@ -0,0 +1,7 @@
+@ParametersAreNonnullByDefault
+@MethodsReturnNonnullByDefault
+package WayofTime.bloodmagic.compat.direwolf;
+
+import mcp.MethodsReturnNonnullByDefault;
+
+import javax.annotation.ParametersAreNonnullByDefault;

src/main/java/WayofTime/bloodmagic/compat/guideapi/CompatibilityGuideAPI.java

@@ -0,0 +1,41 @@
+//package WayofTime.bloodmagic.compat.guideapi;
+//
+//import WayofTime.bloodmagic.api.altar.EnumAltarTier;
+//import WayofTime.bloodmagic.api.registry.AltarRecipeRegistry;
+//import WayofTime.bloodmagic.compat.ICompatibility;
+//import amerifrance.guideapi.api.GuideAPI;
+//import net.minecraft.init.Items;
+//import net.minecraft.item.ItemStack;
+//import net.minecraftforge.fml.common.registry.GameRegistry;
+//
+//public class CompatibilityGuideAPI implements ICompatibility {
+//
+//    @Override
+//    public void loadCompatibility(InitializationPhase phase) {
+//        switch (phase) {
+//            case PRE_INIT: {
+//                GuideBloodMagic.initBook();
+//                AltarRecipeRegistry.registerRecipe(new AltarRecipeRegistry.AltarRecipe(new ItemStack(Items.BOOK), GuideAPI.getStackFromBook(GuideBloodMagic.guideBook), EnumAltarTier.ONE, 500, 2, 0));
+//                break;
+//            }
+//            case INIT: {
+//                break;
+//            }
+//            case POST_INIT: {
+//                GuideBloodMagic.initCategories();
+//                GameRegistry.register(GuideBloodMagic.guideBook);
+//                break;
+//            }
+//        }
+//    }
+//
+//    @Override
+//    public String getModId() {
+//        return "guideapi";
+//    }
+//
+//    @Override
+//    public boolean enableCompat() {
+//        return true;
+//    }
+//}

src/main/java/WayofTime/bloodmagic/compat/guideapi/GuideBloodMagic.java

@@ -0,0 +1,56 @@
+//package WayofTime.bloodmagic.compat.guideapi;
+//
+//import WayofTime.bloodmagic.compat.guideapi.book.*;
+//import WayofTime.bloodmagic.compat.jei.BloodMagicPlugin;
+//import WayofTime.bloodmagic.registry.ModBlocks;
+//import WayofTime.bloodmagic.registry.ModItems;
+//import amerifrance.guideapi.api.GuideAPI;
+//import amerifrance.guideapi.api.impl.Book;
+//import amerifrance.guideapi.api.util.NBTBookTags;
+//import amerifrance.guideapi.category.CategoryItemStack;
+//import net.minecraft.item.ItemStack;
+//import net.minecraftforge.fml.common.FMLCommonHandler;
+//import net.minecraftforge.fml.common.Loader;
+//import net.minecraftforge.fml.relauncher.Side;
+//
+//import java.awt.Color;
+//
+//public class GuideBloodMagic {
+//
+//    public static Book guideBook;
+//
+//    public static void initBook() {
+//        guideBook = new Book();
+//        guideBook.setTitle("guide.BloodMagic.title");
+//        guideBook.setDisplayName("guide.BloodMagic.display");
+//        guideBook.setWelcomeMessage("guide.BloodMagic.welcome");
+//        guideBook.setAuthor("guide.BloodMagic.author");
+//        guideBook.setRegistryName("BloodMagic");
+//        guideBook.setColor(Color.RED);
+//
+//        if (FMLCommonHandler.instance().getSide() == Side.CLIENT)
+//            GuideAPI.setModel(guideBook);
+//    }
+//
+//    public static void initCategories() {
+//        guideBook.addCategory(new CategoryItemStack(CategoryAlchemy.buildCategory(), "guide.BloodMagic.category.alchemy", new ItemStack(ModItems.arcaneAshes)));
+//        guideBook.addCategory(new CategoryItemStack(CategoryArchitect.buildCategory(), "guide.BloodMagic.category.architect", new ItemStack(ModItems.sigilDivination)));
+//        guideBook.addCategory(new CategoryItemStack(CategoryDemon.buildCategory(), "guide.BloodMagic.category.demon", new ItemStack(ModItems.bloodShard)));
+//        guideBook.addCategory(new CategoryItemStack(CategoryRitual.buildCategory(), "guide.BloodMagic.category.ritual", new ItemStack(ModBlocks.ritualController)));
+//        guideBook.addCategory(new CategoryItemStack(CategorySpell.buildCategory(), "guide.BloodMagic.category.spell", new ItemStack(ModItems.ritualDiviner)));
+//    }
+//
+//    public static void initJEIBlacklist() {
+//        if (Loader.isModLoaded("JEI"))
+//            BloodMagicPlugin.jeiHelper.getNbtIgnoreList().ignoreNbtTagNames(
+//                    GuideAPI.guideBook,
+//                    NBTBookTags.BOOK_TAG,
+//                    NBTBookTags.CATEGORY_PAGE_TAG,
+//                    NBTBookTags.CATEGORY_TAG,
+//                    NBTBookTags.ENTRY_PAGE_TAG,
+//                    NBTBookTags.ENTRY_TAG,
+//                    NBTBookTags.KEY_TAG,
+//                    NBTBookTags.PAGE_TAG
+//                    );
+//    }
+//}

src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategoryAlchemy.java

@@ -0,0 +1,20 @@
+//package WayofTime.bloodmagic.compat.guideapi.book;
+//
+//import WayofTime.bloodmagic.api.Constants;
+//import amerifrance.guideapi.api.impl.abstraction.EntryAbstract;
+//import net.minecraft.util.ResourceLocation;
+//
+//import java.util.HashMap;
+//import java.util.Map;
+//
+//public class CategoryAlchemy {
+//
+//    public static Map<ResourceLocation, EntryAbstract> buildCategory() {
+//        Map<ResourceLocation, EntryAbstract> entries = new HashMap<ResourceLocation, EntryAbstract>();
+//        String keyBase = Constants.Mod.DOMAIN + "alchemy_";
+//
+//
+//
+//        return entries;
+//    }
+//}

src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategoryArchitect.java

@@ -0,0 +1,20 @@
+//package WayofTime.bloodmagic.compat.guideapi.book;
+//
+//import WayofTime.bloodmagic.api.Constants;
+//import amerifrance.guideapi.api.impl.abstraction.EntryAbstract;
+//import net.minecraft.util.ResourceLocation;
+//
+//import java.util.HashMap;
+//import java.util.Map;
+//
+//public class CategoryArchitect {
+//
+//    public static Map<ResourceLocation, EntryAbstract> buildCategory() {
+//        Map<ResourceLocation, EntryAbstract> entries = new HashMap<ResourceLocation, EntryAbstract>();
+//        String keyBase = Constants.Mod.DOMAIN + "architect_";
+//
+//
+//
+//        return entries;
+//    }
+//}

src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategoryDemon.java

@@ -0,0 +1,20 @@
+//package WayofTime.bloodmagic.compat.guideapi.book;
+//
+//import WayofTime.bloodmagic.api.Constants;
+//import amerifrance.guideapi.api.impl.abstraction.EntryAbstract;
+//import net.minecraft.util.ResourceLocation;
+//
+//import java.util.HashMap;
+//import java.util.Map;
+//
+//public class CategoryDemon {
+//
+//    public static Map<ResourceLocation, EntryAbstract> buildCategory() {
+//        Map<ResourceLocation, EntryAbstract> entries = new HashMap<ResourceLocation, EntryAbstract>();
+//        String keyBase = Constants.Mod.DOMAIN + "demon_";
+//
+//
+//
+//        return entries;
+//    }
+//}

src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategoryRitual.java

@@ -0,0 +1,34 @@
+//package WayofTime.bloodmagic.compat.guideapi.book;
+//
+//import WayofTime.bloodmagic.api.Constants;
+//import WayofTime.bloodmagic.api.registry.RitualRegistry;
+//import WayofTime.bloodmagic.api.ritual.Ritual;
+//import WayofTime.bloodmagic.compat.guideapi.entry.EntryText;
+//import WayofTime.bloodmagic.util.helper.TextHelper;
+//import amerifrance.guideapi.api.IPage;
+//import amerifrance.guideapi.api.impl.abstraction.EntryAbstract;
+//import amerifrance.guideapi.api.util.PageHelper;
+//import amerifrance.guideapi.page.PageImage;
+//import net.minecraft.util.ResourceLocation;
+//
+//import java.util.ArrayList;
+//import java.util.HashMap;
+//import java.util.List;
+//import java.util.Map;
+//
+//public class CategoryRitual {
+//
+//    public static Map<ResourceLocation, EntryAbstract> buildCategory() {
+//        Map<ResourceLocation, EntryAbstract> entries = new HashMap<ResourceLocation, EntryAbstract>();
+//        String keyBase = Constants.Mod.DOMAIN + "ritual_";
+//
+//        for (Ritual ritual : RitualRegistry.getRituals()) {
+//            List<IPage> ritualPages = new ArrayList<IPage>();
+//            ritualPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(ritual.getUnlocalizedName() + ".desc")));
+//            ritualPages.add(new PageImage(new ResourceLocation("bloodmagicguide", "textures/guide/" + ritual.getName() + ".png")));
+//            entries.put(new ResourceLocation(keyBase + ritual.getName()), new EntryText(ritualPages, TextHelper.localize(ritual.getUnlocalizedName()), true));
+//        }
+//
+//        return entries;
+//    }
+//}

src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategorySpell.java

@@ -0,0 +1,20 @@
+//package WayofTime.bloodmagic.compat.guideapi.book;
+//
+//import WayofTime.bloodmagic.api.Constants;
+//import amerifrance.guideapi.api.impl.abstraction.EntryAbstract;
+//import net.minecraft.util.ResourceLocation;
+//
+//import java.util.HashMap;
+//import java.util.Map;
+//
+//public class CategorySpell {
+//
+//    public static Map<ResourceLocation, EntryAbstract> buildCategory() {
+//        Map<ResourceLocation, EntryAbstract> entries = new HashMap<ResourceLocation, EntryAbstract>();
+//        String keyBase = Constants.Mod.DOMAIN + "spell_";
+//
+//
+//
+//        return entries;
+//    }
+//}

src/main/java/WayofTime/bloodmagic/compat/guideapi/book/package-info.java

@@ -0,0 +1,7 @@
+@ParametersAreNonnullByDefault
+@MethodsReturnNonnullByDefault
+package WayofTime.bloodmagic.compat.guideapi.book;
+
+import mcp.MethodsReturnNonnullByDefault;
+
+import javax.annotation.ParametersAreNonnullByDefault;

src/main/java/WayofTime/bloodmagic/compat/guideapi/entry/EntryText.java

@@ -0,0 +1,34 @@
+//package WayofTime.bloodmagic.compat.guideapi.entry;
+//
+//import amerifrance.guideapi.api.IPage;
+//import amerifrance.guideapi.api.impl.Book;
+//import amerifrance.guideapi.api.impl.abstraction.CategoryAbstract;
+//import amerifrance.guideapi.api.util.GuiHelper;
+//import amerifrance.guideapi.entry.EntryResourceLocation;
+//import amerifrance.guideapi.gui.GuiBase;
+//import net.minecraft.client.Minecraft;
+//import net.minecraft.client.gui.FontRenderer;
+//import net.minecraft.client.renderer.GlStateManager;
+//import net.minecraft.util.ResourceLocation;
+//import net.minecraftforge.fml.relauncher.Side;
+//import net.minecraftforge.fml.relauncher.SideOnly;
+//
+//import java.util.List;
+//
+//public class EntryText extends EntryResourceLocation {
+//
+//    public EntryText(List<IPage> pageList, String unlocEntryName, boolean unicode) {
+//        super(pageList, unlocEntryName, new ResourceLocation("bloodmagicguide", "textures/gui/bullet_point.png"), unicode);
+//    }
+//
+//    public EntryText(List<IPage> pageList, String unlocEntryName) {
+//        this(pageList, unlocEntryName, false);
+//    }
+//
+//    @Override
+//    @SideOnly(Side.CLIENT)
+//    public void drawExtras(Book book, CategoryAbstract category, int entryX, int entryY, int entryWidth, int entryHeight, int mouseX, int mouseY, GuiBase guiBase, FontRenderer fontRendererObj) {
+//        Minecraft.getMinecraft().getTextureManager().bindTexture(image);
+//        GuiHelper.drawSizedIconWithoutColor(entryX + 4, entryY + 2, 8, 8, 1F);
+//    }
+//}

src/main/java/WayofTime/bloodmagic/compat/guideapi/entry/package-info.java

@@ -0,0 +1,7 @@
+@ParametersAreNonnullByDefault
+@MethodsReturnNonnullByDefault
+package WayofTime.bloodmagic.compat.guideapi.entry;
+
+import mcp.MethodsReturnNonnullByDefault;
+
+import javax.annotation.ParametersAreNonnullByDefault;

src/main/java/WayofTime/bloodmagic/compat/guideapi/package-info.java

@@ -0,0 +1,7 @@
+//@ParametersAreNonnullByDefault
+//@MethodsReturnNonnullByDefault
+//package WayofTime.bloodmagic.compat.guideapi;
+//
+//import mcp.MethodsReturnNonnullByDefault;
+//
+//import javax.annotation.ParametersAreNonnullByDefault;

src/main/java/WayofTime/bloodmagic/compat/guideapi/page/PageAltarRecipe.java

@@ -0,0 +1,70 @@
+//package WayofTime.bloodmagic.compat.guideapi.page;
+//
+//import WayofTime.bloodmagic.api.registry.AltarRecipeRegistry;
+//import WayofTime.bloodmagic.util.helper.TextHelper;
+//import amerifrance.guideapi.api.impl.Book;
+//import amerifrance.guideapi.api.impl.Page;
+//import amerifrance.guideapi.api.impl.abstraction.CategoryAbstract;
+//import amerifrance.guideapi.api.impl.abstraction.EntryAbstract;
+//import amerifrance.guideapi.api.util.GuiHelper;
+//import amerifrance.guideapi.gui.GuiBase;
+//import net.minecraft.client.Minecraft;
+//import net.minecraft.client.gui.FontRenderer;
+//import net.minecraft.init.Blocks;
+//import net.minecraft.item.Item;
+//import net.minecraft.item.ItemStack;
+//import net.minecraft.util.ResourceLocation;
+//import net.minecraftforge.fml.relauncher.Side;
+//import net.minecraftforge.fml.relauncher.SideOnly;
+//
+//import java.util.List;
+//
+//public class PageAltarRecipe extends Page {
+//
+//    public List<ItemStack> input;
+//    public ItemStack output;
+//    public int tier;
+//    public int bloodRequired;
+//
+//    public PageAltarRecipe(AltarRecipeRegistry.AltarRecipe recipe) {
+//        this.input = recipe.getInput();
+//        this.output = recipe.getOutput();
+//        this.tier = recipe.getMinTier().toInt();
+//        this.bloodRequired = recipe.getSyphon();
+//    }
+//
+//    @Override
+//    @SideOnly(Side.CLIENT)
+//    public void draw(Book book, CategoryAbstract category, EntryAbstract entry, int guiLeft, int guiTop, int mouseX, int mouseY, GuiBase guiBase, FontRenderer fontRenderer) {
+//
+//        Minecraft.getMinecraft().getTextureManager().bindTexture(new ResourceLocation("alchemicalwizardry" + ":textures/gui/guide/altar.png"));
+//        guiBase.drawTexturedModalRect(guiLeft + 42, guiTop + 53, 0, 87, 146, 104);
+//
+//        guiBase.drawCenteredString(fontRenderer, TextHelper.localize("text.recipe.altar"), guiLeft + guiBase.xSize / 2, guiTop + 12, 0);
+//
+//        int inputX = (1 + 1) * 20 + (guiLeft + guiBase.xSize / 7) + 1;
+//        int inputY = (20) + (guiTop + guiBase.ySize / 5) - 1; //1 * 20
+//        GuiHelper.drawItemStack(input.get(0), inputX, inputY);
+//        if (GuiHelper.isMouseBetween(mouseX, mouseY, inputX, inputY, 15, 15)) {
+//            guiBase.renderToolTip(input.get(0), mouseX, mouseY);
+//        }
+//
+//        if (output == null) {
+//            output = new ItemStack(Blocks.BARRIER);
+//        }
+//        int outputX = (5 * 20) + (guiLeft + guiBase.xSize / 7) + 1;
+//        int outputY = (20) + (guiTop + guiBase.xSize / 5) - 1; // 1 * 20
+//        GuiHelper.drawItemStack(output, outputX, outputY);
+//        if (GuiHelper.isMouseBetween(mouseX, mouseY, outputX, outputY, 15, 15)) {
+//            guiBase.renderToolTip(output, outputX, outputY);
+//        }
+//
+//        if (output.getItem() == Item.getItemFromBlock(Blocks.BARRIER)) {
+//            guiBase.drawCenteredString(fontRenderer, TextHelper.localize("text.furnace.error"), guiLeft + guiBase.xSize / 2, guiTop + 4 * guiBase.ySize / 6, 0xED073D);
+//            guiBase.drawCenteredString(fontRenderer, TextHelper.localize("bm.string.tier") + ": " + String.valueOf(tier), guiLeft + guiBase.xSize / 2, guiTop + 4 * guiBase.ySize / 6 + 15, 0);
+//            guiBase.drawCenteredString(fontRenderer, "LP: " + String.valueOf(bloodRequired), guiLeft + guiBase.xSize / 2, guiTop + 4 * guiBase.ySize / 6 + 30, 0);
+//        }
+//        guiBase.drawCenteredString(fontRenderer, TextHelper.localize("text.recipe.altar.tier", String.valueOf(tier)), guiLeft + guiBase.xSize / 2, guiTop + 4 * guiBase.ySize / 6, 0);
+//        guiBase.drawCenteredString(fontRenderer, TextHelper.localize("text.recipe.altar.bloodRequired", String.valueOf(bloodRequired)), guiLeft + guiBase.xSize / 2, guiTop + 4 * guiBase.ySize / 6 + 15, 0);
+//    }
+//}

src/main/java/WayofTime/bloodmagic/compat/guideapi/page/package-info.java

@@ -0,0 +1,7 @@
+@ParametersAreNonnullByDefault
+@MethodsReturnNonnullByDefault
+package WayofTime.bloodmagic.compat.guideapi.page;
+
+import mcp.MethodsReturnNonnullByDefault;
+
+import javax.annotation.ParametersAreNonnullByDefault;

src/main/java/WayofTime/bloodmagic/compat/guideapi/page/recipeRenderer/OrbRecipeRenderer.java

@@ -0,0 +1,128 @@
+//package WayofTime.bloodmagic.compat.guideapi.page.recipeRenderer;
+//
+//import WayofTime.bloodmagic.api.recipe.ShapedBloodOrbRecipe;
+//import WayofTime.bloodmagic.api.recipe.ShapelessBloodOrbRecipe;
+//import WayofTime.bloodmagic.api.registry.OrbRegistry;
+//import WayofTime.bloodmagic.util.helper.TextHelper;
+//import amerifrance.guideapi.GuideMod;
+//import amerifrance.guideapi.api.IRecipeRenderer;
+//import amerifrance.guideapi.api.impl.Book;
+//import amerifrance.guideapi.api.impl.abstraction.CategoryAbstract;
+//import amerifrance.guideapi.api.impl.abstraction.EntryAbstract;
+//import amerifrance.guideapi.api.util.GuiHelper;
+//import amerifrance.guideapi.gui.GuiBase;
+//import net.minecraft.client.Minecraft;
+//import net.minecraft.client.gui.FontRenderer;
+//import net.minecraft.item.ItemStack;
+//import net.minecraft.item.crafting.IRecipe;
+//import net.minecraft.util.ResourceLocation;
+//import net.minecraftforge.fml.relauncher.ReflectionHelper;
+//
+//import java.util.ArrayList;
+//import java.util.List;
+//
+//public class OrbRecipeRenderer implements IRecipeRenderer
+//{
+//    public IRecipe recipe;
+//
+//    public OrbRecipeRenderer(IRecipe recipe)
+//    {
+//        this.recipe = recipe;
+//    }
+//
+//    @Override
+//    public void draw(Book book, CategoryAbstract category, EntryAbstract entry, int guiLeft, int guiTop, int mouseX, int mouseY, GuiBase guiBase, FontRenderer fontRenderer) {
+//        Minecraft.getMinecraft().getTextureManager().bindTexture(new ResourceLocation(GuideMod.GUITEXLOC + "recipe_elements.png"));
+//        guiBase.drawTexturedModalRect(guiLeft + 42, guiTop + 53, 0, 0, 105, 65);
+//
+//        guiBase.drawCenteredString(fontRenderer, TextHelper.localize("text.recipe.shapedOrb"), guiLeft + guiBase.xSize / 2, guiTop + 12, 0);
+//        if(recipe instanceof ShapelessBloodOrbRecipe)
+//        {
+//            ShapelessBloodOrbRecipe shapelessBloodOrbRecipe = (ShapelessBloodOrbRecipe) recipe;
+//            List<Object> list = shapelessBloodOrbRecipe.getInput();
+//
+//            int width = 3;
+//            int height = 3;
+//            for (int y = 0; y < height; y++) {
+//                for (int x = 0; x < width; x++) {
+//                    if(list.size() - 1 < y * width + x)
+//                    {
+//                        continue;
+//                    }
+//
+//                    int stackX = (x + 1) * 18 + (guiLeft + guiBase.xSize / 7);
+//                    int stackY = (y + 1) * 18 + (guiTop + guiBase.ySize / 5);
+//
+//                    Object component = list.get(y * width + x);
+//                    if (component != null) {
+//                        if (component instanceof ItemStack) {
+//                            GuiHelper.drawItemStack((ItemStack) component, stackX, stackY);
+//                            if (GuiHelper.isMouseBetween(mouseX, mouseY, stackX, stackY, 15, 15)) {
+//                                guiBase.renderToolTip((ItemStack) component, stackX, stackY);
+//                            }
+//                        } else if (component instanceof Integer) {
+//                            GuiHelper.drawItemStack(OrbRegistry.getOrbsForTier((Integer) component).get(0), stackX, stackY);
+//                            if (GuiHelper.isMouseBetween(mouseX, mouseY, stackX, stackY, 15, 15)) {
+//                                guiBase.renderToolTip(OrbRegistry.getOrbsForTier((Integer) component).get(0), stackX, stackY);
+//                            }
+//                        } else {
+//                            if (((ArrayList<ItemStack>) component).isEmpty()) return;
+//                            GuiHelper.drawItemStack(((ArrayList<ItemStack>) component).get(0), stackX, stackY);
+//                            if (GuiHelper.isMouseBetween(mouseX, mouseY, stackX, stackY, 15, 15)) {
+//                                guiBase.renderToolTip(((ArrayList<ItemStack>) component).get(0), stackX, stackY);
+//                            }
+//                        }
+//                    }
+//                }
+//            }
+//            int outputX = (5 * 18) + (guiLeft + guiBase.xSize / 7);
+//            int outputY = (2 * 18) + (guiTop + guiBase.xSize / 5);
+//            GuiHelper.drawItemStack(shapelessBloodOrbRecipe.getRecipeOutput(), outputX, outputY);
+//            if (GuiHelper.isMouseBetween(mouseX, mouseY, outputX, outputY, 15, 15)) {
+//                guiBase.renderToolTip(shapelessBloodOrbRecipe.getRecipeOutput(), outputX, outputY);
+//            }
+//        }else if (recipe instanceof ShapedBloodOrbRecipe)
+//        {
+//            ShapedBloodOrbRecipe shapedBloodOrbRecipe = (ShapedBloodOrbRecipe) recipe;
+//            int width = ReflectionHelper.getPrivateValue(ShapedBloodOrbRecipe.class, shapedBloodOrbRecipe, 4);
+//            int height = ReflectionHelper.getPrivateValue(ShapedBloodOrbRecipe.class, shapedBloodOrbRecipe, 5);
+//            for (int y = 0; y < height; y++) {
+//                for (int x = 0; x < width; x++) {
+//                    int stackX = (x + 1) * 18 + (guiLeft + guiBase.xSize / 7);
+//                    int stackY = (y + 1) * 18 + (guiTop + guiBase.ySize / 5);
+//                    Object component = shapedBloodOrbRecipe.getInput()[y * width + x];
+//                    if (component != null) {
+//                        if (component instanceof ItemStack) {
+//                            GuiHelper.drawItemStack((ItemStack) component, stackX, stackY);
+//                            if (GuiHelper.isMouseBetween(mouseX, mouseY, stackX, stackY, 15, 15)) {
+//                                guiBase.renderToolTip((ItemStack) component, stackX, stackY);
+//                            }
+//                        } else if (component instanceof Integer) {
+//                            GuiHelper.drawItemStack(OrbRegistry.getOrbsForTier((Integer) component).get(0), stackX, stackY);
+//                            if (GuiHelper.isMouseBetween(mouseX, mouseY, stackX, stackY, 15, 15)) {
+//                                guiBase.renderToolTip(OrbRegistry.getOrbsForTier((Integer) component).get(0), stackX, stackY);
+//                            }
+//                        } else {
+//                            if (((ArrayList<ItemStack>) component).isEmpty()) return;
+//                            GuiHelper.drawItemStack(((ArrayList<ItemStack>) component).get(0), stackX, stackY);
+//                            if (GuiHelper.isMouseBetween(mouseX, mouseY, stackX, stackY, 15, 15)) {
+//                                guiBase.renderToolTip(((ArrayList<ItemStack>) component).get(0), stackX, stackY);
+//                            }
+//                        }
+//                    }
+//                }
+//            }
+//            int outputX = (5 * 18) + (guiLeft + guiBase.xSize / 7);
+//            int outputY = (2 * 18) + (guiTop + guiBase.xSize / 5);
+//            GuiHelper.drawItemStack(shapedBloodOrbRecipe.getRecipeOutput(), outputX, outputY);
+//            if (GuiHelper.isMouseBetween(mouseX, mouseY, outputX, outputY, 15, 15)) {
+//                guiBase.renderToolTip(shapedBloodOrbRecipe.getRecipeOutput(), outputX, outputY);
+//            }
+//        }
+//    }
+//
+//    @Override
+//    public void drawExtras(Book book, CategoryAbstract category, EntryAbstract entry, int guiLeft, int guiTop, int mouseX, int mouseY, GuiBase guiBase, FontRenderer fontRenderer) {
+//
+//    }
+//}

src/main/java/WayofTime/bloodmagic/compat/guideapi/page/recipeRenderer/package-info.java

@@ -0,0 +1,7 @@
+@ParametersAreNonnullByDefault
+@MethodsReturnNonnullByDefault
+package WayofTime.bloodmagic.compat.guideapi.page.recipeRenderer;
+
+import mcp.MethodsReturnNonnullByDefault;
+
+import javax.annotation.ParametersAreNonnullByDefault;

src/main/java/WayofTime/bloodmagic/compat/jei/BloodMagicPlugin.java

@@ -9,6 +9,7 @@ import mezz.jei.api.IJeiHelpers;
 import mezz.jei.api.IModRegistry;
 import mezz.jei.api.JEIPlugin;
 import net.minecraft.item.ItemStack;
+import net.minecraftforge.fml.common.Loader;
 import net.minecraftforge.oredict.OreDictionary;
 import WayofTime.bloodmagic.api.Constants;
 import WayofTime.bloodmagic.api.livingArmour.LivingArmourHandler;

src/main/java/WayofTime/bloodmagic/compat/jei/alchemyArray/package-info.java

@@ -0,0 +1,7 @@
+@ParametersAreNonnullByDefault
+@MethodsReturnNonnullByDefault
+package WayofTime.bloodmagic.compat.jei.alchemyArray;
+
+import mcp.MethodsReturnNonnullByDefault;
+
+import javax.annotation.ParametersAreNonnullByDefault;

src/main/java/WayofTime/bloodmagic/compat/jei/alchemyTable/package-info.java

@@ -0,0 +1,7 @@
+@ParametersAreNonnullByDefault
+@MethodsReturnNonnullByDefault
+package WayofTime.bloodmagic.compat.jei.alchemyTable;
+
+import mcp.MethodsReturnNonnullByDefault;
+
+import javax.annotation.ParametersAreNonnullByDefault;

src/main/java/WayofTime/bloodmagic/compat/jei/altar/package-info.java

@@ -0,0 +1,7 @@
+@ParametersAreNonnullByDefault
+@MethodsReturnNonnullByDefault
+package WayofTime.bloodmagic.compat.jei.altar;
+
+import mcp.MethodsReturnNonnullByDefault;
+
+import javax.annotation.ParametersAreNonnullByDefault;

src/main/java/WayofTime/bloodmagic/compat/jei/binding/package-info.java

@@ -0,0 +1,7 @@
+@ParametersAreNonnullByDefault
+@MethodsReturnNonnullByDefault
+package WayofTime.bloodmagic.compat.jei.binding;
+
+import mcp.MethodsReturnNonnullByDefault;
+
+import javax.annotation.ParametersAreNonnullByDefault;

src/main/java/WayofTime/bloodmagic/compat/jei/forge/package-info.java

@@ -0,0 +1,7 @@
+@ParametersAreNonnullByDefault
+@MethodsReturnNonnullByDefault
+package WayofTime.bloodmagic.compat.jei.forge;
+
+import mcp.MethodsReturnNonnullByDefault;
+
+import javax.annotation.ParametersAreNonnullByDefault;

src/main/java/WayofTime/bloodmagic/compat/jei/orb/package-info.java

@@ -0,0 +1,7 @@
+@ParametersAreNonnullByDefault
+@MethodsReturnNonnullByDefault
+package WayofTime.bloodmagic.compat.jei.orb;
+
+import mcp.MethodsReturnNonnullByDefault;
+
+import javax.annotation.ParametersAreNonnullByDefault;

src/main/java/WayofTime/bloodmagic/compat/jei/package-info.java

@@ -0,0 +1,7 @@
+@ParametersAreNonnullByDefault
+@MethodsReturnNonnullByDefault
+package WayofTime.bloodmagic.compat.jei;
+
+import mcp.MethodsReturnNonnullByDefault;
+
+import javax.annotation.ParametersAreNonnullByDefault;

src/main/java/WayofTime/bloodmagic/compat/package-info.java

@@ -0,0 +1,7 @@
+@ParametersAreNonnullByDefault
+@MethodsReturnNonnullByDefault
+package WayofTime.bloodmagic.compat;
+
+import mcp.MethodsReturnNonnullByDefault;
+
+import javax.annotation.ParametersAreNonnullByDefault;

src/main/java/WayofTime/bloodmagic/compat/waila/package-info.java

@@ -0,0 +1,7 @@
+@ParametersAreNonnullByDefault
+@MethodsReturnNonnullByDefault
+package WayofTime.bloodmagic.compat.waila;
+
+import mcp.MethodsReturnNonnullByDefault;
+
+import javax.annotation.ParametersAreNonnullByDefault;

src/main/java/WayofTime/bloodmagic/compat/waila/provider/package-info.java

@@ -0,0 +1,7 @@
+@ParametersAreNonnullByDefault
+@MethodsReturnNonnullByDefault
+package WayofTime.bloodmagic.compat.waila.provider;
+
+import mcp.MethodsReturnNonnullByDefault;
+
+import javax.annotation.ParametersAreNonnullByDefault;

src/main/java/WayofTime/bloodmagic/compress/package-info.java

@@ -0,0 +1,7 @@
+@ParametersAreNonnullByDefault
+@MethodsReturnNonnullByDefault
+package WayofTime.bloodmagic.compress;
+
+import mcp.MethodsReturnNonnullByDefault;
+
+import javax.annotation.ParametersAreNonnullByDefault;

src/main/java/WayofTime/bloodmagic/demonAura/package-info.java

@@ -0,0 +1,7 @@
+@ParametersAreNonnullByDefault
+@MethodsReturnNonnullByDefault
+package WayofTime.bloodmagic.demonAura;
+
+import mcp.MethodsReturnNonnullByDefault;
+
+import javax.annotation.ParametersAreNonnullByDefault;

src/main/java/WayofTime/bloodmagic/entity/projectile/package-info.java

@@ -0,0 +1,7 @@
+@ParametersAreNonnullByDefault
+@MethodsReturnNonnullByDefault
+package WayofTime.bloodmagic.entity.projectile;
+
+import mcp.MethodsReturnNonnullByDefault;
+
+import javax.annotation.ParametersAreNonnullByDefault;

src/main/java/WayofTime/bloodmagic/fuel/package-info.java

@@ -0,0 +1,7 @@
+@ParametersAreNonnullByDefault
+@MethodsReturnNonnullByDefault
+package WayofTime.bloodmagic.fuel;
+
+import mcp.MethodsReturnNonnullByDefault;
+
+import javax.annotation.ParametersAreNonnullByDefault;

src/main/java/WayofTime/bloodmagic/incense/package-info.java

@@ -0,0 +1,7 @@
+@ParametersAreNonnullByDefault
+@MethodsReturnNonnullByDefault
+package WayofTime.bloodmagic.incense;
+
+import mcp.MethodsReturnNonnullByDefault;
+
+import javax.annotation.ParametersAreNonnullByDefault;

src/main/java/WayofTime/bloodmagic/item/alchemy/package-info.java

@@ -0,0 +1,7 @@
+@ParametersAreNonnullByDefault
+@MethodsReturnNonnullByDefault
+package WayofTime.bloodmagic.item.alchemy;
+
+import mcp.MethodsReturnNonnullByDefault;
+
+import javax.annotation.ParametersAreNonnullByDefault;

src/main/java/WayofTime/bloodmagic/item/armour/package-info.java

@@ -0,0 +1,7 @@
+@ParametersAreNonnullByDefault
+@MethodsReturnNonnullByDefault
+package WayofTime.bloodmagic.item.armour;
+
+import mcp.MethodsReturnNonnullByDefault;
+
+import javax.annotation.ParametersAreNonnullByDefault;

src/main/java/WayofTime/bloodmagic/item/block/package-info.java

@@ -0,0 +1,7 @@
+@ParametersAreNonnullByDefault
+@MethodsReturnNonnullByDefault
+package WayofTime.bloodmagic.item.block;
+
+import mcp.MethodsReturnNonnullByDefault;
+
+import javax.annotation.ParametersAreNonnullByDefault;

src/main/java/WayofTime/bloodmagic/item/gear/package-info.java

@@ -0,0 +1,7 @@
+@ParametersAreNonnullByDefault
+@MethodsReturnNonnullByDefault
+package WayofTime.bloodmagic.item.gear;
+
+import mcp.MethodsReturnNonnullByDefault;
+
+import javax.annotation.ParametersAreNonnullByDefault;

src/main/java/WayofTime/bloodmagic/item/inventory/package-info.java

@@ -0,0 +1,7 @@
+@ParametersAreNonnullByDefault
+@MethodsReturnNonnullByDefault
+package WayofTime.bloodmagic.item.inventory;
+
+import mcp.MethodsReturnNonnullByDefault;
+
+import javax.annotation.ParametersAreNonnullByDefault;

src/main/java/WayofTime/bloodmagic/item/package-info.java

@@ -0,0 +1,7 @@
+@ParametersAreNonnullByDefault
+@MethodsReturnNonnullByDefault
+package WayofTime.bloodmagic.item;
+
+import mcp.MethodsReturnNonnullByDefault;
+
+import javax.annotation.ParametersAreNonnullByDefault;

src/main/java/WayofTime/bloodmagic/item/routing/package-info.java

@@ -0,0 +1,7 @@
+@ParametersAreNonnullByDefault
+@MethodsReturnNonnullByDefault
+package WayofTime.bloodmagic.item.routing;
+
+import mcp.MethodsReturnNonnullByDefault;
+
+import javax.annotation.ParametersAreNonnullByDefault;

src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilGreenGrove.java

@@ -24,7 +24,7 @@ public class ItemSigilGreenGrove extends ItemSigilToggleableBase
     {
         if (applyBonemeal(stack, world, blockPos))
         {
-            world.playAuxSFX(2005, blockPos, 0);
+            world.destroyBlock(blockPos, false);
             return true;
         }
 
@@ -59,7 +59,7 @@ public class ItemSigilGreenGrove extends ItemSigilToggleableBase
                                 block.updateTick(worldIn, blockPos, worldIn.getBlockState(blockPos), worldIn.rand);
 
                                 if (!worldIn.getBlockState(blockPos).equals(preBlockState))
-                                    worldIn.playAuxSFX(2005, blockPos, 0);
+                                    worldIn.destroyBlock(blockPos, false);
                             }
                         }
                     }

src/main/java/WayofTime/bloodmagic/item/sigil/package-info.java

@@ -0,0 +1,7 @@
+@ParametersAreNonnullByDefault
+@MethodsReturnNonnullByDefault
+package WayofTime.bloodmagic.item.sigil;
+
+import mcp.MethodsReturnNonnullByDefault;
+
+import javax.annotation.ParametersAreNonnullByDefault;

src/main/java/WayofTime/bloodmagic/item/soul/package-info.java

@@ -0,0 +1,7 @@
+@ParametersAreNonnullByDefault
+@MethodsReturnNonnullByDefault
+package WayofTime.bloodmagic.item.soul;
+
+import mcp.MethodsReturnNonnullByDefault;
+
+import javax.annotation.ParametersAreNonnullByDefault;

src/main/java/WayofTime/bloodmagic/livingArmour/package-info.java

@@ -0,0 +1,7 @@
+@ParametersAreNonnullByDefault
+@MethodsReturnNonnullByDefault
+package WayofTime.bloodmagic.livingArmour;
+
+import mcp.MethodsReturnNonnullByDefault;
+
+import javax.annotation.ParametersAreNonnullByDefault;

src/main/java/WayofTime/bloodmagic/livingArmour/tracker/package-info.java

@@ -0,0 +1,7 @@
+@ParametersAreNonnullByDefault
+@MethodsReturnNonnullByDefault
+package WayofTime.bloodmagic.livingArmour.tracker;
+
+import mcp.MethodsReturnNonnullByDefault;
+
+import javax.annotation.ParametersAreNonnullByDefault;

src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/package-info.java

@@ -0,0 +1,7 @@
+@ParametersAreNonnullByDefault
+@MethodsReturnNonnullByDefault
+package WayofTime.bloodmagic.livingArmour.upgrade;
+
+import mcp.MethodsReturnNonnullByDefault;
+
+import javax.annotation.ParametersAreNonnullByDefault;

src/main/java/WayofTime/bloodmagic/network/package-info.java

@@ -0,0 +1,7 @@
+@ParametersAreNonnullByDefault
+@MethodsReturnNonnullByDefault
+package WayofTime.bloodmagic.network;
+
+import mcp.MethodsReturnNonnullByDefault;
+
+import javax.annotation.ParametersAreNonnullByDefault;

src/main/java/WayofTime/bloodmagic/package-info.java

@@ -0,0 +1,6 @@
+@ParametersAreNonnullByDefault
+@MethodsReturnNonnullByDefault
+package WayofTime.bloodmagic;
+
+import mcp.MethodsReturnNonnullByDefault;
+import javax.annotation.ParametersAreNonnullByDefault;

src/main/java/WayofTime/bloodmagic/potion/package-info.java

@@ -0,0 +1,7 @@
+@ParametersAreNonnullByDefault
+@MethodsReturnNonnullByDefault
+package WayofTime.bloodmagic.potion;
+
+import mcp.MethodsReturnNonnullByDefault;
+
+import javax.annotation.ParametersAreNonnullByDefault;

src/main/java/WayofTime/bloodmagic/proxy/ClientProxy.java

@@ -24,8 +24,12 @@ import WayofTime.bloodmagic.util.handler.ClientEventHandler;
 import WayofTime.bloodmagic.util.helper.InventoryRenderHelper;
 import WayofTime.bloodmagic.util.helper.InventoryRenderHelperV2;
 import net.minecraft.block.Block;
+import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.block.model.ModelResourceLocation;
+import net.minecraft.client.renderer.color.IItemColor;
+import net.minecraft.init.Items;
 import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
 import net.minecraft.util.ResourceLocation;
 import net.minecraftforge.client.model.ModelLoader;
 import net.minecraftforge.client.model.obj.OBJLoader;
@@ -34,6 +38,8 @@ import net.minecraftforge.fml.client.registry.ClientRegistry;
 import net.minecraftforge.fml.client.registry.RenderingRegistry;
 import org.apache.commons.lang3.tuple.Pair;
 
+import java.awt.*;
+
 public class ClientProxy extends CommonProxy
 {
     private InventoryRenderHelper renderHelper;
@@ -84,7 +90,14 @@ public class ClientProxy extends CommonProxy
     @Override
     public void init()
     {
-//        RenderingRegistry.registerEntityRenderingHandler(EntityBloodLight.class, new RenderEntityBloodLight(Minecraft.getMinecraft().getRenderManager()));
+        Minecraft.getMinecraft().getItemColors().registerItemColorHandler(new IItemColor()
+        {
+            @Override
+            public int getColorFromItemstack(ItemStack stack, int tintIndex)
+            {
+                return stack.hasTagCompound() && stack.getTagCompound().hasKey("bloody") ? new Color(0x8B191B).getRGB() : 16777215;
+            }
+        }, Items.BREAD);
     }
 
     @Override

src/main/java/WayofTime/bloodmagic/proxy/package-info.java

@@ -0,0 +1,7 @@
+@ParametersAreNonnullByDefault
+@MethodsReturnNonnullByDefault
+package WayofTime.bloodmagic.proxy;
+
+import mcp.MethodsReturnNonnullByDefault;
+
+import javax.annotation.ParametersAreNonnullByDefault;

src/main/java/WayofTime/bloodmagic/registry/package-info.java

@@ -0,0 +1,7 @@
+@ParametersAreNonnullByDefault
+@MethodsReturnNonnullByDefault
+package WayofTime.bloodmagic.registry;
+
+import mcp.MethodsReturnNonnullByDefault;
+
+import javax.annotation.ParametersAreNonnullByDefault;

src/main/java/WayofTime/bloodmagic/ritual/harvest/HarvestHandlerPlantable.java

@@ -64,7 +64,7 @@ public class HarvestHandlerPlantable implements IHarvestHandler
         if (foundSeed)
         {
             world.setBlockState(pos, blockStack.getBlock().getDefaultState());
-            world.playAuxSFX(2001, pos, Block.getIdFromBlock(blockStack.getBlock()) + (blockStack.getMeta() << 12));
+            world.destroyBlock(pos, false);
             for (ItemStack stack : drops)
             {
                 if (!world.isRemote)

src/main/java/WayofTime/bloodmagic/ritual/harvest/package-info.java

@@ -0,0 +1,7 @@
+@ParametersAreNonnullByDefault
+@MethodsReturnNonnullByDefault
+package WayofTime.bloodmagic.ritual.harvest;
+
+import mcp.MethodsReturnNonnullByDefault;
+
+import javax.annotation.ParametersAreNonnullByDefault;

src/main/java/WayofTime/bloodmagic/ritual/imperfect/package-info.java

@@ -0,0 +1,7 @@
+@ParametersAreNonnullByDefault
+@MethodsReturnNonnullByDefault
+package WayofTime.bloodmagic.ritual.imperfect;
+
+import mcp.MethodsReturnNonnullByDefault;
+
+import javax.annotation.ParametersAreNonnullByDefault;

src/main/java/WayofTime/bloodmagic/ritual/package-info.java

@@ -0,0 +1,7 @@
+@ParametersAreNonnullByDefault
+@MethodsReturnNonnullByDefault
+package WayofTime.bloodmagic.ritual;
+
+import mcp.MethodsReturnNonnullByDefault;
+
+import javax.annotation.ParametersAreNonnullByDefault;

src/main/java/WayofTime/bloodmagic/ritual/portal/Teleports.java

@@ -61,7 +61,7 @@ public class Teleports
 
                         player.setPositionAndUpdate(x + 0.5, y + 0.5, z + 0.5);
                         player.worldObj.updateEntityWithOptionalForce(player, false);
-                        player.playerNetServerHandler.sendPacket(new SPacketUpdateHealth(player.getHealth(), player.getFoodStats().getFoodLevel(), player.getFoodStats().getSaturationLevel()));
+                        player.connection.sendPacket(new SPacketUpdateHealth(player.getHealth(), player.getFoodStats().getFoodLevel(), player.getFoodStats().getSaturationLevel()));
                         player.timeUntilPortal = 150;
 
                         player.worldObj.playSound(x, y, z, SoundEvents.ENTITY_ENDERMEN_TELEPORT, SoundCategory.AMBIENT, 1.0F, 1.0F, false);
@@ -148,7 +148,7 @@ public class Teleports
 //                            server.getConfigurationManager().transferPlayerToDimension(player, newWorldID, new TeleporterBloodMagic(newWorldServer));
                             player.setPositionAndUpdate(x + 0.5, y + 0.5, z + 0.5);
                             player.worldObj.updateEntityWithOptionalForce(player, false);
-                            player.playerNetServerHandler.sendPacket(new SPacketUpdateHealth(player.getHealth(), player.getFoodStats().getFoodLevel(), player.getFoodStats().getSaturationLevel()));
+                            player.connection.sendPacket(new SPacketUpdateHealth(player.getHealth(), player.getFoodStats().getFoodLevel(), player.getFoodStats().getSaturationLevel()));
                             MinecraftForge.EVENT_BUS.post(new TeleposeEvent.Ent.Post(entity, entity.worldObj, entity.getPosition(), newWorldServer, new BlockPos(x, y, z)));
                         }