diff --git a/build.gradle b/build.gradle
index 72caca4b..14a5a1bb 100644
--- a/build.gradle
+++ b/build.gradle
@@ -5,26 +5,21 @@ buildscript {
         maven { url "https://oss.sonatype.org/content/repositories/snapshots/" }
     }
     dependencies {
-		classpath 'net.minecraftforge.gradle:ForgeGradle:2.2-SNAPSHOT'
-        classpath 'org.ajoberstar:gradle-git:0.10.1'
+		classpath 'net.minecraftforge.gradle:ForgeGradle:2.3-SNAPSHOT'
     }
 }
 
 plugins {
 	id "net.minecraftforge.gradle.forge" version "2.0.2"
     id 'com.matthewprenger.cursegradle' version '1.0.9'
-	id 'io.franzbecker.gradle-lombok' version '1.6'
+    id 'maven-publish'
 }
 
-apply plugin: 'maven-publish'
-
 def build_number = 'CUSTOM'
-
 if (System.getenv('BUILD_NUMBER') != null)
     build_number = System.getenv('BUILD_NUMBER')
 
-def username = 'BloodMagicDev'
-
+def username = "${mod_name}"
 if (project.hasProperty('dev_username'))
     username = "${dev_username}"
 
@@ -32,38 +27,15 @@ group = package_group
 archivesBaseName = mod_name
 version = "${mc_version}-${mod_version}-${build_number}"
 
-if (project.hasProperty('gitpush'))
-    version += "-ss"
-
-import org.ajoberstar.grgit.*
-
-ext.repo = Grgit.open(project.file('.'))
-def gitHash = 'unknown'
-
-if (new File(projectDir, '.git').exists())
-    gitHash = repo.log().find().abbreviatedId
-
 repositories {
     maven { url "http://dvs1.progwml6.com/files/maven" }
     maven {	url "http://tehnut.info/maven" }
-	
-    ivy {
-        name "Thaumcraft"
-        artifactPattern "https://dl.dropboxusercontent.com/u/47135879/[module]-[revision]-deobf.[ext]"
-    }
-    ivy {
-        name "Baubles"
-        artifactPattern "https://dl.dropboxusercontent.com/u/47135879/[module]-1.8.9-[revision]-deobf.[ext]"
-    }
 }
 
 dependencies {
     deobfCompile "mezz.jei:jei_${mc_version}:${jei_version}"
     deobfCompile "mcp.mobius.waila:Hwyla:${waila_version}_${mc_version}"
     deobfCompile "info.amerifrance.guideapi:Guide-API:${mc_version}-${guideapi_version}"
-
-//    compile name: "Thaumcraft", version: "${mc_version}-${thaumcraft_version}", ext: "jar"
-//    compile name: 'Baubles', version: "${baubles_version}", ext: 'jar'
 }
 
 minecraft {
@@ -104,23 +76,6 @@ if (JavaVersion.current().isJava8Compatible()) {
     }
 }
 
-lombok {
-    version = "1.16.6"
-    sha256 = "e0a471be03e1e6b02bf019480cec7a3ac9801702bf7bf62f15d077ad4df8dd5d"
-}
-
-import io.franzbecker.gradle.lombok.task.DelombokTask
-
-task delombok(type: DelombokTask) {
-    args("src/main/java", "-d", "build/sources/delomboked/java")
-}
-
-task delombokHelp(type: DelombokTask) {
-    args "--help"
-}
-
-tasks.eclipse.dependsOn installLombok
-
 jar {
     classifier = ''
     manifest.mainAttributes(
@@ -128,7 +83,6 @@ jar {
         "Created-By": "${System.getProperty('java.vm.version')} + (${System.getProperty('java.vm.vendor')})",
         "Implementation-Title": project.name,
         "Implementation-Version": project.version,
-        "Git-Hash": gitHash,
         "Built-On": "${mc_version}-${forge_version}"
     )
 }
@@ -147,11 +101,6 @@ task javadocJar(type: Jar, dependsOn: javadoc) {
     classifier = 'javadoc'
 }
 
-javadoc {
-    source = projectDir.path + "/build/sources/delomboked/java"
-}
-
-tasks.javadoc.dependsOn delombok
 tasks.build.dependsOn javadoc, javadocJar, apiJar
 
 tasks.withType(JavaCompile) { task ->
@@ -202,7 +151,7 @@ String getChangelogText() {
 
 def curseRelations = {
     optionalLibrary 'just-enough-items-jei'
-    optionalLibrary 'waila'
+    optionalLibrary 'hwyla'
     requiredLibrary 'guide-api'
 }
 
@@ -216,7 +165,6 @@ curseforge {
         releaseType = 'beta'
 
         relations curseRelations
-        addGameVersion '1.11.2'
 
         addArtifact javadocJar
         addArtifact sourceJar
diff --git a/gradle.properties b/gradle.properties
index bfbd15a5..bcf9d97a 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,12 +1,12 @@
 mod_name=BloodMagic
 package_group=com.wayoftime.bloodmagic
-mod_version=2.1.11
-mc_version=1.11
-forge_version=13.19.1.2189
+mod_version=2.2.0
+mc_version=1.12
+forge_version=14.21.1.2443
 curse_id=224791
 
-mappings_version=snapshot_20161212
+mappings_version=snapshot_20170814
 
-jei_version=4.0.5.203
-waila_version=1.8.5-B19
-guideapi_version=2.1.0-50
\ No newline at end of file
+jei_version=4.7.5.85
+waila_version=1.8.20-B35
+guideapi_version=2.1.4-56
\ No newline at end of file
diff --git a/src/main/java/WayofTime/bloodmagic/BloodMagic.java b/src/main/java/WayofTime/bloodmagic/BloodMagic.java
index 1d862212..aacd5ff9 100644
--- a/src/main/java/WayofTime/bloodmagic/BloodMagic.java
+++ b/src/main/java/WayofTime/bloodmagic/BloodMagic.java
@@ -5,7 +5,6 @@ import java.io.File;
 import WayofTime.bloodmagic.command.CommandBloodMagic;
 import WayofTime.bloodmagic.api.registry.RitualRegistry;
 import WayofTime.bloodmagic.meteor.MeteorConfigHandler;
-import lombok.Getter;
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.item.ItemStack;
 import net.minecraft.launchwrapper.Launch;
@@ -15,19 +14,14 @@ import net.minecraftforge.fml.common.SidedProxy;
 import net.minecraftforge.fml.common.event.*;
 import net.minecraftforge.fml.common.network.NetworkRegistry;
 import WayofTime.bloodmagic.annot.Handler;
-import WayofTime.bloodmagic.api.Constants;
 import WayofTime.bloodmagic.api.util.helper.LogHelper;
 import WayofTime.bloodmagic.client.gui.GuiHandler;
-import WayofTime.bloodmagic.compat.ICompatibility;
 import WayofTime.bloodmagic.network.BloodMagicPacketHandler;
 import WayofTime.bloodmagic.proxy.CommonProxy;
 import WayofTime.bloodmagic.registry.ModArmourTrackers;
-import WayofTime.bloodmagic.registry.ModBlocks;
-import WayofTime.bloodmagic.registry.ModCompatibility;
+import WayofTime.bloodmagic.registry.RegistrarBloodMagicBlocks;
 import WayofTime.bloodmagic.registry.ModCorruptionBlocks;
-import WayofTime.bloodmagic.registry.ModEntities;
-import WayofTime.bloodmagic.registry.ModItems;
-import WayofTime.bloodmagic.registry.ModPotions;
+import WayofTime.bloodmagic.registry.RegistrarBloodMagicItems;
 import WayofTime.bloodmagic.registry.ModRecipes;
 import WayofTime.bloodmagic.registry.ModRituals;
 import WayofTime.bloodmagic.registry.ModTranquilityHandlers;
@@ -35,31 +29,27 @@ import WayofTime.bloodmagic.structures.ModDungeons;
 import WayofTime.bloodmagic.util.Utils;
 import WayofTime.bloodmagic.util.handler.IMCHandler;
 
-@Mod(modid = Constants.Mod.MODID, name = Constants.Mod.NAME, version = Constants.Mod.VERSION, dependencies = Constants.Mod.DEPEND, guiFactory = "WayofTime.bloodmagic.client.gui.config.ConfigGuiFactory")
-@Getter
+@Mod(modid = BloodMagic.MODID, name = BloodMagic.NAME, version = BloodMagic.VERSION, dependencies = BloodMagic.DEPEND, guiFactory = "WayofTime.bloodmagic.client.gui.config.ConfigGuiFactory")
 public class BloodMagic
 {
-    @SidedProxy(serverSide = "WayofTime.bloodmagic.proxy.CommonProxy", clientSide = "WayofTime.bloodmagic.proxy.ClientProxy")
-    public static CommonProxy proxy;
-
-    @Mod.Instance(Constants.Mod.MODID)
-    public static BloodMagic instance;
-
-    public static CreativeTabs tabBloodMagic = new CreativeTabs(Constants.Mod.MODID + ".creativeTab")
+    public static final String MODID = "bloodmagic";
+    public static final String NAME = "Blood Magic: Alchemical Wizardry";
+    public static final String VERSION = "@VERSION@";
+    public static final String DEPEND = "required-after:guideapi;";
+    public static final CreativeTabs TAB_BM = new CreativeTabs(MODID + ".creativeTab")
     {
         @Override
         public ItemStack getTabIconItem()
         {
-            return new ItemStack(ModItems.BLOOD_ORB);
+            return new ItemStack(RegistrarBloodMagicItems.BLOOD_ORB);
         }
     };
-
-    public static CreativeTabs tabUpgradeTome = new CreativeTabs(Constants.Mod.MODID + ".creativeTabTome")
+    public static CreativeTabs TAB_TOMES = new CreativeTabs(MODID + ".creativeTabTome")
     {
         @Override
         public ItemStack getTabIconItem()
         {
-            return new ItemStack(ModItems.UPGRADE_TOME);
+            return new ItemStack(RegistrarBloodMagicItems.UPGRADE_TOME);
         }
 
         @Override
@@ -67,33 +57,28 @@ public class BloodMagic
         {
             return true;
         }
-    }.setNoTitle().setBackgroundImageName("upgrade_tomes.png");
-
-    @Getter
-    private static boolean isDev = (Boolean) Launch.blackboard.get("fml.deobfuscatedEnvironment");
+    }.setNoTitle().setBackgroundImageName("items_search.png");
+    public static final boolean IS_DEV = (Boolean) Launch.blackboard.get("fml.deobfuscatedEnvironment");
 
     static
     {
-        tabUpgradeTome.setNoTitle().setBackgroundImageName("upgrade_tomes.png");
-
         FluidRegistry.enableUniversalBucket();
     }
 
-    private LogHelper logger = new LogHelper(Constants.Mod.MODID);
+    @SidedProxy(serverSide = "WayofTime.bloodmagic.proxy.CommonProxy", clientSide = "WayofTime.bloodmagic.proxy.ClientProxy")
+    public static CommonProxy proxy;
+    @Mod.Instance(BloodMagic.MODID)
+    public static BloodMagic instance;
+
+    public LogHelper logger = new LogHelper(MODID);
     private File configDir;
 
     @Mod.EventHandler
     public void preInit(FMLPreInitializationEvent event)
     {
         configDir = new File(event.getModConfigurationDirectory(), "BloodMagic");
-        ConfigHandler.init(new File(getConfigDir(), "BloodMagic.cfg"));
+        ConfigHandler.init(new File(configDir, "BloodMagic.cfg"));
 
-        ModBlocks.init();
-        ModItems.init();
-        ModPotions.init();
-        ModEntities.init();
-        ModCompatibility.registerModCompat();
-        ModCompatibility.loadCompat(ICompatibility.InitializationPhase.PRE_INIT);
         ModTranquilityHandlers.init();
         ModDungeons.init();
 
@@ -105,13 +90,13 @@ public class BloodMagic
     public void init(FMLInitializationEvent event)
     {
         BloodMagicPacketHandler.init();
+        RegistrarBloodMagicBlocks.registerBlacklists();
 
         ModRecipes.init();
         ModRituals.initRituals();
         ModRituals.initImperfectRituals();
         MeteorConfigHandler.init(new File(configDir, "meteors"));
         ModArmourTrackers.init();
-        ModCompatibility.loadCompat(ICompatibility.InitializationPhase.INIT);
         NetworkRegistry.INSTANCE.registerGuiHandler(BloodMagic.instance, new GuiHandler());
         ModCorruptionBlocks.init();
 
@@ -122,7 +107,6 @@ public class BloodMagic
     public void postInit(FMLPostInitializationEvent event)
     {
         ModRecipes.addCompressionHandlers();
-        ModCompatibility.loadCompat(ICompatibility.InitializationPhase.POST_INIT);
 
         proxy.postInit();
     }
@@ -135,7 +119,7 @@ public class BloodMagic
     @Mod.EventHandler
     public void modMapping(FMLModIdMappingEvent event)
     {
-        ModCompatibility.loadCompat(ICompatibility.InitializationPhase.MAPPING);
+
     }
 
     @Mod.EventHandler
diff --git a/src/main/java/WayofTime/bloodmagic/ConfigHandler.java b/src/main/java/WayofTime/bloodmagic/ConfigHandler.java
index 373f6a31..8146e99d 100644
--- a/src/main/java/WayofTime/bloodmagic/ConfigHandler.java
+++ b/src/main/java/WayofTime/bloodmagic/ConfigHandler.java
@@ -8,11 +8,9 @@ import java.util.List;
 import java.util.Map;
 
 import WayofTime.bloodmagic.meteor.MeteorConfigHandler;
-import lombok.Getter;
 import net.minecraft.block.Block;
 import net.minecraft.util.ResourceLocation;
 import net.minecraftforge.common.config.Configuration;
-import net.minecraftforge.common.config.Property;
 import net.minecraftforge.fml.client.event.ConfigChangedEvent;
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
 import net.minecraftforge.fml.common.registry.ForgeRegistries;
@@ -26,28 +24,23 @@ import WayofTime.bloodmagic.util.Utils;
 @Handler
 public class ConfigHandler
 {
-    @Getter
-    private static Configuration config;
+    public static Configuration config;
 
     // Teleposer
     public static String[] teleposerBlacklisting;
-    public static ArrayList<BlockStack> teleposerBlacklist = new ArrayList<BlockStack>();
+    public static ArrayList<BlockStack> teleposerBlacklist = new ArrayList<>();
     public static List<String> teleposerBlacklistEntity;
 
     // Transposition Sigil
     public static String[] transpositionBlacklisting;
-    public static ArrayList<BlockStack> transpositionBlacklist = new ArrayList<BlockStack>();
-
-    // Item/Block Disabling
-    public static List<String> itemBlacklist;
-    public static List<String> blockBlacklist;
+    public static ArrayList<BlockStack> transpositionBlacklist = new ArrayList<>();
 
     // Well of Suffering Blacklist
     public static List<String> wellOfSufferingBlacklist;
 
     // Blood Altar Sacrificial Values
     public static String[] entitySacrificeValuesList;
-    public static Map<String, Integer> entitySacrificeValues = new HashMap<String, Integer>();
+    public static Map<String, Integer> entitySacrificeValues = new HashMap<>();
 
     // Rituals
     public static boolean ritualAnimalGrowth;
@@ -167,23 +160,11 @@ public class ConfigHandler
 
     public static void syncConfig()
     {
-        boolean configVersionChanged = false;
-
         String category;
 
-        category = "Version";
-        Property prop = config.get(category, "Config Version", Constants.Mod.VERSION);
-        if (!prop.getString().equals(Constants.Mod.VERSION))
-        {
-            configVersionChanged = true;
-            prop.setValue(Constants.Mod.VERSION);
-        }
-
         category = "Item/Block Blacklisting";
         config.addCustomCategoryComment(category, "Allows disabling of specific Blocks/Items.\nNote that using this may result in crashes. Use is not supported.");
         config.setCategoryRequiresMcRestart(category, true);
-        itemBlacklist = Arrays.asList(config.getStringList("itemBlacklist", category, new String[] {}, "Items to not be registered. This requires their mapping name. Usually the same as the class name. Can be found in F3+H mode."));
-        blockBlacklist = Arrays.asList(config.getStringList("blockBlacklist", category, new String[] {}, "Blocks to not be registered. This requires their mapping name. Usually the same as the class name. Can be found in F3+H mode."));
 
         category = "Teleposer Blacklist";
         config.addCustomCategoryComment(category, "Block blacklisting");
@@ -306,7 +287,7 @@ public class ConfigHandler
 
         category = "General";
         config.addCustomCategoryComment(category, "General settings");
-        BloodMagicAPI.setLoggingEnabled(config.getBoolean("enableLogging", category, true, "Allows logging information to the console. Fatal errors will bypass this"));
+        BloodMagicAPI.loggingEnabled = config.getBoolean("enableLogging", category, true, "Allows logging information to the console. Fatal errors will bypass this");
         sacrificialPackConversion = config.getInt("sacrificialPackConversion", category, 20, 0, 100, "Base multiplier for the Coat of Arms. DamageDealt * sacrificialPackConversion");
         sacrificialDaggerDamage = config.getInt("sacrificialDaggerDamage", category, 2, 0, 10000, "Damage done from using the Sacrificial Dagger");
         sacrificialDaggerConversion = config.getInt("sacrificialDaggerConversion", category, 100, 0, 10000, "Amount of LP received per damage point (not heart!)");
@@ -376,7 +357,7 @@ public class ConfigHandler
     @SubscribeEvent
     public void onConfigChanged(ConfigChangedEvent event)
     {
-        if (event.getModID().equals(Constants.Mod.MODID))
+        if (event.getModID().equals(BloodMagic.MODID))
         {
             syncConfig();
             MeteorConfigHandler.handleMeteors(false);
diff --git a/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectAttractor.java b/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectAttractor.java
index fc933397..6ea52f66 100644
--- a/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectAttractor.java
+++ b/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectAttractor.java
@@ -6,6 +6,7 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Set;
 
+import WayofTime.bloodmagic.BloodMagic;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityLiving;
 import net.minecraft.entity.ai.EntityAIBase;
@@ -28,7 +29,6 @@ import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.MathHelper;
 import net.minecraft.world.World;
 import net.minecraftforge.common.util.FakePlayer;
-import WayofTime.bloodmagic.api.Constants;
 import WayofTime.bloodmagic.api.alchemyCrafting.AlchemyArrayEffect;
 import WayofTime.bloodmagic.fakePlayer.FakePlayerBM;
 import WayofTime.bloodmagic.tile.TileAlchemyArray;
@@ -400,7 +400,7 @@ public class AlchemyArrayEffectAttractor extends AlchemyArrayEffect
     {
         public Target(World world, BlockPos pos)
         {
-            super(world, pos, new GameProfile(null, Constants.Mod.MODID + "ArrayAttractor" + ":" + pos));
+            super(world, pos, new GameProfile(null, BloodMagic.MODID + "ArrayAttractor" + ":" + pos));
             posY += 1;
         }
     }
diff --git a/src/main/java/WayofTime/bloodmagic/altar/BloodAltar.java b/src/main/java/WayofTime/bloodmagic/altar/BloodAltar.java
index 497ec555..6f4ac6de 100644
--- a/src/main/java/WayofTime/bloodmagic/altar/BloodAltar.java
+++ b/src/main/java/WayofTime/bloodmagic/altar/BloodAltar.java
@@ -2,7 +2,6 @@ package WayofTime.bloodmagic.altar;
 
 import java.util.List;
 
-import lombok.Getter;
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
@@ -54,7 +53,7 @@ public class BloodAltar implements IFluidHandler
     private EnumAltarTier altarTier = EnumAltarTier.ONE;
     private AltarUpgrade upgrade;
     private int capacity = Fluid.BUCKET_VOLUME * 10;
-    private FluidStack fluid = new FluidStack(BloodMagicAPI.getLifeEssence(), 0);
+    private FluidStack fluid = new FluidStack(BlockLifeEssence.getLifeEssence(), 0);
     private int liquidRequired; // mB
     private boolean canBeFilled;
     private int consumptionRate;
@@ -84,7 +83,6 @@ public class BloodAltar implements IFluidHandler
     private AltarRecipe recipe;
     private ItemStack result = ItemStack.EMPTY;
 
-    @Getter
     private EnumAltarTier currentTierDisplayed = EnumAltarTier.ONE;
 
     public BloodAltar(TileAltar tileAltar)
@@ -132,9 +130,9 @@ public class BloodAltar implements IFluidHandler
                 } else if (worldBlock.getBlock() != Utils.getBlockForComponent(altarComponent.getComponent())) // Special case Vanilla
                 {
                     return false;
-                } else if (BloodMagicAPI.getAltarComponents().get(worldBlock.getState()) != null) // Mod compat
+                } else if (BloodMagicAPI.altarComponents.get(worldBlock.getState()) != null) // Mod compat
                 {
-                    return BloodMagicAPI.getAltarComponents().get(worldBlock.getState()) == altarComponent.getComponent();
+                    return BloodMagicAPI.altarComponents.get(worldBlock.getState()) == altarComponent.getComponent();
                 }
             } else
             {
@@ -261,10 +259,10 @@ public class BloodAltar implements IFluidHandler
             if (fluid != null)
                 setMainFluid(fluid);
 
-            FluidStack fluidOut = new FluidStack(BloodMagicAPI.getLifeEssence(), tagCompound.getInteger(Constants.NBT.OUTPUT_AMOUNT));
+            FluidStack fluidOut = new FluidStack(BloodMagicAPI.lifeEssence, tagCompound.getInteger(Constants.NBT.OUTPUT_AMOUNT));
             setOutputFluid(fluidOut);
 
-            FluidStack fluidIn = new FluidStack(BloodMagicAPI.getLifeEssence(), tagCompound.getInteger(Constants.NBT.INPUT_AMOUNT));
+            FluidStack fluidIn = new FluidStack(BloodMagicAPI.lifeEssence, tagCompound.getInteger(Constants.NBT.INPUT_AMOUNT));
             setInputFluid(fluidIn);
         }
 
@@ -880,4 +878,8 @@ public class BloodAltar implements IFluidHandler
     {
         return new IFluidTankProperties[] { new FluidTankPropertiesWrapper(new FluidTank(fluid, capacity)) };
     }
+
+    public EnumAltarTier getCurrentTierDisplayed() {
+        return currentTierDisplayed;
+    }
 }
diff --git a/src/main/java/WayofTime/bloodmagic/api/BlockStack.java b/src/main/java/WayofTime/bloodmagic/api/BlockStack.java
index fe2e9341..264f348b 100644
--- a/src/main/java/WayofTime/bloodmagic/api/BlockStack.java
+++ b/src/main/java/WayofTime/bloodmagic/api/BlockStack.java
@@ -1,15 +1,11 @@
 package WayofTime.bloodmagic.api;
 
-import lombok.EqualsAndHashCode;
-import lombok.Getter;
 import net.minecraft.block.Block;
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
 
-@Getter
-@EqualsAndHashCode(exclude = { "state" })
 public class BlockStack
 {
     private final Block block;
@@ -39,6 +35,36 @@ public class BlockStack
         return new ItemStack(block, 1, meta);
     }
 
+    public Block getBlock() {
+        return block;
+    }
+
+    public int getMeta() {
+        return meta;
+    }
+
+    public IBlockState getState() {
+        return state;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (!(o instanceof BlockStack)) return false;
+
+        BlockStack that = (BlockStack) o;
+
+        if (meta != that.meta) return false;
+        return block != null ? block.equals(that.block) : that.block == null;
+    }
+
+    @Override
+    public int hashCode() {
+        int result = block != null ? block.hashCode() : 0;
+        result = 31 * result + meta;
+        return result;
+    }
+
     @Override
     public String toString()
     {
diff --git a/src/main/java/WayofTime/bloodmagic/api/BloodMagicAPI.java b/src/main/java/WayofTime/bloodmagic/api/BloodMagicAPI.java
index 8273047e..488cddc1 100644
--- a/src/main/java/WayofTime/bloodmagic/api/BloodMagicAPI.java
+++ b/src/main/java/WayofTime/bloodmagic/api/BloodMagicAPI.java
@@ -1,9 +1,8 @@
 package WayofTime.bloodmagic.api;
 
+import WayofTime.bloodmagic.BloodMagic;
 import WayofTime.bloodmagic.api.altar.EnumAltarComponent;
 import WayofTime.bloodmagic.api.util.helper.LogHelper;
-import lombok.Getter;
-import lombok.Setter;
 import net.minecraft.block.Block;
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.entity.EntityLivingBase;
@@ -35,38 +34,27 @@ import java.util.Map;
  */
 public class BloodMagicAPI
 {
-    @Getter
-    private static final List<BlockStack> teleposerBlacklist = new ArrayList<BlockStack>();
-    @Getter
-    private static final List<BlockStack> transpositionBlacklist = new ArrayList<BlockStack>();
-    @Getter
-    private static final Map<String, Integer> entitySacrificeValues = new HashMap<String, Integer>();
-    @Getter
-    private static final ArrayList<Block> greenGroveBlacklist = new ArrayList<Block>();
-    @Getter
-    private static final Map<IBlockState, EnumAltarComponent> altarComponents = new HashMap<IBlockState, EnumAltarComponent>();
+    public static final List<BlockStack> teleposerBlacklist = new ArrayList<BlockStack>();
+    public static final List<BlockStack> transpositionBlacklist = new ArrayList<BlockStack>();
+    public static final Map<String, Integer> entitySacrificeValues = new HashMap<String, Integer>();
+    public static final ArrayList<Block> greenGroveBlacklist = new ArrayList<Block>();
+    public static final Map<IBlockState, EnumAltarComponent> altarComponents = new HashMap<IBlockState, EnumAltarComponent>();
 
-    @Getter
-    @Setter
-    private static boolean loggingEnabled;
+    public static boolean loggingEnabled;
 
-    @Getter
-    private static LogHelper logger = new LogHelper("BloodMagic|API");
+    public static LogHelper logger = new LogHelper("BloodMagic|API");
 
-    @Getter
-    private static DamageSource damageSource = new DamageSourceBloodMagic();
+    public static DamageSource damageSource = new DamageSourceBloodMagic();
 
-    @Getter
-    @Setter
-    private static Fluid lifeEssence;
-    private static ItemStack lifeEssenceBucket;
+    public static Fluid lifeEssence;
+    public static ItemStack lifeEssenceBucket;
 
     public static ItemStack getLifeEssenceBucket()
     {
         if (lifeEssenceBucket != null)
             return lifeEssenceBucket;
 
-        lifeEssenceBucket = UniversalBucket.getFilledBucket(ForgeModContainer.getInstance().universalBucket, getLifeEssence());
+        lifeEssenceBucket = UniversalBucket.getFilledBucket(ForgeModContainer.getInstance().universalBucket, lifeEssence);
         return lifeEssenceBucket;
     }
 
@@ -82,7 +70,7 @@ public class BloodMagicAPI
      */
     public static Item getItem(String name)
     {
-        return ForgeRegistries.ITEMS.getValue(new ResourceLocation(Constants.Mod.MODID, name));
+        return ForgeRegistries.ITEMS.getValue(new ResourceLocation(BloodMagic.MODID, name));
     }
 
     /**
@@ -110,7 +98,7 @@ public class BloodMagicAPI
      */
     public static Block getBlock(String name)
     {
-        return ForgeRegistries.BLOCKS.getValue(new ResourceLocation(Constants.Mod.MODID, name));
+        return ForgeRegistries.BLOCKS.getValue(new ResourceLocation(BloodMagic.MODID, name));
     }
 
     /**
diff --git a/src/main/java/WayofTime/bloodmagic/api/Constants.java b/src/main/java/WayofTime/bloodmagic/api/Constants.java
index 1d49da31..3cc3c3ff 100644
--- a/src/main/java/WayofTime/bloodmagic/api/Constants.java
+++ b/src/main/java/WayofTime/bloodmagic/api/Constants.java
@@ -2,7 +2,7 @@ package WayofTime.bloodmagic.api;
 
 import java.util.Locale;
 
-import lombok.Getter;
+import WayofTime.bloodmagic.BloodMagic;
 import net.minecraft.block.Block;
 import net.minecraft.item.Item;
 import net.minecraft.util.ResourceLocation;
@@ -132,11 +132,7 @@ public class Constants
 
     public static class Mod
     {
-        public static final String MODID = "bloodmagic";
-        public static final String DOMAIN = MODID.toLowerCase(Locale.ENGLISH) + ":";
-        public static final String NAME = "Blood Magic: Alchemical Wizardry";
-        public static final String VERSION = "@VERSION@";
-        public static final String DEPEND = "required-after:guideapi;";
+        public static final String DOMAIN = BloodMagic.MODID.toLowerCase(Locale.ENGLISH) + ":";
     }
 
     public static final class Gui
@@ -151,19 +147,19 @@ public class Constants
 
     public static class Compat
     {
-        public static final String JEI_CATEGORY_ALTAR = Mod.MODID + ":altar";
-        public static final String JEI_CATEGORY_BINDING = Mod.MODID + ":binding";
-        public static final String JEI_CATEGORY_ALCHEMYARRAY = Mod.MODID + ":alchemyArray";
-        public static final String JEI_CATEGORY_SOULFORGE = Mod.MODID + ":soulForge";
-        public static final String JEI_CATEGORY_ALCHEMYTABLE = Mod.MODID + ":salchemyTable";
-        public static final String JEI_CATEGORY_ARMOURDOWNGRADE = Mod.MODID + ":armourDowngrade";
+        public static final String JEI_CATEGORY_ALTAR = BloodMagic.MODID + ":altar";
+        public static final String JEI_CATEGORY_BINDING = BloodMagic.MODID + ":binding";
+        public static final String JEI_CATEGORY_ALCHEMYARRAY = BloodMagic.MODID + ":alchemyArray";
+        public static final String JEI_CATEGORY_SOULFORGE = BloodMagic.MODID + ":soulForge";
+        public static final String JEI_CATEGORY_ALCHEMYTABLE = BloodMagic.MODID + ":salchemyTable";
+        public static final String JEI_CATEGORY_ARMOURDOWNGRADE = BloodMagic.MODID + ":armourDowngrade";
 
-        public static final String WAILA_CONFIG_BYPASS_SNEAK = Mod.MODID + ".bypassSneak";
-        public static final String WAILA_CONFIG_ALTAR = Mod.MODID + ".bloodAltar";
-        public static final String WAILA_CONFIG_TELEPOSER = Mod.MODID + ".teleposer";
-        public static final String WAILA_CONFIG_RITUAL = Mod.MODID + ".ritualController";
-        public static final String WAILA_CONFIG_ARRAY = Mod.MODID + ".array";
-        public static final String WAILA_CONFIG_BLOOD_TANK = Mod.MODID + ".bloodTank";
+        public static final String WAILA_CONFIG_BYPASS_SNEAK = BloodMagic.MODID + ".bypassSneak";
+        public static final String WAILA_CONFIG_ALTAR = BloodMagic.MODID + ".bloodAltar";
+        public static final String WAILA_CONFIG_TELEPOSER = BloodMagic.MODID + ".teleposer";
+        public static final String WAILA_CONFIG_RITUAL = BloodMagic.MODID + ".ritualController";
+        public static final String WAILA_CONFIG_ARRAY = BloodMagic.MODID + ".array";
+        public static final String WAILA_CONFIG_BLOOD_TANK = BloodMagic.MODID + ".bloodTank";
 
         public static final Item THAUMCRAFT_GOGGLES = ForgeRegistries.ITEMS.getValue(new ResourceLocation("Thaumcraft", "goggles"));
     }
@@ -187,12 +183,6 @@ public class Constants
         BOUND_PICKAXE("ItemBoundPickaxe"),
         BOUND_SHOVEL("ItemBoundShovel"),
         BOUND_SWORD("ItemBoundSword"),
-        /**
-         * @deprecated - Use
-         *             {@code UniversalBucket.getFilledBucket(ForgeModContainer.getInstance().universalBucket, BloodMagicAPI.getLifeEssence())}
-         **/
-        @Deprecated
-        BUCKET_ESSENCE("ItemBucketEssence"),
         COMPONENT("ItemComponent"),
         CUTTING_FLUID("ItemCuttingFluid"),
         DEMON_CRYSTAL("ItemDemonCrystal"),
@@ -257,7 +247,6 @@ public class Constants
         SIGIL_BOUNCE("ItemSigilBounce"),
         SIGIL_FROST("ItemSigilFrost");
 
-        @Getter
         private final String regName;
 
         BloodMagicItem(String regName)
@@ -267,7 +256,12 @@ public class Constants
 
         public Item getItem()
         {
-            return BloodMagicAPI.getItem(getRegName());
+            return BloodMagicAPI.getItem(regName);
+        }
+
+        public String getRegName()
+        {
+            return regName;
         }
     }
 
@@ -319,7 +313,6 @@ public class Constants
         INVERSION_PILLAR("BlockInversionPillar"),
         INVERSION_PILLAR_END("BlockInversionPillarEnd");
 
-        @Getter
         private final String regName;
 
         BloodMagicBlock(String regName)
@@ -329,7 +322,12 @@ public class Constants
 
         public Block getBlock()
         {
-            return BloodMagicAPI.getBlock(getRegName());
+            return BloodMagicAPI.getBlock(regName);
+        }
+
+        public String getRegName()
+        {
+            return regName;
         }
     }
 }
diff --git a/src/main/java/WayofTime/bloodmagic/api/alchemyCrafting/AlchemyArrayEffect.java b/src/main/java/WayofTime/bloodmagic/api/alchemyCrafting/AlchemyArrayEffect.java
index 4e07a969..37946018 100644
--- a/src/main/java/WayofTime/bloodmagic/api/alchemyCrafting/AlchemyArrayEffect.java
+++ b/src/main/java/WayofTime/bloodmagic/api/alchemyCrafting/AlchemyArrayEffect.java
@@ -1,7 +1,5 @@
 package WayofTime.bloodmagic.api.alchemyCrafting;
 
-import lombok.Getter;
-import lombok.RequiredArgsConstructor;
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.entity.Entity;
 import net.minecraft.nbt.NBTTagCompound;
@@ -10,12 +8,14 @@ import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
 import WayofTime.bloodmagic.api.iface.IAlchemyArray;
 
-@RequiredArgsConstructor
 public abstract class AlchemyArrayEffect
 {
-    @Getter
     public final String key;
 
+    public AlchemyArrayEffect(String key) {
+        this.key = key;
+    }
+
     public abstract boolean update(TileEntity tile, int ticksActive);
 
     public abstract void writeToNBT(NBTTagCompound tag);
@@ -28,4 +28,8 @@ public abstract class AlchemyArrayEffect
     {
 
     }
+
+    public String getKey() {
+        return key;
+    }
 }
diff --git a/src/main/java/WayofTime/bloodmagic/api/altar/AltarComponent.java b/src/main/java/WayofTime/bloodmagic/api/altar/AltarComponent.java
index 7fd90b66..1ff69871 100644
--- a/src/main/java/WayofTime/bloodmagic/api/altar/AltarComponent.java
+++ b/src/main/java/WayofTime/bloodmagic/api/altar/AltarComponent.java
@@ -1,12 +1,10 @@
 package WayofTime.bloodmagic.api.altar;
 
-import lombok.Getter;
 import net.minecraft.util.math.BlockPos;
 
 /**
  * Used for building the altar structure.
  */
-@Getter
 public class AltarComponent
 {
     private BlockPos offset;
@@ -50,4 +48,16 @@ public class AltarComponent
         this.upgradeSlot = true;
         return this;
     }
+
+    public BlockPos getOffset() {
+        return offset;
+    }
+
+    public boolean isUpgradeSlot() {
+        return upgradeSlot;
+    }
+
+    public EnumAltarComponent getComponent() {
+        return component;
+    }
 }
diff --git a/src/main/java/WayofTime/bloodmagic/api/altar/AltarUpgrade.java b/src/main/java/WayofTime/bloodmagic/api/altar/AltarUpgrade.java
index faecb757..d8b73f87 100644
--- a/src/main/java/WayofTime/bloodmagic/api/altar/AltarUpgrade.java
+++ b/src/main/java/WayofTime/bloodmagic/api/altar/AltarUpgrade.java
@@ -1,12 +1,5 @@
 package WayofTime.bloodmagic.api.altar;
 
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-
-@Getter
-@NoArgsConstructor
-@AllArgsConstructor
 public class AltarUpgrade
 {
     private int speedCount;
@@ -20,6 +13,22 @@ public class AltarUpgrade
     private int accelerationCount;
     private int chargingCount;
 
+    public AltarUpgrade(int speedCount, int efficiencyCount, int sacrificeCount, int selfSacrificeCount, int displacementCount, int capacityCount, int orbCapacityCount, int betterCapacityCount, int accelerationCount, int chargingCount) {
+        this.speedCount = speedCount;
+        this.efficiencyCount = efficiencyCount;
+        this.sacrificeCount = sacrificeCount;
+        this.selfSacrificeCount = selfSacrificeCount;
+        this.displacementCount = displacementCount;
+        this.capacityCount = capacityCount;
+        this.orbCapacityCount = orbCapacityCount;
+        this.betterCapacityCount = betterCapacityCount;
+        this.accelerationCount = accelerationCount;
+        this.chargingCount = chargingCount;
+    }
+
+    public AltarUpgrade() {
+    }
+
     // Adders
 
     public AltarUpgrade addSpeed()
@@ -81,4 +90,44 @@ public class AltarUpgrade
         chargingCount++;
         return this;
     }
+
+    public int getSpeedCount() {
+        return speedCount;
+    }
+
+    public int getEfficiencyCount() {
+        return efficiencyCount;
+    }
+
+    public int getSacrificeCount() {
+        return sacrificeCount;
+    }
+
+    public int getSelfSacrificeCount() {
+        return selfSacrificeCount;
+    }
+
+    public int getDisplacementCount() {
+        return displacementCount;
+    }
+
+    public int getCapacityCount() {
+        return capacityCount;
+    }
+
+    public int getOrbCapacityCount() {
+        return orbCapacityCount;
+    }
+
+    public int getBetterCapacityCount() {
+        return betterCapacityCount;
+    }
+
+    public int getAccelerationCount() {
+        return accelerationCount;
+    }
+
+    public int getChargingCount() {
+        return chargingCount;
+    }
 }
diff --git a/src/main/java/WayofTime/bloodmagic/api/altar/EnumAltarComponent.java b/src/main/java/WayofTime/bloodmagic/api/altar/EnumAltarComponent.java
index 319f018b..185fc725 100644
--- a/src/main/java/WayofTime/bloodmagic/api/altar/EnumAltarComponent.java
+++ b/src/main/java/WayofTime/bloodmagic/api/altar/EnumAltarComponent.java
@@ -2,12 +2,9 @@ package WayofTime.bloodmagic.api.altar;
 
 import java.util.Locale;
 
-import lombok.Getter;
-
 /**
  * List of different components used to construct different tiers of altars.
  */
-@Getter
 public enum EnumAltarComponent
 {
     GLOWSTONE,
@@ -24,4 +21,8 @@ public enum EnumAltarComponent
     {
         this.key = BASE + name().toLowerCase(Locale.ENGLISH);
     }
+
+    public String getKey() {
+        return key;
+    }
 }
diff --git a/src/main/java/WayofTime/bloodmagic/api/altar/EnumAltarTier.java b/src/main/java/WayofTime/bloodmagic/api/altar/EnumAltarTier.java
index 6d7cfcb8..ba1ec6ac 100644
--- a/src/main/java/WayofTime/bloodmagic/api/altar/EnumAltarTier.java
+++ b/src/main/java/WayofTime/bloodmagic/api/altar/EnumAltarTier.java
@@ -1,12 +1,10 @@
 package WayofTime.bloodmagic.api.altar;
 
-import lombok.Getter;
 import net.minecraft.util.math.BlockPos;
 
 import java.util.ArrayList;
 
 //@formatter:off
-@Getter
 public enum EnumAltarTier
 {
     ONE(), TWO()
@@ -152,4 +150,8 @@ public enum EnumAltarTier
     {
         return ordinal() + 1;
     }
+
+    public ArrayList<AltarComponent> getAltarComponents() {
+        return altarComponents;
+    }
 }
diff --git a/src/main/java/WayofTime/bloodmagic/api/event/AltarCraftedEvent.java b/src/main/java/WayofTime/bloodmagic/api/event/AltarCraftedEvent.java
index 6ea69d0e..11891289 100644
--- a/src/main/java/WayofTime/bloodmagic/api/event/AltarCraftedEvent.java
+++ b/src/main/java/WayofTime/bloodmagic/api/event/AltarCraftedEvent.java
@@ -1,7 +1,6 @@
 package WayofTime.bloodmagic.api.event;
 
 import WayofTime.bloodmagic.api.registry.AltarRecipeRegistry;
-import lombok.Getter;
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.fml.common.eventhandler.Event;
 
@@ -10,7 +9,6 @@ import net.minecraftforge.fml.common.eventhandler.Event;
  * 
  * It is not cancelable, however you can modify the output stack.
  */
-@Getter
 public class AltarCraftedEvent extends Event
 {
 
@@ -28,4 +26,12 @@ public class AltarCraftedEvent extends Event
         this.altarRecipe = altarRecipe;
         this.output = output;
     }
+
+    public AltarRecipeRegistry.AltarRecipe getAltarRecipe() {
+        return altarRecipe;
+    }
+
+    public ItemStack getOutput() {
+        return output;
+    }
 }
diff --git a/src/main/java/WayofTime/bloodmagic/api/iface/IAlchemyArray.java b/src/main/java/WayofTime/bloodmagic/api/iface/IAlchemyArray.java
index 62406021..e06393b1 100644
--- a/src/main/java/WayofTime/bloodmagic/api/iface/IAlchemyArray.java
+++ b/src/main/java/WayofTime/bloodmagic/api/iface/IAlchemyArray.java
@@ -4,5 +4,5 @@ import net.minecraft.util.EnumFacing;
 
 public interface IAlchemyArray
 {
-    public abstract EnumFacing getRotation();
+    EnumFacing getRotation();
 }
diff --git a/src/main/java/WayofTime/bloodmagic/api/impl/ItemSigil.java b/src/main/java/WayofTime/bloodmagic/api/impl/ItemSigil.java
index 53bb0872..fcf7b227 100644
--- a/src/main/java/WayofTime/bloodmagic/api/impl/ItemSigil.java
+++ b/src/main/java/WayofTime/bloodmagic/api/impl/ItemSigil.java
@@ -3,7 +3,6 @@ package WayofTime.bloodmagic.api.impl;
 import WayofTime.bloodmagic.api.Constants;
 import WayofTime.bloodmagic.api.iface.ISigil;
 import WayofTime.bloodmagic.api.util.helper.NBTHelper;
-import lombok.Getter;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
@@ -13,7 +12,6 @@ import net.minecraft.world.World;
  */
 public class ItemSigil extends ItemBindable implements ISigil
 {
-    @Getter
     private int lpUsed;
 
     public ItemSigil(int lpUsed)
@@ -49,4 +47,8 @@ public class ItemSigil extends ItemBindable implements ISigil
     {
         return false;
     }
+
+    public int getLpUsed() {
+        return lpUsed;
+    }
 }
diff --git a/src/main/java/WayofTime/bloodmagic/api/orb/BloodOrb.java b/src/main/java/WayofTime/bloodmagic/api/orb/BloodOrb.java
index fb15cdb1..a3c801ff 100644
--- a/src/main/java/WayofTime/bloodmagic/api/orb/BloodOrb.java
+++ b/src/main/java/WayofTime/bloodmagic/api/orb/BloodOrb.java
@@ -1,22 +1,23 @@
 package WayofTime.bloodmagic.api.orb;
 
-import WayofTime.bloodmagic.api.registry.OrbRegistry;
+import net.minecraft.client.renderer.block.model.ModelResourceLocation;
+import net.minecraftforge.registries.IForgeRegistryEntry;
+
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 
 /**
  * Base object for all Blood Orbs. Makes Orb creation quite a bit easier.
  * 
- * Just create a new BloodOrb instance then register it with
- * {@link OrbRegistry#registerOrb(BloodOrb)} This will allow the use of just one
- * item ID for all orbs. If an addon dev needs more control over the intricacies
- * of their orb (custom right clicking, renderers, etc), they can just create
- * their own item as normal.
+ * Just create a new BloodOrb instance then register it in {@link net.minecraftforge.event.RegistryEvent.Register<BloodOrb>}
  */
-public class BloodOrb
+public class BloodOrb extends IForgeRegistryEntry.Impl<BloodOrb>
 {
-    private String name;
-    private int tier;
-    private int capacity;
-    private String owner = "BloodMagic";
+    private final String name;
+    private final int tier;
+    private final int capacity;
+    @Nullable
+    private ModelResourceLocation modelLocation;
 
     /**
      * A base object for BloodOrbs. A bit cleaner than the old way through
@@ -51,26 +52,19 @@ public class BloodOrb
         return capacity;
     }
 
-    public String getOwner()
-    {
-        return owner;
+    @Nullable
+    public ModelResourceLocation getModelLocation() {
+        return modelLocation;
     }
 
-    /**
-     * For setting the MODID of the mod that creates the Orb. Not required, but
-     * preferred.
-     * 
-     * @return - The BloodOrb object for further use.
-     */
-    public BloodOrb setOwner(String owner)
-    {
-        this.owner = owner;
+    public BloodOrb withModel(@Nonnull ModelResourceLocation modelLocation) {
+        this.modelLocation = modelLocation;
         return this;
     }
 
     @Override
     public String toString()
     {
-        return "BloodOrb{" + "name='" + name + '\'' + ", tier=" + tier + ", capacity=" + capacity + ", owner=" + owner + '}';
+        return "BloodOrb{" + "name='" + name + '\'' + ", tier=" + tier + ", capacity=" + capacity + ", owner=" + getRegistryName() + '}';
     }
 }
diff --git a/src/main/java/WayofTime/bloodmagic/api/orb/IBloodOrb.java b/src/main/java/WayofTime/bloodmagic/api/orb/IBloodOrb.java
index 998a0205..230b8332 100644
--- a/src/main/java/WayofTime/bloodmagic/api/orb/IBloodOrb.java
+++ b/src/main/java/WayofTime/bloodmagic/api/orb/IBloodOrb.java
@@ -1,10 +1,11 @@
 package WayofTime.bloodmagic.api.orb;
 
+import net.minecraft.item.ItemStack;
+
+import javax.annotation.Nullable;
+
 public interface IBloodOrb
 {
-    BloodOrb getOrb(int meta);
-
-    int getMaxEssence(int meta);
-
-    int getOrbLevel(int meta);
+    @Nullable
+    BloodOrb getOrb(ItemStack stack);
 }
diff --git a/src/main/java/WayofTime/bloodmagic/api/package-info.java b/src/main/java/WayofTime/bloodmagic/api/package-info.java
index 8700523a..3f175867 100644
--- a/src/main/java/WayofTime/bloodmagic/api/package-info.java
+++ b/src/main/java/WayofTime/bloodmagic/api/package-info.java
@@ -1,4 +1,5 @@
-@API(owner = Constants.Mod.MODID, provides = Constants.Mod.MODID + "|API", apiVersion = Constants.Mod.VERSION)
+@API(owner = BloodMagic.MODID, provides = BloodMagic.MODID + "|API", apiVersion = BloodMagic.VERSION)
 package WayofTime.bloodmagic.api;
 
+import WayofTime.bloodmagic.BloodMagic;
 import net.minecraftforge.fml.common.API;
\ No newline at end of file
diff --git a/src/main/java/WayofTime/bloodmagic/api/recipe/AlchemyTableRecipe.java b/src/main/java/WayofTime/bloodmagic/api/recipe/AlchemyTableRecipe.java
index 497102ae..c677afb2 100644
--- a/src/main/java/WayofTime/bloodmagic/api/recipe/AlchemyTableRecipe.java
+++ b/src/main/java/WayofTime/bloodmagic/api/recipe/AlchemyTableRecipe.java
@@ -5,27 +5,20 @@ import java.util.Iterator;
 import java.util.List;
 
 import com.google.common.collect.ImmutableList;
-import lombok.EqualsAndHashCode;
-import lombok.Getter;
-import lombok.ToString;
 import net.minecraft.block.Block;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
 import net.minecraftforge.oredict.OreDictionary;
+import org.apache.commons.lang3.builder.ToStringBuilder;
 
-@EqualsAndHashCode
-@ToString
 public class AlchemyTableRecipe
 {
     protected ItemStack output = ItemStack.EMPTY;
     protected ArrayList<Object> input = new ArrayList<Object>();
-    @Getter
     protected int lpDrained;
-    @Getter
     protected int ticksRequired;
-    @Getter
     protected int tierRequired;
 
     public AlchemyTableRecipe(Block result, int lpDrained, int ticksRequired, int tierRequired, Object... recipe)
@@ -186,4 +179,52 @@ public class AlchemyTableRecipe
 
         return copyStack;
     }
+
+    public int getLpDrained() {
+        return lpDrained;
+    }
+
+    public int getTicksRequired() {
+        return ticksRequired;
+    }
+
+    public int getTierRequired() {
+        return tierRequired;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this)
+                .append("output", output)
+                .append("input", input)
+                .append("lpDrained", lpDrained)
+                .append("ticksRequired", ticksRequired)
+                .append("tierRequired", tierRequired)
+                .append("recipeSize", getRecipeSize())
+                .toString();
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (!(o instanceof AlchemyTableRecipe)) return false;
+
+        AlchemyTableRecipe that = (AlchemyTableRecipe) o;
+
+        if (lpDrained != that.lpDrained) return false;
+        if (ticksRequired != that.ticksRequired) return false;
+        if (tierRequired != that.tierRequired) return false;
+        if (output != null ? !output.equals(that.output) : that.output != null) return false;
+        return input != null ? input.equals(that.input) : that.input == null;
+    }
+
+    @Override
+    public int hashCode() {
+        int result = output != null ? output.hashCode() : 0;
+        result = 31 * result + (input != null ? input.hashCode() : 0);
+        result = 31 * result + lpDrained;
+        result = 31 * result + ticksRequired;
+        result = 31 * result + tierRequired;
+        return result;
+    }
 }
\ No newline at end of file
diff --git a/src/main/java/WayofTime/bloodmagic/api/recipe/TartaricForgeRecipe.java b/src/main/java/WayofTime/bloodmagic/api/recipe/TartaricForgeRecipe.java
index 88f102c3..813d4b04 100644
--- a/src/main/java/WayofTime/bloodmagic/api/recipe/TartaricForgeRecipe.java
+++ b/src/main/java/WayofTime/bloodmagic/api/recipe/TartaricForgeRecipe.java
@@ -1,28 +1,22 @@
 package WayofTime.bloodmagic.api.recipe;
 
-import lombok.EqualsAndHashCode;
-import lombok.Getter;
-import lombok.ToString;
 import net.minecraft.block.Block;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
 import net.minecraftforge.oredict.OreDictionary;
+import org.apache.commons.lang3.builder.ToStringBuilder;
 
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 
-@EqualsAndHashCode
-@ToString
 public class TartaricForgeRecipe
 {
     protected ItemStack output = null;
     protected List<Object> input = new ArrayList<Object>();
-    @Getter
     protected double minimumSouls;
-    @Getter
     protected double soulsDrained;
 
     public TartaricForgeRecipe(Block result, double minSouls, double drain, Object... recipe)
@@ -145,4 +139,50 @@ public class TartaricForgeRecipe
     {
         return this.input;
     }
+
+    public double getMinimumSouls() {
+        return minimumSouls;
+    }
+
+    public double getSoulsDrained() {
+        return soulsDrained;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this)
+                .append("output", output)
+                .append("input", input)
+                .append("minimumSouls", minimumSouls)
+                .append("soulsDrained", soulsDrained)
+                .append("recipeSize", getRecipeSize())
+                .append("recipeOutput", getRecipeOutput())
+                .toString();
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (!(o instanceof TartaricForgeRecipe)) return false;
+
+        TartaricForgeRecipe that = (TartaricForgeRecipe) o;
+
+        if (Double.compare(that.minimumSouls, minimumSouls) != 0) return false;
+        if (Double.compare(that.soulsDrained, soulsDrained) != 0) return false;
+        if (output != null ? !output.equals(that.output) : that.output != null) return false;
+        return input != null ? input.equals(that.input) : that.input == null;
+    }
+
+    @Override
+    public int hashCode() {
+        int result;
+        long temp;
+        result = output != null ? output.hashCode() : 0;
+        result = 31 * result + (input != null ? input.hashCode() : 0);
+        temp = Double.doubleToLongBits(minimumSouls);
+        result = 31 * result + (int) (temp ^ (temp >>> 32));
+        temp = Double.doubleToLongBits(soulsDrained);
+        result = 31 * result + (int) (temp ^ (temp >>> 32));
+        return result;
+    }
 }
\ No newline at end of file
diff --git a/src/main/java/WayofTime/bloodmagic/api/registry/AltarRecipeRegistry.java b/src/main/java/WayofTime/bloodmagic/api/registry/AltarRecipeRegistry.java
index 3f71204b..687813fd 100644
--- a/src/main/java/WayofTime/bloodmagic/api/registry/AltarRecipeRegistry.java
+++ b/src/main/java/WayofTime/bloodmagic/api/registry/AltarRecipeRegistry.java
@@ -5,11 +5,9 @@ import WayofTime.bloodmagic.api.ItemStackWrapper;
 import WayofTime.bloodmagic.api.altar.EnumAltarTier;
 import com.google.common.collect.BiMap;
 import com.google.common.collect.HashBiMap;
-import lombok.EqualsAndHashCode;
-import lombok.Getter;
-import lombok.ToString;
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.oredict.OreDictionary;
+import org.apache.commons.lang3.builder.ToStringBuilder;
 
 import java.util.Collections;
 import java.util.List;
@@ -34,7 +32,7 @@ public class AltarRecipeRegistry
         if (!recipes.containsValue(altarRecipe) && altarRecipe.getInput().size() > 0)
             recipes.put(altarRecipe.getInput(), altarRecipe);
         else
-            BloodMagicAPI.getLogger().error("Error adding altar recipe for input [{}].", altarRecipe.toString());
+            BloodMagicAPI.logger.error("Error adding altar recipe for input [{}].", altarRecipe.toString());
     }
 
     public static void registerFillRecipe(ItemStack orbStack, EnumAltarTier tier, int maxForOrb, int consumeRate, int drainRate)
@@ -87,9 +85,6 @@ public class AltarRecipeRegistry
         return HashBiMap.create(recipes);
     }
 
-    @Getter
-    @ToString
-    @EqualsAndHashCode
     public static class AltarRecipe
     {
         private final List<ItemStackWrapper> input;
@@ -174,5 +169,74 @@ public class AltarRecipeRegistry
 
             return false;
         }
+
+        public List<ItemStackWrapper> getInput() {
+            return input;
+        }
+
+        public ItemStack getOutput() {
+            return output;
+        }
+
+        public EnumAltarTier getMinTier() {
+            return minTier;
+        }
+
+        public int getSyphon() {
+            return syphon;
+        }
+
+        public int getConsumeRate() {
+            return consumeRate;
+        }
+
+        public int getDrainRate() {
+            return drainRate;
+        }
+
+        public boolean isFillable() {
+            return fillable;
+        }
+
+        @Override
+        public boolean equals(Object o) {
+            if (this == o) return true;
+            if (!(o instanceof AltarRecipe)) return false;
+
+            AltarRecipe that = (AltarRecipe) o;
+
+            if (syphon != that.syphon) return false;
+            if (consumeRate != that.consumeRate) return false;
+            if (drainRate != that.drainRate) return false;
+            if (fillable != that.fillable) return false;
+            if (input != null ? !input.equals(that.input) : that.input != null) return false;
+            if (output != null ? !output.equals(that.output) : that.output != null) return false;
+            return minTier == that.minTier;
+        }
+
+        @Override
+        public int hashCode() {
+            int result = input != null ? input.hashCode() : 0;
+            result = 31 * result + (output != null ? output.hashCode() : 0);
+            result = 31 * result + (minTier != null ? minTier.hashCode() : 0);
+            result = 31 * result + syphon;
+            result = 31 * result + consumeRate;
+            result = 31 * result + drainRate;
+            result = 31 * result + (fillable ? 1 : 0);
+            return result;
+        }
+
+        @Override
+        public String toString() {
+            return new ToStringBuilder(this)
+                    .append("input", input)
+                    .append("output", output)
+                    .append("minTier", minTier)
+                    .append("syphon", syphon)
+                    .append("consumeRate", consumeRate)
+                    .append("drainRate", drainRate)
+                    .append("fillable", fillable)
+                    .toString();
+        }
     }
 }
\ No newline at end of file
diff --git a/src/main/java/WayofTime/bloodmagic/api/registry/OrbRegistry.java b/src/main/java/WayofTime/bloodmagic/api/registry/OrbRegistry.java
index 226626a4..19c8500a 100644
--- a/src/main/java/WayofTime/bloodmagic/api/registry/OrbRegistry.java
+++ b/src/main/java/WayofTime/bloodmagic/api/registry/OrbRegistry.java
@@ -5,13 +5,16 @@ import WayofTime.bloodmagic.api.Constants;
 import WayofTime.bloodmagic.api.altar.EnumAltarTier;
 import WayofTime.bloodmagic.api.orb.BloodOrb;
 import WayofTime.bloodmagic.api.orb.IBloodOrb;
+import WayofTime.bloodmagic.registry.RegistrarBloodMagicItems;
 import com.google.common.collect.ArrayListMultimap;
 import net.minecraft.client.renderer.block.model.ModelBakery;
 import net.minecraft.client.renderer.block.model.ModelResourceLocation;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.util.ResourceLocation;
 import net.minecraftforge.client.model.ModelLoader;
+import net.minecraftforge.fml.common.registry.GameRegistry;
 import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;
 
@@ -23,57 +26,14 @@ import java.util.List;
  * This is only for those who wish to add a basic {@link BloodOrb}. If you need
  * custom handling, you will need your own item class.
  */
+@Deprecated
 public class OrbRegistry
 {
     private static List<BloodOrb> orbs = new ArrayList<BloodOrb>();
-    private static ArrayListMultimap<Integer, ItemStack> tierMap = ArrayListMultimap.create();
+    public static ArrayListMultimap<Integer, ItemStack> tierMap = ArrayListMultimap.create();
 
-    private static Item orbItem = Constants.BloodMagicItem.BLOOD_ORB.getItem();
-
-    public static void registerOrb(BloodOrb orb)
-    {
-        if (!orbs.contains(orb))
-        {
-            orbs.add(orb);
-            registerOrbForTier(orb.getTier(), getOrbStack(orb));
-        } else
-            BloodMagicAPI.getLogger().error("Error adding orb %s. Orb already exists!", orb.toString());
-    }
-
-    public static void registerOrbForTier(int tier, ItemStack stack)
-    {
-        if (stack.getItem() instanceof IBloodOrb)
-            tierMap.put(tier, stack);
-    }
-
-    @SideOnly(Side.CLIENT)
-    public static void registerOrbTexture(BloodOrb orb, ResourceLocation resourceLocation)
-    {
-        int meta = getIndexOf(orb);
-
-        ModelBakery.registerItemVariants(orbItem, resourceLocation);
-        ModelLoader.setCustomModelResourceLocation(orbItem, meta, new ModelResourceLocation(resourceLocation, "inventory"));
-    }
-
-    public static BloodOrb getOrb(int index)
-    {
-        return orbs.get(index);
-    }
-
-    public static int getIndexOf(BloodOrb orb)
-    {
-        return orbs.indexOf(orb);
-    }
-
-    public static boolean isEmpty()
-    {
-        return orbs.isEmpty();
-    }
-
-    public static int getSize()
-    {
-        return orbs.size();
-    }
+    @GameRegistry.ObjectHolder("bloodmagic:blood_orb")
+    private static final Item ORB_ITEM = null;
 
     public static List<ItemStack> getOrbsForTier(int tier)
     {
@@ -105,12 +65,11 @@ public class OrbRegistry
 
     public static ItemStack getOrbStack(BloodOrb orb)
     {
-        return new ItemStack(orbItem, 1, getIndexOf(orb));
-    }
-
-    public static List<BloodOrb> getOrbs()
-    {
-        return new ArrayList<BloodOrb>(orbs);
+        ItemStack ret = new ItemStack(ORB_ITEM);
+        NBTTagCompound tag = new NBTTagCompound();
+        tag.setString("orb", orb.getRegistryName().toString());
+        ret.setTagCompound(tag);
+        return ret;
     }
 
     public static ArrayListMultimap<Integer, ItemStack> getTierMap()
diff --git a/src/main/java/WayofTime/bloodmagic/api/ritual/Ritual.java b/src/main/java/WayofTime/bloodmagic/api/ritual/Ritual.java
index 01822165..bec8ef1c 100644
--- a/src/main/java/WayofTime/bloodmagic/api/ritual/Ritual.java
+++ b/src/main/java/WayofTime/bloodmagic/api/ritual/Ritual.java
@@ -6,10 +6,6 @@ import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 
-import lombok.EqualsAndHashCode;
-import lombok.Getter;
-import lombok.RequiredArgsConstructor;
-import lombok.ToString;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
@@ -21,15 +17,12 @@ import net.minecraft.world.World;
 import WayofTime.bloodmagic.api.soul.DemonWillHolder;
 import WayofTime.bloodmagic.api.soul.EnumDemonWillType;
 import WayofTime.bloodmagic.demonAura.WorldDemonWillHandler;
+import org.apache.commons.lang3.builder.ToStringBuilder;
 
 /**
  * Abstract class for creating new rituals. Rituals need be registered with
  * {@link WayofTime.bloodmagic.api.registry.RitualRegistry#registerRitual(Ritual, String)}
  */
-@Getter
-@RequiredArgsConstructor
-@EqualsAndHashCode(exclude = { "modableRangeMap", "ritualComponents", "renderer", "volumeRangeMap", "horizontalRangeMap", "verticalRangeMap" })
-@ToString
 public abstract class Ritual
 {
     public final ArrayList<RitualComponent> ritualComponents = new ArrayList<RitualComponent>();
@@ -44,6 +37,14 @@ public abstract class Ritual
     protected final Map<String, Integer> horizontalRangeMap = new HashMap<String, Integer>();
     protected final Map<String, Integer> verticalRangeMap = new HashMap<String, Integer>();
 
+    public Ritual(String name, int crystalLevel, int activationCost, RitualRenderer renderer, String unlocalizedName) {
+        this.name = name;
+        this.crystalLevel = crystalLevel;
+        this.activationCost = activationCost;
+        this.renderer = renderer;
+        this.unlocalizedName = unlocalizedName;
+    }
+
     /**
      * @param name
      *        - The name of the ritual
@@ -365,4 +366,84 @@ public abstract class Ritual
     }
 
     public abstract Ritual getNewCopy();
+
+    public ArrayList<RitualComponent> getRitualComponents() {
+        return ritualComponents;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public int getCrystalLevel() {
+        return crystalLevel;
+    }
+
+    public int getActivationCost() {
+        return activationCost;
+    }
+
+    public RitualRenderer getRenderer() {
+        return renderer;
+    }
+
+    public String getUnlocalizedName() {
+        return unlocalizedName;
+    }
+
+    public Map<String, AreaDescriptor> getModableRangeMap() {
+        return modableRangeMap;
+    }
+
+    public Map<String, Integer> getVolumeRangeMap() {
+        return volumeRangeMap;
+    }
+
+    public Map<String, Integer> getHorizontalRangeMap() {
+        return horizontalRangeMap;
+    }
+
+    public Map<String, Integer> getVerticalRangeMap() {
+        return verticalRangeMap;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this)
+                .append("ritualComponents", ritualComponents)
+                .append("name", name)
+                .append("crystalLevel", crystalLevel)
+                .append("activationCost", activationCost)
+                .append("renderer", renderer)
+                .append("unlocalizedName", unlocalizedName)
+                .append("modableRangeMap", modableRangeMap)
+                .append("volumeRangeMap", volumeRangeMap)
+                .append("horizontalRangeMap", horizontalRangeMap)
+                .append("verticalRangeMap", verticalRangeMap)
+                .append("refreshTime", getRefreshTime())
+                .append("listOfRanges", getListOfRanges())
+                .toString();
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (!(o instanceof Ritual)) return false;
+
+        Ritual ritual = (Ritual) o;
+
+        if (crystalLevel != ritual.crystalLevel) return false;
+        if (activationCost != ritual.activationCost) return false;
+        if (name != null ? !name.equals(ritual.name) : ritual.name != null) return false;
+        return unlocalizedName != null ? unlocalizedName.equals(ritual.unlocalizedName) : ritual.unlocalizedName == null;
+    }
+
+    @Override
+    public int hashCode() {
+        int result = name != null ? name.hashCode() : 0;
+        result = 31 * result + crystalLevel;
+        result = 31 * result + activationCost;
+        result = 31 * result + (unlocalizedName != null ? unlocalizedName.hashCode() : 0);
+        return result;
+    }
 }
diff --git a/src/main/java/WayofTime/bloodmagic/api/ritual/RitualComponent.java b/src/main/java/WayofTime/bloodmagic/api/ritual/RitualComponent.java
index 2fdf3ab9..2bfd071f 100644
--- a/src/main/java/WayofTime/bloodmagic/api/ritual/RitualComponent.java
+++ b/src/main/java/WayofTime/bloodmagic/api/ritual/RitualComponent.java
@@ -1,7 +1,5 @@
 package WayofTime.bloodmagic.api.ritual;
 
-import lombok.Getter;
-import lombok.RequiredArgsConstructor;
 import net.minecraft.util.EnumFacing;
 import net.minecraft.util.math.BlockPos;
 
@@ -9,13 +7,16 @@ import net.minecraft.util.math.BlockPos;
  * Used to set a {@link EnumRuneType} type to a given {@link BlockPos} for usage
  * in Ritual creation.
  */
-@Getter
-@RequiredArgsConstructor
 public class RitualComponent
 {
     private final BlockPos offset;
     private final EnumRuneType runeType;
 
+    public RitualComponent(BlockPos offset, EnumRuneType runeType) {
+        this.offset = offset;
+        this.runeType = runeType;
+    }
+
     public int getX(EnumFacing direction)
     {
         switch (direction)
@@ -55,4 +56,12 @@ public class RitualComponent
     {
         return new BlockPos(getX(direction), offset.getY(), getZ(direction));
     }
+
+    public BlockPos getOffset() {
+        return offset;
+    }
+
+    public EnumRuneType getRuneType() {
+        return runeType;
+    }
 }
diff --git a/src/main/java/WayofTime/bloodmagic/api/ritual/imperfect/ImperfectRitual.java b/src/main/java/WayofTime/bloodmagic/api/ritual/imperfect/ImperfectRitual.java
index c9ec02a6..28b92f67 100644
--- a/src/main/java/WayofTime/bloodmagic/api/ritual/imperfect/ImperfectRitual.java
+++ b/src/main/java/WayofTime/bloodmagic/api/ritual/imperfect/ImperfectRitual.java
@@ -1,9 +1,6 @@
 package WayofTime.bloodmagic.api.ritual.imperfect;
 
 import WayofTime.bloodmagic.api.BlockStack;
-import lombok.EqualsAndHashCode;
-import lombok.Getter;
-import lombok.RequiredArgsConstructor;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.world.World;
 
@@ -12,9 +9,6 @@ import net.minecraft.world.World;
  * registered with
  * {@link WayofTime.bloodmagic.api.registry.ImperfectRitualRegistry#registerRitual(ImperfectRitual)}
  */
-@RequiredArgsConstructor
-@Getter
-@EqualsAndHashCode
 public abstract class ImperfectRitual
 {
 
@@ -24,6 +18,14 @@ public abstract class ImperfectRitual
     private final boolean lightshow;
     private final String unlocalizedName;
 
+    public ImperfectRitual(String name, BlockStack requiredBlock, int activationCost, boolean lightshow, String unlocalizedName) {
+        this.name = name;
+        this.requiredBlock = requiredBlock;
+        this.activationCost = activationCost;
+        this.lightshow = lightshow;
+        this.unlocalizedName = unlocalizedName;
+    }
+
     /**
      * @param name
      *        - The name of the ritual
@@ -49,9 +51,54 @@ public abstract class ImperfectRitual
      */
     public abstract boolean onActivate(IImperfectRitualStone imperfectRitualStone, EntityPlayer player);
 
+    public String getName() {
+        return name;
+    }
+
+    public BlockStack getRequiredBlock() {
+        return requiredBlock;
+    }
+
+    public int getActivationCost() {
+        return activationCost;
+    }
+
+    public boolean isLightshow() {
+        return lightshow;
+    }
+
+    public String getUnlocalizedName() {
+        return unlocalizedName;
+    }
+
     @Override
     public String toString()
     {
         return getName() + ":" + getRequiredBlock().toString() + "@" + getActivationCost();
     }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (!(o instanceof ImperfectRitual)) return false;
+
+        ImperfectRitual that = (ImperfectRitual) o;
+
+        if (activationCost != that.activationCost) return false;
+        if (lightshow != that.lightshow) return false;
+        if (name != null ? !name.equals(that.name) : that.name != null) return false;
+        if (requiredBlock != null ? !requiredBlock.equals(that.requiredBlock) : that.requiredBlock != null)
+            return false;
+        return unlocalizedName != null ? unlocalizedName.equals(that.unlocalizedName) : that.unlocalizedName == null;
+    }
+
+    @Override
+    public int hashCode() {
+        int result = name != null ? name.hashCode() : 0;
+        result = 31 * result + (requiredBlock != null ? requiredBlock.hashCode() : 0);
+        result = 31 * result + activationCost;
+        result = 31 * result + (lightshow ? 1 : 0);
+        result = 31 * result + (unlocalizedName != null ? unlocalizedName.hashCode() : 0);
+        return result;
+    }
 }
diff --git a/src/main/java/WayofTime/bloodmagic/api/saving/BMWorldSavedData.java b/src/main/java/WayofTime/bloodmagic/api/saving/BMWorldSavedData.java
index 3499c82c..eae38187 100644
--- a/src/main/java/WayofTime/bloodmagic/api/saving/BMWorldSavedData.java
+++ b/src/main/java/WayofTime/bloodmagic/api/saving/BMWorldSavedData.java
@@ -4,7 +4,7 @@ import WayofTime.bloodmagic.api.util.helper.PlayerHelper;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.nbt.NBTTagList;
-import net.minecraft.world.WorldSavedData;
+import net.minecraft.world.storage.WorldSavedData;
 
 import java.util.*;
 
diff --git a/src/main/java/WayofTime/bloodmagic/api/saving/SoulNetwork.java b/src/main/java/WayofTime/bloodmagic/api/saving/SoulNetwork.java
index 53324cf0..57048184 100644
--- a/src/main/java/WayofTime/bloodmagic/api/saving/SoulNetwork.java
+++ b/src/main/java/WayofTime/bloodmagic/api/saving/SoulNetwork.java
@@ -5,7 +5,6 @@ import WayofTime.bloodmagic.api.event.AddToNetworkEvent;
 import WayofTime.bloodmagic.api.event.SoulNetworkEvent;
 import WayofTime.bloodmagic.api.util.helper.PlayerHelper;
 import com.google.common.base.Strings;
-import lombok.Getter;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.init.MobEffects;
 import net.minecraft.nbt.NBTTagCompound;
@@ -18,7 +17,6 @@ import net.minecraftforge.fml.common.eventhandler.Event;
 import javax.annotation.Nullable;
 import java.util.UUID;
 
-@Getter
 public class SoulNetwork implements INBTSerializable<NBTTagCompound>
 {
     private BMWorldSavedData parent;
@@ -129,7 +127,7 @@ public class SoulNetwork implements INBTSerializable<NBTTagCompound>
                 if (!user.capabilities.isCreativeMode)
                 {
                     user.hurtResistantTime = 0;
-                    user.attackEntityFrom(BloodMagicAPI.getDamageSource(), 1.0F);
+                    user.attackEntityFrom(BloodMagicAPI.damageSource, 1.0F);
                 }
 
             } else if (syphon >= 100)
@@ -139,7 +137,7 @@ public class SoulNetwork implements INBTSerializable<NBTTagCompound>
                     for (int i = 0; i < ((syphon + 99) / 100); i++)
                     {
                         user.hurtResistantTime = 0;
-                        user.attackEntityFrom(BloodMagicAPI.getDamageSource(), 1.0F);
+                        user.attackEntityFrom(BloodMagicAPI.damageSource, 1.0F);
                     }
                 }
             }
@@ -151,7 +149,7 @@ public class SoulNetwork implements INBTSerializable<NBTTagCompound>
         if (getParent() != null)
             getParent().markDirty();
         else
-            BloodMagicAPI.getLogger().error("A SoulNetwork was created, but a parent was not set to allow saving.");
+            BloodMagicAPI.logger.error("A SoulNetwork was created, but a parent was not set to allow saving.");
     }
 
     @Nullable
@@ -184,6 +182,26 @@ public class SoulNetwork implements INBTSerializable<NBTTagCompound>
         return this;
     }
 
+    public BMWorldSavedData getParent() {
+        return parent;
+    }
+
+    public EntityPlayer getCachedPlayer() {
+        return cachedPlayer;
+    }
+
+    public UUID getPlayerId() {
+        return playerId;
+    }
+
+    public int getCurrentEssence() {
+        return currentEssence;
+    }
+
+    public int getOrbTier() {
+        return orbTier;
+    }
+
     // INBTSerializable
 
     @Override
diff --git a/src/main/java/WayofTime/bloodmagic/api/util/helper/LogHelper.java b/src/main/java/WayofTime/bloodmagic/api/util/helper/LogHelper.java
index ca72d76e..a7fe7f78 100644
--- a/src/main/java/WayofTime/bloodmagic/api/util/helper/LogHelper.java
+++ b/src/main/java/WayofTime/bloodmagic/api/util/helper/LogHelper.java
@@ -15,19 +15,19 @@ public class LogHelper
 
     public void info(String info, Object... format)
     {
-        if (BloodMagicAPI.isLoggingEnabled())
+        if (BloodMagicAPI.loggingEnabled)
             logger.info(info, format);
     }
 
     public void error(String error, Object... format)
     {
-        if (BloodMagicAPI.isLoggingEnabled())
+        if (BloodMagicAPI.loggingEnabled)
             logger.error(error, format);
     }
 
     public void debug(String debug, Object... format)
     {
-        if (BloodMagicAPI.isLoggingEnabled())
+        if (BloodMagicAPI.loggingEnabled)
             logger.debug(debug, format);
     }
 
diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockAlchemyArray.java b/src/main/java/WayofTime/bloodmagic/block/BlockAlchemyArray.java
index 3f486341..538a176c 100644
--- a/src/main/java/WayofTime/bloodmagic/block/BlockAlchemyArray.java
+++ b/src/main/java/WayofTime/bloodmagic/block/BlockAlchemyArray.java
@@ -3,12 +3,11 @@ package WayofTime.bloodmagic.block;
 import java.util.List;
 import java.util.Random;
 
+import WayofTime.bloodmagic.BloodMagic;
 import net.minecraft.block.Block;
-import net.minecraft.block.BlockContainer;
 import net.minecraft.block.material.Material;
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.entity.Entity;
-import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
 import net.minecraft.tileentity.TileEntity;
@@ -23,8 +22,7 @@ import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
 import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;
-import WayofTime.bloodmagic.api.Constants;
-import WayofTime.bloodmagic.registry.ModItems;
+import WayofTime.bloodmagic.registry.RegistrarBloodMagicItems;
 import WayofTime.bloodmagic.tile.TileAlchemyArray;
 import WayofTime.bloodmagic.util.Utils;
 
@@ -38,13 +36,12 @@ public class BlockAlchemyArray extends Block
     {
         super(Material.CLOTH);
 
-        setUnlocalizedName(Constants.Mod.MODID + ".alchemyArray");
+        setUnlocalizedName(BloodMagic.MODID + ".alchemyArray");
         setHardness(0.1f);
     }
 
     @Override
-    public void addCollisionBoxToList(IBlockState state, World worldIn, BlockPos pos, AxisAlignedBB mask, List<AxisAlignedBB> list, Entity collidingEntity)
-    {
+    public void addCollisionBoxToList(IBlockState state, World worldIn, BlockPos pos, AxisAlignedBB entityBox, List<AxisAlignedBB> collidingBoxes, @Nullable Entity entityIn, boolean p_185477_7_) {
         // No-op
     }
 
@@ -134,7 +131,7 @@ public class BlockAlchemyArray extends Block
     @Override
     public ItemStack getPickBlock(IBlockState state, RayTraceResult target, World world, BlockPos pos, EntityPlayer player)
     {
-        return new ItemStack(ModItems.ARCANE_ASHES);
+        return new ItemStack(RegistrarBloodMagicItems.ARCANE_ASHES);
     }
 
     @Override
diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockAlchemyTable.java b/src/main/java/WayofTime/bloodmagic/block/BlockAlchemyTable.java
index f8040fed..ce4bc9d0 100644
--- a/src/main/java/WayofTime/bloodmagic/block/BlockAlchemyTable.java
+++ b/src/main/java/WayofTime/bloodmagic/block/BlockAlchemyTable.java
@@ -1,15 +1,14 @@
 package WayofTime.bloodmagic.block;
 
+import WayofTime.bloodmagic.item.block.ItemBlockAlchemyTable;
 import net.minecraft.block.Block;
-import net.minecraft.block.BlockContainer;
 import net.minecraft.block.material.Material;
-import net.minecraft.block.properties.IProperty;
 import net.minecraft.block.properties.PropertyBool;
 import net.minecraft.block.properties.PropertyEnum;
 import net.minecraft.block.state.BlockStateContainer;
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.ItemStack;
+import net.minecraft.item.ItemBlock;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.BlockRenderLayer;
 import net.minecraft.util.EnumBlockRenderType;
@@ -24,7 +23,7 @@ import WayofTime.bloodmagic.tile.TileAlchemyTable;
 
 import javax.annotation.Nullable;
 
-public class BlockAlchemyTable extends Block
+public class BlockAlchemyTable extends Block implements IBMBlock
 {
     public static final PropertyBool INVISIBLE = PropertyBool.create("invisible");
     public static final PropertyEnum<EnumFacing> DIRECTION = PropertyEnum.<EnumFacing>create("direction", EnumFacing.class);
@@ -34,8 +33,8 @@ public class BlockAlchemyTable extends Block
         super(Material.ROCK);
 //        this.setDefaultState(this.blockState.getBaseState().withProperty(DIRECTION, EnumFacing.DOWN).withProperty(INVISIBLE, false));
 
-        setUnlocalizedName(Constants.Mod.MODID + ".alchemyTable");
-        setCreativeTab(BloodMagic.tabBloodMagic);
+        setUnlocalizedName(BloodMagic.MODID + ".alchemyTable");
+        setCreativeTab(BloodMagic.TAB_BM);
         setHardness(2.0F);
         setResistance(5.0F);
         setHarvestLevel("pickaxe", 0);
@@ -173,4 +172,9 @@ public class BlockAlchemyTable extends Block
             }
         }
     }
+
+    @Override
+    public ItemBlock getItem() {
+        return new ItemBlockAlchemyTable(this);
+    }
 }
diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockAltar.java b/src/main/java/WayofTime/bloodmagic/block/BlockAltar.java
index d2b87a4d..2c1ed34c 100644
--- a/src/main/java/WayofTime/bloodmagic/block/BlockAltar.java
+++ b/src/main/java/WayofTime/bloodmagic/block/BlockAltar.java
@@ -26,7 +26,6 @@ import org.apache.commons.lang3.tuple.ImmutablePair;
 import org.apache.commons.lang3.tuple.Pair;
 
 import WayofTime.bloodmagic.BloodMagic;
-import WayofTime.bloodmagic.api.Constants;
 import WayofTime.bloodmagic.api.altar.IAltarManipulator;
 import WayofTime.bloodmagic.api.iface.IAltarReader;
 import WayofTime.bloodmagic.api.iface.IBindable;
@@ -47,8 +46,8 @@ public class BlockAltar extends Block implements IVariantProvider, IDocumentedBl
     {
         super(Material.ROCK);
 
-        setUnlocalizedName(Constants.Mod.MODID + ".altar");
-        setCreativeTab(BloodMagic.tabBloodMagic);
+        setUnlocalizedName(BloodMagic.MODID + ".altar");
+        setCreativeTab(BloodMagic.TAB_BM);
         setHardness(2.0F);
         setResistance(5.0F);
         setHarvestLevel("pickaxe", 1);
@@ -73,7 +72,7 @@ public class BlockAltar extends Block implements IVariantProvider, IDocumentedBl
             TileAltar altar = (TileAltar) tile;
             ItemStack orbStack = altar.getStackInSlot(0);
 
-            if (world.getBlockState(pos.down()).getBlock() instanceof BlockBloodStoneBrick)
+            if (world.getBlockState(pos.down()).getBlock() instanceof BlockDecorative)
             {
                 if (orbStack.getItem() instanceof IBloodOrb && orbStack.getItem() instanceof IBindable)
                 {
diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockBloodLight.java b/src/main/java/WayofTime/bloodmagic/block/BlockBloodLight.java
index e6fcedeb..33815c73 100644
--- a/src/main/java/WayofTime/bloodmagic/block/BlockBloodLight.java
+++ b/src/main/java/WayofTime/bloodmagic/block/BlockBloodLight.java
@@ -2,6 +2,7 @@ package WayofTime.bloodmagic.block;
 
 import java.util.Random;
 
+import WayofTime.bloodmagic.BloodMagic;
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
 import net.minecraft.block.state.IBlockState;
@@ -16,8 +17,7 @@ import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
 import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;
-import WayofTime.bloodmagic.api.Constants;
-import WayofTime.bloodmagic.registry.ModItems;
+import WayofTime.bloodmagic.registry.RegistrarBloodMagicItems;
 
 import javax.annotation.Nullable;
 
@@ -29,7 +29,7 @@ public class BlockBloodLight extends Block
     {
         super(Material.CLOTH);
 
-        setUnlocalizedName(Constants.Mod.MODID + ".bloodLight");
+        setUnlocalizedName(BloodMagic.MODID + ".bloodLight");
     }
 
     @Nullable
@@ -109,7 +109,7 @@ public class BlockBloodLight extends Block
         if (rand.nextInt(3) != 0)
         {
             world.spawnParticle(EnumParticleTypes.REDSTONE, pos.getX() + 0.5D + rand.nextGaussian() / 8, pos.getY() + 0.5D, pos.getZ() + 0.5D + rand.nextGaussian() / 8, 0, 0, 0, 0);
-            if (!playerSP.getActiveItemStack().isEmpty() && playerSP.getActiveItemStack().getItem() == ModItems.SIGIL_BLOOD_LIGHT)
+            if (!playerSP.getActiveItemStack().isEmpty() && playerSP.getActiveItemStack().getItem() == RegistrarBloodMagicItems.SIGIL_BLOOD_LIGHT)
             {
                 world.spawnParticle(EnumParticleTypes.REDSTONE, pos.getX() + 0.5D + rand.nextGaussian() / 8, pos.getY() + 0.5D, pos.getZ() + 0.5D + rand.nextGaussian() / 8, 0, 0, 0, 0);
                 world.spawnParticle(EnumParticleTypes.REDSTONE, pos.getX() + 0.5D + rand.nextGaussian() / 8, pos.getY() + 0.5D, pos.getZ() + 0.5D + rand.nextGaussian() / 8, 0, 0, 0, 0);
diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockBloodRune.java b/src/main/java/WayofTime/bloodmagic/block/BlockBloodRune.java
index b289acad..30e399f4 100644
--- a/src/main/java/WayofTime/bloodmagic/block/BlockBloodRune.java
+++ b/src/main/java/WayofTime/bloodmagic/block/BlockBloodRune.java
@@ -5,27 +5,28 @@ import java.util.List;
 
 import net.minecraft.block.SoundType;
 import net.minecraft.block.material.Material;
+import net.minecraft.client.util.ITooltipFlag;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
 
+import net.minecraft.world.World;
 import org.apache.commons.lang3.tuple.ImmutablePair;
 import org.apache.commons.lang3.tuple.Pair;
 
 import WayofTime.bloodmagic.BloodMagic;
-import WayofTime.bloodmagic.api.Constants;
 import WayofTime.bloodmagic.block.base.BlockEnum;
 import WayofTime.bloodmagic.block.enums.EnumBloodRune;
 import WayofTime.bloodmagic.client.IVariantProvider;
 import WayofTime.bloodmagic.util.helper.TextHelper;
 
-public class BlockBloodRune extends BlockEnum<EnumBloodRune> implements IVariantProvider
+public class BlockBloodRune extends BlockEnum<EnumBloodRune>
 {
     public BlockBloodRune()
     {
         super(Material.ROCK, EnumBloodRune.class);
 
-        setUnlocalizedName(Constants.Mod.MODID + ".rune.");
-        setCreativeTab(BloodMagic.tabBloodMagic);
+        setUnlocalizedName(BloodMagic.MODID + ".rune.");
+        setCreativeTab(BloodMagic.TAB_BM);
         setSoundType(SoundType.STONE);
         setHardness(2.0F);
         setResistance(5.0F);
@@ -38,18 +39,9 @@ public class BlockBloodRune extends BlockEnum<EnumBloodRune> implements IVariant
     }
 
     @Override
-    public void addInformation(ItemStack stack, EntityPlayer player, List<String> tooltip, boolean advanced)
+    public void addInformation(ItemStack stack, World world, List<String> tooltip, ITooltipFlag tooltipFlag)
     {
         tooltip.add(TextHelper.localizeEffect("tooltip.bloodmagic.decoration.safe"));
-        super.addInformation(stack, player, tooltip, advanced);
-    }
-
-    @Override
-    public List<Pair<Integer, String>> getVariants()
-    {
-        List<Pair<Integer, String>> ret = new ArrayList<Pair<Integer, String>>();
-        for (int i = 0; i < this.getTypes().length; i++)
-            ret.add(new ImmutablePair<Integer, String>(i, "type=" + this.getTypes()[i]));
-        return ret;
+        super.addInformation(stack, world, tooltip, tooltipFlag);
     }
 }
diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockBloodStoneBrick.java b/src/main/java/WayofTime/bloodmagic/block/BlockBloodStoneBrick.java
deleted file mode 100644
index 2dfd0095..00000000
--- a/src/main/java/WayofTime/bloodmagic/block/BlockBloodStoneBrick.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package WayofTime.bloodmagic.block;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import net.minecraft.block.SoundType;
-import net.minecraft.block.material.Material;
-
-import org.apache.commons.lang3.tuple.ImmutablePair;
-import org.apache.commons.lang3.tuple.Pair;
-
-import WayofTime.bloodmagic.BloodMagic;
-import WayofTime.bloodmagic.api.Constants;
-import WayofTime.bloodmagic.block.base.BlockEnum;
-import WayofTime.bloodmagic.block.enums.EnumBrickSize;
-import WayofTime.bloodmagic.client.IVariantProvider;
-
-public class BlockBloodStoneBrick extends BlockEnum<EnumBrickSize> implements IVariantProvider
-{
-    public BlockBloodStoneBrick()
-    {
-        super(Material.ROCK, EnumBrickSize.class);
-
-        setUnlocalizedName(Constants.Mod.MODID + ".bloodstonebrick.");
-        setCreativeTab(BloodMagic.tabBloodMagic);
-        setHardness(2.0F);
-        setResistance(5.0F);
-        setSoundType(SoundType.STONE);
-        setHarvestLevel("pickaxe", 2);
-    }
-
-    @Override
-    public List<Pair<Integer, String>> getVariants()
-    {
-        List<Pair<Integer, String>> ret = new ArrayList<Pair<Integer, String>>();
-        for (int i = 0; i < this.getTypes().length; i++)
-            ret.add(new ImmutablePair<Integer, String>(i, "type=" + this.getTypes()[i]));
-        return ret;
-    }
-}
diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockBloodTank.java b/src/main/java/WayofTime/bloodmagic/block/BlockBloodTank.java
index 3acdc104..f08e8135 100644
--- a/src/main/java/WayofTime/bloodmagic/block/BlockBloodTank.java
+++ b/src/main/java/WayofTime/bloodmagic/block/BlockBloodTank.java
@@ -1,9 +1,9 @@
 package WayofTime.bloodmagic.block;
 
 import WayofTime.bloodmagic.BloodMagic;
-import WayofTime.bloodmagic.api.Constants;
 import WayofTime.bloodmagic.block.base.BlockInteger;
 import WayofTime.bloodmagic.client.IVariantProvider;
+import WayofTime.bloodmagic.item.block.ItemBlockBloodTank;
 import WayofTime.bloodmagic.tile.TileBloodTank;
 import com.google.common.collect.Lists;
 import net.minecraft.block.SoundType;
@@ -11,6 +11,7 @@ import net.minecraft.block.material.Material;
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.ItemBlock;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.tileentity.TileEntity;
@@ -31,12 +32,11 @@ import net.minecraftforge.fml.relauncher.SideOnly;
 import org.apache.commons.lang3.tuple.ImmutablePair;
 import org.apache.commons.lang3.tuple.Pair;
 
-import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 import java.util.ArrayList;
 import java.util.List;
 
-public class BlockBloodTank extends BlockInteger implements IVariantProvider
+public class BlockBloodTank extends BlockInteger implements IVariantProvider, IBMBlock
 {
     public static final AxisAlignedBB BOX = new AxisAlignedBB(0.25, 0, 0.25, 0.75, 0.8, 0.75);
 
@@ -44,12 +44,12 @@ public class BlockBloodTank extends BlockInteger implements IVariantProvider
     {
         super(Material.IRON, TileBloodTank.CAPACITIES.length - 1, "tier");
 
-        setUnlocalizedName(Constants.Mod.MODID + ".bloodTank");
+        setUnlocalizedName(BloodMagic.MODID + ".bloodTank");
         setHardness(2.0F);
         setResistance(5.0F);
         setSoundType(SoundType.GLASS);
         setHarvestLevel("pickaxe", 1);
-        setCreativeTab(BloodMagic.tabBloodMagic);
+        setCreativeTab(BloodMagic.TAB_BM);
         setLightOpacity(0);
     }
 
@@ -105,12 +105,9 @@ public class BlockBloodTank extends BlockInteger implements IVariantProvider
     @Override
     public boolean onBlockActivated(World world, BlockPos blockPos, IBlockState state, EntityPlayer player, EnumHand hand, EnumFacing side, float hitX, float hitY, float hitZ)
     {
-        ItemStack held = player.getHeldItem(hand);
-        TileBloodTank fluidHandler = (TileBloodTank) world.getTileEntity(blockPos);
-        FluidActionResult result = FluidUtil.interactWithFluidHandler(held, fluidHandler.getTank(), player);
-        if (result.isSuccess())
+        boolean success = FluidUtil.interactWithFluidHandler(player, hand, world, blockPos, side);
+        if (success)
         {
-            player.setHeldItem(hand, result.getResult());
             world.checkLight(blockPos);
             world.updateComparatorOutputLevel(blockPos, this);
             world.markAndNotifyBlock(blockPos, world.getChunkFromBlockCoords(blockPos), state, state, 3);
@@ -216,14 +213,19 @@ public class BlockBloodTank extends BlockInteger implements IVariantProvider
         return true;
     }
 
+    @Override
+    public ItemBlock getItem() {
+        return new ItemBlockBloodTank(this);
+    }
+
     // IVariantProvider
 
     @Override
     public List<Pair<Integer, String>> getVariants()
     {
-        List<Pair<Integer, String>> ret = new ArrayList<Pair<Integer, String>>();
+        List<Pair<Integer, String>> ret = Lists.newArrayList();
         for (int i = 0; i < TileBloodTank.CAPACITIES.length; i++)
-            ret.add(new ImmutablePair<Integer, String>(i, "inventory"));
+            ret.add(Pair.of(i, "inventory"));
 
         return ret;
     }
diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockCrystal.java b/src/main/java/WayofTime/bloodmagic/block/BlockCrystal.java
deleted file mode 100644
index 0ee11fa4..00000000
--- a/src/main/java/WayofTime/bloodmagic/block/BlockCrystal.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package WayofTime.bloodmagic.block;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import net.minecraft.block.SoundType;
-import net.minecraft.block.material.Material;
-
-import org.apache.commons.lang3.tuple.ImmutablePair;
-import org.apache.commons.lang3.tuple.Pair;
-
-import WayofTime.bloodmagic.BloodMagic;
-import WayofTime.bloodmagic.api.Constants;
-import WayofTime.bloodmagic.block.base.BlockEnum;
-import WayofTime.bloodmagic.block.enums.EnumBrickSize;
-import WayofTime.bloodmagic.client.IVariantProvider;
-
-public class BlockCrystal extends BlockEnum<EnumBrickSize> implements IVariantProvider
-{
-    public BlockCrystal()
-    {
-        super(Material.ROCK, EnumBrickSize.class);
-
-        setUnlocalizedName(Constants.Mod.MODID + ".crystal.");
-        setCreativeTab(BloodMagic.tabBloodMagic);
-        setSoundType(SoundType.STONE);
-        setHardness(2.0F);
-        setResistance(5.0F);
-        setHarvestLevel("pickaxe", 2);
-    }
-
-    @Override
-    public List<Pair<Integer, String>> getVariants()
-    {
-        List<Pair<Integer, String>> ret = new ArrayList<Pair<Integer, String>>();
-        for (int i = 0; i < this.getTypes().length; i++)
-            ret.add(new ImmutablePair<Integer, String>(i, "type=" + this.getTypes()[i]));
-        return ret;
-    }
-}
diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockDecorative.java b/src/main/java/WayofTime/bloodmagic/block/BlockDecorative.java
new file mode 100644
index 00000000..a22fd8a8
--- /dev/null
+++ b/src/main/java/WayofTime/bloodmagic/block/BlockDecorative.java
@@ -0,0 +1,23 @@
+package WayofTime.bloodmagic.block;
+
+import net.minecraft.block.SoundType;
+import net.minecraft.block.material.Material;
+
+import WayofTime.bloodmagic.BloodMagic;
+import WayofTime.bloodmagic.block.base.BlockEnum;
+import WayofTime.bloodmagic.block.enums.EnumDecorative;
+
+public class BlockDecorative extends BlockEnum<EnumDecorative>
+{
+    public BlockDecorative()
+    {
+        super(Material.ROCK, EnumDecorative.class);
+
+        setUnlocalizedName(BloodMagic.MODID + ".");
+        setCreativeTab(BloodMagic.TAB_BM);
+        setHardness(2.0F);
+        setResistance(5.0F);
+        setSoundType(SoundType.STONE);
+        setHarvestLevel("pickaxe", 2);
+    }
+}
diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockDemonBase.java b/src/main/java/WayofTime/bloodmagic/block/BlockDemonBase.java
index ab665f5b..e093621a 100644
--- a/src/main/java/WayofTime/bloodmagic/block/BlockDemonBase.java
+++ b/src/main/java/WayofTime/bloodmagic/block/BlockDemonBase.java
@@ -1,17 +1,15 @@
 package WayofTime.bloodmagic.block;
 
-import java.util.ArrayList;
 import java.util.List;
 
+import com.google.common.collect.Lists;
 import net.minecraft.block.SoundType;
 import net.minecraft.block.material.Material;
 import net.minecraft.util.IStringSerializable;
 
-import org.apache.commons.lang3.tuple.ImmutablePair;
 import org.apache.commons.lang3.tuple.Pair;
 
 import WayofTime.bloodmagic.BloodMagic;
-import WayofTime.bloodmagic.api.Constants;
 import WayofTime.bloodmagic.block.base.BlockEnum;
 import WayofTime.bloodmagic.client.IVariantProvider;
 
@@ -21,20 +19,11 @@ public class BlockDemonBase<E extends Enum<E> & IStringSerializable> extends Blo
     {
         super(Material.ROCK, enumClass);
 
-        setUnlocalizedName(Constants.Mod.MODID + "." + baseName + ".");
-        setCreativeTab(BloodMagic.tabBloodMagic);
+        setUnlocalizedName(BloodMagic.MODID + "." + baseName + ".");
+        setCreativeTab(BloodMagic.TAB_BM);
         setHardness(2.0F);
         setResistance(5.0F);
         setSoundType(SoundType.STONE);
         setHarvestLevel("pickaxe", 2);
     }
-
-    @Override
-    public List<Pair<Integer, String>> getVariants()
-    {
-        List<Pair<Integer, String>> ret = new ArrayList<Pair<Integer, String>>();
-        for (int i = 0; i < this.getTypes().length; i++)
-            ret.add(new ImmutablePair<Integer, String>(i, "type=" + this.getTypes()[i]));
-        return ret;
-    }
 }
diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockDemonCrucible.java b/src/main/java/WayofTime/bloodmagic/block/BlockDemonCrucible.java
index 6a329fd5..612c73d5 100644
--- a/src/main/java/WayofTime/bloodmagic/block/BlockDemonCrucible.java
+++ b/src/main/java/WayofTime/bloodmagic/block/BlockDemonCrucible.java
@@ -4,7 +4,6 @@ import java.util.ArrayList;
 import java.util.List;
 
 import net.minecraft.block.Block;
-import net.minecraft.block.BlockContainer;
 import net.minecraft.block.material.Material;
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.entity.player.EntityPlayer;
@@ -21,7 +20,6 @@ import org.apache.commons.lang3.tuple.ImmutablePair;
 import org.apache.commons.lang3.tuple.Pair;
 
 import WayofTime.bloodmagic.BloodMagic;
-import WayofTime.bloodmagic.api.Constants;
 import WayofTime.bloodmagic.api.soul.IDemonWillGem;
 import WayofTime.bloodmagic.api.soul.IDiscreteDemonWill;
 import WayofTime.bloodmagic.client.IVariantProvider;
@@ -36,8 +34,8 @@ public class BlockDemonCrucible extends Block implements IVariantProvider
     {
         super(Material.ROCK);
 
-        setUnlocalizedName(Constants.Mod.MODID + ".demonCrucible");
-        setCreativeTab(BloodMagic.tabBloodMagic);
+        setUnlocalizedName(BloodMagic.MODID + ".demonCrucible");
+        setCreativeTab(BloodMagic.TAB_BM);
         setHardness(2.0F);
         setResistance(5.0F);
         setHarvestLevel("pickaxe", 0);
diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockDemonCrystal.java b/src/main/java/WayofTime/bloodmagic/block/BlockDemonCrystal.java
index ff7e64ff..7f9e6a24 100644
--- a/src/main/java/WayofTime/bloodmagic/block/BlockDemonCrystal.java
+++ b/src/main/java/WayofTime/bloodmagic/block/BlockDemonCrystal.java
@@ -1,12 +1,10 @@
 package WayofTime.bloodmagic.block;
 
-import java.util.List;
 import java.util.Random;
 
+import WayofTime.bloodmagic.item.block.ItemBlockDemonCrystal;
 import net.minecraft.block.Block;
-import net.minecraft.block.BlockContainer;
 import net.minecraft.block.material.Material;
-import net.minecraft.block.properties.IProperty;
 import net.minecraft.block.properties.PropertyEnum;
 import net.minecraft.block.properties.PropertyInteger;
 import net.minecraft.block.state.BlockStateContainer;
@@ -14,6 +12,7 @@ import net.minecraft.block.state.IBlockState;
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.Item;
+import net.minecraft.item.ItemBlock;
 import net.minecraft.item.ItemStack;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.EnumBlockRenderType;
@@ -26,7 +25,6 @@ import net.minecraft.world.World;
 import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;
 import WayofTime.bloodmagic.BloodMagic;
-import WayofTime.bloodmagic.api.Constants;
 import WayofTime.bloodmagic.api.soul.EnumDemonWillType;
 import WayofTime.bloodmagic.api.soul.PlayerDemonWillHandler;
 import WayofTime.bloodmagic.item.ItemDemonCrystal;
@@ -34,7 +32,7 @@ import WayofTime.bloodmagic.tile.TileDemonCrystal;
 
 import javax.annotation.Nullable;
 
-public class BlockDemonCrystal extends Block
+public class BlockDemonCrystal extends Block implements IBMBlock
 {
     public static final PropertyInteger AGE = PropertyInteger.create("age", 0, 6);
     public static final PropertyEnum<EnumDemonWillType> TYPE = PropertyEnum.<EnumDemonWillType>create("type", EnumDemonWillType.class);
@@ -45,8 +43,8 @@ public class BlockDemonCrystal extends Block
         super(Material.ROCK);
         this.setDefaultState(this.blockState.getBaseState().withProperty(TYPE, EnumDemonWillType.DEFAULT).withProperty(ATTACHED, EnumFacing.UP));
 
-        setUnlocalizedName(Constants.Mod.MODID + ".demonCrystal.");
-        setCreativeTab(BloodMagic.tabBloodMagic);
+        setUnlocalizedName(BloodMagic.MODID + ".demonCrystal.");
+        setCreativeTab(BloodMagic.TAB_BM);
         setHardness(2.0F);
         setResistance(5.0F);
         setHarvestLevel("pickaxe", 2);
@@ -89,8 +87,7 @@ public class BlockDemonCrystal extends Block
     }
 
     @Override
-    @SideOnly(Side.CLIENT)
-    public void getSubBlocks(Item item, CreativeTabs creativeTabs, NonNullList<ItemStack> list)
+    public void getSubBlocks(CreativeTabs creativeTabs, NonNullList<ItemStack> list)
     {
         for (int i = 0; i < EnumDemonWillType.values().length; i++)
             list.add(new ItemStack(this, 1, i));
@@ -233,6 +230,11 @@ public class BlockDemonCrystal extends Block
         return new TileDemonCrystal();
     }
 
+    @Override
+    public ItemBlock getItem() {
+        return new ItemBlockDemonCrystal(this);
+    }
+
     //    @Override
 //    public java.util.List<ItemStack> getDrops(net.minecraft.world.IBlockAccess world, BlockPos pos, IBlockState state, int fortune)
 //    {
diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockDemonCrystallizer.java b/src/main/java/WayofTime/bloodmagic/block/BlockDemonCrystallizer.java
index aef22bcd..f2251c90 100644
--- a/src/main/java/WayofTime/bloodmagic/block/BlockDemonCrystallizer.java
+++ b/src/main/java/WayofTime/bloodmagic/block/BlockDemonCrystallizer.java
@@ -17,7 +17,6 @@ import org.apache.commons.lang3.tuple.ImmutablePair;
 import org.apache.commons.lang3.tuple.Pair;
 
 import WayofTime.bloodmagic.BloodMagic;
-import WayofTime.bloodmagic.api.Constants;
 import WayofTime.bloodmagic.client.IVariantProvider;
 import WayofTime.bloodmagic.tile.TileDemonCrystallizer;
 
@@ -27,8 +26,8 @@ public class BlockDemonCrystallizer extends BlockContainer implements IVariantPr
     {
         super(Material.ROCK);
 
-        setUnlocalizedName(Constants.Mod.MODID + ".demonCrystallizer");
-        setCreativeTab(BloodMagic.tabBloodMagic);
+        setUnlocalizedName(BloodMagic.MODID + ".demonCrystallizer");
+        setCreativeTab(BloodMagic.TAB_BM);
         setHardness(2.0F);
         setResistance(5.0F);
         setHarvestLevel("pickaxe", 0);
diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockDemonLight.java b/src/main/java/WayofTime/bloodmagic/block/BlockDemonLight.java
index 71bc8c46..6d776883 100644
--- a/src/main/java/WayofTime/bloodmagic/block/BlockDemonLight.java
+++ b/src/main/java/WayofTime/bloodmagic/block/BlockDemonLight.java
@@ -10,32 +10,22 @@ import org.apache.commons.lang3.tuple.ImmutablePair;
 import org.apache.commons.lang3.tuple.Pair;
 
 import WayofTime.bloodmagic.BloodMagic;
-import WayofTime.bloodmagic.api.Constants;
 import WayofTime.bloodmagic.block.base.BlockEnum;
 import WayofTime.bloodmagic.block.enums.EnumSubWillType;
 import WayofTime.bloodmagic.client.IVariantProvider;
 
-public class BlockDemonLight extends BlockEnum<EnumSubWillType> implements IVariantProvider
+public class BlockDemonLight extends BlockEnum<EnumSubWillType>
 {
     public BlockDemonLight()
     {
         super(Material.ROCK, EnumSubWillType.class);
 
-        setUnlocalizedName(Constants.Mod.MODID + ".demonlight.");
-        setCreativeTab(BloodMagic.tabBloodMagic);
+        setUnlocalizedName(BloodMagic.MODID + ".demonlight.");
+        setCreativeTab(BloodMagic.TAB_BM);
         setHardness(2.0F);
         setResistance(5.0F);
         setSoundType(SoundType.STONE);
         setHarvestLevel("pickaxe", 2);
         setLightLevel(1);
     }
-
-    @Override
-    public List<Pair<Integer, String>> getVariants()
-    {
-        List<Pair<Integer, String>> ret = new ArrayList<Pair<Integer, String>>();
-        for (int i = 0; i < this.getTypes().length; i++)
-            ret.add(new ImmutablePair<Integer, String>(i, "type=" + this.getTypes()[i]));
-        return ret;
-    }
 }
diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockDemonPillarBase.java b/src/main/java/WayofTime/bloodmagic/block/BlockDemonPillarBase.java
index 8fd5c2a0..53c2c495 100644
--- a/src/main/java/WayofTime/bloodmagic/block/BlockDemonPillarBase.java
+++ b/src/main/java/WayofTime/bloodmagic/block/BlockDemonPillarBase.java
@@ -1,29 +1,26 @@
 package WayofTime.bloodmagic.block;
 
-import java.util.ArrayList;
 import java.util.List;
 
+import com.google.common.collect.Lists;
 import net.minecraft.block.SoundType;
 import net.minecraft.block.material.Material;
 import net.minecraft.util.EnumFacing;
 import net.minecraft.util.IStringSerializable;
 
-import org.apache.commons.lang3.tuple.ImmutablePair;
 import org.apache.commons.lang3.tuple.Pair;
 
 import WayofTime.bloodmagic.BloodMagic;
-import WayofTime.bloodmagic.api.Constants;
 import WayofTime.bloodmagic.block.base.BlockEnumPillar;
-import WayofTime.bloodmagic.client.IVariantProvider;
 
-public class BlockDemonPillarBase<E extends Enum<E> & IStringSerializable> extends BlockEnumPillar<E> implements IVariantProvider
+public class BlockDemonPillarBase<E extends Enum<E> & IStringSerializable> extends BlockEnumPillar<E>
 {
     public BlockDemonPillarBase(String baseName, Material materialIn, Class<E> enumClass)
     {
         super(materialIn, enumClass);
 
-        setUnlocalizedName(Constants.Mod.MODID + "." + baseName + ".");
-        setCreativeTab(BloodMagic.tabBloodMagic);
+        setUnlocalizedName(BloodMagic.MODID + "." + baseName + ".");
+        setCreativeTab(BloodMagic.TAB_BM);
         setHardness(2.0F);
         setResistance(5.0F);
         setSoundType(SoundType.STONE);
@@ -33,18 +30,14 @@ public class BlockDemonPillarBase<E extends Enum<E> & IStringSerializable> exten
     @Override
     public List<Pair<Integer, String>> getVariants()
     {
-        List<Pair<Integer, String>> ret = new ArrayList<Pair<Integer, String>>();
+        List<Pair<Integer, String>> ret = Lists.newArrayList();
 
         //This is done to make the ItemBlocks have the proper model
         EnumFacing.Axis[] axis = new EnumFacing.Axis[] { EnumFacing.Axis.Y, EnumFacing.Axis.X, EnumFacing.Axis.Z };
 
         for (int i = 0; i < 3; i++)
-        {
             for (int j = 0; j < this.getTypes().length; j++)
-            {
-                ret.add(new ImmutablePair<Integer, String>(i * 5 + j, "axis=" + axis[i] + ",type=" + this.getTypes()[j]));
-            }
-        }
+                ret.add(Pair.of(i * 5 + j, "axis=" + axis[i] + ",type=" + this.getTypes()[j]));
 
         return ret;
     }
diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockDemonPillarCapBase.java b/src/main/java/WayofTime/bloodmagic/block/BlockDemonPillarCapBase.java
index b2729cfa..865b89ca 100644
--- a/src/main/java/WayofTime/bloodmagic/block/BlockDemonPillarCapBase.java
+++ b/src/main/java/WayofTime/bloodmagic/block/BlockDemonPillarCapBase.java
@@ -1,29 +1,26 @@
 package WayofTime.bloodmagic.block;
 
-import java.util.ArrayList;
 import java.util.List;
 
+import com.google.common.collect.Lists;
 import net.minecraft.block.SoundType;
 import net.minecraft.block.material.Material;
 import net.minecraft.util.EnumFacing;
 import net.minecraft.util.IStringSerializable;
 
-import org.apache.commons.lang3.tuple.ImmutablePair;
 import org.apache.commons.lang3.tuple.Pair;
 
 import WayofTime.bloodmagic.BloodMagic;
-import WayofTime.bloodmagic.api.Constants;
 import WayofTime.bloodmagic.block.base.BlockEnumPillarCap;
-import WayofTime.bloodmagic.client.IVariantProvider;
 
-public class BlockDemonPillarCapBase<E extends Enum<E> & IStringSerializable> extends BlockEnumPillarCap<E> implements IVariantProvider
+public class BlockDemonPillarCapBase<E extends Enum<E> & IStringSerializable> extends BlockEnumPillarCap<E>
 {
     public BlockDemonPillarCapBase(String baseName, Material materialIn, Class<E> enumClass)
     {
         super(materialIn, enumClass);
 
-        setUnlocalizedName(Constants.Mod.MODID + "." + baseName + ".");
-        setCreativeTab(BloodMagic.tabBloodMagic);
+        setUnlocalizedName(BloodMagic.MODID + "." + baseName + ".");
+        setCreativeTab(BloodMagic.TAB_BM);
         setHardness(2.0F);
         setResistance(5.0F);
         setSoundType(SoundType.STONE);
@@ -33,17 +30,13 @@ public class BlockDemonPillarCapBase<E extends Enum<E> & IStringSerializable> ex
     @Override
     public List<Pair<Integer, String>> getVariants()
     {
-        List<Pair<Integer, String>> ret = new ArrayList<Pair<Integer, String>>();
+        List<Pair<Integer, String>> ret = Lists.newArrayList();
 
         //This is done to make the ItemBlocks have the proper model
 
         for (int i = 0; i < EnumFacing.values().length; i++)
-        {
             for (int j = 0; j < this.getTypes().length; j++)
-            {
-                ret.add(new ImmutablePair<Integer, String>(i * 2 + j, "facing=" + EnumFacing.values()[i] + ",type=" + this.getTypes()[j]));
-            }
-        }
+                ret.add(Pair.of(i * 2 + j, "facing=" + EnumFacing.values()[i] + ",type=" + this.getTypes()[j]));
 
         return ret;
     }
diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockDemonPylon.java b/src/main/java/WayofTime/bloodmagic/block/BlockDemonPylon.java
index 26b8f331..1eda088e 100644
--- a/src/main/java/WayofTime/bloodmagic/block/BlockDemonPylon.java
+++ b/src/main/java/WayofTime/bloodmagic/block/BlockDemonPylon.java
@@ -16,7 +16,6 @@ import org.apache.commons.lang3.tuple.ImmutablePair;
 import org.apache.commons.lang3.tuple.Pair;
 
 import WayofTime.bloodmagic.BloodMagic;
-import WayofTime.bloodmagic.api.Constants;
 import WayofTime.bloodmagic.client.IVariantProvider;
 import WayofTime.bloodmagic.tile.TileDemonPylon;
 
@@ -26,8 +25,8 @@ public class BlockDemonPylon extends BlockContainer implements IVariantProvider
     {
         super(Material.ROCK);
 
-        setUnlocalizedName(Constants.Mod.MODID + ".demonPylon");
-        setCreativeTab(BloodMagic.tabBloodMagic);
+        setUnlocalizedName(BloodMagic.MODID + ".demonPylon");
+        setCreativeTab(BloodMagic.TAB_BM);
         setHardness(2.0F);
         setResistance(5.0F);
         setHarvestLevel("pickaxe", 0);
diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockDemonStairsBase.java b/src/main/java/WayofTime/bloodmagic/block/BlockDemonStairsBase.java
index 084c90ed..26ae4b4e 100644
--- a/src/main/java/WayofTime/bloodmagic/block/BlockDemonStairsBase.java
+++ b/src/main/java/WayofTime/bloodmagic/block/BlockDemonStairsBase.java
@@ -3,6 +3,7 @@ package WayofTime.bloodmagic.block;
 import java.util.ArrayList;
 import java.util.List;
 
+import com.google.common.collect.Lists;
 import net.minecraft.block.SoundType;
 import net.minecraft.block.material.Material;
 import net.minecraft.util.IStringSerializable;
@@ -11,18 +12,17 @@ import org.apache.commons.lang3.tuple.ImmutablePair;
 import org.apache.commons.lang3.tuple.Pair;
 
 import WayofTime.bloodmagic.BloodMagic;
-import WayofTime.bloodmagic.api.Constants;
 import WayofTime.bloodmagic.block.base.BlockEnumStairs;
 import WayofTime.bloodmagic.client.IVariantProvider;
 
-public class BlockDemonStairsBase<E extends Enum<E> & IStringSerializable> extends BlockEnumStairs<E> implements IVariantProvider
+public class BlockDemonStairsBase<E extends Enum<E> & IStringSerializable> extends BlockEnumStairs<E>
 {
     public BlockDemonStairsBase(String baseName, Material materialIn, Class<E> enumClass)
     {
         super(materialIn, enumClass);
 
-        setUnlocalizedName(Constants.Mod.MODID + "." + baseName + ".");
-        setCreativeTab(BloodMagic.tabBloodMagic);
+        setUnlocalizedName(BloodMagic.MODID + "." + baseName + ".");
+        setCreativeTab(BloodMagic.TAB_BM);
         setHardness(2.0F);
         setResistance(5.0F);
         setSoundType(SoundType.STONE);
@@ -32,12 +32,10 @@ public class BlockDemonStairsBase<E extends Enum<E> & IStringSerializable> exten
     @Override
     public List<Pair<Integer, String>> getVariants()
     {
-        List<Pair<Integer, String>> ret = new ArrayList<Pair<Integer, String>>();
+        List<Pair<Integer, String>> ret = Lists.newArrayList();
 
         for (int i = 0; i < this.getTypes().length; i++)
-        {
-            ret.add(new ImmutablePair<Integer, String>(i, "facing=south,half=bottom,shape=straight,type=" + this.getTypes()[i]));
-        }
+            ret.add(Pair.of(i, "facing=south,half=bottom,shape=straight,type=" + this.getTypes()[i]));
 
         return ret;
     }
diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockDemonWallBase.java b/src/main/java/WayofTime/bloodmagic/block/BlockDemonWallBase.java
index 08fd0e72..3bd4be9f 100644
--- a/src/main/java/WayofTime/bloodmagic/block/BlockDemonWallBase.java
+++ b/src/main/java/WayofTime/bloodmagic/block/BlockDemonWallBase.java
@@ -3,6 +3,7 @@ package WayofTime.bloodmagic.block;
 import java.util.ArrayList;
 import java.util.List;
 
+import com.google.common.collect.Lists;
 import net.minecraft.block.SoundType;
 import net.minecraft.block.material.Material;
 import net.minecraft.util.IStringSerializable;
@@ -10,18 +11,17 @@ import net.minecraft.util.IStringSerializable;
 import org.apache.commons.lang3.tuple.Pair;
 
 import WayofTime.bloodmagic.BloodMagic;
-import WayofTime.bloodmagic.api.Constants;
 import WayofTime.bloodmagic.block.base.BlockEnumWall;
 import WayofTime.bloodmagic.client.IVariantProvider;
 
-public class BlockDemonWallBase<E extends Enum<E> & IStringSerializable> extends BlockEnumWall<E> implements IVariantProvider
+public class BlockDemonWallBase<E extends Enum<E> & IStringSerializable> extends BlockEnumWall<E>
 {
     public BlockDemonWallBase(String baseName, Material materialIn, Class<E> enumClass)
     {
         super(materialIn, enumClass);
 
-        setUnlocalizedName(Constants.Mod.MODID + "." + baseName + ".");
-        setCreativeTab(BloodMagic.tabBloodMagic);
+        setUnlocalizedName(BloodMagic.MODID + "." + baseName + ".");
+        setCreativeTab(BloodMagic.TAB_BM);
         setHardness(2.0F);
         setResistance(5.0F);
         setSoundType(SoundType.STONE);
@@ -31,7 +31,7 @@ public class BlockDemonWallBase<E extends Enum<E> & IStringSerializable> extends
     @Override
     public List<Pair<Integer, String>> getVariants()
     {
-        List<Pair<Integer, String>> ret = new ArrayList<Pair<Integer, String>>();
+        List<Pair<Integer, String>> ret = Lists.newArrayList();
 
         for (int i = 0; i < this.getTypes().length; i++)
             ret.add(Pair.of(i, "east=true,north=false,south=false,type=" + this.getTypes()[i] + ",up=true,west=true"));
diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockDimensionalPortal.java b/src/main/java/WayofTime/bloodmagic/block/BlockDimensionalPortal.java
index a5ce9e94..1fe90938 100644
--- a/src/main/java/WayofTime/bloodmagic/block/BlockDimensionalPortal.java
+++ b/src/main/java/WayofTime/bloodmagic/block/BlockDimensionalPortal.java
@@ -3,6 +3,7 @@ package WayofTime.bloodmagic.block;
 import java.util.ArrayList;
 import java.util.Random;
 
+import WayofTime.bloodmagic.BloodMagic;
 import WayofTime.bloodmagic.block.base.BlockInteger;
 import net.minecraft.block.material.Material;
 import net.minecraft.block.state.IBlockState;
@@ -16,7 +17,6 @@ import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
 import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;
-import WayofTime.bloodmagic.api.Constants;
 import WayofTime.bloodmagic.api.ritual.IMasterRitualStone;
 import WayofTime.bloodmagic.api.teleport.PortalLocation;
 import WayofTime.bloodmagic.api.teleport.TeleportQueue;
@@ -35,7 +35,7 @@ public class BlockDimensionalPortal extends BlockInteger
     public BlockDimensionalPortal()
     {
         super(Material.PORTAL, 2);
-        setUnlocalizedName(Constants.Mod.MODID + ".dimensionalPortal");
+        setUnlocalizedName(BloodMagic.MODID + ".dimensionalPortal");
         setBlockUnbreakable();
         setResistance(2000);
         setLightOpacity(0);
diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockIncenseAltar.java b/src/main/java/WayofTime/bloodmagic/block/BlockIncenseAltar.java
index 92ace672..edc30df5 100644
--- a/src/main/java/WayofTime/bloodmagic/block/BlockIncenseAltar.java
+++ b/src/main/java/WayofTime/bloodmagic/block/BlockIncenseAltar.java
@@ -4,7 +4,6 @@ import java.util.ArrayList;
 import java.util.List;
 
 import net.minecraft.block.Block;
-import net.minecraft.block.BlockContainer;
 import net.minecraft.block.material.Material;
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.tileentity.TileEntity;
@@ -18,7 +17,6 @@ import org.apache.commons.lang3.tuple.ImmutablePair;
 import org.apache.commons.lang3.tuple.Pair;
 
 import WayofTime.bloodmagic.BloodMagic;
-import WayofTime.bloodmagic.api.Constants;
 import WayofTime.bloodmagic.client.IVariantProvider;
 import WayofTime.bloodmagic.tile.TileIncenseAltar;
 
@@ -32,8 +30,8 @@ public class BlockIncenseAltar extends Block implements IVariantProvider
     {
         super(Material.ROCK);
 
-        setUnlocalizedName(Constants.Mod.MODID + ".incenseAltar");
-        setCreativeTab(BloodMagic.tabBloodMagic);
+        setUnlocalizedName(BloodMagic.MODID + ".incenseAltar");
+        setCreativeTab(BloodMagic.TAB_BM);
         setHardness(2.0F);
         setResistance(5.0F);
         setHarvestLevel("pickaxe", 0);
diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockInputRoutingNode.java b/src/main/java/WayofTime/bloodmagic/block/BlockInputRoutingNode.java
index f7217004..8fdf5607 100644
--- a/src/main/java/WayofTime/bloodmagic/block/BlockInputRoutingNode.java
+++ b/src/main/java/WayofTime/bloodmagic/block/BlockInputRoutingNode.java
@@ -2,7 +2,6 @@ package WayofTime.bloodmagic.block;
 
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.ItemStack;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.EnumFacing;
 import net.minecraft.util.EnumHand;
@@ -20,7 +19,7 @@ public class BlockInputRoutingNode extends BlockRoutingNode
     {
         super();
 
-        setUnlocalizedName(Constants.Mod.MODID + ".inputRouting");
+        setUnlocalizedName(BloodMagic.MODID + ".inputRouting");
     }
 
     @Override
diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockInversionPillar.java b/src/main/java/WayofTime/bloodmagic/block/BlockInversionPillar.java
index b05b122d..396c320d 100644
--- a/src/main/java/WayofTime/bloodmagic/block/BlockInversionPillar.java
+++ b/src/main/java/WayofTime/bloodmagic/block/BlockInversionPillar.java
@@ -19,19 +19,18 @@ import org.apache.commons.lang3.tuple.ImmutablePair;
 import org.apache.commons.lang3.tuple.Pair;
 
 import WayofTime.bloodmagic.BloodMagic;
-import WayofTime.bloodmagic.api.Constants;
 import WayofTime.bloodmagic.block.enums.EnumSubWillType;
 import WayofTime.bloodmagic.client.IVariantProvider;
 import WayofTime.bloodmagic.tile.TileInversionPillar;
 
-public class BlockInversionPillar extends BlockEnum<EnumSubWillType> implements IVariantProvider
+public class BlockInversionPillar extends BlockEnum<EnumSubWillType>
 {
     public BlockInversionPillar()
     {
         super(Material.ROCK, EnumSubWillType.class);
 
-        setUnlocalizedName(Constants.Mod.MODID + ".inversionpillar.");
-        setCreativeTab(BloodMagic.tabBloodMagic);
+        setUnlocalizedName(BloodMagic.MODID + ".inversionpillar.");
+        setCreativeTab(BloodMagic.TAB_BM);
         setHardness(2.0F);
         setResistance(5.0F);
         setSoundType(SoundType.STONE);
@@ -92,7 +91,7 @@ public class BlockInversionPillar extends BlockEnum<EnumSubWillType> implements
     {
         List<Pair<Integer, String>> ret = new ArrayList<Pair<Integer, String>>();
         for (int i = 0; i < this.getTypes().length; i++)
-            ret.add(new ImmutablePair<Integer, String>(i, "static=false,type=" + this.getTypes()[i]));
+            ret.add(Pair.of(i, "static=false,type=" + this.getTypes()[i]));
         return ret;
     }
 
diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockInversionPillarEnd.java b/src/main/java/WayofTime/bloodmagic/block/BlockInversionPillarEnd.java
index 0840c48b..873e466a 100644
--- a/src/main/java/WayofTime/bloodmagic/block/BlockInversionPillarEnd.java
+++ b/src/main/java/WayofTime/bloodmagic/block/BlockInversionPillarEnd.java
@@ -14,7 +14,6 @@ import org.apache.commons.lang3.tuple.ImmutablePair;
 import org.apache.commons.lang3.tuple.Pair;
 
 import WayofTime.bloodmagic.BloodMagic;
-import WayofTime.bloodmagic.api.Constants;
 import WayofTime.bloodmagic.block.base.BlockEnum;
 import WayofTime.bloodmagic.block.enums.EnumInversionCap;
 import WayofTime.bloodmagic.client.IVariantProvider;
@@ -25,8 +24,8 @@ public class BlockInversionPillarEnd extends BlockEnum<EnumInversionCap> impleme
     {
         super(Material.ROCK, EnumInversionCap.class);
 
-        setUnlocalizedName(Constants.Mod.MODID + ".inversionpillarend.");
-        setCreativeTab(BloodMagic.tabBloodMagic);
+        setUnlocalizedName(BloodMagic.MODID + ".inversionpillarend.");
+        setCreativeTab(BloodMagic.TAB_BM);
         setHardness(2.0F);
         setResistance(5.0F);
         setSoundType(SoundType.STONE);
diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockItemRoutingNode.java b/src/main/java/WayofTime/bloodmagic/block/BlockItemRoutingNode.java
index 8bc69487..32dc9d79 100644
--- a/src/main/java/WayofTime/bloodmagic/block/BlockItemRoutingNode.java
+++ b/src/main/java/WayofTime/bloodmagic/block/BlockItemRoutingNode.java
@@ -1,10 +1,10 @@
 package WayofTime.bloodmagic.block;
 
+import WayofTime.bloodmagic.BloodMagic;
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
-import WayofTime.bloodmagic.api.Constants;
 import WayofTime.bloodmagic.tile.routing.TileItemRoutingNode;
 import WayofTime.bloodmagic.tile.routing.TileRoutingNode;
 
@@ -16,7 +16,7 @@ public class BlockItemRoutingNode extends BlockRoutingNode
     {
         super();
 
-        setUnlocalizedName(Constants.Mod.MODID + ".itemRouting");
+        setUnlocalizedName(BloodMagic.MODID + ".itemRouting");
     }
 
     @Override
diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockLifeEssence.java b/src/main/java/WayofTime/bloodmagic/block/BlockLifeEssence.java
index 1678a8ce..11e26187 100644
--- a/src/main/java/WayofTime/bloodmagic/block/BlockLifeEssence.java
+++ b/src/main/java/WayofTime/bloodmagic/block/BlockLifeEssence.java
@@ -2,9 +2,8 @@ package WayofTime.bloodmagic.block;
 
 import java.awt.Color;
 
-import lombok.Getter;
+import WayofTime.bloodmagic.BloodMagic;
 import net.minecraft.block.material.Material;
-import net.minecraft.block.state.IBlockState;
 import net.minecraft.util.BlockRenderLayer;
 import net.minecraft.util.ResourceLocation;
 import net.minecraft.util.math.BlockPos;
@@ -19,16 +18,15 @@ import WayofTime.bloodmagic.util.helper.TextHelper;
 
 public class BlockLifeEssence extends BlockFluidClassic
 {
-    @Getter
-    private static Fluid lifeEssence = new FluidLifeEssence();
+    private static final Fluid LIFE_ESSENCE = new FluidLifeEssence();
 
     public BlockLifeEssence()
     {
-        super(lifeEssence, Material.WATER);
+        super(LIFE_ESSENCE, Material.WATER);
 
-        setUnlocalizedName(Constants.Mod.MODID + ".fluid.lifeEssence");
+        setUnlocalizedName(BloodMagic.MODID + ".fluid.lifeEssence");
         getLifeEssence().setBlock(this);
-        BloodMagicAPI.setLifeEssence(getLifeEssence());
+        BloodMagicAPI.lifeEssence = LIFE_ESSENCE;
     }
 
     @Override
@@ -43,6 +41,10 @@ public class BlockLifeEssence extends BlockFluidClassic
         return !world.getBlockState(blockPos).getBlock().getMaterial(world.getBlockState(blockPos)).isLiquid() && super.displaceIfPossible(world, blockPos);
     }
 
+    public static Fluid getLifeEssence() {
+        return LIFE_ESSENCE;
+    }
+
     @Override
     public BlockRenderLayer getBlockLayer()
     {
diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockMasterRoutingNode.java b/src/main/java/WayofTime/bloodmagic/block/BlockMasterRoutingNode.java
index 1ae1b8a6..eec3d1e4 100644
--- a/src/main/java/WayofTime/bloodmagic/block/BlockMasterRoutingNode.java
+++ b/src/main/java/WayofTime/bloodmagic/block/BlockMasterRoutingNode.java
@@ -4,7 +4,6 @@ import net.minecraft.block.state.IBlockState;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.World;
 import WayofTime.bloodmagic.BloodMagic;
-import WayofTime.bloodmagic.api.Constants;
 import WayofTime.bloodmagic.tile.routing.TileMasterRoutingNode;
 
 import javax.annotation.Nullable;
@@ -15,8 +14,8 @@ public class BlockMasterRoutingNode extends BlockRoutingNode
     {
         super();
 
-        setUnlocalizedName(Constants.Mod.MODID + ".masterRouting");
-        setCreativeTab(BloodMagic.tabBloodMagic);
+        setUnlocalizedName(BloodMagic.MODID + ".masterRouting");
+        setCreativeTab(BloodMagic.TAB_BM);
         setHardness(2.0F);
         setResistance(5.0F);
         setHarvestLevel("pickaxe", 2);
diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockMimic.java b/src/main/java/WayofTime/bloodmagic/block/BlockMimic.java
index 599b5a18..188f2f74 100644
--- a/src/main/java/WayofTime/bloodmagic/block/BlockMimic.java
+++ b/src/main/java/WayofTime/bloodmagic/block/BlockMimic.java
@@ -1,8 +1,5 @@
 package WayofTime.bloodmagic.block;
 
-import java.util.ArrayList;
-import java.util.List;
-
 import javax.annotation.Nullable;
 
 import WayofTime.bloodmagic.block.base.BlockEnum;
@@ -26,20 +23,15 @@ import net.minecraft.world.World;
 import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;
 
-import org.apache.commons.lang3.tuple.ImmutablePair;
-import org.apache.commons.lang3.tuple.Pair;
-
 import WayofTime.bloodmagic.BloodMagic;
-import WayofTime.bloodmagic.api.Constants;
 import WayofTime.bloodmagic.api.altar.EnumAltarComponent;
 import WayofTime.bloodmagic.api.altar.IAltarComponent;
 import WayofTime.bloodmagic.block.enums.EnumMimic;
-import WayofTime.bloodmagic.client.IVariantProvider;
-import WayofTime.bloodmagic.registry.ModBlocks;
+import WayofTime.bloodmagic.registry.RegistrarBloodMagicBlocks;
 import WayofTime.bloodmagic.tile.TileMimic;
 import WayofTime.bloodmagic.util.Utils;
 
-public class BlockMimic extends BlockEnum<EnumMimic> implements IVariantProvider, IAltarComponent
+public class BlockMimic extends BlockEnum<EnumMimic> implements IAltarComponent
 {
     public static final int sentientMimicMeta = 4;
 
@@ -47,8 +39,8 @@ public class BlockMimic extends BlockEnum<EnumMimic> implements IVariantProvider
     {
         super(Material.ROCK, EnumMimic.class);
 
-        setUnlocalizedName(Constants.Mod.MODID + ".mimic.");
-        setCreativeTab(BloodMagic.tabBloodMagic);
+        setUnlocalizedName(BloodMagic.MODID + ".mimic.");
+        setCreativeTab(BloodMagic.TAB_BM);
         setHardness(2.0F);
         setResistance(5.0F);
         setSoundType(SoundType.STONE);
@@ -171,7 +163,7 @@ public class BlockMimic extends BlockEnum<EnumMimic> implements IVariantProvider
                 {
                     if (block.getRenderType(mimicState) == EnumBlockRenderType.ENTITYBLOCK_ANIMATED)
                     {
-                        return ModBlocks.BLOOD_LIGHT.getDefaultState(); //Small and invisible-ish, basically this is returned in order to not render over the animated block (TESR)
+                        return RegistrarBloodMagicBlocks.BLOOD_LIGHT.getDefaultState(); //Small and invisible-ish, basically this is returned in order to not render over the animated block (TESR)
                     }
 
                     return block.getActualState(mimicState, world, pos);
@@ -225,15 +217,6 @@ public class BlockMimic extends BlockEnum<EnumMimic> implements IVariantProvider
         super.breakBlock(world, blockPos, blockState);
     }
 
-    @Override
-    public List<Pair<Integer, String>> getVariants()
-    {
-        List<Pair<Integer, String>> ret = new ArrayList<Pair<Integer, String>>();
-        for (int i = 0; i < this.getTypes().length; i++)
-            ret.add(new ImmutablePair<Integer, String>(i, "type=" + this.getTypes()[i]));
-        return ret;
-    }
-
     @Override
     public boolean hasTileEntity(IBlockState state) {
         return true;
diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockOutputRoutingNode.java b/src/main/java/WayofTime/bloodmagic/block/BlockOutputRoutingNode.java
index 194490f0..3b65f42d 100644
--- a/src/main/java/WayofTime/bloodmagic/block/BlockOutputRoutingNode.java
+++ b/src/main/java/WayofTime/bloodmagic/block/BlockOutputRoutingNode.java
@@ -2,7 +2,6 @@ package WayofTime.bloodmagic.block;
 
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.ItemStack;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.EnumFacing;
 import net.minecraft.util.EnumHand;
@@ -20,7 +19,7 @@ public class BlockOutputRoutingNode extends BlockRoutingNode
     {
         super();
 
-        setUnlocalizedName(Constants.Mod.MODID + ".outputRouting");
+        setUnlocalizedName(BloodMagic.MODID + ".outputRouting");
     }
 
     @Override
diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockPath.java b/src/main/java/WayofTime/bloodmagic/block/BlockPath.java
index 9be944dc..4e5099f1 100644
--- a/src/main/java/WayofTime/bloodmagic/block/BlockPath.java
+++ b/src/main/java/WayofTime/bloodmagic/block/BlockPath.java
@@ -6,6 +6,7 @@ import java.util.List;
 import net.minecraft.block.SoundType;
 import net.minecraft.block.material.Material;
 import net.minecraft.block.state.IBlockState;
+import net.minecraft.client.util.ITooltipFlag;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.math.BlockPos;
@@ -15,22 +16,21 @@ import org.apache.commons.lang3.tuple.ImmutablePair;
 import org.apache.commons.lang3.tuple.Pair;
 
 import WayofTime.bloodmagic.BloodMagic;
-import WayofTime.bloodmagic.api.Constants;
 import WayofTime.bloodmagic.api.incense.IIncensePath;
 import WayofTime.bloodmagic.block.base.BlockEnum;
 import WayofTime.bloodmagic.block.enums.EnumPath;
 import WayofTime.bloodmagic.client.IVariantProvider;
 import WayofTime.bloodmagic.util.helper.TextHelper;
 
-public class BlockPath extends BlockEnum<EnumPath> implements IIncensePath, IVariantProvider
+public class BlockPath extends BlockEnum<EnumPath> implements IIncensePath
 {
 
     public BlockPath()
     {
         super(Material.ROCK, EnumPath.class);
 
-        setUnlocalizedName(Constants.Mod.MODID + ".path.");
-        setCreativeTab(BloodMagic.tabBloodMagic);
+        setUnlocalizedName(BloodMagic.MODID + ".path.");
+        setCreativeTab(BloodMagic.TAB_BM);
         setHardness(2.0F);
         setResistance(5.0F);
         setSoundType(SoundType.STONE);
@@ -46,10 +46,10 @@ public class BlockPath extends BlockEnum<EnumPath> implements IIncensePath, IVar
     }
 
     @Override
-    public void addInformation(ItemStack stack, EntityPlayer player, List<String> tooltip, boolean advanced)
+    public void addInformation(ItemStack stack, World world, List<String> tooltip, ITooltipFlag tooltipFlag)
     {
         tooltip.add(TextHelper.localizeEffect("tooltip.bloodmagic.decoration.safe"));
-        super.addInformation(stack, player, tooltip, advanced);
+        super.addInformation(stack, world, tooltip, tooltipFlag);
     }
 
     @Override
@@ -73,13 +73,4 @@ public class BlockPath extends BlockEnum<EnumPath> implements IIncensePath, IVar
             return 0;
         }
     }
-
-    @Override
-    public List<Pair<Integer, String>> getVariants()
-    {
-        List<Pair<Integer, String>> ret = new ArrayList<Pair<Integer, String>>();
-        for (int i = 0; i < this.getTypes().length; i++)
-            ret.add(new ImmutablePair<Integer, String>(i, "type=" + this.getTypes()[i]));
-        return ret;
-    }
 }
diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockPhantom.java b/src/main/java/WayofTime/bloodmagic/block/BlockPhantom.java
index 8b35601e..257d417e 100644
--- a/src/main/java/WayofTime/bloodmagic/block/BlockPhantom.java
+++ b/src/main/java/WayofTime/bloodmagic/block/BlockPhantom.java
@@ -5,7 +5,6 @@ import java.util.List;
 import java.util.Random;
 
 import net.minecraft.block.Block;
-import net.minecraft.block.BlockContainer;
 import net.minecraft.block.material.Material;
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.tileentity.TileEntity;
@@ -22,7 +21,6 @@ import org.apache.commons.lang3.tuple.ImmutablePair;
 import org.apache.commons.lang3.tuple.Pair;
 
 import WayofTime.bloodmagic.BloodMagic;
-import WayofTime.bloodmagic.api.Constants;
 import WayofTime.bloodmagic.client.IVariantProvider;
 import WayofTime.bloodmagic.tile.TilePhantomBlock;
 
@@ -34,8 +32,8 @@ public class BlockPhantom extends Block implements IVariantProvider
     {
         super(Material.CLOTH);
 
-        setUnlocalizedName(Constants.Mod.MODID + ".phantom");
-        setCreativeTab(BloodMagic.tabBloodMagic);
+        setUnlocalizedName(BloodMagic.MODID + ".phantom");
+        setCreativeTab(BloodMagic.TAB_BM);
     }
 
     @Override
diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockRitualController.java b/src/main/java/WayofTime/bloodmagic/block/BlockRitualController.java
index f19b7126..08884846 100644
--- a/src/main/java/WayofTime/bloodmagic/block/BlockRitualController.java
+++ b/src/main/java/WayofTime/bloodmagic/block/BlockRitualController.java
@@ -1,8 +1,5 @@
 package WayofTime.bloodmagic.block;
 
-import java.util.ArrayList;
-import java.util.List;
-
 import javax.annotation.Nullable;
 
 import WayofTime.bloodmagic.api.iface.IBindable;
@@ -21,36 +18,28 @@ import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.text.TextComponentTranslation;
 import net.minecraft.world.Explosion;
 import net.minecraft.world.World;
-import net.minecraftforge.fml.common.Optional;
-
-import org.apache.commons.lang3.tuple.ImmutablePair;
-import org.apache.commons.lang3.tuple.Pair;
 
 import WayofTime.bloodmagic.BloodMagic;
 import WayofTime.bloodmagic.api.BlockStack;
-import WayofTime.bloodmagic.api.Constants;
 import WayofTime.bloodmagic.api.registry.ImperfectRitualRegistry;
 import WayofTime.bloodmagic.api.registry.RitualRegistry;
 import WayofTime.bloodmagic.api.ritual.Ritual;
 import WayofTime.bloodmagic.api.ritual.imperfect.ImperfectRitual;
 import WayofTime.bloodmagic.api.util.helper.RitualHelper;
 import WayofTime.bloodmagic.block.enums.EnumRitualController;
-import WayofTime.bloodmagic.client.IVariantProvider;
-import WayofTime.bloodmagic.registry.ModItems;
+import WayofTime.bloodmagic.registry.RegistrarBloodMagicItems;
 import WayofTime.bloodmagic.tile.TileImperfectRitualStone;
 import WayofTime.bloodmagic.tile.TileMasterRitualStone;
-import WayofTime.bloodmagic.util.ChatUtil;
 import amerifrance.guideapi.api.IGuideLinked;
 
-@Optional.Interface(modid = "guideapi", iface = "amerifrance.guideapi.api.IGuideLinked")
-public class BlockRitualController extends BlockEnum<EnumRitualController> implements IVariantProvider, IGuideLinked
+public class BlockRitualController extends BlockEnum<EnumRitualController> implements IGuideLinked
 {
     public BlockRitualController()
     {
         super(Material.ROCK, EnumRitualController.class);
 
-        setUnlocalizedName(Constants.Mod.MODID + ".stone.ritual.");
-        setCreativeTab(BloodMagic.tabBloodMagic);
+        setUnlocalizedName(BloodMagic.MODID + ".stone.ritual.");
+        setCreativeTab(BloodMagic.TAB_BM);
         setSoundType(SoundType.STONE);
         setHardness(2.0F);
         setResistance(5.0F);
@@ -65,7 +54,7 @@ public class BlockRitualController extends BlockEnum<EnumRitualController> imple
 
         if (state.getValue(getProperty()) != EnumRitualController.IMPERFECT && tile instanceof TileMasterRitualStone)
         {
-            if (heldItem.getItem() == ModItems.ACTIVATION_CRYSTAL)
+            if (heldItem.getItem() == RegistrarBloodMagicItems.ACTIVATION_CRYSTAL)
             {
                 IBindable bindable = (IBindable) heldItem.getItem();
                 if (Strings.isNullOrEmpty(bindable.getOwnerName(heldItem)))
@@ -129,17 +118,6 @@ public class BlockRitualController extends BlockEnum<EnumRitualController> imple
         return state.getValue(getProperty()) != EnumRitualController.IMPERFECT ? new TileMasterRitualStone() : new TileImperfectRitualStone();
     }
 
-    // IVariantProvider
-
-    @Override
-    public List<Pair<Integer, String>> getVariants()
-    {
-        List<Pair<Integer, String>> ret = new ArrayList<Pair<Integer, String>>();
-        for (int i = 0; i < this.getTypes().length; i++)
-            ret.add(new ImmutablePair<Integer, String>(i, "type=" + this.getTypes()[i]));
-        return ret;
-    }
-
     // IGuideLinked
 
     @Override
diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockRitualStone.java b/src/main/java/WayofTime/bloodmagic/block/BlockRitualStone.java
index e4e1e002..050aa5bc 100644
--- a/src/main/java/WayofTime/bloodmagic/block/BlockRitualStone.java
+++ b/src/main/java/WayofTime/bloodmagic/block/BlockRitualStone.java
@@ -6,42 +6,45 @@ import java.util.List;
 import net.minecraft.block.SoundType;
 import net.minecraft.block.material.Material;
 import net.minecraft.block.state.IBlockState;
+import net.minecraft.client.util.ITooltipFlag;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
 
+import net.minecraftforge.fml.relauncher.Side;
+import net.minecraftforge.fml.relauncher.SideOnly;
 import org.apache.commons.lang3.tuple.ImmutablePair;
 import org.apache.commons.lang3.tuple.Pair;
 
 import WayofTime.bloodmagic.BloodMagic;
-import WayofTime.bloodmagic.api.Constants;
 import WayofTime.bloodmagic.api.ritual.EnumRuneType;
 import WayofTime.bloodmagic.api.ritual.IRitualStone;
 import WayofTime.bloodmagic.block.base.BlockEnum;
 import WayofTime.bloodmagic.client.IVariantProvider;
-import WayofTime.bloodmagic.registry.ModBlocks;
+import WayofTime.bloodmagic.registry.RegistrarBloodMagicBlocks;
 import WayofTime.bloodmagic.util.helper.TextHelper;
 
-public class BlockRitualStone extends BlockEnum<EnumRuneType> implements IRitualStone, IVariantProvider
+public class BlockRitualStone extends BlockEnum<EnumRuneType> implements IRitualStone
 {
     public BlockRitualStone()
     {
         super(Material.IRON, EnumRuneType.class);
 
-        setUnlocalizedName(Constants.Mod.MODID + ".ritualStone.");
-        setCreativeTab(BloodMagic.tabBloodMagic);
+        setUnlocalizedName(BloodMagic.MODID + ".ritualStone.");
+        setCreativeTab(BloodMagic.TAB_BM);
         setSoundType(SoundType.STONE);
         setHardness(2.0F);
         setResistance(5.0F);
         setHarvestLevel("pickaxe", 2);
     }
 
+    @SideOnly(Side.CLIENT)
     @Override
-    public void addInformation(ItemStack stack, EntityPlayer player, List<String> tooltip, boolean advanced)
+    public void addInformation(ItemStack stack, World world, List<String> tooltip, ITooltipFlag tooltipFlag)
     {
         tooltip.add(TextHelper.localizeEffect("tooltip.bloodmagic.decoration.safe"));
-        super.addInformation(stack, player, tooltip, advanced);
+        super.addInformation(stack, world, tooltip, tooltipFlag);
     }
 
     @Override
@@ -66,16 +69,7 @@ public class BlockRitualStone extends BlockEnum<EnumRuneType> implements IRitual
     public void setRuneType(World world, BlockPos pos, EnumRuneType runeType)
     {
         int meta = runeType.ordinal();
-        IBlockState newState = ModBlocks.RITUAL_STONE.getStateFromMeta(meta);
+        IBlockState newState = RegistrarBloodMagicBlocks.RITUAL_STONE.getStateFromMeta(meta);
         world.setBlockState(pos, newState);
     }
-
-    @Override
-    public List<Pair<Integer, String>> getVariants()
-    {
-        List<Pair<Integer, String>> ret = new ArrayList<Pair<Integer, String>>();
-        for (int i = 0; i < this.getTypes().length; i++)
-            ret.add(new ImmutablePair<Integer, String>(i, "type=" + this.getTypes()[i]));
-        return ret;
-    }
 }
diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockRoutingNode.java b/src/main/java/WayofTime/bloodmagic/block/BlockRoutingNode.java
index bf068a92..1234bab3 100644
--- a/src/main/java/WayofTime/bloodmagic/block/BlockRoutingNode.java
+++ b/src/main/java/WayofTime/bloodmagic/block/BlockRoutingNode.java
@@ -1,11 +1,11 @@
 package WayofTime.bloodmagic.block;
 
 import net.minecraft.block.Block;
-import net.minecraft.block.BlockContainer;
 import net.minecraft.block.material.Material;
 import net.minecraft.block.properties.PropertyBool;
 import net.minecraft.block.state.BlockStateContainer;
 import net.minecraft.block.state.IBlockState;
+import net.minecraft.item.ItemBlock;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.BlockRenderLayer;
 import net.minecraft.util.EnumBlockRenderType;
@@ -18,7 +18,7 @@ import WayofTime.bloodmagic.BloodMagic;
 import WayofTime.bloodmagic.tile.routing.TileMasterRoutingNode;
 import WayofTime.bloodmagic.tile.routing.TileRoutingNode;
 
-public class BlockRoutingNode extends Block
+public class BlockRoutingNode extends Block implements IBMBlock
 {
     protected static final AxisAlignedBB AABB = new AxisAlignedBB(0.378F, 0.378F, 0.378F, 0.625F, 0.625F, 0.625F);
 
@@ -33,7 +33,7 @@ public class BlockRoutingNode extends Block
     {
         super(Material.ROCK);
 
-        setCreativeTab(BloodMagic.tabBloodMagic);
+        setCreativeTab(BloodMagic.TAB_BM);
         setHardness(2.0F);
         setResistance(5.0F);
         setHarvestLevel("pickaxe", 2);
@@ -140,4 +140,9 @@ public class BlockRoutingNode extends Block
 
         super.breakBlock(world, pos, blockState);
     }
+
+    @Override
+    public ItemBlock getItem() {
+        return new ItemBlock(this);
+    }
 }
diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockSoulForge.java b/src/main/java/WayofTime/bloodmagic/block/BlockSoulForge.java
index 2203c7d5..129edaaa 100644
--- a/src/main/java/WayofTime/bloodmagic/block/BlockSoulForge.java
+++ b/src/main/java/WayofTime/bloodmagic/block/BlockSoulForge.java
@@ -4,12 +4,10 @@ import java.util.ArrayList;
 import java.util.List;
 
 import net.minecraft.block.Block;
-import net.minecraft.block.BlockContainer;
 import net.minecraft.block.SoundType;
 import net.minecraft.block.material.Material;
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.ItemStack;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.EnumBlockRenderType;
 import net.minecraft.util.EnumFacing;
@@ -37,12 +35,12 @@ public class BlockSoulForge extends Block implements IVariantProvider
     {
         super(Material.IRON);
 
-        setUnlocalizedName(Constants.Mod.MODID + ".soulForge");
+        setUnlocalizedName(BloodMagic.MODID + ".soulForge");
         setHardness(2.0F);
         setResistance(5.0F);
         setSoundType(SoundType.METAL);
         setHarvestLevel("pickaxe", 1);
-        setCreativeTab(BloodMagic.tabBloodMagic);
+        setCreativeTab(BloodMagic.TAB_BM);
     }
 
     @Override
diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockSpectral.java b/src/main/java/WayofTime/bloodmagic/block/BlockSpectral.java
index e72b9abb..c11a4365 100644
--- a/src/main/java/WayofTime/bloodmagic/block/BlockSpectral.java
+++ b/src/main/java/WayofTime/bloodmagic/block/BlockSpectral.java
@@ -4,9 +4,9 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Random;
 
+import WayofTime.bloodmagic.BloodMagic;
 import WayofTime.bloodmagic.ConfigHandler;
 import net.minecraft.block.Block;
-import net.minecraft.block.BlockContainer;
 import net.minecraft.block.material.Material;
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.entity.Entity;
@@ -24,7 +24,6 @@ import net.minecraftforge.fml.relauncher.SideOnly;
 import org.apache.commons.lang3.tuple.ImmutablePair;
 import org.apache.commons.lang3.tuple.Pair;
 
-import WayofTime.bloodmagic.api.Constants;
 import WayofTime.bloodmagic.client.IVariantProvider;
 import WayofTime.bloodmagic.tile.TileSpectralBlock;
 
@@ -38,7 +37,7 @@ public class BlockSpectral extends Block implements IVariantProvider
     {
         super(Material.CLOTH);
 
-        setUnlocalizedName(Constants.Mod.MODID + ".spectral");
+        setUnlocalizedName(BloodMagic.MODID + ".spectral");
     }
 
     @Override
diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockTeleposer.java b/src/main/java/WayofTime/bloodmagic/block/BlockTeleposer.java
index da254a0d..4c764482 100644
--- a/src/main/java/WayofTime/bloodmagic/block/BlockTeleposer.java
+++ b/src/main/java/WayofTime/bloodmagic/block/BlockTeleposer.java
@@ -30,8 +30,8 @@ public class BlockTeleposer extends BlockContainer implements IVariantProvider
     {
         super(Material.ROCK);
 
-        setCreativeTab(BloodMagic.tabBloodMagic);
-        setUnlocalizedName(Constants.Mod.MODID + ".teleposer");
+        setCreativeTab(BloodMagic.TAB_BM);
+        setUnlocalizedName(BloodMagic.MODID + ".teleposer");
         setHardness(2.0F);
         setResistance(5.0F);
     }
diff --git a/src/main/java/WayofTime/bloodmagic/block/IBMBlock.java b/src/main/java/WayofTime/bloodmagic/block/IBMBlock.java
new file mode 100644
index 00000000..7dd5b818
--- /dev/null
+++ b/src/main/java/WayofTime/bloodmagic/block/IBMBlock.java
@@ -0,0 +1,8 @@
+package WayofTime.bloodmagic.block;
+
+import net.minecraft.item.ItemBlock;
+
+public interface IBMBlock {
+
+    ItemBlock getItem();
+}
diff --git a/src/main/java/WayofTime/bloodmagic/block/base/BlockEnum.java b/src/main/java/WayofTime/bloodmagic/block/base/BlockEnum.java
index 36c41e6d..451ec2a8 100644
--- a/src/main/java/WayofTime/bloodmagic/block/base/BlockEnum.java
+++ b/src/main/java/WayofTime/bloodmagic/block/base/BlockEnum.java
@@ -1,23 +1,24 @@
 package WayofTime.bloodmagic.block.base;
 
-import lombok.Getter;
+import WayofTime.bloodmagic.block.IBMBlock;
+import WayofTime.bloodmagic.client.IVariantProvider;
+import WayofTime.bloodmagic.item.block.base.ItemBlockEnum;
+import com.google.common.collect.Lists;
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
 import net.minecraft.block.properties.PropertyEnum;
 import net.minecraft.block.state.BlockStateContainer;
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.creativetab.CreativeTabs;
-import net.minecraft.item.Item;
+import net.minecraft.item.ItemBlock;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.IStringSerializable;
 import net.minecraft.util.NonNullList;
-import net.minecraftforge.fml.relauncher.Side;
-import net.minecraftforge.fml.relauncher.SideOnly;
+import org.apache.commons.lang3.tuple.Pair;
 
 import java.util.List;
 
-@Getter
-public class BlockEnum<E extends Enum<E> & IStringSerializable> extends Block
+public class BlockEnum<E extends Enum<E> & IStringSerializable> extends Block implements IBMBlock, IVariantProvider
 {
     private final E[] types;
     private final PropertyEnum<E> property;
@@ -68,16 +69,44 @@ public class BlockEnum<E extends Enum<E> & IStringSerializable> extends Block
         return getMetaFromState(state);
     }
 
-    @SideOnly(Side.CLIENT)
     @Override
-    public void getSubBlocks(Item item, CreativeTabs tab, NonNullList<ItemStack> subBlocks)
+    public void getSubBlocks(CreativeTabs tab, NonNullList<ItemStack> subBlocks)
     {
         for (E type : types)
-            subBlocks.add(new ItemStack(item, 1, type.ordinal()));
+            subBlocks.add(new ItemStack(this, 1, type.ordinal()));
     }
 
     protected BlockStateContainer createStateContainer()
     {
         return new BlockStateContainer.Builder(this).add(property).build();
     }
+
+    @Override
+    public ItemBlock getItem() {
+        return new ItemBlockEnum<>(this);
+    }
+
+    @Override
+    public List<Pair<Integer, String>> getVariants() {
+        List<Pair<Integer, String>> variants = Lists.newArrayList();
+        if (getItem() == null)
+            return variants;
+
+        for (int i = 0; i < types.length; i++)
+            variants.add(Pair.of(i, getProperty().getName() + "=" + types[i].name()));
+
+        return variants;
+    }
+
+    public E[] getTypes() {
+        return types;
+    }
+
+    public PropertyEnum<E> getProperty() {
+        return property;
+    }
+
+    public BlockStateContainer getRealStateContainer() {
+        return realStateContainer;
+    }
 }
diff --git a/src/main/java/WayofTime/bloodmagic/block/base/BlockEnumStairs.java b/src/main/java/WayofTime/bloodmagic/block/base/BlockEnumStairs.java
index 1cfa5837..271c5b76 100644
--- a/src/main/java/WayofTime/bloodmagic/block/base/BlockEnumStairs.java
+++ b/src/main/java/WayofTime/bloodmagic/block/base/BlockEnumStairs.java
@@ -71,7 +71,7 @@ public class BlockEnumStairs<E extends Enum<E> & IStringSerializable> extends Bl
     }
 
     @Override
-    public void addCollisionBoxToList(IBlockState state, World worldIn, BlockPos pos, AxisAlignedBB entityBox, List<AxisAlignedBB> collidingBoxes, @Nullable Entity entityIn)
+    public void addCollisionBoxToList(IBlockState state, World worldIn, BlockPos pos, AxisAlignedBB entityBox, List<AxisAlignedBB> collidingBoxes, @Nullable Entity entityIn, boolean bool)
     {
         state = this.getActualState(state, worldIn, pos);
 
diff --git a/src/main/java/WayofTime/bloodmagic/block/base/BlockInteger.java b/src/main/java/WayofTime/bloodmagic/block/base/BlockInteger.java
index 5d24ed53..3bf70c91 100644
--- a/src/main/java/WayofTime/bloodmagic/block/base/BlockInteger.java
+++ b/src/main/java/WayofTime/bloodmagic/block/base/BlockInteger.java
@@ -1,6 +1,5 @@
 package WayofTime.bloodmagic.block.base;
 
-import lombok.Getter;
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
 import net.minecraft.block.properties.PropertyInteger;
@@ -18,7 +17,6 @@ import net.minecraftforge.fml.relauncher.SideOnly;
  * 
  * These states will be numbered 0 through {@code maxMeta}.
  */
-@Getter
 public class BlockInteger extends Block
 {
     private final int maxMeta;
@@ -65,11 +63,10 @@ public class BlockInteger extends Block
         return getMetaFromState(state);
     }
 
-    @SideOnly(Side.CLIENT)
     @Override
-    public void getSubBlocks(Item item, CreativeTabs tab, NonNullList<ItemStack> subBlocks) {
+    public void getSubBlocks(CreativeTabs tab, NonNullList<ItemStack> subBlocks) {
         for (int i = 0; i < maxMeta; i++)
-            subBlocks.add(new ItemStack(item, 1, i));
+            subBlocks.add(new ItemStack(this, 1, i));
     }
 
     protected BlockStateContainer createStateContainer() {
diff --git a/src/main/java/WayofTime/bloodmagic/block/base/BlockString.java b/src/main/java/WayofTime/bloodmagic/block/base/BlockString.java
index d6381cdf..9b989e9a 100644
--- a/src/main/java/WayofTime/bloodmagic/block/base/BlockString.java
+++ b/src/main/java/WayofTime/bloodmagic/block/base/BlockString.java
@@ -1,6 +1,5 @@
 package WayofTime.bloodmagic.block.base;
 
-import lombok.Getter;
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
 import net.minecraft.block.state.BlockStateContainer;
@@ -21,7 +20,6 @@ import org.apache.commons.lang3.ArrayUtils;
  * way, each value is {@code toLowerCase()}'ed, so the blockstate JSON needs all
  * values to be lowercase.
  */
-@Getter
 public class BlockString extends Block
 {
     private final int maxMeta;
@@ -78,10 +76,10 @@ public class BlockString extends Block
 
     @SideOnly(Side.CLIENT)
     @Override
-    public void getSubBlocks(Item item, CreativeTabs tab, NonNullList<ItemStack> subBlocks)
+    public void getSubBlocks(CreativeTabs tab, NonNullList<ItemStack> subBlocks)
     {
         for (int i = 0; i < maxMeta; i++)
-            subBlocks.add(new ItemStack(item, 1, i));
+            subBlocks.add(new ItemStack(this, 1, i));
     }
 
     protected BlockStateContainer createStateContainer()
@@ -91,4 +89,20 @@ public class BlockString extends Block
         System.out.println("Number of states: " + ctn.getValidStates().size());
         return ctn;
     }
+
+    public int getMaxMeta() {
+        return maxMeta;
+    }
+
+    public String[] getTypes() {
+        return types;
+    }
+
+    public PropertyString getProperty() {
+        return property;
+    }
+
+    public BlockStateContainer getRealStateContainer() {
+        return realStateContainer;
+    }
 }
diff --git a/src/main/java/WayofTime/bloodmagic/block/enums/EnumBrickSize.java b/src/main/java/WayofTime/bloodmagic/block/enums/EnumDecorative.java
similarity index 51%
rename from src/main/java/WayofTime/bloodmagic/block/enums/EnumBrickSize.java
rename to src/main/java/WayofTime/bloodmagic/block/enums/EnumDecorative.java
index b76396e1..c9ae8947 100644
--- a/src/main/java/WayofTime/bloodmagic/block/enums/EnumBrickSize.java
+++ b/src/main/java/WayofTime/bloodmagic/block/enums/EnumDecorative.java
@@ -4,20 +4,23 @@ import java.util.Locale;
 
 import net.minecraft.util.IStringSerializable;
 
-public enum EnumBrickSize implements IStringSerializable
+public enum EnumDecorative implements IStringSerializable
 {
-    LARGE,
-    BRICK;
+    BLOODSTONE_TILE,
+    BLOODSTONE_BRICK,
+    CRYSTAL_TILE,
+    CRYSTAL_BRICK,
+    ;
 
     @Override
     public String toString()
     {
-        return name().toLowerCase(Locale.ENGLISH);
+        return name().toLowerCase(Locale.ROOT);
     }
 
     @Override
     public String getName()
     {
-        return this.toString();
+        return toString();
     }
 }
diff --git a/src/main/java/WayofTime/bloodmagic/client/gui/GuiAlchemyTable.java b/src/main/java/WayofTime/bloodmagic/client/gui/GuiAlchemyTable.java
index 22164f2f..5794d1e6 100644
--- a/src/main/java/WayofTime/bloodmagic/client/gui/GuiAlchemyTable.java
+++ b/src/main/java/WayofTime/bloodmagic/client/gui/GuiAlchemyTable.java
@@ -1,5 +1,6 @@
 package WayofTime.bloodmagic.client.gui;
 
+import WayofTime.bloodmagic.BloodMagic;
 import net.minecraft.client.gui.inventory.GuiContainer;
 import net.minecraft.client.renderer.GlStateManager;
 import net.minecraft.entity.player.InventoryPlayer;
@@ -8,7 +9,6 @@ import net.minecraft.inventory.Slot;
 import net.minecraft.util.ResourceLocation;
 import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;
-import WayofTime.bloodmagic.api.Constants;
 import WayofTime.bloodmagic.tile.TileAlchemyTable;
 import WayofTime.bloodmagic.tile.container.ContainerAlchemyTable;
 import WayofTime.bloodmagic.util.helper.TextHelper;
@@ -37,7 +37,7 @@ public class GuiAlchemyTable extends GuiContainer
     protected void drawGuiContainerBackgroundLayer(float partialTicks, int mouseX, int mouseY)
     {
         GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F);
-        ResourceLocation soulForgeGuiTextures = new ResourceLocation(Constants.Mod.MODID + ":textures/gui/alchemyTable.png");
+        ResourceLocation soulForgeGuiTextures = new ResourceLocation(BloodMagic.MODID + ":textures/gui/alchemyTable.png");
         this.mc.getTextureManager().bindTexture(soulForgeGuiTextures);
         int i = (this.width - this.xSize) / 2;
         int j = (this.height - this.ySize) / 2;
diff --git a/src/main/java/WayofTime/bloodmagic/client/gui/GuiHolding.java b/src/main/java/WayofTime/bloodmagic/client/gui/GuiHolding.java
index 49893a7a..c5a8383c 100644
--- a/src/main/java/WayofTime/bloodmagic/client/gui/GuiHolding.java
+++ b/src/main/java/WayofTime/bloodmagic/client/gui/GuiHolding.java
@@ -1,10 +1,10 @@
 package WayofTime.bloodmagic.client.gui;
 
-import WayofTime.bloodmagic.api.Constants;
+import WayofTime.bloodmagic.BloodMagic;
 import WayofTime.bloodmagic.item.inventory.ContainerHolding;
 import WayofTime.bloodmagic.item.inventory.InventoryHolding;
 import WayofTime.bloodmagic.item.sigil.ItemSigilHolding;
-import WayofTime.bloodmagic.registry.ModItems;
+import WayofTime.bloodmagic.registry.RegistrarBloodMagicItems;
 import WayofTime.bloodmagic.util.helper.TextHelper;
 import net.minecraft.client.gui.inventory.GuiContainer;
 import net.minecraft.client.renderer.GlStateManager;
@@ -16,7 +16,7 @@ import net.minecraftforge.fml.relauncher.SideOnly;
 @SideOnly(Side.CLIENT)
 public class GuiHolding extends GuiContainer
 {
-    private ResourceLocation texture = new ResourceLocation(Constants.Mod.MODID, "gui/SigilHolding.png");
+    private ResourceLocation texture = new ResourceLocation(BloodMagic.MODID, "gui/SigilHolding.png");
     private EntityPlayer player;
 
     public GuiHolding(EntityPlayer player, InventoryHolding inventoryHolding)
@@ -43,7 +43,7 @@ public class GuiHolding extends GuiContainer
         int x = (width - xSize) / 2;
         int y = (height - ySize) / 2;
         this.drawTexturedModalRect(x, y, 0, 0, xSize, ySize);
-        if (player.getHeldItemMainhand() != null && player.getHeldItemMainhand().getItem() == ModItems.SIGIL_HOLDING)
+        if (player.getHeldItemMainhand() != null && player.getHeldItemMainhand().getItem() == RegistrarBloodMagicItems.SIGIL_HOLDING)
         {
             GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F);
             this.drawTexturedModalRect(4 + x + 36 * ItemSigilHolding.getCurrentItemOrdinal(player.getHeldItemMainhand()), y + 13, 0, 123, 24, 24);
diff --git a/src/main/java/WayofTime/bloodmagic/client/gui/GuiItemRoutingNode.java b/src/main/java/WayofTime/bloodmagic/client/gui/GuiItemRoutingNode.java
index ddb5a2b8..049a8fdf 100644
--- a/src/main/java/WayofTime/bloodmagic/client/gui/GuiItemRoutingNode.java
+++ b/src/main/java/WayofTime/bloodmagic/client/gui/GuiItemRoutingNode.java
@@ -2,6 +2,7 @@ package WayofTime.bloodmagic.client.gui;
 
 import java.io.IOException;
 
+import WayofTime.bloodmagic.BloodMagic;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.GuiButton;
 import net.minecraft.client.gui.GuiTextField;
@@ -15,7 +16,6 @@ import net.minecraft.util.EnumFacing;
 import net.minecraft.util.ResourceLocation;
 import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;
-import WayofTime.bloodmagic.api.Constants;
 import WayofTime.bloodmagic.network.BloodMagicPacketHandler;
 import WayofTime.bloodmagic.network.ItemRouterAmountPacketProcessor;
 import WayofTime.bloodmagic.network.ItemRouterButtonPacketProcessor;
@@ -211,7 +211,7 @@ public class GuiItemRoutingNode extends GuiContainer
     protected void drawGuiContainerBackgroundLayer(float partialTicks, int mouseX, int mouseY)
     {
         GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F);
-        ResourceLocation soulForgeGuiTextures = new ResourceLocation(Constants.Mod.MODID + ":textures/gui/routingNode.png");
+        ResourceLocation soulForgeGuiTextures = new ResourceLocation(BloodMagic.MODID + ":textures/gui/routingNode.png");
         this.mc.getTextureManager().bindTexture(soulForgeGuiTextures);
         this.drawTexturedModalRect(left, top, 0, 0, this.xSize, this.ySize);
         GlStateManager.disableLighting();
diff --git a/src/main/java/WayofTime/bloodmagic/client/gui/GuiMasterRoutingNode.java b/src/main/java/WayofTime/bloodmagic/client/gui/GuiMasterRoutingNode.java
index 883ec432..d8f0c3bb 100644
--- a/src/main/java/WayofTime/bloodmagic/client/gui/GuiMasterRoutingNode.java
+++ b/src/main/java/WayofTime/bloodmagic/client/gui/GuiMasterRoutingNode.java
@@ -1,6 +1,6 @@
 package WayofTime.bloodmagic.client.gui;
 
-import WayofTime.bloodmagic.api.Constants;
+import WayofTime.bloodmagic.BloodMagic;
 import WayofTime.bloodmagic.tile.container.ContainerMasterRoutingNode;
 import net.minecraft.client.gui.inventory.GuiContainer;
 import net.minecraft.client.renderer.GlStateManager;
@@ -35,7 +35,7 @@ public class GuiMasterRoutingNode extends GuiContainer
     protected void drawGuiContainerBackgroundLayer(float partialTicks, int mouseX, int mouseY)
     {
         GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F);
-        ResourceLocation soulForgeGuiTextures = new ResourceLocation(Constants.Mod.MODID + ":textures/gui/masterRoutingNode.png");
+        ResourceLocation soulForgeGuiTextures = new ResourceLocation(BloodMagic.MODID + ":textures/gui/masterRoutingNode.png");
         this.mc.getTextureManager().bindTexture(soulForgeGuiTextures);
         int i = (this.width - this.xSize) / 2;
         int j = (this.height - this.ySize) / 2;
diff --git a/src/main/java/WayofTime/bloodmagic/client/gui/GuiSoulForge.java b/src/main/java/WayofTime/bloodmagic/client/gui/GuiSoulForge.java
index 7153656d..6dc01ad4 100644
--- a/src/main/java/WayofTime/bloodmagic/client/gui/GuiSoulForge.java
+++ b/src/main/java/WayofTime/bloodmagic/client/gui/GuiSoulForge.java
@@ -1,6 +1,6 @@
 package WayofTime.bloodmagic.client.gui;
 
-import WayofTime.bloodmagic.api.Constants;
+import WayofTime.bloodmagic.BloodMagic;
 import WayofTime.bloodmagic.tile.TileSoulForge;
 import WayofTime.bloodmagic.tile.container.ContainerSoulForge;
 import WayofTime.bloodmagic.util.helper.TextHelper;
@@ -36,7 +36,7 @@ public class GuiSoulForge extends GuiContainer
     protected void drawGuiContainerBackgroundLayer(float partialTicks, int mouseX, int mouseY)
     {
         GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F);
-        ResourceLocation soulForgeGuiTextures = new ResourceLocation(Constants.Mod.MODID + ":textures/gui/soulForge.png");
+        ResourceLocation soulForgeGuiTextures = new ResourceLocation(BloodMagic.MODID + ":textures/gui/soulForge.png");
         this.mc.getTextureManager().bindTexture(soulForgeGuiTextures);
         int i = (this.width - this.xSize) / 2;
         int j = (this.height - this.ySize) / 2;
diff --git a/src/main/java/WayofTime/bloodmagic/client/gui/GuiTeleposer.java b/src/main/java/WayofTime/bloodmagic/client/gui/GuiTeleposer.java
index 4bafa7f8..74729451 100644
--- a/src/main/java/WayofTime/bloodmagic/client/gui/GuiTeleposer.java
+++ b/src/main/java/WayofTime/bloodmagic/client/gui/GuiTeleposer.java
@@ -1,6 +1,6 @@
 package WayofTime.bloodmagic.client.gui;
 
-import WayofTime.bloodmagic.api.Constants;
+import WayofTime.bloodmagic.BloodMagic;
 import WayofTime.bloodmagic.tile.container.ContainerTeleposer;
 import WayofTime.bloodmagic.util.helper.TextHelper;
 import net.minecraft.client.gui.inventory.GuiContainer;
@@ -30,7 +30,7 @@ public class GuiTeleposer extends GuiContainer
     protected void drawGuiContainerBackgroundLayer(float partialTicks, int mouseX, int mouseY)
     {
         GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F);
-        ResourceLocation teleposerGuiTextures = new ResourceLocation(Constants.Mod.MODID + ":textures/gui/teleposer.png");
+        ResourceLocation teleposerGuiTextures = new ResourceLocation(BloodMagic.MODID + ":textures/gui/teleposer.png");
         this.mc.getTextureManager().bindTexture(teleposerGuiTextures);
         int i = (this.width - this.xSize) / 2;
         int j = (this.height - this.ySize) / 2;
diff --git a/src/main/java/WayofTime/bloodmagic/client/gui/config/ConfigGui.java b/src/main/java/WayofTime/bloodmagic/client/gui/config/ConfigGui.java
index 9daa85d1..910bba94 100644
--- a/src/main/java/WayofTime/bloodmagic/client/gui/config/ConfigGui.java
+++ b/src/main/java/WayofTime/bloodmagic/client/gui/config/ConfigGui.java
@@ -1,7 +1,7 @@
 package WayofTime.bloodmagic.client.gui.config;
 
+import WayofTime.bloodmagic.BloodMagic;
 import WayofTime.bloodmagic.ConfigHandler;
-import WayofTime.bloodmagic.api.Constants;
 import net.minecraft.client.gui.GuiScreen;
 import net.minecraftforge.common.config.ConfigElement;
 import net.minecraftforge.fml.client.config.GuiConfig;
@@ -15,7 +15,7 @@ public class ConfigGui extends GuiConfig
 
     public ConfigGui(GuiScreen parentScreen)
     {
-        super(parentScreen, getConfigElements(parentScreen), Constants.Mod.MODID, false, false, "BloodMagic Configuration");
+        super(parentScreen, getConfigElements(parentScreen), BloodMagic.MODID, false, false, "BloodMagic Configuration");
     }
 
     @SuppressWarnings("rawtypes")
diff --git a/src/main/java/WayofTime/bloodmagic/client/hud/HUDElement.java b/src/main/java/WayofTime/bloodmagic/client/hud/HUDElement.java
index 3bb369d7..ea91517c 100644
--- a/src/main/java/WayofTime/bloodmagic/client/hud/HUDElement.java
+++ b/src/main/java/WayofTime/bloodmagic/client/hud/HUDElement.java
@@ -1,17 +1,13 @@
 package WayofTime.bloodmagic.client.hud;
 
 import WayofTime.bloodmagic.util.handler.event.ClientHandler;
-import lombok.Getter;
-import lombok.Setter;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.ScaledResolution;
+import net.minecraft.client.renderer.BufferBuilder;
 import net.minecraft.client.renderer.Tessellator;
-import net.minecraft.client.renderer.VertexBuffer;
 import net.minecraft.client.renderer.vertex.DefaultVertexFormats;
 import net.minecraftforge.client.event.RenderGameOverlayEvent;
 
-@Getter
-@Setter
 public abstract class HUDElement
 {
 
@@ -52,12 +48,32 @@ public abstract class HUDElement
         float f = 0.00390625F;
         float f1 = 0.00390625F;
         Tessellator tessellator = Tessellator.getInstance();
-        VertexBuffer vertexbuffer = tessellator.getBuffer();
-        vertexbuffer.begin(7, DefaultVertexFormats.POSITION_TEX);
-        vertexbuffer.pos((double) (x + 0), (double) (y + height), 0).tex((double) ((float) (textureX + 0) * f), (double) ((float) (textureY + height) * f1)).endVertex();
-        vertexbuffer.pos((double) (x + width), (double) (y + height), 0).tex((double) ((float) (textureX + width) * f), (double) ((float) (textureY + height) * f1)).endVertex();
-        vertexbuffer.pos((double) (x + width), (double) (y + 0), 0).tex((double) ((float) (textureX + width) * f), (double) ((float) (textureY + 0) * f1)).endVertex();
-        vertexbuffer.pos((double) (x + 0), (double) (y + 0), 0).tex((double) ((float) (textureX + 0) * f), (double) ((float) (textureY + 0) * f1)).endVertex();
+        BufferBuilder buffer = tessellator.getBuffer();
+        buffer.begin(7, DefaultVertexFormats.POSITION_TEX);
+        buffer.pos(x + 0, y + height, 0).tex((double) ((float) (textureX + 0) * f), (double) ((float) (textureY + height) * f1)).endVertex();
+        buffer.pos(x + width, y + height, 0).tex((double) ((float) (textureX + width) * f), (double) ((float) (textureY + height) * f1)).endVertex();
+        buffer.pos(x + width, y + 0, 0).tex((double) ((float) (textureX + width) * f), (double) ((float) (textureY + 0) * f1)).endVertex();
+        buffer.pos(x + 0, y + 0, 0).tex((double) ((float) (textureX + 0) * f), (double) ((float) (textureY + 0) * f1)).endVertex();
         tessellator.draw();
     }
+
+    public int getxOffset() {
+        return xOffset;
+    }
+
+    public int getyOffset() {
+        return yOffset;
+    }
+
+    public int getxOffsetDefault() {
+        return xOffsetDefault;
+    }
+
+    public int getyOffsetDefault() {
+        return yOffsetDefault;
+    }
+
+    public RenderGameOverlayEvent.ElementType getElementType() {
+        return elementType;
+    }
 }
diff --git a/src/main/java/WayofTime/bloodmagic/client/hud/HUDElementDemonWillAura.java b/src/main/java/WayofTime/bloodmagic/client/hud/HUDElementDemonWillAura.java
index 4226c787..45d8ce3e 100644
--- a/src/main/java/WayofTime/bloodmagic/client/hud/HUDElementDemonWillAura.java
+++ b/src/main/java/WayofTime/bloodmagic/client/hud/HUDElementDemonWillAura.java
@@ -3,15 +3,14 @@ package WayofTime.bloodmagic.client.hud;
 import java.util.ArrayList;
 import java.util.List;
 
+import WayofTime.bloodmagic.BloodMagic;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.ScaledResolution;
 import net.minecraft.client.renderer.GlStateManager;
-import net.minecraft.client.renderer.Tessellator;
 import net.minecraft.client.renderer.VertexBuffer;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.util.ResourceLocation;
 import net.minecraftforge.client.event.RenderGameOverlayEvent;
-import WayofTime.bloodmagic.api.Constants;
 import WayofTime.bloodmagic.api.soul.EnumDemonWillType;
 import WayofTime.bloodmagic.proxy.ClientProxy;
 import WayofTime.bloodmagic.util.Utils;
@@ -41,7 +40,7 @@ public class HUDElementDemonWillAura extends HUDElement
             return;
         }
 
-        minecraft.getTextureManager().bindTexture(new ResourceLocation(Constants.Mod.MODID, "textures/hud/bars.png"));
+        minecraft.getTextureManager().bindTexture(new ResourceLocation(BloodMagic.MODID, "textures/hud/bars.png"));
         GlStateManager.color(1.0F, 1.0F, 1.0F);
         this.drawTexturedModalRect(getXOffset(), getYOffset(), 0, 105 * 2, 80, 46);
 
@@ -52,7 +51,7 @@ public class HUDElementDemonWillAura extends HUDElement
         {
             i++;
             GlStateManager.color(1.0F, 1.0F, 1.0F);
-            minecraft.getTextureManager().bindTexture(new ResourceLocation(Constants.Mod.MODID, "textures/hud/bars.png"));
+            minecraft.getTextureManager().bindTexture(new ResourceLocation(BloodMagic.MODID, "textures/hud/bars.png"));
             int textureXOffset = (i > 3) ? (i - 3) : (3 - i);
             int maxBarSize = 30 - 2 * textureXOffset;
 
diff --git a/src/main/java/WayofTime/bloodmagic/client/hud/HUDElementHolding.java b/src/main/java/WayofTime/bloodmagic/client/hud/HUDElementHolding.java
index f56e2cbc..e390f1c7 100644
--- a/src/main/java/WayofTime/bloodmagic/client/hud/HUDElementHolding.java
+++ b/src/main/java/WayofTime/bloodmagic/client/hud/HUDElementHolding.java
@@ -1,8 +1,8 @@
 package WayofTime.bloodmagic.client.hud;
 
-import WayofTime.bloodmagic.api.Constants;
+import WayofTime.bloodmagic.BloodMagic;
 import WayofTime.bloodmagic.item.sigil.ItemSigilHolding;
-import WayofTime.bloodmagic.registry.ModItems;
+import WayofTime.bloodmagic.registry.RegistrarBloodMagicItems;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.Gui;
 import net.minecraft.client.gui.ScaledResolution;
@@ -28,15 +28,15 @@ public class HUDElementHolding extends HUDElement
     {
         ItemStack sigilHolding = minecraft.player.getHeldItemMainhand();
         // Check mainhand for Sigil of Holding
-        if (!(sigilHolding.getItem() == ModItems.SIGIL_HOLDING))
+        if (!(sigilHolding.getItem() == RegistrarBloodMagicItems.SIGIL_HOLDING))
             sigilHolding = minecraft.player.getHeldItemOffhand();
         // Check offhand for Sigil of Holding
-        if (!(sigilHolding.getItem() == ModItems.SIGIL_HOLDING))
+        if (!(sigilHolding.getItem() == RegistrarBloodMagicItems.SIGIL_HOLDING))
             return;
 
         Gui ingameGui = minecraft.ingameGUI;
 
-        minecraft.getTextureManager().bindTexture(new ResourceLocation(Constants.Mod.MODID, "textures/gui/widgets.png"));
+        minecraft.getTextureManager().bindTexture(new ResourceLocation(BloodMagic.MODID, "textures/gui/widgets.png"));
         GlStateManager.color(1.0F, 1.0F, 1.0F);
         ingameGui.drawTexturedModalRect(resolution.getScaledWidth() / 2 + 100 + getXOffset(), resolution.getScaledHeight() - 22 + getYOffset(), 0, 0, 102, 22);
         int currentSlot = ItemSigilHolding.getCurrentItemOrdinal(sigilHolding);
diff --git a/src/main/java/WayofTime/bloodmagic/client/key/KeyBindingBloodMagic.java b/src/main/java/WayofTime/bloodmagic/client/key/KeyBindingBloodMagic.java
index 32f65613..6d2ba73b 100644
--- a/src/main/java/WayofTime/bloodmagic/client/key/KeyBindingBloodMagic.java
+++ b/src/main/java/WayofTime/bloodmagic/client/key/KeyBindingBloodMagic.java
@@ -1,6 +1,6 @@
 package WayofTime.bloodmagic.client.key;
 
-import WayofTime.bloodmagic.api.Constants;
+import WayofTime.bloodmagic.BloodMagic;
 import net.minecraft.client.settings.KeyBinding;
 import net.minecraftforge.fml.client.registry.ClientRegistry;
 import net.minecraftforge.fml.relauncher.Side;
@@ -11,7 +11,7 @@ public class KeyBindingBloodMagic extends KeyBinding
 {
     public KeyBindingBloodMagic(KeyBindings key)
     {
-        super(key.getDescription(), key.getKeyConflictContext(), key.getKeyModifier(), key.getKeyCode(), Constants.Mod.NAME);
+        super(key.getDescription(), key.getKeyConflictContext(), key.getKeyModifier(), key.getKeyCode(), BloodMagic.NAME);
 
         ClientRegistry.registerKeyBinding(this);
     }
diff --git a/src/main/java/WayofTime/bloodmagic/client/key/KeyBindings.java b/src/main/java/WayofTime/bloodmagic/client/key/KeyBindings.java
index eb894c9b..d10e0897 100644
--- a/src/main/java/WayofTime/bloodmagic/client/key/KeyBindings.java
+++ b/src/main/java/WayofTime/bloodmagic/client/key/KeyBindings.java
@@ -1,6 +1,6 @@
 package WayofTime.bloodmagic.client.key;
 
-import WayofTime.bloodmagic.api.Constants;
+import WayofTime.bloodmagic.BloodMagic;
 import WayofTime.bloodmagic.item.sigil.ItemSigilHolding;
 import WayofTime.bloodmagic.network.BloodMagicPacketHandler;
 import WayofTime.bloodmagic.network.KeyProcessor;
@@ -106,6 +106,6 @@ public enum KeyBindings
 
     public String getDescription()
     {
-        return Constants.Mod.MODID + ".keybind." + name().toLowerCase(Locale.ENGLISH);
+        return BloodMagic.MODID + ".keybind." + name().toLowerCase(Locale.ENGLISH);
     }
 }
diff --git a/src/main/java/WayofTime/bloodmagic/client/mesh/CustomMeshDefinitionActivatable.java b/src/main/java/WayofTime/bloodmagic/client/mesh/CustomMeshDefinitionActivatable.java
index 934600ff..2ba73161 100644
--- a/src/main/java/WayofTime/bloodmagic/client/mesh/CustomMeshDefinitionActivatable.java
+++ b/src/main/java/WayofTime/bloodmagic/client/mesh/CustomMeshDefinitionActivatable.java
@@ -1,6 +1,6 @@
 package WayofTime.bloodmagic.client.mesh;
 
-import WayofTime.bloodmagic.api.Constants;
+import WayofTime.bloodmagic.BloodMagic;
 import WayofTime.bloodmagic.api.iface.IActivatable;
 import net.minecraft.client.renderer.ItemMeshDefinition;
 import net.minecraft.client.renderer.block.model.ModelResourceLocation;
@@ -21,8 +21,8 @@ public class CustomMeshDefinitionActivatable implements ItemMeshDefinition
     {
         if (stack != null && stack.getItem() instanceof IActivatable)
             if (((IActivatable) stack.getItem()).getActivated(stack))
-                return new ModelResourceLocation(new ResourceLocation(Constants.Mod.MODID, "item/" + name), "active=true");
+                return new ModelResourceLocation(new ResourceLocation(BloodMagic.MODID, "item/" + name), "active=true");
 
-        return new ModelResourceLocation(new ResourceLocation(Constants.Mod.MODID, "item/" + name), "active=false");
+        return new ModelResourceLocation(new ResourceLocation(BloodMagic.MODID, "item/" + name), "active=false");
     }
 }
diff --git a/src/main/java/WayofTime/bloodmagic/client/mesh/CustomMeshDefinitionMultiWill.java b/src/main/java/WayofTime/bloodmagic/client/mesh/CustomMeshDefinitionMultiWill.java
index ed901323..0edb0e0c 100644
--- a/src/main/java/WayofTime/bloodmagic/client/mesh/CustomMeshDefinitionMultiWill.java
+++ b/src/main/java/WayofTime/bloodmagic/client/mesh/CustomMeshDefinitionMultiWill.java
@@ -1,10 +1,10 @@
 package WayofTime.bloodmagic.client.mesh;
 
+import WayofTime.bloodmagic.BloodMagic;
 import net.minecraft.client.renderer.ItemMeshDefinition;
 import net.minecraft.client.renderer.block.model.ModelResourceLocation;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.ResourceLocation;
-import WayofTime.bloodmagic.api.Constants;
 import WayofTime.bloodmagic.api.iface.IMultiWillTool;
 import WayofTime.bloodmagic.api.soul.EnumDemonWillType;
 
@@ -23,9 +23,9 @@ public class CustomMeshDefinitionMultiWill implements ItemMeshDefinition
         if (stack != null && stack.getItem() instanceof IMultiWillTool)
         {
             EnumDemonWillType type = ((IMultiWillTool) stack.getItem()).getCurrentType(stack);
-            return new ModelResourceLocation(new ResourceLocation(Constants.Mod.MODID, "item/" + name), "type=" + type.getName().toLowerCase());
+            return new ModelResourceLocation(new ResourceLocation(BloodMagic.MODID, "item/" + name), "type=" + type.getName().toLowerCase());
         }
 
-        return new ModelResourceLocation(new ResourceLocation(Constants.Mod.MODID, "item/" + name), "type=default");
+        return new ModelResourceLocation(new ResourceLocation(BloodMagic.MODID, "item/" + name), "type=default");
     }
 }
diff --git a/src/main/java/WayofTime/bloodmagic/client/mesh/CustomMeshDefinitionWillGem.java b/src/main/java/WayofTime/bloodmagic/client/mesh/CustomMeshDefinitionWillGem.java
index ed3383c2..9fce3d6b 100644
--- a/src/main/java/WayofTime/bloodmagic/client/mesh/CustomMeshDefinitionWillGem.java
+++ b/src/main/java/WayofTime/bloodmagic/client/mesh/CustomMeshDefinitionWillGem.java
@@ -1,13 +1,13 @@
 package WayofTime.bloodmagic.client.mesh;
 
+import WayofTime.bloodmagic.BloodMagic;
 import net.minecraft.client.renderer.ItemMeshDefinition;
 import net.minecraft.client.renderer.block.model.ModelResourceLocation;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.ResourceLocation;
-import WayofTime.bloodmagic.api.Constants;
 import WayofTime.bloodmagic.api.soul.EnumDemonWillType;
 import WayofTime.bloodmagic.item.soul.ItemSoulGem;
-import WayofTime.bloodmagic.registry.ModItems;
+import WayofTime.bloodmagic.registry.RegistrarBloodMagicItems;
 
 public class CustomMeshDefinitionWillGem implements ItemMeshDefinition
 {
@@ -21,12 +21,12 @@ public class CustomMeshDefinitionWillGem implements ItemMeshDefinition
     @Override
     public ModelResourceLocation getModelLocation(ItemStack stack)
     {
-        if (stack != null && stack.getItem() == ModItems.SOUL_GEM)
+        if (stack != null && stack.getItem() == RegistrarBloodMagicItems.SOUL_GEM)
         {
             EnumDemonWillType type = ((ItemSoulGem) stack.getItem()).getCurrentType(stack);
-            return new ModelResourceLocation(new ResourceLocation(Constants.Mod.MODID, "item/" + name), "type=" + ItemSoulGem.names[stack.getItemDamage()] + "_" + type.getName().toLowerCase());
+            return new ModelResourceLocation(new ResourceLocation(BloodMagic.MODID, "item/" + name), "type=" + ItemSoulGem.names[stack.getItemDamage()] + "_" + type.getName().toLowerCase());
         }
 
-        return new ModelResourceLocation(new ResourceLocation(Constants.Mod.MODID, "item/" + name), "type=petty_default");
+        return new ModelResourceLocation(new ResourceLocation(BloodMagic.MODID, "item/" + name), "type=petty_default");
     }
 }
diff --git a/src/main/java/WayofTime/bloodmagic/client/render/LayerBloodElytra.java b/src/main/java/WayofTime/bloodmagic/client/render/LayerBloodElytra.java
index a6c6ab6f..08186d3b 100644
--- a/src/main/java/WayofTime/bloodmagic/client/render/LayerBloodElytra.java
+++ b/src/main/java/WayofTime/bloodmagic/client/render/LayerBloodElytra.java
@@ -1,6 +1,6 @@
 package WayofTime.bloodmagic.client.render;
 
-import WayofTime.bloodmagic.api.Constants;
+import WayofTime.bloodmagic.BloodMagic;
 import WayofTime.bloodmagic.item.armour.ItemLivingArmour;
 import WayofTime.bloodmagic.livingArmour.LivingArmour;
 import net.minecraft.client.entity.AbstractClientPlayer;
@@ -31,7 +31,7 @@ public class LayerBloodElytra implements LayerRenderer<AbstractClientPlayer>
         if (LivingArmour.hasFullSet(clientPlayer))
         {
             ItemStack chestStack = clientPlayer.getItemStackFromSlot(EntityEquipmentSlot.CHEST);
-            if (ItemLivingArmour.hasUpgrade(Constants.Mod.MODID + ".upgrade.elytra", chestStack))
+            if (ItemLivingArmour.hasUpgrade(BloodMagic.MODID + ".upgrade.elytra", chestStack))
             {
                 GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F);
                 GlStateManager.enableBlend();
diff --git a/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/AttractorAlchemyCircleRenderer.java b/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/AttractorAlchemyCircleRenderer.java
index 09e0c193..2318d142 100644
--- a/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/AttractorAlchemyCircleRenderer.java
+++ b/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/AttractorAlchemyCircleRenderer.java
@@ -50,7 +50,7 @@ public class AttractorAlchemyCircleRenderer extends AlchemyCircleRenderer
         {
             if (craftTime < secondaryOffset)
             {
-                float modifier = 90 * (craftTime - offset) / (float) (secondaryOffset - offset);
+                float modifier = 90 * (craftTime - offset) / (secondaryOffset - offset);
                 return modifier;
             } else
             {
diff --git a/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/BindingAlchemyCircleRenderer.java b/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/BindingAlchemyCircleRenderer.java
index be708860..0ef9593e 100644
--- a/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/BindingAlchemyCircleRenderer.java
+++ b/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/BindingAlchemyCircleRenderer.java
@@ -96,7 +96,7 @@ public class BindingAlchemyCircleRenderer extends AlchemyCircleRenderer
         float offset = 2;
         if (circle == -1)
         {
-            return (float) (craftTime * 360 * 2 / 5 / sweepTime);
+            return craftTime * 360 * 2 / 5 / sweepTime;
         }
         if (craftTime >= offset)
         {
diff --git a/src/main/java/WayofTime/bloodmagic/client/render/block/RenderItemRoutingNode.java b/src/main/java/WayofTime/bloodmagic/client/render/block/RenderItemRoutingNode.java
index 4f69d238..83774dd1 100644
--- a/src/main/java/WayofTime/bloodmagic/client/render/block/RenderItemRoutingNode.java
+++ b/src/main/java/WayofTime/bloodmagic/client/render/block/RenderItemRoutingNode.java
@@ -1,7 +1,7 @@
 package WayofTime.bloodmagic.client.render.block;
 
+import WayofTime.bloodmagic.BloodMagic;
 import WayofTime.bloodmagic.ConfigHandler;
-import WayofTime.bloodmagic.api.Constants;
 import WayofTime.bloodmagic.api.iface.INodeRenderer;
 import WayofTime.bloodmagic.client.helper.ShaderHelper;
 import WayofTime.bloodmagic.tile.routing.TileRoutingNode;
@@ -20,7 +20,7 @@ import java.util.List;
 
 public class RenderItemRoutingNode extends TileEntitySpecialRenderer<TileRoutingNode>
 {
-    private static final ResourceLocation beamTexture = new ResourceLocation(Constants.Mod.MODID, "textures/entities/nodeBeam.png");
+    private static final ResourceLocation beamTexture = new ResourceLocation(BloodMagic.MODID, "textures/entities/nodeBeam.png");
     private static final Minecraft mc = Minecraft.getMinecraft();
 
 //    private static final ResourceLocation test = new ResourceLocation("luminescence:textures/models/InputMirror.png");
@@ -71,11 +71,11 @@ public class RenderItemRoutingNode extends TileEntitySpecialRenderer<TileRouting
                 double d23 = width / 2;
                 double d24 = width / 2;
                 double d25 = width / 2;
-                double d26 = (double) (distance * f1);
+                double d26 = distance * f1;
                 double d27 = 0.0D;
                 double d28 = 1.0D;
                 double d29 = (double) (f3) + test;
-                double d30 = (double) (distance * f1) + d29;
+                double d30 = distance * f1 + d29;
 
                 GlStateManager.translate(x + 0.5, y + 0.5, z + 0.5);
 
diff --git a/src/main/java/WayofTime/bloodmagic/client/render/entity/RenderEntityMeteor.java b/src/main/java/WayofTime/bloodmagic/client/render/entity/RenderEntityMeteor.java
index f1425847..6aa13082 100644
--- a/src/main/java/WayofTime/bloodmagic/client/render/entity/RenderEntityMeteor.java
+++ b/src/main/java/WayofTime/bloodmagic/client/render/entity/RenderEntityMeteor.java
@@ -1,11 +1,11 @@
 package WayofTime.bloodmagic.client.render.entity;
 
+import WayofTime.bloodmagic.BloodMagic;
 import net.minecraft.client.model.ModelBase;
 import net.minecraft.client.renderer.GlStateManager;
 import net.minecraft.client.renderer.entity.Render;
 import net.minecraft.client.renderer.entity.RenderManager;
 import net.minecraft.util.ResourceLocation;
-import WayofTime.bloodmagic.api.Constants;
 import WayofTime.bloodmagic.client.render.model.ModelMeteor;
 import WayofTime.bloodmagic.entity.projectile.EntityMeteor;
 
@@ -13,7 +13,7 @@ public class RenderEntityMeteor extends Render<EntityMeteor>
 {
     public ModelBase model = new ModelMeteor();
     private float scale = 1;
-    private static final ResourceLocation resource = new ResourceLocation(Constants.Mod.MODID, "textures/models/Meteor.png");
+    private static final ResourceLocation resource = new ResourceLocation(BloodMagic.MODID, "textures/models/Meteor.png");
 
     public RenderEntityMeteor(RenderManager renderManagerIn)
     {
diff --git a/src/main/java/WayofTime/bloodmagic/client/render/entity/RenderEntityMimic.java b/src/main/java/WayofTime/bloodmagic/client/render/entity/RenderEntityMimic.java
index 9d2c755c..08e6f26f 100644
--- a/src/main/java/WayofTime/bloodmagic/client/render/entity/RenderEntityMimic.java
+++ b/src/main/java/WayofTime/bloodmagic/client/render/entity/RenderEntityMimic.java
@@ -82,7 +82,7 @@ public class RenderEntityMimic extends RenderLiving<EntityMimic>
 
                         if (!StringUtils.isNullOrEmpty(s))
                         {
-                            gameprofile = TileEntitySkull.updateGameprofile(new GameProfile((UUID) null, s));
+                            gameprofile = TileEntitySkull.updateGameprofile(new GameProfile(null, s));
                             nbttagcompound.setTag("SkullOwner", NBTUtil.writeGameProfile(new NBTTagCompound(), gameprofile));
                         }
                     }
diff --git a/src/main/java/WayofTime/bloodmagic/client/render/entity/RenderEntitySoulSnare.java b/src/main/java/WayofTime/bloodmagic/client/render/entity/RenderEntitySoulSnare.java
index 788f0616..1e7fe96f 100644
--- a/src/main/java/WayofTime/bloodmagic/client/render/entity/RenderEntitySoulSnare.java
+++ b/src/main/java/WayofTime/bloodmagic/client/render/entity/RenderEntitySoulSnare.java
@@ -1,7 +1,7 @@
 package WayofTime.bloodmagic.client.render.entity;
 
 import WayofTime.bloodmagic.entity.projectile.EntitySoulSnare;
-import WayofTime.bloodmagic.registry.ModItems;
+import WayofTime.bloodmagic.registry.RegistrarBloodMagicItems;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.GlStateManager;
 import net.minecraft.client.renderer.RenderItem;
@@ -30,7 +30,7 @@ public class RenderEntitySoulSnare extends Render<EntitySoulSnare>
         GlStateManager.rotate(-this.renderManager.playerViewY, 0.0F, 1.0F, 0.0F);
         GlStateManager.rotate(this.renderManager.playerViewX, 1.0F, 0.0F, 0.0F);
         this.bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE);
-        this.renderItem.renderItem(new ItemStack(ModItems.SOUL_SNARE), ItemCameraTransforms.TransformType.GROUND);
+        this.renderItem.renderItem(new ItemStack(RegistrarBloodMagicItems.SOUL_SNARE), ItemCameraTransforms.TransformType.GROUND);
         GlStateManager.disableRescaleNormal();
         GlStateManager.popMatrix();
         super.doRender(entity, x, y, z, entityYaw, partialTicks);
diff --git a/src/main/java/WayofTime/bloodmagic/client/render/entity/layer/LayerAlchemyCircle.java b/src/main/java/WayofTime/bloodmagic/client/render/entity/layer/LayerAlchemyCircle.java
index f2148ee2..454a71fa 100644
--- a/src/main/java/WayofTime/bloodmagic/client/render/entity/layer/LayerAlchemyCircle.java
+++ b/src/main/java/WayofTime/bloodmagic/client/render/entity/layer/LayerAlchemyCircle.java
@@ -35,7 +35,7 @@ public class LayerAlchemyCircle<T extends EntityCorruptedSheep> implements Layer
         VertexBuffer wr = tessellator.getBuffer();
 
         GlStateManager.pushMatrix();
-        float rot = (float) this.rotationspeed * (partialTicks + demon.ticksExisted);
+        float rot = this.rotationspeed * (partialTicks + demon.ticksExisted);
         float secondaryRot = 0;
 
         float size = 3.0F;
diff --git a/src/main/java/WayofTime/bloodmagic/compat/ICompatibility.java b/src/main/java/WayofTime/bloodmagic/compat/ICompatibility.java
deleted file mode 100644
index c1c75352..00000000
--- a/src/main/java/WayofTime/bloodmagic/compat/ICompatibility.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package WayofTime.bloodmagic.compat;
-
-/**
- * Implement on all primary compatibility classes.
- */
-public interface ICompatibility
-{
-    /**
-     * Called during each initialization phase after the given
-     * {@link #getModId()} has been verified as loaded.
-     * 
-     * @param phase
-     *        - The load phase at which this method is being called.
-     */
-    void loadCompatibility(InitializationPhase phase);
-
-    /**
-     * @return The {@code modid} of the mod we are adding compatibility for.
-     */
-    String getModId();
-
-    /**
-     * Whether or not compatibility should be loaded even if the mod were to be
-     * found.
-     * 
-     * Generally a determined by a config option.
-     * 
-     * @return If Compatibility should load.
-     */
-    boolean enableCompat();
-
-    /**
-     * Represents a given mod initialization state.
-     */
-    enum InitializationPhase
-    {
-        /**
-         * Represents
-         * {@link net.minecraftforge.fml.common.event.FMLPreInitializationEvent}
-         */
-        PRE_INIT,
-        /**
-         * Represents
-         * {@link net.minecraftforge.fml.common.event.FMLInitializationEvent}
-         */
-        INIT,
-        /**
-         * Represents
-         * {@link net.minecraftforge.fml.common.event.FMLPostInitializationEvent}
-         */
-        POST_INIT,
-        /**
-         * Represents
-         * {@link net.minecraftforge.fml.common.event.FMLModIdMappingEvent}
-         */
-        MAPPING,
-        ;
-    }
-}
diff --git a/src/main/java/WayofTime/bloodmagic/compat/guideapi/GuideBloodMagic.java b/src/main/java/WayofTime/bloodmagic/compat/guideapi/GuideBloodMagic.java
index d8192078..44e32f8f 100644
--- a/src/main/java/WayofTime/bloodmagic/compat/guideapi/GuideBloodMagic.java
+++ b/src/main/java/WayofTime/bloodmagic/compat/guideapi/GuideBloodMagic.java
@@ -1,60 +1,55 @@
 package WayofTime.bloodmagic.compat.guideapi;
 
-import WayofTime.bloodmagic.api.Constants;
+import WayofTime.bloodmagic.BloodMagic;
 import WayofTime.bloodmagic.compat.guideapi.book.*;
-import WayofTime.bloodmagic.registry.ModBlocks;
-import WayofTime.bloodmagic.registry.ModItems;
+import WayofTime.bloodmagic.registry.RegistrarBloodMagicBlocks;
+import WayofTime.bloodmagic.registry.RegistrarBloodMagicItems;
 import amerifrance.guideapi.api.GuideAPI;
 import amerifrance.guideapi.api.GuideBook;
 import amerifrance.guideapi.api.IGuideBook;
 import amerifrance.guideapi.api.impl.Book;
 import amerifrance.guideapi.category.CategoryItemStack;
-import net.minecraft.init.Blocks;
 import net.minecraft.init.Items;
 import net.minecraft.item.ItemStack;
+import net.minecraft.item.crafting.IRecipe;
 import net.minecraft.util.ResourceLocation;
-import net.minecraftforge.fml.common.FMLCommonHandler;
-import net.minecraftforge.fml.common.registry.GameRegistry;
-import net.minecraftforge.fml.relauncher.Side;
+import net.minecraftforge.fml.common.eventhandler.EventPriority;
 import net.minecraftforge.oredict.ShapelessOreRecipe;
 
+import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 import java.awt.Color;
 
-@GuideBook
-public class GuideBloodMagic implements IGuideBook
-{
-    public static Book guideBook;
+@GuideBook(priority = EventPriority.HIGHEST)
+public class GuideBloodMagic implements IGuideBook {
+
+    public static final Book GUIDE_BOOK = new Book();
 
     @Nullable
     @Override
     public Book buildBook() {
-        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(new ResourceLocation(Constants.Mod.MODID, "guide"));
-        guideBook.setColor(Color.RED);
+        GUIDE_BOOK.setTitle("guide.bloodmagic.title");
+        GUIDE_BOOK.setDisplayName("guide.bloodmagic.display");
+        GUIDE_BOOK.setWelcomeMessage("guide.bloodmagic.welcome");
+        GUIDE_BOOK.setAuthor("guide.bloodmagic.author");
+        GUIDE_BOOK.setRegistryName(new ResourceLocation(BloodMagic.MODID, "guide"));
+        GUIDE_BOOK.setColor(Color.RED);
 
-        return guideBook;
-    }
-
-    @Override
-    public void handleModel(ItemStack bookStack) {
-        GuideAPI.setModel(guideBook);
+        return GUIDE_BOOK;
     }
 
     @Override
     public void handlePost(ItemStack bookStack) {
-        if (FMLCommonHandler.instance().getSide() == Side.CLIENT) {
-            guideBook.addCategory(new CategoryItemStack(CategoryAlchemy.buildCategory(), "guide.bloodmagic.category.alchemy", new ItemStack(ModItems.ARCANE_ASHES)));
-            guideBook.addCategory(new CategoryItemStack(CategoryArchitect.buildCategory(), "guide.bloodmagic.category.architect", new ItemStack(ModItems.SIGIL_DIVINATION)));
-            guideBook.addCategory(new CategoryItemStack(CategoryDemon.buildCategory(), "guide.bloodmagic.category.demon", new ItemStack(ModItems.BLOOD_SHARD)));
-            guideBook.addCategory(new CategoryItemStack(CategoryRitual.buildCategory(), "guide.bloodmagic.category.ritual", new ItemStack(ModBlocks.RITUAL_CONTROLLER)));
-//          guideBook.addCategory(new CategoryItemStack(CategorySpell.buildCategory(), "guide.bloodmagic.category.spell", new ItemStack(ModItems.ritualDiviner)));
-        }
+        GUIDE_BOOK.addCategory(new CategoryItemStack(CategoryAlchemy.buildCategory(), "guide.bloodmagic.category.alchemy", new ItemStack(RegistrarBloodMagicItems.ARCANE_ASHES)));
+        GUIDE_BOOK.addCategory(new CategoryItemStack(CategoryArchitect.buildCategory(), "guide.bloodmagic.category.architect", new ItemStack(RegistrarBloodMagicItems.SIGIL_DIVINATION)));
+        GUIDE_BOOK.addCategory(new CategoryItemStack(CategoryDemon.buildCategory(), "guide.bloodmagic.category.demon", new ItemStack(RegistrarBloodMagicItems.BLOOD_SHARD)));
+        GUIDE_BOOK.addCategory(new CategoryItemStack(CategoryRitual.buildCategory(), "guide.bloodmagic.category.ritual", new ItemStack(RegistrarBloodMagicBlocks.RITUAL_CONTROLLER)));
+//        guideBook.addCategory(new CategoryItemStack(CategorySpell.buildCategory(), "guide.bloodmagic.category.spell", new ItemStack(ModItems.ritualDiviner)));
+    }
 
-        GameRegistry.addRecipe(new ShapelessOreRecipe(GuideAPI.getStackFromBook(GuideBloodMagic.guideBook), new ItemStack(Items.BOOK), Blocks.GLASS, Items.FEATHER));
+    @Nullable
+    @Override
+    public IRecipe getRecipe(@Nonnull ItemStack bookStack) {
+        return new ShapelessOreRecipe(new ResourceLocation(BloodMagic.MODID, "guide"), GuideAPI.getStackFromBook(GUIDE_BOOK), new ItemStack(Items.BOOK), "glass", "feather");
     }
 }
diff --git a/src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategoryAlchemy.java b/src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategoryAlchemy.java
index e6d0a5ce..39700f14 100644
--- a/src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategoryAlchemy.java
+++ b/src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategoryAlchemy.java
@@ -1,12 +1,12 @@
 package WayofTime.bloodmagic.compat.guideapi.book;
 
-import WayofTime.bloodmagic.api.Constants;
+import WayofTime.bloodmagic.BloodMagic;
 import WayofTime.bloodmagic.api.recipe.TartaricForgeRecipe;
 import WayofTime.bloodmagic.compat.guideapi.BookUtils;
 import WayofTime.bloodmagic.compat.guideapi.entry.EntryText;
 import WayofTime.bloodmagic.compat.guideapi.page.PageAlchemyArray;
 import WayofTime.bloodmagic.compat.guideapi.page.PageTartaricForgeRecipe;
-import WayofTime.bloodmagic.registry.ModItems;
+import WayofTime.bloodmagic.registry.RegistrarBloodMagicItems;
 import WayofTime.bloodmagic.util.helper.RecipeHelper;
 import WayofTime.bloodmagic.util.helper.TextHelper;
 import amerifrance.guideapi.api.IPage;
@@ -27,7 +27,7 @@ public class CategoryAlchemy
     public static Map<ResourceLocation, EntryAbstract> buildCategory()
     {
         Map<ResourceLocation, EntryAbstract> entries = new LinkedHashMap<ResourceLocation, EntryAbstract>();
-        String keyBase = "guide." + Constants.Mod.MODID + ".entry.alchemy.";
+        String keyBase = "guide." + BloodMagic.MODID + ".entry.alchemy.";
 
         List<IPage> introPages = new ArrayList<IPage>();
         introPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "intro" + ".info"), 370));
@@ -35,7 +35,7 @@ public class CategoryAlchemy
 
         List<IPage> ashPages = new ArrayList<IPage>();
 
-        TartaricForgeRecipe ashRecipe = RecipeHelper.getForgeRecipeForOutput(new ItemStack(ModItems.ARCANE_ASHES));
+        TartaricForgeRecipe ashRecipe = RecipeHelper.getForgeRecipeForOutput(new ItemStack(RegistrarBloodMagicItems.ARCANE_ASHES));
         if (ashRecipe != null)
         {
             ashPages.add(new PageTartaricForgeRecipe(ashRecipe));
diff --git a/src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategoryArchitect.java b/src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategoryArchitect.java
index 8766ab28..620c5d4f 100644
--- a/src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategoryArchitect.java
+++ b/src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategoryArchitect.java
@@ -6,10 +6,10 @@ import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 
+import WayofTime.bloodmagic.BloodMagic;
 import net.minecraft.item.ItemStack;
 import net.minecraft.item.crafting.IRecipe;
 import net.minecraft.util.ResourceLocation;
-import WayofTime.bloodmagic.api.Constants;
 import WayofTime.bloodmagic.api.recipe.TartaricForgeRecipe;
 import WayofTime.bloodmagic.api.registry.AltarRecipeRegistry.AltarRecipe;
 import WayofTime.bloodmagic.api.registry.OrbRegistry;
@@ -19,8 +19,8 @@ import WayofTime.bloodmagic.compat.guideapi.page.PageAlchemyArray;
 import WayofTime.bloodmagic.compat.guideapi.page.PageAltarRecipe;
 import WayofTime.bloodmagic.compat.guideapi.page.PageTartaricForgeRecipe;
 import WayofTime.bloodmagic.item.ItemComponent;
-import WayofTime.bloodmagic.registry.ModBlocks;
-import WayofTime.bloodmagic.registry.ModItems;
+import WayofTime.bloodmagic.registry.RegistrarBloodMagicBlocks;
+import WayofTime.bloodmagic.registry.RegistrarBloodMagicItems;
 import WayofTime.bloodmagic.util.helper.RecipeHelper;
 import WayofTime.bloodmagic.util.helper.TextHelper;
 import amerifrance.guideapi.api.IPage;
@@ -33,7 +33,7 @@ public class CategoryArchitect
     public static Map<ResourceLocation, EntryAbstract> buildCategory()
     {
         Map<ResourceLocation, EntryAbstract> entries = new LinkedHashMap<ResourceLocation, EntryAbstract>();
-        String keyBase = "guide." + Constants.Mod.MODID + ".entry.architect.";
+        String keyBase = "guide." + BloodMagic.MODID + ".entry.architect.";
 
         List<IPage> introPages = new ArrayList<IPage>();
         introPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "intro" + ".info"), 370));
@@ -42,7 +42,7 @@ public class CategoryArchitect
 
         List<IPage> altarPages = new ArrayList<IPage>();
 
-        IRecipe altarRecipe = RecipeHelper.getRecipeForOutput(new ItemStack(ModBlocks.ALTAR));
+        IRecipe altarRecipe = RecipeHelper.getRecipeForOutput(new ItemStack(RegistrarBloodMagicBlocks.ALTAR));
         if (altarRecipe != null)
         {
             altarPages.add(BookUtils.getPageForRecipe(altarRecipe));
@@ -50,7 +50,7 @@ public class CategoryArchitect
 
         altarPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "bloodaltar" + ".info.1"), 370));
 
-        IRecipe daggerRecipe = RecipeHelper.getRecipeForOutput(new ItemStack(ModItems.SACRIFICIAL_DAGGER));
+        IRecipe daggerRecipe = RecipeHelper.getRecipeForOutput(new ItemStack(RegistrarBloodMagicItems.SACRIFICIAL_DAGGER));
         if (daggerRecipe != null)
         {
             altarPages.add(BookUtils.getPageForRecipe(daggerRecipe));
@@ -61,7 +61,7 @@ public class CategoryArchitect
 
         List<IPage> ashPages = new ArrayList<IPage>();
 
-        TartaricForgeRecipe ashRecipe = RecipeHelper.getForgeRecipeForOutput(new ItemStack(ModItems.ARCANE_ASHES));
+        TartaricForgeRecipe ashRecipe = RecipeHelper.getForgeRecipeForOutput(new ItemStack(RegistrarBloodMagicItems.ARCANE_ASHES));
         if (ashRecipe != null)
         {
             ashPages.add(new PageTartaricForgeRecipe(ashRecipe));
@@ -71,7 +71,7 @@ public class CategoryArchitect
 
         List<IPage> divinationPages = new ArrayList<IPage>();
 
-        PageAlchemyArray divinationRecipePage = BookUtils.getAlchemyPage(new ItemStack(ModItems.SIGIL_DIVINATION));
+        PageAlchemyArray divinationRecipePage = BookUtils.getAlchemyPage(new ItemStack(RegistrarBloodMagicItems.SIGIL_DIVINATION));
         if (divinationRecipePage != null)
         {
             divinationPages.add(divinationRecipePage);
@@ -88,7 +88,7 @@ public class CategoryArchitect
         List<IPage> weakorbPages = new ArrayList<IPage>();
         weakorbPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "weakorb" + ".info.1"), 370));
 
-        AltarRecipe weakorbRecipe = RecipeHelper.getAltarRecipeForOutput(OrbRegistry.getOrbStack(ModItems.ORB_WEAK));
+        AltarRecipe weakorbRecipe = RecipeHelper.getAltarRecipeForOutput(OrbRegistry.getOrbStack(RegistrarBloodMagicItems.ORB_WEAK));
         if (weakorbRecipe != null)
         {
             weakorbPages.add(new PageAltarRecipe(weakorbRecipe));
@@ -99,7 +99,7 @@ public class CategoryArchitect
 
         List<IPage> incensePages = new ArrayList<IPage>();
 
-        IRecipe incenseRecipe = RecipeHelper.getRecipeForOutput(new ItemStack(ModBlocks.INCENSE_ALTAR));
+        IRecipe incenseRecipe = RecipeHelper.getRecipeForOutput(new ItemStack(RegistrarBloodMagicBlocks.INCENSE_ALTAR));
         if (incenseRecipe != null)
         {
             incensePages.add(BookUtils.getPageForRecipe(incenseRecipe));
@@ -107,7 +107,7 @@ public class CategoryArchitect
 
         incensePages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "incense" + ".info.1"), 370));
 
-        IRecipe woodPathRecipe = RecipeHelper.getRecipeForOutput(new ItemStack(ModBlocks.PATH_BLOCK, 1, 0));
+        IRecipe woodPathRecipe = RecipeHelper.getRecipeForOutput(new ItemStack(RegistrarBloodMagicBlocks.PATH, 1, 0));
         if (woodPathRecipe != null)
         {
             incensePages.add(BookUtils.getPageForRecipe(woodPathRecipe));
@@ -118,7 +118,7 @@ public class CategoryArchitect
 
         List<IPage> runePages = new ArrayList<IPage>();
 
-        IRecipe runeRecipe = RecipeHelper.getRecipeForOutput(new ItemStack(ModBlocks.BLOOD_RUNE, 1, 0));
+        IRecipe runeRecipe = RecipeHelper.getRecipeForOutput(new ItemStack(RegistrarBloodMagicBlocks.BLOOD_RUNE, 1, 0));
         if (runeRecipe != null)
         {
             runePages.add(BookUtils.getPageForRecipe(runeRecipe));
@@ -129,7 +129,7 @@ public class CategoryArchitect
 
         List<IPage> inspectPages = new ArrayList<IPage>();
 
-        AltarRecipe inspectRecipe = RecipeHelper.getAltarRecipeForOutput(new ItemStack(ModItems.SANGUINE_BOOK));
+        AltarRecipe inspectRecipe = RecipeHelper.getAltarRecipeForOutput(new ItemStack(RegistrarBloodMagicItems.SANGUINE_BOOK));
         if (inspectRecipe != null)
         {
             inspectPages.add(new PageAltarRecipe(inspectRecipe));
@@ -140,7 +140,7 @@ public class CategoryArchitect
 
         List<IPage> speedRunePages = new ArrayList<IPage>();
 
-        IRecipe speedRecipe = RecipeHelper.getRecipeForOutput(new ItemStack(ModBlocks.BLOOD_RUNE, 1, 1));
+        IRecipe speedRecipe = RecipeHelper.getRecipeForOutput(new ItemStack(RegistrarBloodMagicBlocks.BLOOD_RUNE, 1, 1));
         if (speedRecipe != null)
         {
             speedRunePages.add(BookUtils.getPageForRecipe(speedRecipe));
@@ -157,7 +157,7 @@ public class CategoryArchitect
             waterPages.add(new PageTartaricForgeRecipe(waterRecipe));
         }
 
-        PageAlchemyArray waterRecipePage = BookUtils.getAlchemyPage(new ItemStack(ModItems.SIGIL_WATER));
+        PageAlchemyArray waterRecipePage = BookUtils.getAlchemyPage(new ItemStack(RegistrarBloodMagicItems.SIGIL_WATER));
         if (waterRecipePage != null)
         {
             waterPages.add(waterRecipePage);
@@ -174,7 +174,7 @@ public class CategoryArchitect
             lavaPages.add(new PageTartaricForgeRecipe(lavaRecipe));
         }
 
-        PageAlchemyArray lavaRecipePage = BookUtils.getAlchemyPage(new ItemStack(ModItems.SIGIL_LAVA));
+        PageAlchemyArray lavaRecipePage = BookUtils.getAlchemyPage(new ItemStack(RegistrarBloodMagicItems.SIGIL_LAVA));
         if (lavaRecipePage != null)
         {
             lavaPages.add(lavaRecipePage);
@@ -185,7 +185,7 @@ public class CategoryArchitect
 
         List<IPage> lavaCrystalPages = new ArrayList<IPage>();
 
-        IRecipe lavaCrystalRecipe = RecipeHelper.getRecipeForOutput(new ItemStack(ModItems.LAVA_CRYSTAL));
+        IRecipe lavaCrystalRecipe = RecipeHelper.getRecipeForOutput(new ItemStack(RegistrarBloodMagicItems.LAVA_CRYSTAL));
         if (lavaCrystalRecipe != null)
         {
             lavaCrystalPages.add(BookUtils.getPageForRecipe(lavaCrystalRecipe));
@@ -196,7 +196,7 @@ public class CategoryArchitect
 
         List<IPage> apprenticeorbPages = new ArrayList<IPage>();
 
-        AltarRecipe apprenticeorbRecipe = RecipeHelper.getAltarRecipeForOutput(OrbRegistry.getOrbStack(ModItems.ORB_APPRENTICE));
+        AltarRecipe apprenticeorbRecipe = RecipeHelper.getAltarRecipeForOutput(OrbRegistry.getOrbStack(RegistrarBloodMagicItems.ORB_APPRENTICE));
         if (apprenticeorbRecipe != null)
         {
             apprenticeorbPages.add(new PageAltarRecipe(apprenticeorbRecipe));
@@ -207,7 +207,7 @@ public class CategoryArchitect
 
         List<IPage> daggerPages = new ArrayList<IPage>();
 
-        AltarRecipe daggerOfSacrificeRecipe = RecipeHelper.getAltarRecipeForOutput(new ItemStack(ModItems.DAGGER_OF_SACRIFICE));
+        AltarRecipe daggerOfSacrificeRecipe = RecipeHelper.getAltarRecipeForOutput(new ItemStack(RegistrarBloodMagicItems.DAGGER_OF_SACRIFICE));
         if (daggerOfSacrificeRecipe != null)
         {
             daggerPages.add(new PageAltarRecipe(daggerOfSacrificeRecipe));
@@ -218,7 +218,7 @@ public class CategoryArchitect
 
         List<IPage> runeSacrificePages = new ArrayList<IPage>();
 
-        IRecipe runeSacrificeRecipe = RecipeHelper.getRecipeForOutput(new ItemStack(ModBlocks.BLOOD_RUNE, 1, 3));
+        IRecipe runeSacrificeRecipe = RecipeHelper.getRecipeForOutput(new ItemStack(RegistrarBloodMagicBlocks.BLOOD_RUNE, 1, 3));
         if (runeSacrificeRecipe != null)
         {
             runeSacrificePages.add(BookUtils.getPageForRecipe(runeSacrificeRecipe));
@@ -229,7 +229,7 @@ public class CategoryArchitect
 
         List<IPage> runeSelfSacrificePages = new ArrayList<IPage>();
 
-        IRecipe runeSelfSacrificeRecipe = RecipeHelper.getRecipeForOutput(new ItemStack(ModBlocks.BLOOD_RUNE, 1, 4));
+        IRecipe runeSelfSacrificeRecipe = RecipeHelper.getRecipeForOutput(new ItemStack(RegistrarBloodMagicBlocks.BLOOD_RUNE, 1, 4));
         if (runeSelfSacrificeRecipe != null)
         {
             runeSelfSacrificePages.add(BookUtils.getPageForRecipe(runeSelfSacrificeRecipe));
@@ -246,7 +246,7 @@ public class CategoryArchitect
             holdingPages.add(new PageTartaricForgeRecipe(holdingRecipe));
         }
 
-        PageAlchemyArray holdingRecipePage = BookUtils.getAlchemyPage(new ItemStack(ModItems.SIGIL_HOLDING));
+        PageAlchemyArray holdingRecipePage = BookUtils.getAlchemyPage(new ItemStack(RegistrarBloodMagicItems.SIGIL_HOLDING));
         if (holdingRecipePage != null)
         {
             holdingPages.add(holdingRecipePage);
@@ -263,7 +263,7 @@ public class CategoryArchitect
             airPages.add(new PageTartaricForgeRecipe(airRecipe));
         }
 
-        PageAlchemyArray airRecipePage = BookUtils.getAlchemyPage(new ItemStack(ModItems.SIGIL_AIR));
+        PageAlchemyArray airRecipePage = BookUtils.getAlchemyPage(new ItemStack(RegistrarBloodMagicItems.SIGIL_AIR));
         if (airRecipePage != null)
         {
             airPages.add(airRecipePage);
@@ -280,7 +280,7 @@ public class CategoryArchitect
             voidPages.add(new PageTartaricForgeRecipe(voidRecipe));
         }
 
-        PageAlchemyArray voidRecipePage = BookUtils.getAlchemyPage(new ItemStack(ModItems.SIGIL_VOID));
+        PageAlchemyArray voidRecipePage = BookUtils.getAlchemyPage(new ItemStack(RegistrarBloodMagicItems.SIGIL_VOID));
         if (voidRecipePage != null)
         {
             voidPages.add(voidRecipePage);
@@ -297,7 +297,7 @@ public class CategoryArchitect
             greenGrovePages.add(new PageTartaricForgeRecipe(greenGroveRecipe));
         }
 
-        PageAlchemyArray greenGroveRecipePage = BookUtils.getAlchemyPage(new ItemStack(ModItems.SIGIL_GREEN_GROVE));
+        PageAlchemyArray greenGroveRecipePage = BookUtils.getAlchemyPage(new ItemStack(RegistrarBloodMagicItems.SIGIL_GREEN_GROVE));
         if (greenGroveRecipePage != null)
         {
             greenGrovePages.add(greenGroveRecipePage);
@@ -314,7 +314,7 @@ public class CategoryArchitect
             fastMinerPages.add(new PageTartaricForgeRecipe(fastMinerRecipe));
         }
 
-        PageAlchemyArray fastMinerRecipePage = BookUtils.getAlchemyPage(new ItemStack(ModItems.SIGIL_FAST_MINER));
+        PageAlchemyArray fastMinerRecipePage = BookUtils.getAlchemyPage(new ItemStack(RegistrarBloodMagicItems.SIGIL_FAST_MINER));
         if (fastMinerRecipePage != null)
         {
             fastMinerPages.add(fastMinerRecipePage);
@@ -331,7 +331,7 @@ public class CategoryArchitect
             seerPages.add(new PageTartaricForgeRecipe(seerRecipe));
         }
 
-        PageAlchemyArray seerRecipePage = BookUtils.getAlchemyPage(new ItemStack(ModItems.SIGIL_SEER));
+        PageAlchemyArray seerRecipePage = BookUtils.getAlchemyPage(new ItemStack(RegistrarBloodMagicItems.SIGIL_SEER));
         if (seerRecipePage != null)
         {
             seerPages.add(seerRecipePage);
@@ -342,7 +342,7 @@ public class CategoryArchitect
 
         List<IPage> magicianOrbPages = new ArrayList<IPage>();
 
-        AltarRecipe magicianOrbRecipe = RecipeHelper.getAltarRecipeForOutput(OrbRegistry.getOrbStack(ModItems.ORB_MAGICIAN));
+        AltarRecipe magicianOrbRecipe = RecipeHelper.getAltarRecipeForOutput(OrbRegistry.getOrbStack(RegistrarBloodMagicItems.ORB_MAGICIAN));
         if (magicianOrbRecipe != null)
         {
             magicianOrbPages.add(new PageAltarRecipe(magicianOrbRecipe));
@@ -353,7 +353,7 @@ public class CategoryArchitect
 
         List<IPage> capacityPages = new ArrayList<IPage>();
 
-        IRecipe capacityRecipe = RecipeHelper.getRecipeForOutput(new ItemStack(ModBlocks.BLOOD_RUNE, 1, 4));
+        IRecipe capacityRecipe = RecipeHelper.getRecipeForOutput(new ItemStack(RegistrarBloodMagicBlocks.BLOOD_RUNE, 1, 4));
         if (capacityRecipe != null)
         {
             capacityPages.add(BookUtils.getPageForRecipe(capacityRecipe));
@@ -364,7 +364,7 @@ public class CategoryArchitect
 
         List<IPage> displacementPages = new ArrayList<IPage>();
 
-        IRecipe displacementRecipe = RecipeHelper.getRecipeForOutput(new ItemStack(ModBlocks.BLOOD_RUNE, 1, 4));
+        IRecipe displacementRecipe = RecipeHelper.getRecipeForOutput(new ItemStack(RegistrarBloodMagicBlocks.BLOOD_RUNE, 1, 4));
         if (displacementRecipe != null)
         {
             displacementPages.add(BookUtils.getPageForRecipe(displacementRecipe));
@@ -381,7 +381,7 @@ public class CategoryArchitect
             affinityPages.add(new PageTartaricForgeRecipe(affinityRecipe));
         }
 
-        PageAlchemyArray affinityRecipePage = BookUtils.getAlchemyPage(new ItemStack(ModItems.SIGIL_ELEMENTAL_AFFINITY));
+        PageAlchemyArray affinityRecipePage = BookUtils.getAlchemyPage(new ItemStack(RegistrarBloodMagicItems.SIGIL_ELEMENTAL_AFFINITY));
         if (affinityRecipePage != null)
         {
             affinityPages.add(affinityRecipePage);
@@ -398,7 +398,7 @@ public class CategoryArchitect
             lampPages.add(new PageTartaricForgeRecipe(lampRecipe));
         }
 
-        PageAlchemyArray lampRecipePage = BookUtils.getAlchemyPage(new ItemStack(ModItems.SIGIL_BLOOD_LIGHT));
+        PageAlchemyArray lampRecipePage = BookUtils.getAlchemyPage(new ItemStack(RegistrarBloodMagicItems.SIGIL_BLOOD_LIGHT));
         if (lampRecipePage != null)
         {
             lampPages.add(lampRecipePage);
@@ -415,7 +415,7 @@ public class CategoryArchitect
             magnetismPages.add(new PageTartaricForgeRecipe(magnetismRecipe));
         }
 
-        PageAlchemyArray magnetismRecipePage = BookUtils.getAlchemyPage(new ItemStack(ModItems.SIGIL_MAGNETISM));
+        PageAlchemyArray magnetismRecipePage = BookUtils.getAlchemyPage(new ItemStack(RegistrarBloodMagicItems.SIGIL_MAGNETISM));
         if (magnetismRecipePage != null)
         {
             magnetismPages.add(magnetismRecipePage);
@@ -426,7 +426,7 @@ public class CategoryArchitect
 
         List<IPage> peritiaPages = new ArrayList<IPage>();
 
-        IRecipe peritiaRecipe = RecipeHelper.getRecipeForOutput(new ItemStack(ModItems.EXPERIENCE_TOME));
+        IRecipe peritiaRecipe = RecipeHelper.getRecipeForOutput(new ItemStack(RegistrarBloodMagicItems.EXPERIENCE_TOME));
         if (peritiaRecipe != null)
         {
             peritiaPages.add(BookUtils.getPageForRecipe(peritiaRecipe));
@@ -443,25 +443,25 @@ public class CategoryArchitect
             livingArmourPages.add(new PageTartaricForgeRecipe(bindingRecipe));
         }
 
-        PageAlchemyArray bindingRecipePage = BookUtils.getAlchemyPage(new ItemStack(ModItems.LIVING_ARMOUR_CHEST));
+        PageAlchemyArray bindingRecipePage = BookUtils.getAlchemyPage(new ItemStack(RegistrarBloodMagicItems.LIVING_ARMOUR_CHEST));
         if (bindingRecipePage != null)
         {
             livingArmourPages.add(bindingRecipePage);
         }
 
-        bindingRecipePage = BookUtils.getAlchemyPage(new ItemStack(ModItems.LIVING_ARMOUR_HELMET));
+        bindingRecipePage = BookUtils.getAlchemyPage(new ItemStack(RegistrarBloodMagicItems.LIVING_ARMOUR_HELMET));
         if (bindingRecipePage != null)
         {
             livingArmourPages.add(bindingRecipePage);
         }
 
-        bindingRecipePage = BookUtils.getAlchemyPage(new ItemStack(ModItems.LIVING_ARMOUR_LEGS));
+        bindingRecipePage = BookUtils.getAlchemyPage(new ItemStack(RegistrarBloodMagicItems.LIVING_ARMOUR_LEGS));
         if (bindingRecipePage != null)
         {
             livingArmourPages.add(bindingRecipePage);
         }
 
-        bindingRecipePage = BookUtils.getAlchemyPage(new ItemStack(ModItems.LIVING_ARMOUR_BOOTS));
+        bindingRecipePage = BookUtils.getAlchemyPage(new ItemStack(RegistrarBloodMagicItems.LIVING_ARMOUR_BOOTS));
         if (bindingRecipePage != null)
         {
             livingArmourPages.add(bindingRecipePage);
@@ -482,13 +482,13 @@ public class CategoryArchitect
 
         List<IPage> teleposerPages = new ArrayList<IPage>();
 
-        AltarRecipe teleposerFocusRecipe = RecipeHelper.getAltarRecipeForOutput(new ItemStack(ModItems.TELEPOSITION_FOCUS));
+        AltarRecipe teleposerFocusRecipe = RecipeHelper.getAltarRecipeForOutput(new ItemStack(RegistrarBloodMagicItems.TELEPOSITION_FOCUS));
         if (teleposerFocusRecipe != null)
         {
             teleposerPages.add(new PageAltarRecipe(teleposerFocusRecipe));
         }
 
-        IRecipe teleposerRecipe = RecipeHelper.getRecipeForOutput(new ItemStack(ModBlocks.TELEPOSER));
+        IRecipe teleposerRecipe = RecipeHelper.getRecipeForOutput(new ItemStack(RegistrarBloodMagicBlocks.TELEPOSER));
         if (teleposerRecipe != null)
         {
             teleposerPages.add(BookUtils.getPageForRecipe(teleposerRecipe));
@@ -499,7 +499,7 @@ public class CategoryArchitect
 
         List<IPage> boundBladePages = new ArrayList<IPage>();
 
-        PageAlchemyArray boundBladePage = BookUtils.getAlchemyPage(new ItemStack(ModItems.BOUND_SWORD));
+        PageAlchemyArray boundBladePage = BookUtils.getAlchemyPage(new ItemStack(RegistrarBloodMagicItems.BOUND_SWORD));
         if (boundBladePage != null)
         {
             boundBladePages.add(boundBladePage);
@@ -510,19 +510,19 @@ public class CategoryArchitect
 
         List<IPage> boundToolPages = new ArrayList<IPage>();
 
-        PageAlchemyArray boundToolPage = BookUtils.getAlchemyPage(new ItemStack(ModItems.BOUND_PICKAXE));
+        PageAlchemyArray boundToolPage = BookUtils.getAlchemyPage(new ItemStack(RegistrarBloodMagicItems.BOUND_PICKAXE));
         if (boundToolPage != null)
         {
             boundToolPages.add(boundToolPage);
         }
 
-        boundToolPage = BookUtils.getAlchemyPage(new ItemStack(ModItems.BOUND_AXE));
+        boundToolPage = BookUtils.getAlchemyPage(new ItemStack(RegistrarBloodMagicItems.BOUND_AXE));
         if (boundToolPage != null)
         {
             boundToolPages.add(boundToolPage);
         }
 
-        boundToolPage = BookUtils.getAlchemyPage(new ItemStack(ModItems.BOUND_SHOVEL));
+        boundToolPage = BookUtils.getAlchemyPage(new ItemStack(RegistrarBloodMagicItems.BOUND_SHOVEL));
         if (boundToolPage != null)
         {
             boundToolPages.add(boundToolPage);
@@ -538,7 +538,7 @@ public class CategoryArchitect
 
         List<IPage> masterOrbPages = new ArrayList<IPage>();
 
-        AltarRecipe masterOrbRecipe = RecipeHelper.getAltarRecipeForOutput(OrbRegistry.getOrbStack(ModItems.ORB_MASTER));
+        AltarRecipe masterOrbRecipe = RecipeHelper.getAltarRecipeForOutput(OrbRegistry.getOrbStack(RegistrarBloodMagicItems.ORB_MASTER));
         if (magicianOrbRecipe != null)
         {
             masterOrbPages.add(new PageAltarRecipe(masterOrbRecipe));
@@ -549,7 +549,7 @@ public class CategoryArchitect
 
         List<IPage> orbRunePages = new ArrayList<IPage>();
 
-        IRecipe orbRuneRecipe = RecipeHelper.getRecipeForOutput(new ItemStack(ModBlocks.BLOOD_RUNE, 1, 8));
+        IRecipe orbRuneRecipe = RecipeHelper.getRecipeForOutput(new ItemStack(RegistrarBloodMagicBlocks.BLOOD_RUNE, 1, 8));
         if (orbRuneRecipe != null)
         {
             orbRunePages.add(BookUtils.getPageForRecipe(orbRuneRecipe));
@@ -560,7 +560,7 @@ public class CategoryArchitect
 
         List<IPage> augmentedCapacityPages = new ArrayList<IPage>();
 
-        IRecipe augmentedCapacityRecipe = RecipeHelper.getRecipeForOutput(new ItemStack(ModBlocks.BLOOD_RUNE, 1, 7));
+        IRecipe augmentedCapacityRecipe = RecipeHelper.getRecipeForOutput(new ItemStack(RegistrarBloodMagicBlocks.BLOOD_RUNE, 1, 7));
         if (orbRuneRecipe != null)
         {
             augmentedCapacityPages.add(BookUtils.getPageForRecipe(augmentedCapacityRecipe));
@@ -571,7 +571,7 @@ public class CategoryArchitect
 
         List<IPage> chargingPages = new ArrayList<IPage>();
 
-        IRecipe chargingRecipe = RecipeHelper.getRecipeForOutput(new ItemStack(ModBlocks.BLOOD_RUNE, 1, 10));
+        IRecipe chargingRecipe = RecipeHelper.getRecipeForOutput(new ItemStack(RegistrarBloodMagicBlocks.BLOOD_RUNE, 1, 10));
         if (orbRuneRecipe != null)
         {
             chargingPages.add(BookUtils.getPageForRecipe(chargingRecipe));
@@ -582,7 +582,7 @@ public class CategoryArchitect
 
         List<IPage> accelerationPages = new ArrayList<IPage>();
 
-        IRecipe accelerationRecipe = RecipeHelper.getRecipeForOutput(new ItemStack(ModBlocks.BLOOD_RUNE, 1, 9));
+        IRecipe accelerationRecipe = RecipeHelper.getRecipeForOutput(new ItemStack(RegistrarBloodMagicBlocks.BLOOD_RUNE, 1, 9));
         if (orbRuneRecipe != null)
         {
             accelerationPages.add(BookUtils.getPageForRecipe(accelerationRecipe));
@@ -599,7 +599,7 @@ public class CategoryArchitect
             suppressionPages.add(new PageTartaricForgeRecipe(suppressionRecipe));
         }
 
-        PageAlchemyArray suppressionRecipePage = BookUtils.getAlchemyPage(new ItemStack(ModItems.SIGIL_SUPPRESSION));
+        PageAlchemyArray suppressionRecipePage = BookUtils.getAlchemyPage(new ItemStack(RegistrarBloodMagicItems.SIGIL_SUPPRESSION));
         if (suppressionRecipePage != null)
         {
             suppressionPages.add(suppressionRecipePage);
@@ -616,7 +616,7 @@ public class CategoryArchitect
             hastePages.add(new PageTartaricForgeRecipe(hasteRecipe));
         }
 
-        PageAlchemyArray hasteRecipePage = BookUtils.getAlchemyPage(new ItemStack(ModItems.SIGIL_HASTE));
+        PageAlchemyArray hasteRecipePage = BookUtils.getAlchemyPage(new ItemStack(RegistrarBloodMagicItems.SIGIL_HASTE));
         if (hasteRecipePage != null)
         {
             hastePages.add(hasteRecipePage);
@@ -633,7 +633,7 @@ public class CategoryArchitect
             severancePages.add(new PageTartaricForgeRecipe(severanceRecipe));
         }
 
-        PageAlchemyArray severanceRecipePage = BookUtils.getAlchemyPage(new ItemStack(ModItems.SIGIL_ENDER_SEVERANCE));
+        PageAlchemyArray severanceRecipePage = BookUtils.getAlchemyPage(new ItemStack(RegistrarBloodMagicItems.SIGIL_ENDER_SEVERANCE));
         if (severanceRecipePage != null)
         {
             severancePages.add(severanceRecipePage);
@@ -650,7 +650,7 @@ public class CategoryArchitect
             telepositionPages.add(new PageTartaricForgeRecipe(telepositionRecipe));
         }
 
-        PageAlchemyArray telepositionRecipePage = BookUtils.getAlchemyPage(new ItemStack(ModItems.SIGIL_TELEPOSITION));
+        PageAlchemyArray telepositionRecipePage = BookUtils.getAlchemyPage(new ItemStack(RegistrarBloodMagicItems.SIGIL_TELEPOSITION));
         if (telepositionRecipePage != null)
         {
             telepositionPages.add(telepositionRecipePage);
@@ -667,7 +667,7 @@ public class CategoryArchitect
             compressionPages.add(new PageTartaricForgeRecipe(compressionRecipe));
         }
 
-        PageAlchemyArray compressionRecipePage = BookUtils.getAlchemyPage(new ItemStack(ModItems.SIGIL_COMPRESSION));
+        PageAlchemyArray compressionRecipePage = BookUtils.getAlchemyPage(new ItemStack(RegistrarBloodMagicItems.SIGIL_COMPRESSION));
         if (compressionRecipePage != null)
         {
             compressionPages.add(compressionRecipePage);
@@ -684,7 +684,7 @@ public class CategoryArchitect
             bridgePages.add(new PageTartaricForgeRecipe(bridgeRecipe));
         }
 
-        PageAlchemyArray bridgeRecipePage = BookUtils.getAlchemyPage(new ItemStack(ModItems.SIGIL_PHANTOM_BRIDGE));
+        PageAlchemyArray bridgeRecipePage = BookUtils.getAlchemyPage(new ItemStack(RegistrarBloodMagicItems.SIGIL_PHANTOM_BRIDGE));
         if (bridgeRecipePage != null)
         {
             bridgePages.add(bridgeRecipePage);
@@ -695,7 +695,7 @@ public class CategoryArchitect
 
         List<IPage> mimicPages = new ArrayList<IPage>();
 
-        IRecipe mimicRecipe = RecipeHelper.getRecipeForOutput(new ItemStack(ModBlocks.MIMIC, 1, 1));
+        IRecipe mimicRecipe = RecipeHelper.getRecipeForOutput(new ItemStack(RegistrarBloodMagicBlocks.MIMIC, 1, 1));
         if (mimicRecipe != null)
         {
             mimicPages.add(BookUtils.getPageForRecipe(mimicRecipe));
diff --git a/src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategoryDemon.java b/src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategoryDemon.java
index 37d5f3d6..932a25ca 100644
--- a/src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategoryDemon.java
+++ b/src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategoryDemon.java
@@ -6,16 +6,16 @@ import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 
+import WayofTime.bloodmagic.BloodMagic;
 import net.minecraft.item.ItemStack;
 import net.minecraft.item.crafting.IRecipe;
 import net.minecraft.util.ResourceLocation;
-import WayofTime.bloodmagic.api.Constants;
 import WayofTime.bloodmagic.api.recipe.TartaricForgeRecipe;
 import WayofTime.bloodmagic.compat.guideapi.BookUtils;
 import WayofTime.bloodmagic.compat.guideapi.entry.EntryText;
 import WayofTime.bloodmagic.compat.guideapi.page.PageTartaricForgeRecipe;
-import WayofTime.bloodmagic.registry.ModBlocks;
-import WayofTime.bloodmagic.registry.ModItems;
+import WayofTime.bloodmagic.registry.RegistrarBloodMagicBlocks;
+import WayofTime.bloodmagic.registry.RegistrarBloodMagicItems;
 import WayofTime.bloodmagic.util.helper.RecipeHelper;
 import WayofTime.bloodmagic.util.helper.TextHelper;
 import amerifrance.guideapi.api.IPage;
@@ -29,7 +29,7 @@ public class CategoryDemon
     public static Map<ResourceLocation, EntryAbstract> buildCategory()
     {
         Map<ResourceLocation, EntryAbstract> entries = new LinkedHashMap<ResourceLocation, EntryAbstract>();
-        String keyBase = "guide." + Constants.Mod.MODID + ".entry.demon.";
+        String keyBase = "guide." + BloodMagic.MODID + ".entry.demon.";
 
         List<IPage> introPages = new ArrayList<IPage>();
         introPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "intro" + ".info"), 370));
@@ -39,7 +39,7 @@ public class CategoryDemon
         List<IPage> snarePages = new ArrayList<IPage>();
         snarePages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "snare" + ".info.1"), 370));
 
-        IRecipe snareRecipe = RecipeHelper.getRecipeForOutput(new ItemStack(ModItems.SOUL_SNARE));
+        IRecipe snareRecipe = RecipeHelper.getRecipeForOutput(new ItemStack(RegistrarBloodMagicItems.SOUL_SNARE));
         if (snareRecipe != null)
         {
             snarePages.add(BookUtils.getPageForRecipe(snareRecipe));
@@ -51,7 +51,7 @@ public class CategoryDemon
         List<IPage> forgePages = new ArrayList<IPage>();
         forgePages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "forge" + ".info.1"), 370));
 
-        IRecipe forgeRecipe = RecipeHelper.getRecipeForOutput(new ItemStack(ModBlocks.SOUL_FORGE));
+        IRecipe forgeRecipe = RecipeHelper.getRecipeForOutput(new ItemStack(RegistrarBloodMagicBlocks.SOUL_FORGE));
         if (forgeRecipe != null)
         {
             forgePages.add(BookUtils.getPageForRecipe(forgeRecipe));
@@ -62,7 +62,7 @@ public class CategoryDemon
 
         List<IPage> pettyPages = new ArrayList<IPage>();
         pettyPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "petty" + ".info.1"), 370));
-        TartaricForgeRecipe pettyRecipe = RecipeHelper.getForgeRecipeForOutput(new ItemStack(ModItems.SOUL_GEM));
+        TartaricForgeRecipe pettyRecipe = RecipeHelper.getForgeRecipeForOutput(new ItemStack(RegistrarBloodMagicItems.SOUL_GEM));
         if (pettyRecipe != null)
         {
             pettyPages.add(new PageTartaricForgeRecipe(pettyRecipe));
@@ -72,7 +72,7 @@ public class CategoryDemon
 
         List<IPage> swordPages = new ArrayList<IPage>();
         swordPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "sword" + ".info.1"), 370));
-        TartaricForgeRecipe swordRecipe = RecipeHelper.getForgeRecipeForOutput(new ItemStack(ModItems.SENTIENT_SWORD));
+        TartaricForgeRecipe swordRecipe = RecipeHelper.getForgeRecipeForOutput(new ItemStack(RegistrarBloodMagicItems.SENTIENT_SWORD));
         if (swordRecipe != null)
         {
             swordPages.add(new PageTartaricForgeRecipe(swordRecipe));
@@ -82,7 +82,7 @@ public class CategoryDemon
 
         List<IPage> lesserPages = new ArrayList<IPage>();
         lesserPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "lesser" + ".info.1"), 370));
-        TartaricForgeRecipe lesserRecipe = RecipeHelper.getForgeRecipeForOutput(new ItemStack(ModItems.SOUL_GEM, 1, 1));
+        TartaricForgeRecipe lesserRecipe = RecipeHelper.getForgeRecipeForOutput(new ItemStack(RegistrarBloodMagicItems.SOUL_GEM, 1, 1));
         if (lesserRecipe != null)
         {
             lesserPages.add(new PageTartaricForgeRecipe(lesserRecipe));
@@ -100,28 +100,28 @@ public class CategoryDemon
         entries.put(new ResourceLocation(keyBase + "sentientGem"), new EntryText(sentientGemPages, TextHelper.localize(keyBase + "sentientGem"), true));
 
         List<IPage> routingPages = new ArrayList<IPage>();
-        TartaricForgeRecipe nodeRecipe = RecipeHelper.getForgeRecipeForOutput(new ItemStack(ModBlocks.ITEM_ROUTING_NODE));
+        TartaricForgeRecipe nodeRecipe = RecipeHelper.getForgeRecipeForOutput(new ItemStack(RegistrarBloodMagicBlocks.ITEM_ROUTING_NODE));
         if (nodeRecipe != null)
         {
             routingPages.add(new PageTartaricForgeRecipe(nodeRecipe));
         }
-        TartaricForgeRecipe inputNodeRecipe = RecipeHelper.getForgeRecipeForOutput(new ItemStack(ModBlocks.INPUT_ROUTING_NODE));
+        TartaricForgeRecipe inputNodeRecipe = RecipeHelper.getForgeRecipeForOutput(new ItemStack(RegistrarBloodMagicBlocks.INPUT_ROUTING_NODE));
         if (inputNodeRecipe != null)
         {
             routingPages.add(new PageTartaricForgeRecipe(inputNodeRecipe));
         }
-        TartaricForgeRecipe outputNodeRecipe = RecipeHelper.getForgeRecipeForOutput(new ItemStack(ModBlocks.OUTPUT_ROUTING_NODE));
+        TartaricForgeRecipe outputNodeRecipe = RecipeHelper.getForgeRecipeForOutput(new ItemStack(RegistrarBloodMagicBlocks.OUTPUT_ROUTING_NODE));
         if (outputNodeRecipe != null)
         {
             routingPages.add(new PageTartaricForgeRecipe(outputNodeRecipe));
         }
-        TartaricForgeRecipe masterNodeRecipe = RecipeHelper.getForgeRecipeForOutput(new ItemStack(ModBlocks.MASTER_ROUTING_NODE));
+        TartaricForgeRecipe masterNodeRecipe = RecipeHelper.getForgeRecipeForOutput(new ItemStack(RegistrarBloodMagicBlocks.MASTER_ROUTING_NODE));
         if (masterNodeRecipe != null)
         {
             routingPages.add(new PageTartaricForgeRecipe(masterNodeRecipe));
         }
 
-        TartaricForgeRecipe nodeRouterRecipe = RecipeHelper.getForgeRecipeForOutput(new ItemStack(ModItems.NODE_ROUTER));
+        TartaricForgeRecipe nodeRouterRecipe = RecipeHelper.getForgeRecipeForOutput(new ItemStack(RegistrarBloodMagicItems.NODE_ROUTER));
         if (nodeRouterRecipe != null)
         {
             routingPages.add(new PageTartaricForgeRecipe(nodeRouterRecipe));
@@ -142,7 +142,7 @@ public class CategoryDemon
 
         List<IPage> cruciblePages = new ArrayList<IPage>();
 
-        TartaricForgeRecipe crucibleRecipe = RecipeHelper.getForgeRecipeForOutput(new ItemStack(ModBlocks.DEMON_CRUCIBLE));
+        TartaricForgeRecipe crucibleRecipe = RecipeHelper.getForgeRecipeForOutput(new ItemStack(RegistrarBloodMagicBlocks.DEMON_CRUCIBLE));
         if (crucibleRecipe != null)
         {
             cruciblePages.add(new PageTartaricForgeRecipe(crucibleRecipe));
@@ -153,7 +153,7 @@ public class CategoryDemon
 
         List<IPage> crystallizerPages = new ArrayList<IPage>();
 
-        TartaricForgeRecipe crystallizerRecipe = RecipeHelper.getForgeRecipeForOutput(new ItemStack(ModBlocks.DEMON_CRYSTALLIZER));
+        TartaricForgeRecipe crystallizerRecipe = RecipeHelper.getForgeRecipeForOutput(new ItemStack(RegistrarBloodMagicBlocks.DEMON_CRYSTALLIZER));
         if (crystallizerRecipe != null)
         {
             crystallizerPages.add(new PageTartaricForgeRecipe(crystallizerRecipe));
@@ -164,7 +164,7 @@ public class CategoryDemon
 
         List<IPage> clusterPages = new ArrayList<IPage>();
 
-        TartaricForgeRecipe clusterRecipe = RecipeHelper.getForgeRecipeForOutput(new ItemStack(ModBlocks.DEMON_CRYSTAL));
+        TartaricForgeRecipe clusterRecipe = RecipeHelper.getForgeRecipeForOutput(new ItemStack(RegistrarBloodMagicBlocks.DEMON_CRYSTAL));
         if (clusterRecipe != null)
         {
             clusterPages.add(new PageTartaricForgeRecipe(clusterRecipe));
@@ -175,7 +175,7 @@ public class CategoryDemon
 
         List<IPage> pylonPages = new ArrayList<IPage>();
 
-        TartaricForgeRecipe pylonRecipe = RecipeHelper.getForgeRecipeForOutput(new ItemStack(ModBlocks.DEMON_PYLON));
+        TartaricForgeRecipe pylonRecipe = RecipeHelper.getForgeRecipeForOutput(new ItemStack(RegistrarBloodMagicBlocks.DEMON_PYLON));
         if (pylonRecipe != null)
         {
             pylonPages.add(new PageTartaricForgeRecipe(pylonRecipe));
@@ -186,7 +186,7 @@ public class CategoryDemon
 
         List<IPage> gaugePages = new ArrayList<IPage>();
 
-        TartaricForgeRecipe gaugeRecipe = RecipeHelper.getForgeRecipeForOutput(new ItemStack(ModItems.DEMON_WILL_GAUGE));
+        TartaricForgeRecipe gaugeRecipe = RecipeHelper.getForgeRecipeForOutput(new ItemStack(RegistrarBloodMagicItems.DEMON_WILL_GAUGE));
         if (gaugeRecipe != null)
         {
             gaugePages.add(new PageTartaricForgeRecipe(gaugeRecipe));
diff --git a/src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategoryRitual.java b/src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategoryRitual.java
index 344069b3..b80a4530 100644
--- a/src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategoryRitual.java
+++ b/src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategoryRitual.java
@@ -6,17 +6,17 @@ import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 
+import WayofTime.bloodmagic.BloodMagic;
 import net.minecraft.item.ItemStack;
 import net.minecraft.item.crafting.IRecipe;
 import net.minecraft.util.ResourceLocation;
-import WayofTime.bloodmagic.api.Constants;
 import WayofTime.bloodmagic.api.registry.AltarRecipeRegistry.AltarRecipe;
 import WayofTime.bloodmagic.api.ritual.EnumRuneType;
 import WayofTime.bloodmagic.compat.guideapi.BookUtils;
 import WayofTime.bloodmagic.compat.guideapi.entry.EntryText;
 import WayofTime.bloodmagic.compat.guideapi.page.PageAltarRecipe;
-import WayofTime.bloodmagic.registry.ModBlocks;
-import WayofTime.bloodmagic.registry.ModItems;
+import WayofTime.bloodmagic.registry.RegistrarBloodMagicBlocks;
+import WayofTime.bloodmagic.registry.RegistrarBloodMagicItems;
 import WayofTime.bloodmagic.util.helper.RecipeHelper;
 import WayofTime.bloodmagic.util.helper.TextHelper;
 import amerifrance.guideapi.api.IPage;
@@ -26,7 +26,7 @@ import amerifrance.guideapi.page.PageText;
 
 public class CategoryRitual
 {
-    static String keyBase = "guide." + Constants.Mod.MODID + ".entry.ritual.";
+    static String keyBase = "guide." + BloodMagic.MODID + ".entry.ritual.";
 
     public static Map<ResourceLocation, EntryAbstract> buildCategory()
     {
@@ -37,7 +37,7 @@ public class CategoryRitual
 
         List<IPage> ritualStonePages = new ArrayList<IPage>();
 
-        IRecipe ritualStoneRecipe = RecipeHelper.getRecipeForOutput(new ItemStack(ModBlocks.RITUAL_STONE));
+        IRecipe ritualStoneRecipe = RecipeHelper.getRecipeForOutput(new ItemStack(RegistrarBloodMagicBlocks.RITUAL_STONE));
         if (ritualStoneRecipe != null)
         {
             ritualStonePages.add(BookUtils.getPageForRecipe(ritualStoneRecipe));
@@ -60,7 +60,7 @@ public class CategoryRitual
 
         List<IPage> masterRitualStonePages = new ArrayList<IPage>();
 
-        IRecipe masterRitualStoneRecipe = RecipeHelper.getRecipeForOutput(new ItemStack(ModBlocks.RITUAL_CONTROLLER, 1, 0));
+        IRecipe masterRitualStoneRecipe = RecipeHelper.getRecipeForOutput(new ItemStack(RegistrarBloodMagicBlocks.RITUAL_CONTROLLER, 1, 0));
         if (masterRitualStoneRecipe != null)
         {
             masterRitualStonePages.add(BookUtils.getPageForRecipe(masterRitualStoneRecipe));
@@ -73,7 +73,7 @@ public class CategoryRitual
 
         activationCrystalPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "activationCrystal" + ".info.1"), 370));
 
-        AltarRecipe crystalRecipe = RecipeHelper.getAltarRecipeForOutput(new ItemStack(ModItems.ACTIVATION_CRYSTAL));
+        AltarRecipe crystalRecipe = RecipeHelper.getAltarRecipeForOutput(new ItemStack(RegistrarBloodMagicItems.ACTIVATION_CRYSTAL));
         if (crystalRecipe != null)
         {
             activationCrystalPages.add(new PageAltarRecipe(crystalRecipe));
@@ -86,7 +86,7 @@ public class CategoryRitual
 
         divinerPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "diviner" + ".info.1"), 370));
 
-        IRecipe divinerRecipe = RecipeHelper.getRecipeForOutput(new ItemStack(ModItems.RITUAL_DIVINER));
+        IRecipe divinerRecipe = RecipeHelper.getRecipeForOutput(new ItemStack(RegistrarBloodMagicItems.RITUAL_DIVINER));
         if (divinerRecipe != null)
         {
             divinerPages.add(BookUtils.getPageForRecipe(divinerRecipe));
diff --git a/src/main/java/WayofTime/bloodmagic/compat/guideapi/page/PageAlchemyArray.java b/src/main/java/WayofTime/bloodmagic/compat/guideapi/page/PageAlchemyArray.java
index 5c8065b6..3c5479de 100644
--- a/src/main/java/WayofTime/bloodmagic/compat/guideapi/page/PageAlchemyArray.java
+++ b/src/main/java/WayofTime/bloodmagic/compat/guideapi/page/PageAlchemyArray.java
@@ -5,7 +5,6 @@ import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 
-import lombok.AllArgsConstructor;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.FontRenderer;
 import net.minecraft.client.renderer.GlStateManager;
@@ -21,7 +20,6 @@ import amerifrance.guideapi.api.impl.abstraction.EntryAbstract;
 import amerifrance.guideapi.api.util.GuiHelper;
 import amerifrance.guideapi.gui.GuiBase;
 
-@AllArgsConstructor
 public class PageAlchemyArray extends Page
 {
     public static final double scale = 58d / 256d;
@@ -31,6 +29,13 @@ public class PageAlchemyArray extends Page
 
     public final ItemStack outputStack;
 
+    public PageAlchemyArray(List<ResourceLocation> arrayResources, ItemStack inputStack, ItemStack catalystStack, ItemStack outputStack) {
+        this.arrayResources = arrayResources;
+        this.inputStack = inputStack;
+        this.catalystStack = catalystStack;
+        this.outputStack = outputStack;
+    }
+
     public PageAlchemyArray(List<ResourceLocation> resources, ItemStack inputStack, ItemStack catalystStack)
     {
         this(resources, inputStack, catalystStack, ItemStack.EMPTY);
diff --git a/src/main/java/WayofTime/bloodmagic/compat/jei/BloodMagicPlugin.java b/src/main/java/WayofTime/bloodmagic/compat/jei/BloodMagicPlugin.java
index 247c91d3..36488e9f 100644
--- a/src/main/java/WayofTime/bloodmagic/compat/jei/BloodMagicPlugin.java
+++ b/src/main/java/WayofTime/bloodmagic/compat/jei/BloodMagicPlugin.java
@@ -31,8 +31,8 @@ import WayofTime.bloodmagic.compat.jei.forge.TartaricForgeRecipeHandler;
 import WayofTime.bloodmagic.compat.jei.forge.TartaricForgeRecipeMaker;
 import WayofTime.bloodmagic.compat.jei.orb.ShapedOrbRecipeHandler;
 import WayofTime.bloodmagic.compat.jei.orb.ShapelessOrbRecipeHandler;
-import WayofTime.bloodmagic.registry.ModBlocks;
-import WayofTime.bloodmagic.registry.ModItems;
+import WayofTime.bloodmagic.registry.RegistrarBloodMagicBlocks;
+import WayofTime.bloodmagic.registry.RegistrarBloodMagicItems;
 
 @JEIPlugin
 public class BloodMagicPlugin extends BlankModPlugin
@@ -55,14 +55,14 @@ public class BloodMagicPlugin extends BlankModPlugin
         registry.addRecipes(AlchemyTableRecipeMaker.getRecipes());
         registry.addRecipes(ArmourDowngradeRecipeMaker.getRecipes());
 
-        registry.addDescription(new ItemStack(ModItems.ALTAR_MAKER), "jei.bloodmagic.desc.altarBuilder");
-        registry.addDescription(new ItemStack(ModItems.MONSTER_SOUL), "jei.bloodmagic.desc.demonicWill");
+        registry.addDescription(new ItemStack(RegistrarBloodMagicItems.ALTAR_MAKER), "jei.bloodmagic.desc.altarBuilder");
+        registry.addDescription(new ItemStack(RegistrarBloodMagicItems.MONSTER_SOUL), "jei.bloodmagic.desc.demonicWill");
 
-        jeiHelper.getItemBlacklist().addItemToBlacklist(new ItemStack(ModBlocks.BLOOD_LIGHT));
-        jeiHelper.getItemBlacklist().addItemToBlacklist(new ItemStack(ModBlocks.SPECTRAL_BLOCK));
-        jeiHelper.getItemBlacklist().addItemToBlacklist(new ItemStack(ModBlocks.PHANTOM_BLOCK));
-        jeiHelper.getItemBlacklist().addItemToBlacklist(new ItemStack(ModBlocks.ALCHEMY_ARRAY));
-        jeiHelper.getItemBlacklist().addItemToBlacklist(new ItemStack(ModBlocks.DIMENSIONAL_PORTAL, 1, OreDictionary.WILDCARD_VALUE));
+        jeiHelper.getItemBlacklist().addItemToBlacklist(new ItemStack(RegistrarBloodMagicBlocks.BLOOD_LIGHT));
+        jeiHelper.getItemBlacklist().addItemToBlacklist(new ItemStack(RegistrarBloodMagicBlocks.SPECTRAL));
+        jeiHelper.getItemBlacklist().addItemToBlacklist(new ItemStack(RegistrarBloodMagicBlocks.PHANTOM));
+        jeiHelper.getItemBlacklist().addItemToBlacklist(new ItemStack(RegistrarBloodMagicBlocks.ALCHEMY_ARRAY));
+        jeiHelper.getItemBlacklist().addItemToBlacklist(new ItemStack(RegistrarBloodMagicBlocks.DIMENSIONAL_PORTAL, 1, OreDictionary.WILDCARD_VALUE));
 
         for (Map.Entry<String, Integer> entry : LivingArmourHandler.upgradeMaxLevelMap.entrySet())
         {
@@ -70,7 +70,7 @@ public class BloodMagicPlugin extends BlankModPlugin
             int maxLevel = entry.getValue();
             for (int i = 0; i < maxLevel - 1; i++)
             {
-                ItemStack stack = new ItemStack(ModItems.UPGRADE_TOME);
+                ItemStack stack = new ItemStack(RegistrarBloodMagicItems.UPGRADE_TOME);
                 LivingUpgrades.setKey(stack, key);
                 LivingUpgrades.setLevel(stack, i);
                 jeiHelper.getItemBlacklist().addItemToBlacklist(stack);
@@ -79,16 +79,16 @@ public class BloodMagicPlugin extends BlankModPlugin
 
         registry.addRecipeClickArea(GuiSoulForge.class, 115, 15, 16, 88, Constants.Compat.JEI_CATEGORY_SOULFORGE);
 
-        registry.addRecipeCategoryCraftingItem(new ItemStack(ModBlocks.ALTAR), Constants.Compat.JEI_CATEGORY_ALTAR);
-        registry.addRecipeCategoryCraftingItem(new ItemStack(ModBlocks.SOUL_FORGE), Constants.Compat.JEI_CATEGORY_SOULFORGE);
-        registry.addRecipeCategoryCraftingItem(new ItemStack(ModItems.ARCANE_ASHES), Constants.Compat.JEI_CATEGORY_ALCHEMYARRAY);
-        registry.addRecipeCategoryCraftingItem(new ItemStack(ModItems.ARCANE_ASHES), Constants.Compat.JEI_CATEGORY_BINDING);
-        registry.addRecipeCategoryCraftingItem(new ItemStack(ModBlocks.ALCHEMY_TABLE), Constants.Compat.JEI_CATEGORY_ALCHEMYTABLE);
-        registry.addRecipeCategoryCraftingItem(new ItemStack(ModBlocks.RITUAL_CONTROLLER), Constants.Compat.JEI_CATEGORY_ARMOURDOWNGRADE);
+        registry.addRecipeCategoryCraftingItem(new ItemStack(RegistrarBloodMagicBlocks.ALTAR), Constants.Compat.JEI_CATEGORY_ALTAR);
+        registry.addRecipeCategoryCraftingItem(new ItemStack(RegistrarBloodMagicBlocks.SOUL_FORGE), Constants.Compat.JEI_CATEGORY_SOULFORGE);
+        registry.addRecipeCategoryCraftingItem(new ItemStack(RegistrarBloodMagicItems.ARCANE_ASHES), Constants.Compat.JEI_CATEGORY_ALCHEMYARRAY);
+        registry.addRecipeCategoryCraftingItem(new ItemStack(RegistrarBloodMagicItems.ARCANE_ASHES), Constants.Compat.JEI_CATEGORY_BINDING);
+        registry.addRecipeCategoryCraftingItem(new ItemStack(RegistrarBloodMagicBlocks.ALCHEMY_TABLE), Constants.Compat.JEI_CATEGORY_ALCHEMYTABLE);
+        registry.addRecipeCategoryCraftingItem(new ItemStack(RegistrarBloodMagicBlocks.RITUAL_CONTROLLER), Constants.Compat.JEI_CATEGORY_ARMOURDOWNGRADE);
     }
 
     @Override
     public void registerItemSubtypes(ISubtypeRegistry subtypeRegistry) {
-        subtypeRegistry.useNbtForSubtypes(ModItems.UPGRADE_TOME);
+        subtypeRegistry.useNbtForSubtypes(RegistrarBloodMagicItems.UPGRADE_TOME);
     }
 }
diff --git a/src/main/java/WayofTime/bloodmagic/compat/jei/armourDowngrade/ArmourDowngradeRecipeJEI.java b/src/main/java/WayofTime/bloodmagic/compat/jei/armourDowngrade/ArmourDowngradeRecipeJEI.java
index e412380a..dc52ada3 100644
--- a/src/main/java/WayofTime/bloodmagic/compat/jei/armourDowngrade/ArmourDowngradeRecipeJEI.java
+++ b/src/main/java/WayofTime/bloodmagic/compat/jei/armourDowngrade/ArmourDowngradeRecipeJEI.java
@@ -8,7 +8,7 @@ import mezz.jei.api.recipe.BlankRecipeWrapper;
 import net.minecraft.item.ItemStack;
 import WayofTime.bloodmagic.api.recipe.LivingArmourDowngradeRecipe;
 import WayofTime.bloodmagic.api.util.helper.ItemHelper.LivingUpgrades;
-import WayofTime.bloodmagic.registry.ModItems;
+import WayofTime.bloodmagic.registry.RegistrarBloodMagicItems;
 
 import java.util.List;
 
@@ -27,7 +27,7 @@ public class ArmourDowngradeRecipeJEI extends BlankRecipeWrapper
         List<List<ItemStack>> expanded = BloodMagicPlugin.jeiHelper.getStackHelper().expandRecipeItemStackInputs(recipe.getInput());
         expanded.add(Lists.newArrayList(recipe.getKey()));
         ingredients.setInputLists(ItemStack.class, expanded);
-        ItemStack upgradeStack = new ItemStack(ModItems.UPGRADE_TOME);
+        ItemStack upgradeStack = new ItemStack(RegistrarBloodMagicItems.UPGRADE_TOME);
         LivingUpgrades.setUpgrade(upgradeStack, recipe.getRecipeOutput());
         ingredients.setOutput(ItemStack.class, upgradeStack);
     }
diff --git a/src/main/java/WayofTime/bloodmagic/compat/jei/forge/TartaricForgeRecipeJEI.java b/src/main/java/WayofTime/bloodmagic/compat/jei/forge/TartaricForgeRecipeJEI.java
index 82133b75..054bf9ab 100644
--- a/src/main/java/WayofTime/bloodmagic/compat/jei/forge/TartaricForgeRecipeJEI.java
+++ b/src/main/java/WayofTime/bloodmagic/compat/jei/forge/TartaricForgeRecipeJEI.java
@@ -1,21 +1,17 @@
 package WayofTime.bloodmagic.compat.jei.forge;
 
 import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
 import java.util.List;
 
-import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
 import WayofTime.bloodmagic.compat.jei.BloodMagicPlugin;
-import com.google.common.collect.Lists;
 import lombok.Getter;
 import mezz.jei.api.ingredients.IIngredients;
 import mezz.jei.api.recipe.BlankRecipeWrapper;
 import net.minecraft.item.ItemStack;
 import WayofTime.bloodmagic.api.recipe.TartaricForgeRecipe;
-import WayofTime.bloodmagic.registry.ModItems;
+import WayofTime.bloodmagic.registry.RegistrarBloodMagicItems;
 import WayofTime.bloodmagic.util.helper.TextHelper;
 
 public class TartaricForgeRecipeJEI extends BlankRecipeWrapper
@@ -58,12 +54,12 @@ public class TartaricForgeRecipeJEI extends BlankRecipeWrapper
 
     public enum DefaultWill
     {
-        SOUL(new ItemStack(ModItems.MONSTER_SOUL, 1, 0), 64),
-        PETTY(new ItemStack(ModItems.SOUL_GEM, 1, 0), 64),
-        LESSER(new ItemStack(ModItems.SOUL_GEM, 1, 1), 256),
-        COMMON(new ItemStack(ModItems.SOUL_GEM, 1, 2), 1024),
-        GREATER(new ItemStack(ModItems.SOUL_GEM, 1, 3), 4096),
-        GRAND(new ItemStack(ModItems.SOUL_GEM, 1, 4), 16384);
+        SOUL(new ItemStack(RegistrarBloodMagicItems.MONSTER_SOUL, 1, 0), 64),
+        PETTY(new ItemStack(RegistrarBloodMagicItems.SOUL_GEM, 1, 0), 64),
+        LESSER(new ItemStack(RegistrarBloodMagicItems.SOUL_GEM, 1, 1), 256),
+        COMMON(new ItemStack(RegistrarBloodMagicItems.SOUL_GEM, 1, 2), 1024),
+        GREATER(new ItemStack(RegistrarBloodMagicItems.SOUL_GEM, 1, 3), 4096),
+        GRAND(new ItemStack(RegistrarBloodMagicItems.SOUL_GEM, 1, 4), 16384);
 
         public final ItemStack willStack;
         public final double minSouls;
diff --git a/src/main/java/WayofTime/bloodmagic/compat/waila/CompatibilityWaila.java b/src/main/java/WayofTime/bloodmagic/compat/waila/CompatibilityWaila.java
deleted file mode 100644
index 8ef1264e..00000000
--- a/src/main/java/WayofTime/bloodmagic/compat/waila/CompatibilityWaila.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package WayofTime.bloodmagic.compat.waila;
-
-import net.minecraftforge.fml.common.event.FMLInterModComms;
-import WayofTime.bloodmagic.compat.ICompatibility;
-
-public class CompatibilityWaila implements ICompatibility
-{
-    @Override
-    public void loadCompatibility(InitializationPhase phase)
-    {
-        if (phase == InitializationPhase.INIT)
-            FMLInterModComms.sendMessage(getModId(), "register", "WayofTime.bloodmagic.compat.waila.WailaCallbackHandler.callbackRegister");
-    }
-
-    @Override
-    public String getModId()
-    {
-        return "waila";
-    }
-
-    @Override
-    public boolean enableCompat()
-    {
-        return true;
-    }
-}
diff --git a/src/main/java/WayofTime/bloodmagic/compat/waila/WailaCallbackHandler.java b/src/main/java/WayofTime/bloodmagic/compat/waila/WailaPluginBloodMagic.java
similarity index 58%
rename from src/main/java/WayofTime/bloodmagic/compat/waila/WailaCallbackHandler.java
rename to src/main/java/WayofTime/bloodmagic/compat/waila/WailaPluginBloodMagic.java
index dd76cf93..07b7226a 100644
--- a/src/main/java/WayofTime/bloodmagic/compat/waila/WailaCallbackHandler.java
+++ b/src/main/java/WayofTime/bloodmagic/compat/waila/WailaPluginBloodMagic.java
@@ -1,14 +1,17 @@
 package WayofTime.bloodmagic.compat.waila;
 
+import WayofTime.bloodmagic.BloodMagic;
 import WayofTime.bloodmagic.block.*;
 import WayofTime.bloodmagic.compat.waila.provider.*;
+import mcp.mobius.waila.api.IWailaPlugin;
 import mcp.mobius.waila.api.IWailaRegistrar;
 import WayofTime.bloodmagic.api.Constants;
+import mcp.mobius.waila.api.WailaPlugin;
 
-public class WailaCallbackHandler
-{
-    public static void callbackRegister(IWailaRegistrar registrar)
-    {
+@WailaPlugin
+public class WailaPluginBloodMagic implements IWailaPlugin {
+    @Override
+    public void register(IWailaRegistrar registrar) {
         registrar.registerBodyProvider(new DataProviderBloodAltar(), BlockAltar.class);
         registrar.registerNBTProvider(new DataProviderBloodAltar(), BlockAltar.class);
         registrar.registerBodyProvider(new DataProviderTeleposer(), BlockTeleposer.class);
@@ -20,11 +23,11 @@ public class WailaCallbackHandler
         registrar.registerStackProvider(new DataProviderMimic(), BlockMimic.class);
         registrar.registerNBTProvider(new DataProviderMimic(), BlockMimic.class);
 
-        registrar.addConfig(Constants.Mod.MODID, Constants.Compat.WAILA_CONFIG_BYPASS_SNEAK, false);
-        registrar.addConfig(Constants.Mod.MODID, Constants.Compat.WAILA_CONFIG_ALTAR, true);
-        registrar.addConfig(Constants.Mod.MODID, Constants.Compat.WAILA_CONFIG_TELEPOSER, true);
-        registrar.addConfig(Constants.Mod.MODID, Constants.Compat.WAILA_CONFIG_RITUAL, true);
-        registrar.addConfig(Constants.Mod.MODID, Constants.Compat.WAILA_CONFIG_ARRAY, true);
-        registrar.addConfig(Constants.Mod.MODID, Constants.Compat.WAILA_CONFIG_BLOOD_TANK, true);
+        registrar.addConfig(BloodMagic.MODID, Constants.Compat.WAILA_CONFIG_BYPASS_SNEAK, false);
+        registrar.addConfig(BloodMagic.MODID, Constants.Compat.WAILA_CONFIG_ALTAR, true);
+        registrar.addConfig(BloodMagic.MODID, Constants.Compat.WAILA_CONFIG_TELEPOSER, true);
+        registrar.addConfig(BloodMagic.MODID, Constants.Compat.WAILA_CONFIG_RITUAL, true);
+        registrar.addConfig(BloodMagic.MODID, Constants.Compat.WAILA_CONFIG_ARRAY, true);
+        registrar.addConfig(BloodMagic.MODID, Constants.Compat.WAILA_CONFIG_BLOOD_TANK, true);
     }
 }
diff --git a/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderAlchemyArray.java b/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderAlchemyArray.java
index 2e81535f..0e42a93e 100644
--- a/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderAlchemyArray.java
+++ b/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderAlchemyArray.java
@@ -12,8 +12,8 @@ import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
 import WayofTime.bloodmagic.api.Constants;
-import WayofTime.bloodmagic.registry.ModBlocks;
-import WayofTime.bloodmagic.registry.ModItems;
+import WayofTime.bloodmagic.registry.RegistrarBloodMagicBlocks;
+import WayofTime.bloodmagic.registry.RegistrarBloodMagicItems;
 import WayofTime.bloodmagic.tile.TileAlchemyArray;
 import WayofTime.bloodmagic.util.helper.TextHelper;
 
@@ -22,7 +22,7 @@ public class DataProviderAlchemyArray implements IWailaDataProvider
     @Override
     public ItemStack getWailaStack(IWailaDataAccessor accessor, IWailaConfigHandler config)
     {
-        return new ItemStack(ModItems.ARCANE_ASHES).setStackDisplayName(TextHelper.getFormattedText(ModBlocks.ALCHEMY_ARRAY.getLocalizedName()));
+        return new ItemStack(RegistrarBloodMagicItems.ARCANE_ASHES).setStackDisplayName(TextHelper.getFormattedText(RegistrarBloodMagicBlocks.ALCHEMY_ARRAY.getLocalizedName()));
     }
 
     @Override
diff --git a/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderBloodAltar.java b/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderBloodAltar.java
index b6011653..dfc428ec 100644
--- a/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderBloodAltar.java
+++ b/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderBloodAltar.java
@@ -17,7 +17,7 @@ import WayofTime.bloodmagic.api.Constants;
 import WayofTime.bloodmagic.block.BlockAltar;
 import WayofTime.bloodmagic.item.sigil.ItemSigilDivination;
 import WayofTime.bloodmagic.item.sigil.ItemSigilSeer;
-import WayofTime.bloodmagic.registry.ModItems;
+import WayofTime.bloodmagic.registry.RegistrarBloodMagicItems;
 import WayofTime.bloodmagic.tile.TileAltar;
 import WayofTime.bloodmagic.util.helper.TextHelper;
 
@@ -64,8 +64,8 @@ public class DataProviderBloodAltar implements IWailaDataProvider
         }
         case 2:
         {
-            hasSeer = hasStack(new ItemStack(ModItems.SIGIL_SEER), accessor.getPlayer());
-            hasSigil = hasSeer || hasStack(new ItemStack(ModItems.SIGIL_DIVINATION), accessor.getPlayer());
+            hasSeer = hasStack(new ItemStack(RegistrarBloodMagicItems.SIGIL_SEER), accessor.getPlayer());
+            hasSigil = hasSeer || hasStack(new ItemStack(RegistrarBloodMagicItems.SIGIL_DIVINATION), accessor.getPlayer());
             break;
         }
         default:
diff --git a/src/main/java/WayofTime/bloodmagic/compress/StorageBlockCraftingManager.java b/src/main/java/WayofTime/bloodmagic/compress/StorageBlockCraftingManager.java
index 7a2844a2..61561423 100644
--- a/src/main/java/WayofTime/bloodmagic/compress/StorageBlockCraftingManager.java
+++ b/src/main/java/WayofTime/bloodmagic/compress/StorageBlockCraftingManager.java
@@ -27,7 +27,7 @@ public class StorageBlockCraftingManager
     {
         this.recipes = new StorageBlockCraftingRecipeAssimilator().getPackingRecipes();
 
-        BloodMagic.instance.getLogger().info("Total number of compression recipes: " + this.recipes.size());
+        BloodMagic.instance.logger.info("Total number of compression recipes: " + this.recipes.size());
     }
 
     private static boolean isResultStackReversible(ItemStack stack, int gridSize, World world, List list)
diff --git a/src/main/java/WayofTime/bloodmagic/compress/StorageBlockCraftingRecipeAssimilator.java b/src/main/java/WayofTime/bloodmagic/compress/StorageBlockCraftingRecipeAssimilator.java
index 20316b3d..7841cab2 100644
--- a/src/main/java/WayofTime/bloodmagic/compress/StorageBlockCraftingRecipeAssimilator.java
+++ b/src/main/java/WayofTime/bloodmagic/compress/StorageBlockCraftingRecipeAssimilator.java
@@ -5,11 +5,9 @@ import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.inventory.Container;
 import net.minecraft.inventory.InventoryCrafting;
 import net.minecraft.item.ItemStack;
-import net.minecraft.item.crafting.CraftingManager;
-import net.minecraft.item.crafting.IRecipe;
-import net.minecraft.item.crafting.ShapedRecipes;
-import net.minecraft.item.crafting.ShapelessRecipes;
+import net.minecraft.item.crafting.*;
 import net.minecraft.world.World;
+import net.minecraftforge.fml.common.registry.ForgeRegistries;
 import net.minecraftforge.oredict.OreDictionary;
 import net.minecraftforge.oredict.ShapedOreRecipe;
 import net.minecraftforge.oredict.ShapelessOreRecipe;
@@ -44,7 +42,7 @@ public class StorageBlockCraftingRecipeAssimilator
                 {
                     packingRecipes.add(packingRecipe);
                 }
-            } else if ((output.getCount() == 4 || output.getCount() == 9) && recipe.getRecipeSize() == 1)
+            } else if ((output.getCount() == 4 || output.getCount() == 9) && recipe.canFit(1, 1))
             {
                 unpackingRecipes.add(recipe);
             }
@@ -99,7 +97,7 @@ public class StorageBlockCraftingRecipeAssimilator
                 {
                     // unknown IRecipe, check through the recipe conventionally verify recipe size for 3x3 to skip anything smaller quickly
 
-                    if (unpacked.getCount() == 9 && recipePack.recipe.getRecipeSize() < 9)
+                    if (unpacked.getCount() == 9 && recipePack.recipe.getIngredients().size() < 9)
                         continue;
 
                     // initialize inventory late, but only once per unpack recipe
@@ -149,7 +147,7 @@ public class StorageBlockCraftingRecipeAssimilator
     @SuppressWarnings("unchecked")
     private List<IRecipe> getCraftingRecipes()
     {
-        return CraftingManager.getInstance().getRecipeList();
+        return ForgeRegistries.RECIPES.getValues();
     }
 
     private Container makeDummyContainer()
@@ -166,27 +164,10 @@ public class StorageBlockCraftingRecipeAssimilator
 
     private PackingRecipe getPackingRecipe(IRecipe recipe)
     {
-        if (recipe.getRecipeSize() < 4)
+        if (recipe.getIngredients().size() < 4)
             return null;
 
-        List<?> inputs;
-
-        if (recipe instanceof ShapedRecipes)
-        {
-            inputs = Arrays.asList(((ShapedRecipes) recipe).recipeItems);
-        } else if (recipe instanceof ShapelessRecipes)
-        {
-            inputs = ((ShapelessRecipes) recipe).recipeItems;
-        } else if (recipe instanceof ShapedOreRecipe)
-        {
-            inputs = Arrays.asList(((ShapedOreRecipe) recipe).getInput());
-        } else if (recipe instanceof ShapelessOreRecipe)
-        {
-            inputs = ((ShapelessOreRecipe) recipe).getInput();
-        } else
-        {
-            return new PackingRecipe(recipe, null, -1);
-        }
+        List<Ingredient> inputs = recipe.getIngredients();
 
         // check if the recipe inputs are size 4 or 9
 
@@ -203,7 +184,7 @@ public class StorageBlockCraftingRecipeAssimilator
 
         // grab identical inputs
 
-        List<ItemStack> identicalInputs = getIdenticalInputs(inputs);
+        List<Ingredient> identicalInputs = getIdenticalInputs(inputs);
         if (identicalInputs == null)
             return null;
 
@@ -219,18 +200,18 @@ public class StorageBlockCraftingRecipeAssimilator
      * @return List List of all options.
      */
     @SuppressWarnings("unchecked")
-    private List<ItemStack> getIdenticalInputs(List<?> inputs)
+    private List<Ingredient> getIdenticalInputs(List<Ingredient> inputs)
     {
-        List<ItemStack> options = null;
+        List<Ingredient> options = null;
 
-        for (Object input : inputs)
+        for (Ingredient input : inputs)
         {
             if (input == null)
                 continue;
 
             List<ItemStack> offers;
 
-            if (input instanceof ItemStack)
+            if (input. instanceof ItemStack)
             {
                 offers = Collections.singletonList((ItemStack) input);
             } else if (input instanceof List)
diff --git a/src/main/java/WayofTime/bloodmagic/demonAura/PosXY.java b/src/main/java/WayofTime/bloodmagic/demonAura/PosXY.java
index 309090b8..8a478e7d 100644
--- a/src/main/java/WayofTime/bloodmagic/demonAura/PosXY.java
+++ b/src/main/java/WayofTime/bloodmagic/demonAura/PosXY.java
@@ -1,17 +1,20 @@
 package WayofTime.bloodmagic.demonAura;
 
-import lombok.*;
+import org.apache.commons.lang3.builder.ToStringBuilder;
 
-@EqualsAndHashCode
-@ToString
-@NoArgsConstructor
-@AllArgsConstructor
-@Setter
 public class PosXY implements Comparable<PosXY>
 {
     public int x;
     public int y;
 
+    public PosXY() {
+    }
+
+    public PosXY(int x, int y) {
+        this.x = x;
+        this.y = y;
+    }
+
     @Override
     public int compareTo(PosXY c)
     {
@@ -29,4 +32,38 @@ public class PosXY implements Comparable<PosXY>
     {
         return getDistanceSquared(c.x, c.y);
     }
+
+    public void setX(int x) {
+        this.x = x;
+    }
+
+    public void setY(int y) {
+        this.y = y;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this)
+                .append("x", x)
+                .append("y", y)
+                .toString();
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (!(o instanceof PosXY)) return false;
+
+        PosXY posXY = (PosXY) o;
+
+        if (x != posXY.x) return false;
+        return y == posXY.y;
+    }
+
+    @Override
+    public int hashCode() {
+        int result = x;
+        result = 31 * result + y;
+        return result;
+    }
 }
diff --git a/src/main/java/WayofTime/bloodmagic/demonAura/WillChunk.java b/src/main/java/WayofTime/bloodmagic/demonAura/WillChunk.java
index 15db5c60..bf0c4f6e 100644
--- a/src/main/java/WayofTime/bloodmagic/demonAura/WillChunk.java
+++ b/src/main/java/WayofTime/bloodmagic/demonAura/WillChunk.java
@@ -1,14 +1,10 @@
 package WayofTime.bloodmagic.demonAura;
 
 import WayofTime.bloodmagic.api.soul.DemonWillHolder;
-import lombok.Getter;
-import lombok.Setter;
 import net.minecraft.world.chunk.Chunk;
 
 import java.lang.ref.WeakReference;
 
-@Getter
-@Setter
 public class WillChunk
 {
     PosXY loc;
@@ -23,7 +19,7 @@ public class WillChunk
 
     public WillChunk(Chunk chunk, short base, DemonWillHolder currentWill)
     {
-        this.loc = new PosXY(chunk.xPosition, chunk.zPosition);
+        this.loc = new PosXY(chunk.x, chunk.z);
         this.chunkRef = new WeakReference(chunk);
         this.base = base;
         this.currentWill = currentWill;
@@ -32,4 +28,36 @@ public class WillChunk
     public boolean isModified() {
         return (this.chunkRef != null) && (this.chunkRef.get() != null) && this.chunkRef.get().needsSaving(false);
     }
+
+    public PosXY getLoc() {
+        return loc;
+    }
+
+    public void setLoc(PosXY loc) {
+        this.loc = loc;
+    }
+
+    public short getBase() {
+        return base;
+    }
+
+    public void setBase(short base) {
+        this.base = base;
+    }
+
+    public DemonWillHolder getCurrentWill() {
+        return currentWill;
+    }
+
+    public void setCurrentWill(DemonWillHolder currentWill) {
+        this.currentWill = currentWill;
+    }
+
+    public WeakReference<Chunk> getChunkRef() {
+        return chunkRef;
+    }
+
+    public void setChunkRef(WeakReference<Chunk> chunkRef) {
+        this.chunkRef = chunkRef;
+    }
 }
diff --git a/src/main/java/WayofTime/bloodmagic/demonAura/WillWorld.java b/src/main/java/WayofTime/bloodmagic/demonAura/WillWorld.java
index e66411a8..3d3f0164 100644
--- a/src/main/java/WayofTime/bloodmagic/demonAura/WillWorld.java
+++ b/src/main/java/WayofTime/bloodmagic/demonAura/WillWorld.java
@@ -1,15 +1,10 @@
 package WayofTime.bloodmagic.demonAura;
 
-import lombok.Getter;
-import lombok.Setter;
-
 import java.util.concurrent.ConcurrentHashMap;
 
 public class WillWorld
 {
     int dim;
-    @Getter
-    @Setter
     ConcurrentHashMap<PosXY, WillChunk> willChunks = new ConcurrentHashMap<PosXY, WillChunk>();
 
 //    private static ConcurrentHashMap<PosXY, AspectList> nodeTickets = new ConcurrentHashMap();
@@ -29,6 +24,14 @@ public class WillWorld
         return this.willChunks.get(loc);
     }
 
+    public ConcurrentHashMap<PosXY, WillChunk> getWillChunks() {
+        return willChunks;
+    }
+
+    public void setWillChunks(ConcurrentHashMap<PosXY, WillChunk> willChunks) {
+        this.willChunks = willChunks;
+    }
+
 //    public static ConcurrentHashMap<PosXY, AspectList> getNodeTickets()
 //    {
 //        return nodeTickets;
diff --git a/src/main/java/WayofTime/bloodmagic/demonAura/WorldDemonWillHandler.java b/src/main/java/WayofTime/bloodmagic/demonAura/WorldDemonWillHandler.java
index 89762e2e..65f783ab 100644
--- a/src/main/java/WayofTime/bloodmagic/demonAura/WorldDemonWillHandler.java
+++ b/src/main/java/WayofTime/bloodmagic/demonAura/WorldDemonWillHandler.java
@@ -54,14 +54,14 @@ public class WorldDemonWillHandler
         if (!containedWills.containsKey(dim))
         {
             containedWills.put(dim, new WillWorld(dim));
-            BloodMagicAPI.getLogger().info("Creating demon will cache for world " + dim);
+            BloodMagicAPI.logger.info("Creating demon will cache for world " + dim);
         }
     }
 
     public static void removeWillWorld(int dim)
     {
         containedWills.remove(dim);
-        BloodMagicAPI.getLogger().info("Removing demon will cache for world " + dim);
+        BloodMagicAPI.logger.info("Removing demon will cache for world " + dim);
     }
 
     public static void addWillChunk(int dim, Chunk chunk, short base, DemonWillHolder currentWill)
@@ -71,7 +71,7 @@ public class WorldDemonWillHandler
         {
             aw = new WillWorld(dim);
         }
-        aw.getWillChunks().put(new PosXY(chunk.xPosition, chunk.zPosition), new WillChunk(chunk, base, currentWill));
+        aw.getWillChunks().put(new PosXY(chunk.x, chunk.z), new WillChunk(chunk, base, currentWill));
 
         containedWills.put(dim, aw);
     }
diff --git a/src/main/java/WayofTime/bloodmagic/entity/ai/EntityAIAttackStealthMelee.java b/src/main/java/WayofTime/bloodmagic/entity/ai/EntityAIAttackStealthMelee.java
index 6a5ca700..066033ac 100644
--- a/src/main/java/WayofTime/bloodmagic/entity/ai/EntityAIAttackStealthMelee.java
+++ b/src/main/java/WayofTime/bloodmagic/entity/ai/EntityAIAttackStealthMelee.java
@@ -79,9 +79,9 @@ public class EntityAIAttackStealthMelee extends EntityAIBase
     }
 
     @Override
-    public boolean continueExecuting()
+    public boolean shouldContinueExecuting()
     {
-        return chicken.attackStateMachine == 1 && super.continueExecuting();
+        return chicken.attackStateMachine == 1 && super.shouldContinueExecuting();
     }
 
     @Override
@@ -114,7 +114,7 @@ public class EntityAIAttackStealthMelee extends EntityAIBase
                 if (this.chicken.getNavigator().getPath() != null)
                 {
                     net.minecraft.pathfinding.PathPoint finalPathPoint = this.chicken.getNavigator().getPath().getFinalPathPoint();
-                    if (finalPathPoint != null && entitylivingbase.getDistanceSq(finalPathPoint.xCoord, finalPathPoint.yCoord, finalPathPoint.zCoord) < 1)
+                    if (finalPathPoint != null && entitylivingbase.getDistanceSq(finalPathPoint.x, finalPathPoint.y, finalPathPoint.z) < 1)
                         failedPathFindingPenalty = 0;
                     else
                         failedPathFindingPenalty += 10;
diff --git a/src/main/java/WayofTime/bloodmagic/entity/ai/EntityAIFollowOwner.java b/src/main/java/WayofTime/bloodmagic/entity/ai/EntityAIFollowOwner.java
index cac00901..92e7bebb 100644
--- a/src/main/java/WayofTime/bloodmagic/entity/ai/EntityAIFollowOwner.java
+++ b/src/main/java/WayofTime/bloodmagic/entity/ai/EntityAIFollowOwner.java
@@ -130,7 +130,7 @@ public class EntityAIFollowOwner extends EntityAIBase
                             {
                                 for (int i1 = 0; i1 <= 4; ++i1)
                                 {
-                                    if ((l < 1 || i1 < 1 || l > 3 || i1 > 3) && this.theWorld.getBlockState(new BlockPos(i + l, k - 1, j + i1)).isFullyOpaque() && this.isEmptyBlock(new BlockPos(i + l, k, j + i1)) && this.isEmptyBlock(new BlockPos(i + l, k + 1, j + i1)))
+                                    if ((l < 1 || i1 < 1 || l > 3 || i1 > 3) && this.theWorld.getBlockState(new BlockPos(i + l, k - 1, j + i1)).isTopSolid() && this.isEmptyBlock(new BlockPos(i + l, k, j + i1)) && this.isEmptyBlock(new BlockPos(i + l, k + 1, j + i1)))
                                     {
                                         this.thePet.setLocationAndAngles((double) ((float) (i + l) + 0.5F), (double) k, (double) ((float) (j + i1) + 0.5F), this.thePet.rotationYaw, this.thePet.rotationPitch);
                                         this.petPathfinder.clearPathEntity();
diff --git a/src/main/java/WayofTime/bloodmagic/entity/ai/EntityAIGrabEffectsFromOwner.java b/src/main/java/WayofTime/bloodmagic/entity/ai/EntityAIGrabEffectsFromOwner.java
index 1559d2b2..364506fc 100644
--- a/src/main/java/WayofTime/bloodmagic/entity/ai/EntityAIGrabEffectsFromOwner.java
+++ b/src/main/java/WayofTime/bloodmagic/entity/ai/EntityAIGrabEffectsFromOwner.java
@@ -143,7 +143,7 @@ public class EntityAIGrabEffectsFromOwner extends EntityAIBase
                             {
                                 for (int i1 = 0; i1 <= 4; ++i1)
                                 {
-                                    if ((l < 1 || i1 < 1 || l > 3 || i1 > 3) && this.theWorld.getBlockState(new BlockPos(i + l, k - 1, j + i1)).isFullyOpaque() && this.isEmptyBlock(new BlockPos(i + l, k, j + i1)) && this.isEmptyBlock(new BlockPos(i + l, k + 1, j + i1)))
+                                    if ((l < 1 || i1 < 1 || l > 3 || i1 > 3) && this.theWorld.getBlockState(new BlockPos(i + l, k - 1, j + i1)).isTopSolid() && this.isEmptyBlock(new BlockPos(i + l, k, j + i1)) && this.isEmptyBlock(new BlockPos(i + l, k + 1, j + i1)))
                                     {
                                         this.thePet.setLocationAndAngles((double) ((float) (i + l) + 0.5F), (double) k, (double) ((float) (j + i1) + 0.5F), this.thePet.rotationYaw, this.thePet.rotationPitch);
                                         this.petPathfinder.clearPathEntity();
diff --git a/src/main/java/WayofTime/bloodmagic/entity/ai/EntityAIOwnerHurtByTarget.java b/src/main/java/WayofTime/bloodmagic/entity/ai/EntityAIOwnerHurtByTarget.java
index ef8ca421..37213741 100644
--- a/src/main/java/WayofTime/bloodmagic/entity/ai/EntityAIOwnerHurtByTarget.java
+++ b/src/main/java/WayofTime/bloodmagic/entity/ai/EntityAIOwnerHurtByTarget.java
@@ -34,7 +34,7 @@ public class EntityAIOwnerHurtByTarget extends EntityAITarget
                 return false;
             } else
             {
-                this.theOwnerAttacker = owner.getAITarget();
+                this.theOwnerAttacker = owner.getRevengeTarget();
                 int i = owner.getRevengeTimer();
                 return i != this.timestamp && this.isSuitableTarget(this.theOwnerAttacker, false) && this.theDefendingTameable.shouldAttackEntity(this.theOwnerAttacker, owner);
             }
diff --git a/src/main/java/WayofTime/bloodmagic/entity/ai/EntityAIOwnerHurtTarget.java b/src/main/java/WayofTime/bloodmagic/entity/ai/EntityAIOwnerHurtTarget.java
index 5c7ee8f2..70980372 100644
--- a/src/main/java/WayofTime/bloodmagic/entity/ai/EntityAIOwnerHurtTarget.java
+++ b/src/main/java/WayofTime/bloodmagic/entity/ai/EntityAIOwnerHurtTarget.java
@@ -34,8 +34,8 @@ public class EntityAIOwnerHurtTarget extends EntityAITarget
                 return false;
             } else
             {
-                this.theTarget = entitylivingbase.getLastAttacker();
-                int i = entitylivingbase.getLastAttackerTime();
+                this.theTarget = entitylivingbase.getLastAttackedEntity();
+                int i = entitylivingbase.getLastAttackedEntityTime();
                 return i != this.timestamp && this.isSuitableTarget(this.theTarget, false) && this.theEntityDemonBase.shouldAttackEntity(this.theTarget, entitylivingbase);
             }
         }
@@ -51,7 +51,7 @@ public class EntityAIOwnerHurtTarget extends EntityAITarget
 
         if (entitylivingbase != null)
         {
-            this.timestamp = entitylivingbase.getLastAttackerTime();
+            this.timestamp = entitylivingbase.getLastAttackedEntityTime();
         }
 
         super.startExecuting();
diff --git a/src/main/java/WayofTime/bloodmagic/entity/ai/EntityAIPickUpAlly.java b/src/main/java/WayofTime/bloodmagic/entity/ai/EntityAIPickUpAlly.java
index 62477326..427f4ae3 100644
--- a/src/main/java/WayofTime/bloodmagic/entity/ai/EntityAIPickUpAlly.java
+++ b/src/main/java/WayofTime/bloodmagic/entity/ai/EntityAIPickUpAlly.java
@@ -56,7 +56,7 @@ public class EntityAIPickUpAlly extends EntityAIBase
             return false;
         }
 
-        AxisAlignedBB bb = new AxisAlignedBB(entity.posX - 0.5, entity.posY - 0.5, entity.posZ - 0.5, entity.posX + 0.5, entity.posY + 0.5, entity.posZ + 0.5).expandXyz(5);
+        AxisAlignedBB bb = new AxisAlignedBB(entity.posX - 0.5, entity.posY - 0.5, entity.posZ - 0.5, entity.posX + 0.5, entity.posY + 0.5, entity.posZ + 0.5).grow(5);
         List<EntityLivingBase> list = this.entity.getEntityWorld().getEntitiesWithinAABB(EntityLivingBase.class, bb, new EntityAspectedDemonBase.WillTypePredicate(entity.getType()));
         for (EntityLivingBase testEntity : list)
         {
@@ -124,7 +124,7 @@ public class EntityAIPickUpAlly extends EntityAIBase
                 if (this.entity.getNavigator().getPath() != null)
                 {
                     net.minecraft.pathfinding.PathPoint finalPathPoint = this.entity.getNavigator().getPath().getFinalPathPoint();
-                    if (finalPathPoint != null && entitylivingbase.getDistanceSq(finalPathPoint.xCoord, finalPathPoint.yCoord, finalPathPoint.zCoord) < 1)
+                    if (finalPathPoint != null && entitylivingbase.getDistanceSq(finalPathPoint.x, finalPathPoint.y, finalPathPoint.z) < 1)
                         failedPathFindingPenalty = 0;
                     else
                         failedPathFindingPenalty += 10;
diff --git a/src/main/java/WayofTime/bloodmagic/entity/ai/EntityAIProtectAlly.java b/src/main/java/WayofTime/bloodmagic/entity/ai/EntityAIProtectAlly.java
index 23b345ca..93e64955 100644
--- a/src/main/java/WayofTime/bloodmagic/entity/ai/EntityAIProtectAlly.java
+++ b/src/main/java/WayofTime/bloodmagic/entity/ai/EntityAIProtectAlly.java
@@ -36,7 +36,7 @@ public class EntityAIProtectAlly extends EntityAIBase
     @Override
     public boolean shouldExecute()
     {
-        AxisAlignedBB bb = new AxisAlignedBB(entity.posX - 0.5, entity.posY - 0.5, entity.posZ - 0.5, entity.posX + 0.5, entity.posY + 0.5, entity.posZ + 0.5).expandXyz(5);
+        AxisAlignedBB bb = new AxisAlignedBB(entity.posX - 0.5, entity.posY - 0.5, entity.posZ - 0.5, entity.posX + 0.5, entity.posY + 0.5, entity.posZ + 0.5).grow(5);
         List<EntityLivingBase> list = world.getEntitiesWithinAABB(EntityLivingBase.class, bb, new EntityAspectedDemonBase.WillTypePredicate(entity.getType()));
         for (EntityLivingBase testEntity : list)
         {
@@ -76,7 +76,7 @@ public class EntityAIProtectAlly extends EntityAIBase
      * Returns whether an in-progress EntityAIBase should continue executing
      */
     @Override
-    public boolean continueExecuting()
+    public boolean shouldContinueExecuting()
     {
         return castTimer > 0;
     }
@@ -90,7 +90,7 @@ public class EntityAIProtectAlly extends EntityAIBase
         this.castTimer = Math.max(0, this.castTimer - 1);
         if (castTimer == 0)
         {
-            AxisAlignedBB bb = new AxisAlignedBB(entity.posX - 0.5, entity.posY - 0.5, entity.posZ - 0.5, entity.posX + 0.5, entity.posY + 0.5, entity.posZ + 0.5).expandXyz(5);
+            AxisAlignedBB bb = new AxisAlignedBB(entity.posX - 0.5, entity.posY - 0.5, entity.posZ - 0.5, entity.posX + 0.5, entity.posY + 0.5, entity.posZ + 0.5).grow(5);
             List<EntityLivingBase> list = world.getEntitiesWithinAABB(EntityLivingBase.class, bb, new EntityAspectedDemonBase.WillTypePredicate(entity.getType()));
             for (EntityLivingBase testEntity : list)
             {
diff --git a/src/main/java/WayofTime/bloodmagic/entity/ai/EntityAIRetreatToHeal.java b/src/main/java/WayofTime/bloodmagic/entity/ai/EntityAIRetreatToHeal.java
index 57561229..69b30960 100644
--- a/src/main/java/WayofTime/bloodmagic/entity/ai/EntityAIRetreatToHeal.java
+++ b/src/main/java/WayofTime/bloodmagic/entity/ai/EntityAIRetreatToHeal.java
@@ -40,13 +40,7 @@ public class EntityAIRetreatToHeal<T extends Entity> extends EntityAIBase
 
     public EntityAIRetreatToHeal(EntityDemonBase theEntityIn, Class<T> classToAvoidIn, Predicate<? super T> avoidTargetSelectorIn, float avoidDistanceIn, double farSpeedIn, double nearSpeedIn)
     {
-        this.canBeSeenSelector = new Predicate<Entity>()
-        {
-            public boolean apply(@Nullable Entity p_apply_1_)
-            {
-                return p_apply_1_.isEntityAlive() && EntityAIRetreatToHeal.this.theEntity.getEntitySenses().canSee(p_apply_1_);
-            }
-        };
+        this.canBeSeenSelector = p_apply_1_ -> p_apply_1_.isEntityAlive() && EntityAIRetreatToHeal.this.theEntity.getEntitySenses().canSee(p_apply_1_);
         this.theEntity = theEntityIn;
         this.classToAvoid = classToAvoidIn;
         this.avoidTargetSelector = avoidTargetSelectorIn;
@@ -69,7 +63,7 @@ public class EntityAIRetreatToHeal<T extends Entity> extends EntityAIBase
         }
 
         //This part almost doesn't matter
-        List<T> list = this.theEntity.getEntityWorld().<T>getEntitiesWithinAABB(this.classToAvoid, this.theEntity.getEntityBoundingBox().expand((double) this.avoidDistance, 3.0D, (double) this.avoidDistance), Predicates.and(new Predicate[] { EntitySelectors.CAN_AI_TARGET, this.canBeSeenSelector, this.avoidTargetSelector }));
+        List<T> list = this.theEntity.getEntityWorld().getEntitiesWithinAABB(this.classToAvoid, this.theEntity.getEntityBoundingBox().expand((double) this.avoidDistance, 3.0D, (double) this.avoidDistance), Predicates.and(EntitySelectors.CAN_AI_TARGET, this.canBeSeenSelector, this.avoidTargetSelector));
 
         if (list.isEmpty())
         {
@@ -82,12 +76,12 @@ public class EntityAIRetreatToHeal<T extends Entity> extends EntityAIBase
             if (vec3d == null)
             {
                 return false; //Nowhere to run, gotta fight!
-            } else if (this.closestLivingEntity.getDistanceSq(vec3d.xCoord, vec3d.yCoord, vec3d.zCoord) < this.closestLivingEntity.getDistanceSqToEntity(this.theEntity))
+            } else if (this.closestLivingEntity.getDistanceSq(vec3d.x, vec3d.y, vec3d.z) < this.closestLivingEntity.getDistanceSqToEntity(this.theEntity))
             {
                 return false; //I'll be headed off if I choose this direction.
             } else
             {
-                this.entityPathEntity = this.entityPathNavigate.getPathToXYZ(vec3d.xCoord, vec3d.yCoord, vec3d.zCoord);
+                this.entityPathEntity = this.entityPathNavigate.getPathToXYZ(vec3d.x, vec3d.y, vec3d.z);
                 return this.entityPathEntity != null;
             }
         }
@@ -97,7 +91,7 @@ public class EntityAIRetreatToHeal<T extends Entity> extends EntityAIBase
      * Returns whether an in-progress EntityAIBase should continue executing
      */
     @Override
-    public boolean continueExecuting()
+    public boolean shouldContinueExecuting()
     {
         return this.theEntity.shouldEmergencyHeal();//!this.entityPathNavigate.noPath();
     }
diff --git a/src/main/java/WayofTime/bloodmagic/entity/ai/EntityAIStealthRetreat.java b/src/main/java/WayofTime/bloodmagic/entity/ai/EntityAIStealthRetreat.java
index 533af52b..5f8b5e33 100644
--- a/src/main/java/WayofTime/bloodmagic/entity/ai/EntityAIStealthRetreat.java
+++ b/src/main/java/WayofTime/bloodmagic/entity/ai/EntityAIStealthRetreat.java
@@ -48,12 +48,12 @@ public class EntityAIStealthRetreat extends EntityAIBase
             if (vec3d == null)
             {
                 return false;
-            } else if (attacked.getDistanceSq(vec3d.xCoord, vec3d.yCoord, vec3d.zCoord) < attacked.getDistanceSqToEntity(this.entity))
+            } else if (attacked.getDistanceSq(vec3d.x, vec3d.y, vec3d.z) < attacked.getDistanceSqToEntity(this.entity))
             {
                 return false;
             } else
             {
-                this.entityPathEntity = this.entityPathNavigate.getPathToXYZ(vec3d.xCoord, vec3d.yCoord, vec3d.zCoord);
+                this.entityPathEntity = this.entityPathNavigate.getPathToXYZ(vec3d.x, vec3d.y, vec3d.z);
                 return this.entityPathEntity != null;
             }
         }
@@ -62,7 +62,7 @@ public class EntityAIStealthRetreat extends EntityAIBase
     }
 
     @Override
-    public boolean continueExecuting()
+    public boolean shouldContinueExecuting()
     {
         if (this.entityPathNavigate.noPath())
         {
diff --git a/src/main/java/WayofTime/bloodmagic/entity/ai/EntityAIStealthTowardsTarget.java b/src/main/java/WayofTime/bloodmagic/entity/ai/EntityAIStealthTowardsTarget.java
index cba52335..11ac1534 100644
--- a/src/main/java/WayofTime/bloodmagic/entity/ai/EntityAIStealthTowardsTarget.java
+++ b/src/main/java/WayofTime/bloodmagic/entity/ai/EntityAIStealthTowardsTarget.java
@@ -48,9 +48,9 @@ public class EntityAIStealthTowardsTarget extends EntityAIBase
         } else
         {
             ticksLeft = this.entity.getEntityWorld().rand.nextInt(200) + 100;
-            this.xPosition = vec3d.xCoord;
-            this.yPosition = vec3d.yCoord;
-            this.zPosition = vec3d.zCoord;
+            this.xPosition = vec3d.x;
+            this.yPosition = vec3d.y;
+            this.zPosition = vec3d.z;
             return true;
         }
     }
@@ -62,7 +62,7 @@ public class EntityAIStealthTowardsTarget extends EntityAIBase
     }
 
     @Override
-    public boolean continueExecuting()
+    public boolean shouldContinueExecuting()
     {
         ticksLeft--;
         if (ticksLeft <= 0)
@@ -86,9 +86,9 @@ public class EntityAIStealthTowardsTarget extends EntityAIBase
 
             if (vec3d != null)
             {
-                this.xPosition = vec3d.xCoord;
-                this.yPosition = vec3d.yCoord;
-                this.zPosition = vec3d.zCoord;
+                this.xPosition = vec3d.x;
+                this.yPosition = vec3d.y;
+                this.zPosition = vec3d.z;
                 this.entity.getNavigator().tryMoveToXYZ(this.xPosition, this.yPosition, this.zPosition, this.speed);
             }
         }
diff --git a/src/main/java/WayofTime/bloodmagic/entity/mob/EntityCorruptedSheep.java b/src/main/java/WayofTime/bloodmagic/entity/mob/EntityCorruptedSheep.java
index b6ceb3c6..b9e3e3c0 100644
--- a/src/main/java/WayofTime/bloodmagic/entity/mob/EntityCorruptedSheep.java
+++ b/src/main/java/WayofTime/bloodmagic/entity/mob/EntityCorruptedSheep.java
@@ -6,7 +6,6 @@ import java.util.Random;
 
 import javax.annotation.Nullable;
 
-import lombok.Getter;
 import net.minecraft.block.Block;
 import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.entity.IEntityLivingData;
@@ -53,7 +52,6 @@ public class EntityCorruptedSheep extends EntityAspectedDemonBase implements ISh
      */
     private int sheepTimer;
 
-    @Getter
     private int castTimer = 0;
     private EntityAIEatAndCorruptBlock entityAIEatGrass;
     private EntityAIProtectAlly entityAIProtectAlly;
@@ -66,7 +64,7 @@ public class EntityCorruptedSheep extends EntityAspectedDemonBase implements ISh
 
     public static float[] getDyeRgb(EnumDyeColor dyeColor)
     {
-        return (float[]) DYE_TO_RGB.get(dyeColor);
+        return DYE_TO_RGB.get(dyeColor);
     }
 
     public EntityCorruptedSheep(World world)
@@ -289,7 +287,7 @@ public class EntityCorruptedSheep extends EntityAspectedDemonBase implements ISh
      */
     public EnumDyeColor getFleeceColor()
     {
-        return EnumDyeColor.byMetadata(((Byte) this.dataManager.get(DYE_COLOR)).byteValue() & 15);
+        return EnumDyeColor.byMetadata(this.dataManager.get(DYE_COLOR).byteValue() & 15);
     }
 
     /**
@@ -297,7 +295,7 @@ public class EntityCorruptedSheep extends EntityAspectedDemonBase implements ISh
      */
     public void setFleeceColor(EnumDyeColor color)
     {
-        byte b0 = ((Byte) this.dataManager.get(DYE_COLOR)).byteValue();
+        byte b0 = this.dataManager.get(DYE_COLOR).byteValue();
         this.dataManager.set(DYE_COLOR, Byte.valueOf((byte) (b0 & 240 | color.getMetadata() & 15)));
     }
 
@@ -306,7 +304,7 @@ public class EntityCorruptedSheep extends EntityAspectedDemonBase implements ISh
      */
     public boolean getSheared()
     {
-        return (((Byte) this.dataManager.get(DYE_COLOR)).byteValue() & 16) != 0;
+        return (this.dataManager.get(DYE_COLOR).byteValue() & 16) != 0;
     }
 
     /**
@@ -314,7 +312,7 @@ public class EntityCorruptedSheep extends EntityAspectedDemonBase implements ISh
      */
     public void setSheared(boolean sheared)
     {
-        byte b0 = ((Byte) this.dataManager.get(DYE_COLOR)).byteValue();
+        byte b0 = this.dataManager.get(DYE_COLOR).byteValue();
 
         if (sheared)
         {
@@ -408,4 +406,8 @@ public class EntityCorruptedSheep extends EntityAspectedDemonBase implements ISh
         this.playSound(SoundEvents.ENTITY_SHEEP_SHEAR, 1.0F, 1.0F);
         return ret;
     }
+
+    public int getCastTimer() {
+        return castTimer;
+    }
 }
\ No newline at end of file
diff --git a/src/main/java/WayofTime/bloodmagic/entity/mob/EntityCorruptedSpider.java b/src/main/java/WayofTime/bloodmagic/entity/mob/EntityCorruptedSpider.java
index 1b6ec0cc..05957123 100644
--- a/src/main/java/WayofTime/bloodmagic/entity/mob/EntityCorruptedSpider.java
+++ b/src/main/java/WayofTime/bloodmagic/entity/mob/EntityCorruptedSpider.java
@@ -207,9 +207,9 @@ public class EntityCorruptedSpider extends EntityAspectedDemonBase
         /**
          * Returns whether an in-progress EntityAIBase should continue executing
          */
-        public boolean continueExecuting()
+        public boolean shouldContinueExecuting()
         {
-            float f = this.attacker.getBrightness(1.0F);
+            float f = this.attacker.getBrightness();
 
             if (f >= 0.5F && this.attacker.getRNG().nextInt(100) == 0)
             {
@@ -217,7 +217,7 @@ public class EntityCorruptedSpider extends EntityAspectedDemonBase
                 return false;
             } else
             {
-                return super.continueExecuting();
+                return super.shouldContinueExecuting();
             }
         }
 
@@ -239,7 +239,7 @@ public class EntityCorruptedSpider extends EntityAspectedDemonBase
          */
         public boolean shouldExecute()
         {
-            float f = this.taskOwner.getBrightness(1.0F);
+            float f = this.taskOwner.getBrightness();
             return !(f >= 0.5F) && super.shouldExecute();
         }
     }
diff --git a/src/main/java/WayofTime/bloodmagic/entity/mob/EntityCorruptedZombie.java b/src/main/java/WayofTime/bloodmagic/entity/mob/EntityCorruptedZombie.java
index 719b98de..3e96d17b 100644
--- a/src/main/java/WayofTime/bloodmagic/entity/mob/EntityCorruptedZombie.java
+++ b/src/main/java/WayofTime/bloodmagic/entity/mob/EntityCorruptedZombie.java
@@ -50,10 +50,10 @@ public class EntityCorruptedZombie extends EntityAspectedDemonBase
         this.tasks.addTask(8, new EntityAILookIdle(this));
 
         this.tasks.addTask(6, new EntityAIMoveThroughVillage(this, 1.0D, false));
-        this.targetTasks.addTask(1, new EntityAIHurtByTarget(this, true, new Class[] { EntityPigZombie.class }));
-        this.targetTasks.addTask(2, new EntityAINearestAttackableTarget<EntityPlayer>(this, EntityPlayer.class, true));
-        this.targetTasks.addTask(3, new EntityAINearestAttackableTarget<EntityVillager>(this, EntityVillager.class, false));
-        this.targetTasks.addTask(3, new EntityAINearestAttackableTarget<EntityIronGolem>(this, EntityIronGolem.class, true));
+        this.targetTasks.addTask(1, new EntityAIHurtByTarget(this, true, EntityPigZombie.class));
+        this.targetTasks.addTask(2, new EntityAINearestAttackableTarget<>(this, EntityPlayer.class, true));
+        this.targetTasks.addTask(3, new EntityAINearestAttackableTarget<>(this, EntityVillager.class, false));
+        this.targetTasks.addTask(3, new EntityAINearestAttackableTarget<>(this, EntityIronGolem.class, true));
 
         this.setCombatTask();
 //        this.targetTasks.addTask(8, new EntityAINearestAttackableTarget<EntityMob>(this, EntityMob.class, 10, true, false, new TargetPredicate(this)));
diff --git a/src/main/java/WayofTime/bloodmagic/entity/mob/EntityDemonBase.java b/src/main/java/WayofTime/bloodmagic/entity/mob/EntityDemonBase.java
index 7373eea7..0aad0e12 100644
--- a/src/main/java/WayofTime/bloodmagic/entity/mob/EntityDemonBase.java
+++ b/src/main/java/WayofTime/bloodmagic/entity/mob/EntityDemonBase.java
@@ -37,6 +37,8 @@ import net.minecraft.world.WorldServer;
 import com.google.common.base.Optional;
 import com.google.common.base.Predicate;
 
+import javax.annotation.Nullable;
+
 public class EntityDemonBase extends EntityCreature implements IEntityOwnable
 {
     protected static final DataParameter<Byte> TAMED = EntityDataManager.createKey(EntityDemonBase.class, DataSerializers.BYTE);
@@ -286,7 +288,12 @@ public class EntityDemonBase extends EntityCreature implements IEntityOwnable
         return SoundEvents.ENTITY_COW_AMBIENT;
     }
 
+    @Nullable
     @Override
+    protected SoundEvent getHurtSound(DamageSource damageSourceIn) {
+        return getHurtSound();
+    }
+
     protected SoundEvent getHurtSound()
     {
         return SoundEvents.ENTITY_COW_HURT;
diff --git a/src/main/java/WayofTime/bloodmagic/entity/mob/EntityMimic.java b/src/main/java/WayofTime/bloodmagic/entity/mob/EntityMimic.java
index cfe63b1a..ee5dbb28 100644
--- a/src/main/java/WayofTime/bloodmagic/entity/mob/EntityMimic.java
+++ b/src/main/java/WayofTime/bloodmagic/entity/mob/EntityMimic.java
@@ -35,7 +35,7 @@ import net.minecraft.world.EnumDifficulty;
 import net.minecraft.world.World;
 import WayofTime.bloodmagic.block.BlockMimic;
 import WayofTime.bloodmagic.entity.ai.EntityAIMimicReform;
-import WayofTime.bloodmagic.registry.ModBlocks;
+import WayofTime.bloodmagic.registry.RegistrarBloodMagicBlocks;
 import WayofTime.bloodmagic.tile.TileMimic;
 
 public class EntityMimic extends EntityDemonBase
@@ -110,7 +110,7 @@ public class EntityMimic extends EntityDemonBase
     {
         if (world.isAirBlock(pos))
         {
-            IBlockState mimicState = ModBlocks.MIMIC.getStateFromMeta(BlockMimic.sentientMimicMeta);
+            IBlockState mimicState = RegistrarBloodMagicBlocks.MIMIC.getStateFromMeta(BlockMimic.sentientMimicMeta);
             world.setBlockState(pos, mimicState, 3);
             TileEntity tile = world.getTileEntity(pos);
             if (tile instanceof TileMimic)
@@ -367,15 +367,6 @@ public class EntityMimic extends EntityDemonBase
             super(spider, 1.0D, true);
         }
 
-        /**
-         * Returns whether an in-progress EntityAIBase should continue executing
-         */
-        @Override
-        public boolean continueExecuting()
-        {
-            return super.continueExecuting();
-        }
-
         @Override
         protected double getAttackReachSqr(EntityLivingBase attackTarget)
         {
@@ -389,13 +380,5 @@ public class EntityMimic extends EntityDemonBase
         {
             super(spider, classTarget, true);
         }
-
-        /**
-         * Returns whether the EntityAIBase should begin execution.
-         */
-        public boolean shouldExecute()
-        {
-            return super.shouldExecute();
-        }
     }
 }
\ No newline at end of file
diff --git a/src/main/java/WayofTime/bloodmagic/entity/mob/EntitySentientSpecter.java b/src/main/java/WayofTime/bloodmagic/entity/mob/EntitySentientSpecter.java
index 655e2371..28870cf9 100644
--- a/src/main/java/WayofTime/bloodmagic/entity/mob/EntitySentientSpecter.java
+++ b/src/main/java/WayofTime/bloodmagic/entity/mob/EntitySentientSpecter.java
@@ -4,10 +4,6 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Locale;
 
-import javax.annotation.Nullable;
-
-import lombok.Getter;
-import lombok.Setter;
 import net.minecraft.block.Block;
 import net.minecraft.enchantment.EnchantmentHelper;
 import net.minecraft.entity.Entity;
@@ -54,16 +50,11 @@ import WayofTime.bloodmagic.entity.ai.EntityAIOwnerHurtByTarget;
 import WayofTime.bloodmagic.entity.ai.EntityAIOwnerHurtTarget;
 import WayofTime.bloodmagic.entity.ai.EntityAIRetreatToHeal;
 import WayofTime.bloodmagic.item.soul.ItemSentientBow;
-import WayofTime.bloodmagic.registry.ModItems;
+import WayofTime.bloodmagic.registry.RegistrarBloodMagicItems;
 
 public class EntitySentientSpecter extends EntityDemonBase
 {
-    @Getter
-    @Setter
     protected EnumDemonWillType type = EnumDemonWillType.DESTRUCTIVE;
-
-    @Getter
-    @Setter
     protected boolean wasGivenSentientArmour = false;
 
     private final EntityAIAttackRangedBow aiArrowAttack = new EntityAIAttackRangedBow(this, 1.0D, 20, 15.0F);
@@ -355,7 +346,7 @@ public class EntitySentientSpecter extends EntityDemonBase
 
                     if (wasGivenSentientArmour)
                     {
-                        this.entityDropItem(new ItemStack(ModItems.SENTIENT_ARMOUR_GEM), 0);
+                        this.entityDropItem(new ItemStack(RegistrarBloodMagicItems.SENTIENT_ARMOUR_GEM), 0);
                     }
 
                     this.setDead();
@@ -479,7 +470,7 @@ public class EntitySentientSpecter extends EntityDemonBase
     public void attackEntityWithRangedAttack(EntityLivingBase target, float velocity)
     {
         ItemStack heldStack = this.getItemStackFromSlot(EntityEquipmentSlot.MAINHAND);
-        if (!heldStack.isEmpty() && heldStack.getItem() == ModItems.SENTIENT_BOW)
+        if (!heldStack.isEmpty() && heldStack.getItem() == RegistrarBloodMagicItems.SENTIENT_BOW)
         {
             EntityTippedArrow arrowEntity = ((ItemSentientBow) heldStack.getItem()).getArrowEntity(getEntityWorld(), heldStack, target, this, velocity);
             if (arrowEntity != null)
@@ -565,4 +556,20 @@ public class EntitySentientSpecter extends EntityDemonBase
     {
         return 0.4F;
     }
+
+    public EnumDemonWillType getType() {
+        return type;
+    }
+
+    public void setType(EnumDemonWillType type) {
+        this.type = type;
+    }
+
+    public boolean isWasGivenSentientArmour() {
+        return wasGivenSentientArmour;
+    }
+
+    public void setWasGivenSentientArmour(boolean wasGivenSentientArmour) {
+        this.wasGivenSentientArmour = wasGivenSentientArmour;
+    }
 }
\ No newline at end of file
diff --git a/src/main/java/WayofTime/bloodmagic/entity/projectile/EntityBloodLight.java b/src/main/java/WayofTime/bloodmagic/entity/projectile/EntityBloodLight.java
index 6d8f86ef..3f9c0c9d 100644
--- a/src/main/java/WayofTime/bloodmagic/entity/projectile/EntityBloodLight.java
+++ b/src/main/java/WayofTime/bloodmagic/entity/projectile/EntityBloodLight.java
@@ -1,7 +1,7 @@
 package WayofTime.bloodmagic.entity.projectile;
 
 import WayofTime.bloodmagic.api.Constants;
-import WayofTime.bloodmagic.registry.ModBlocks;
+import WayofTime.bloodmagic.registry.RegistrarBloodMagicBlocks;
 import io.netty.buffer.ByteBuf;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityLivingBase;
@@ -107,7 +107,7 @@ public class EntityBloodLight extends EntityThrowable implements IThrowableEntit
 
             if (getEntityWorld().isAirBlock(blockPos))
             {
-                getEntityWorld().setBlockState(blockPos, ModBlocks.BLOOD_LIGHT.getDefaultState());
+                getEntityWorld().setBlockState(blockPos, RegistrarBloodMagicBlocks.BLOOD_LIGHT.getDefaultState());
             }
         }
 
diff --git a/src/main/java/WayofTime/bloodmagic/entity/projectile/EntityMeteor.java b/src/main/java/WayofTime/bloodmagic/entity/projectile/EntityMeteor.java
index d9c0096a..51e4aee6 100644
--- a/src/main/java/WayofTime/bloodmagic/entity/projectile/EntityMeteor.java
+++ b/src/main/java/WayofTime/bloodmagic/entity/projectile/EntityMeteor.java
@@ -1,6 +1,5 @@
 package WayofTime.bloodmagic.entity.projectile;
 
-import lombok.Setter;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.entity.projectile.EntityThrowable;
@@ -24,7 +23,6 @@ public class EntityMeteor extends EntityThrowable implements IThrowableEntity
     protected double explosionModifier = 1;
     protected double fillerChance = 0;
 
-    @Setter
     public ItemStack meteorStack = ItemStack.EMPTY;
 
     public EntityMeteor(World world)
@@ -150,4 +148,8 @@ public class EntityMeteor extends EntityThrowable implements IThrowableEntity
     {
 
     }
+
+    public void setMeteorStack(ItemStack meteorStack) {
+        this.meteorStack = meteorStack;
+    }
 }
\ No newline at end of file
diff --git a/src/main/java/WayofTime/bloodmagic/fakePlayer/FakeNetHandlerPlayServer.java b/src/main/java/WayofTime/bloodmagic/fakePlayer/FakeNetHandlerPlayServer.java
index b807b886..7fba5008 100644
--- a/src/main/java/WayofTime/bloodmagic/fakePlayer/FakeNetHandlerPlayServer.java
+++ b/src/main/java/WayofTime/bloodmagic/fakePlayer/FakeNetHandlerPlayServer.java
@@ -34,7 +34,7 @@ public class FakeNetHandlerPlayServer extends NetHandlerPlayServer
     }
 
     @Override
-    public void disconnect(String reason)
+    public void disconnect(final ITextComponent textComponent)
     {
     }
 
diff --git a/src/main/java/WayofTime/bloodmagic/fakePlayer/FakePlayerBM.java b/src/main/java/WayofTime/bloodmagic/fakePlayer/FakePlayerBM.java
index 1de85e6b..cd1b41b8 100644
--- a/src/main/java/WayofTime/bloodmagic/fakePlayer/FakePlayerBM.java
+++ b/src/main/java/WayofTime/bloodmagic/fakePlayer/FakePlayerBM.java
@@ -6,6 +6,7 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.potion.PotionEffect;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
+import net.minecraft.world.WorldServer;
 import net.minecraftforge.common.util.FakePlayer;
 import net.minecraftforge.fml.common.FMLCommonHandler;
 
@@ -14,11 +15,16 @@ import com.mojang.authlib.GameProfile;
 /**
  * All credits for this go to CrazyPants, from EIO
  */
+@SuppressWarnings("EntityConstructor")
 public class FakePlayerBM extends FakePlayer
 {
+    public FakePlayerBM(WorldServer world, GameProfile name) {
+        super(world, name);
+    }
+
     public FakePlayerBM(World world, BlockPos pos, GameProfile profile)
     {
-        super(FMLCommonHandler.instance().getMinecraftServerInstance().worldServerForDimension(world.provider.getDimension()), profile);
+        super(FMLCommonHandler.instance().getMinecraftServerInstance().getWorld(world.provider.getDimension()), profile);
         posX = pos.getX() + 0.5;
         posY = pos.getY() + 0.5;
         posZ = pos.getZ() + 0.5;
diff --git a/src/main/java/WayofTime/bloodmagic/fuel/FuelHandler.java b/src/main/java/WayofTime/bloodmagic/fuel/FuelHandler.java
index d1ad5777..5aeac49d 100644
--- a/src/main/java/WayofTime/bloodmagic/fuel/FuelHandler.java
+++ b/src/main/java/WayofTime/bloodmagic/fuel/FuelHandler.java
@@ -1,7 +1,7 @@
 package WayofTime.bloodmagic.fuel;
 
 import WayofTime.bloodmagic.item.ItemComponent;
-import WayofTime.bloodmagic.registry.ModItems;
+import WayofTime.bloodmagic.registry.RegistrarBloodMagicItems;
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.fml.common.IFuelHandler;
 
@@ -10,7 +10,7 @@ public class FuelHandler implements IFuelHandler
     @Override
     public int getBurnTime(ItemStack fuel)
     {
-        if (fuel != null && fuel.getItem() == ModItems.ITEM_COMPONENT && fuel.getMetadata() == ItemComponent.getStack(ItemComponent.SAND_COAL).getMetadata())
+        if (fuel != null && fuel.getItem() == RegistrarBloodMagicItems.ITEM_COMPONENT && fuel.getMetadata() == ItemComponent.getStack(ItemComponent.SAND_COAL).getMetadata())
         {
             return 1600;
         }
diff --git a/src/main/java/WayofTime/bloodmagic/gson/Serializers.java b/src/main/java/WayofTime/bloodmagic/gson/Serializers.java
index 3b67c610..709c66a8 100644
--- a/src/main/java/WayofTime/bloodmagic/gson/Serializers.java
+++ b/src/main/java/WayofTime/bloodmagic/gson/Serializers.java
@@ -40,7 +40,12 @@ public class Serializers
         @Override
         public DataParameter<EnumDemonWillType> createKey(int id)
         {
-            return new DataParameter<EnumDemonWillType>(id, this);
+            return new DataParameter<>(id, this);
+        }
+
+        @Override
+        public EnumDemonWillType copyValue(EnumDemonWillType value) {
+            return EnumDemonWillType.valueOf(value.getName());
         }
     };
 
diff --git a/src/main/java/WayofTime/bloodmagic/incense/TranquilityHandlers.java b/src/main/java/WayofTime/bloodmagic/incense/TranquilityHandlers.java
index 4e1d3d69..a5bb1bca 100644
--- a/src/main/java/WayofTime/bloodmagic/incense/TranquilityHandlers.java
+++ b/src/main/java/WayofTime/bloodmagic/incense/TranquilityHandlers.java
@@ -3,7 +3,7 @@ package WayofTime.bloodmagic.incense;
 import WayofTime.bloodmagic.api.incense.EnumTranquilityType;
 import WayofTime.bloodmagic.api.incense.ITranquilityHandler;
 import WayofTime.bloodmagic.api.incense.TranquilityStack;
-import WayofTime.bloodmagic.registry.ModBlocks;
+import WayofTime.bloodmagic.registry.RegistrarBloodMagicBlocks;
 import net.minecraft.block.*;
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.init.Blocks;
@@ -122,7 +122,7 @@ public class TranquilityHandlers
                 return new TranquilityStack(EnumTranquilityType.WATER, 1);
             }
 
-            if (block == ModBlocks.LIFE_ESSENCE)
+            if (block == RegistrarBloodMagicBlocks.LIFE_ESSENCE)
             {
                 return new TranquilityStack(EnumTranquilityType.WATER, 1.5);
             }
diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemActivationCrystal.java b/src/main/java/WayofTime/bloodmagic/item/ItemActivationCrystal.java
index 52f88d86..c2f2fe97 100644
--- a/src/main/java/WayofTime/bloodmagic/item/ItemActivationCrystal.java
+++ b/src/main/java/WayofTime/bloodmagic/item/ItemActivationCrystal.java
@@ -1,6 +1,6 @@
 package WayofTime.bloodmagic.item;
 
-import WayofTime.bloodmagic.api.Constants;
+import WayofTime.bloodmagic.BloodMagic;
 import WayofTime.bloodmagic.client.IVariantProvider;
 import WayofTime.bloodmagic.util.helper.TextHelper;
 import net.minecraft.creativetab.CreativeTabs;
@@ -24,7 +24,7 @@ public class ItemActivationCrystal extends ItemBindableBase implements IVariantP
     {
         super();
 
-        setUnlocalizedName(Constants.Mod.MODID + ".activationCrystal.");
+        setUnlocalizedName(BloodMagic.MODID + ".activationCrystal.");
         setHasSubtypes(true);
     }
 
diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemAltarMaker.java b/src/main/java/WayofTime/bloodmagic/item/ItemAltarMaker.java
index 2421488a..239f3365 100644
--- a/src/main/java/WayofTime/bloodmagic/item/ItemAltarMaker.java
+++ b/src/main/java/WayofTime/bloodmagic/item/ItemAltarMaker.java
@@ -41,8 +41,8 @@ public class ItemAltarMaker extends Item implements IAltarManipulator, IVariantP
     public ItemAltarMaker()
     {
         super();
-        setUnlocalizedName(Constants.Mod.MODID + ".altarMaker");
-        setCreativeTab(BloodMagic.tabBloodMagic);
+        setUnlocalizedName(BloodMagic.MODID + ".altarMaker");
+        setCreativeTab(BloodMagic.TAB_BM);
         setMaxStackSize(1);
         setFull3D();
     }
diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemArcaneAshes.java b/src/main/java/WayofTime/bloodmagic/item/ItemArcaneAshes.java
index 6cb43f05..0455e0cf 100644
--- a/src/main/java/WayofTime/bloodmagic/item/ItemArcaneAshes.java
+++ b/src/main/java/WayofTime/bloodmagic/item/ItemArcaneAshes.java
@@ -19,9 +19,8 @@ import org.apache.commons.lang3.tuple.ImmutablePair;
 import org.apache.commons.lang3.tuple.Pair;
 
 import WayofTime.bloodmagic.BloodMagic;
-import WayofTime.bloodmagic.api.Constants;
 import WayofTime.bloodmagic.client.IVariantProvider;
-import WayofTime.bloodmagic.registry.ModBlocks;
+import WayofTime.bloodmagic.registry.RegistrarBloodMagicBlocks;
 import WayofTime.bloodmagic.tile.TileAlchemyArray;
 import WayofTime.bloodmagic.util.helper.TextHelper;
 
@@ -29,10 +28,10 @@ public class ItemArcaneAshes extends Item implements IVariantProvider
 {
     public ItemArcaneAshes()
     {
-        setUnlocalizedName(Constants.Mod.MODID + ".arcaneAshes");
+        setUnlocalizedName(BloodMagic.MODID + ".arcaneAshes");
         setMaxStackSize(1);
         setMaxDamage(19); //Allows for 20 uses
-        setCreativeTab(BloodMagic.tabBloodMagic);
+        setCreativeTab(BloodMagic.TAB_BM);
     }
 
     @Override
@@ -53,7 +52,7 @@ public class ItemArcaneAshes extends Item implements IVariantProvider
             if (!world.isRemote)
             {
                 EnumFacing rotation = EnumFacing.fromAngle(player.getRotationYawHead());
-                world.setBlockState(newPos, ModBlocks.ALCHEMY_ARRAY.getDefaultState());
+                world.setBlockState(newPos, RegistrarBloodMagicBlocks.ALCHEMY_ARRAY.getDefaultState());
                 TileEntity tile = world.getTileEntity(newPos);
                 if (tile instanceof TileAlchemyArray)
                 {
diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemBindableBase.java b/src/main/java/WayofTime/bloodmagic/item/ItemBindableBase.java
index 300ad7a0..8f8c07e8 100644
--- a/src/main/java/WayofTime/bloodmagic/item/ItemBindableBase.java
+++ b/src/main/java/WayofTime/bloodmagic/item/ItemBindableBase.java
@@ -2,7 +2,6 @@ package WayofTime.bloodmagic.item;
 
 import WayofTime.bloodmagic.BloodMagic;
 import WayofTime.bloodmagic.api.impl.ItemBindable;
-import WayofTime.bloodmagic.api.util.helper.NBTHelper;
 import WayofTime.bloodmagic.api.util.helper.PlayerHelper;
 import WayofTime.bloodmagic.util.helper.TextHelper;
 import com.google.common.base.Strings;
@@ -19,7 +18,7 @@ public class ItemBindableBase extends ItemBindable
     {
         super();
 
-        setCreativeTab(BloodMagic.tabBloodMagic);
+        setCreativeTab(BloodMagic.TAB_BM);
     }
 
     @Override
diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemBloodOrb.java b/src/main/java/WayofTime/bloodmagic/item/ItemBloodOrb.java
index 49d0d5d0..11363574 100644
--- a/src/main/java/WayofTime/bloodmagic/item/ItemBloodOrb.java
+++ b/src/main/java/WayofTime/bloodmagic/item/ItemBloodOrb.java
@@ -2,19 +2,18 @@ package WayofTime.bloodmagic.item;
 
 import java.util.List;
 
+import WayofTime.bloodmagic.BloodMagic;
+import WayofTime.bloodmagic.registry.RegistrarBloodMagic;
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.init.SoundEvents;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
-import net.minecraft.util.ActionResult;
-import net.minecraft.util.EnumHand;
-import net.minecraft.util.NonNullList;
-import net.minecraft.util.SoundCategory;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.util.*;
 import net.minecraft.world.World;
 import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;
-import WayofTime.bloodmagic.api.Constants;
 import WayofTime.bloodmagic.api.iface.IBindable;
 import WayofTime.bloodmagic.api.orb.BloodOrb;
 import WayofTime.bloodmagic.api.orb.IBloodOrb;
@@ -25,11 +24,13 @@ import WayofTime.bloodmagic.util.helper.TextHelper;
 
 import com.google.common.base.Strings;
 
+import javax.annotation.Nullable;
+
 public class ItemBloodOrb extends ItemBindableBase implements IBloodOrb, IBindable
 {
     public ItemBloodOrb()
     {
-        setUnlocalizedName(Constants.Mod.MODID + ".orb.");
+        setUnlocalizedName(BloodMagic.MODID + ".orb");
         this.setMaxDamage(0);
         setHasSubtypes(true);
     }
@@ -37,27 +38,41 @@ public class ItemBloodOrb extends ItemBindableBase implements IBloodOrb, IBindab
     @Override
     public String getUnlocalizedName(ItemStack stack)
     {
-        return super.getUnlocalizedName(stack) + OrbRegistry.getOrb(stack.getItemDamage()).getName();
+        BloodOrb orb = getOrb(stack);
+        if (orb == null)
+            return super.getUnlocalizedName(stack);
+
+        return super.getUnlocalizedName(stack) + "." + orb.getName();
     }
 
     @Override
-    @SideOnly(Side.CLIENT)
-    public void getSubItems(Item id, CreativeTabs creativeTab, NonNullList<ItemStack> list)
+    public void getSubItems(CreativeTabs creativeTab, NonNullList<ItemStack> list)
     {
-        for (int i = 0; i < OrbRegistry.getSize(); i++)
-            list.add(new ItemStack(id, 1, i));
+        if (!isInCreativeTab(creativeTab))
+            return;
+
+        for (BloodOrb orb : RegistrarBloodMagic.BLOOD_ORBS) {
+            ItemStack orbStack = new ItemStack(this);
+            NBTTagCompound tag = new NBTTagCompound();
+            tag.setString("orb", orb.getRegistryName().toString());
+            orbStack.setTagCompound(tag);
+            list.add(orbStack);
+        }
     }
 
     @Override
     public ActionResult<ItemStack> onItemRightClick(World world, EntityPlayer player, EnumHand hand)
     {
         ItemStack stack = player.getHeldItem(hand);
+        BloodOrb orb = getOrb(stack);
+
+        if (orb == null)
+            return ActionResult.newResult(EnumActionResult.FAIL, stack);
+
         if (world == null)
             return super.onItemRightClick(world, player, hand);
 
         world.playSound(null, player.posX, player.posY, player.posZ, SoundEvents.BLOCK_FIRE_EXTINGUISH, SoundCategory.BLOCKS, 0.5F, 2.6F + (world.rand.nextFloat() - world.rand.nextFloat()) * 0.8F);
-        // SpellHelper.sendIndexedParticleToAllAround(world, posX, posY, posZ,
-        // 20, world.provider.getDimensionId(), 4, posX, posY, posZ);
 
         if (PlayerHelper.isFakePlayer(player))
             return super.onItemRightClick(world, player, hand);
@@ -74,9 +89,9 @@ public class ItemBloodOrb extends ItemBindableBase implements IBloodOrb, IBindab
             return super.onItemRightClick(world, player, hand);
 
         if (getOwnerUUID(stack).equals(PlayerHelper.getUsernameFromPlayer(player)))
-            NetworkHelper.setMaxOrb(NetworkHelper.getSoulNetwork(getOwnerUUID(stack)), getOrbLevel(stack.getItemDamage()));
+            NetworkHelper.setMaxOrb(NetworkHelper.getSoulNetwork(getOwnerUUID(stack)), orb.getTier());
 
-        NetworkHelper.getSoulNetwork(getOwnerUUID(stack)).add(200, getMaxEssence(stack.getItemDamage()));
+        NetworkHelper.getSoulNetwork(getOwnerUUID(stack)).add(200, orb.getCapacity());
         NetworkHelper.getSoulNetwork(player).hurtPlayer(player, 200);
         return super.onItemRightClick(world, player, hand);
     }
@@ -87,8 +102,9 @@ public class ItemBloodOrb extends ItemBindableBase implements IBloodOrb, IBindab
     {
         tooltip.add(TextHelper.localizeEffect("tooltip.bloodmagic.orb.desc"));
 
-        if (advanced)
-            tooltip.add(TextHelper.localizeEffect("tooltip.bloodmagic.orb.owner", getOrb(stack.getItemDamage()).getOwner()));
+        BloodOrb orb = getOrb(stack);
+        if (advanced && orb != null)
+            tooltip.add(TextHelper.localizeEffect("tooltip.bloodmagic.orb.owner", orb.getRegistryName()));
 
         super.addInformation(stack, player, tooltip, advanced);
     }
@@ -115,21 +131,13 @@ public class ItemBloodOrb extends ItemBindableBase implements IBloodOrb, IBindab
 
     // IBloodOrb
 
+    @Nullable
     @Override
-    public BloodOrb getOrb(int meta)
-    {
-        return OrbRegistry.getOrb(meta);
-    }
+    public BloodOrb getOrb(ItemStack stack) {
+        if (!stack.hasTagCompound())
+            return null;
 
-    @Override
-    public int getMaxEssence(int meta)
-    {
-        return OrbRegistry.getOrb(meta).getCapacity();
-    }
-
-    @Override
-    public int getOrbLevel(int meta)
-    {
-        return OrbRegistry.getOrb(meta).getTier();
+        ResourceLocation id = new ResourceLocation(stack.getTagCompound().getString("orb"));
+        return RegistrarBloodMagic.BLOOD_ORBS.getValue(id);
     }
 }
diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemBloodShard.java b/src/main/java/WayofTime/bloodmagic/item/ItemBloodShard.java
index ed72887e..303b5c87 100644
--- a/src/main/java/WayofTime/bloodmagic/item/ItemBloodShard.java
+++ b/src/main/java/WayofTime/bloodmagic/item/ItemBloodShard.java
@@ -1,7 +1,6 @@
 package WayofTime.bloodmagic.item;
 
 import WayofTime.bloodmagic.BloodMagic;
-import WayofTime.bloodmagic.api.Constants;
 import WayofTime.bloodmagic.client.IVariantProvider;
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.item.Item;
@@ -23,8 +22,8 @@ public class ItemBloodShard extends Item implements IVariantProvider
     {
         super();
 
-        setCreativeTab(BloodMagic.tabBloodMagic);
-        setUnlocalizedName(Constants.Mod.MODID + ".bloodShard.");
+        setCreativeTab(BloodMagic.TAB_BM);
+        setUnlocalizedName(BloodMagic.MODID + ".bloodShard.");
         setHasSubtypes(true);
     }
 
diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemBoundAxe.java b/src/main/java/WayofTime/bloodmagic/item/ItemBoundAxe.java
index cafe5944..b76723ca 100644
--- a/src/main/java/WayofTime/bloodmagic/item/ItemBoundAxe.java
+++ b/src/main/java/WayofTime/bloodmagic/item/ItemBoundAxe.java
@@ -67,7 +67,7 @@ public class ItemBoundAxe extends ItemBoundTool implements IMeshProvider
 
         boolean silkTouch = EnchantmentHelper.getEnchantmentLevel(Enchantments.SILK_TOUCH, stack) > 0;
         int fortuneLvl = EnchantmentHelper.getEnchantmentLevel(Enchantments.FORTUNE, stack);
-        int range = (int) (charge / 6); //Charge is a max of 30 - want 5 to be the max
+        int range = charge / 6; //Charge is a max of 30 - want 5 to be the max
 
         HashMultiset<ItemStackWrapper> drops = HashMultiset.create();
 
diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemBoundShovel.java b/src/main/java/WayofTime/bloodmagic/item/ItemBoundShovel.java
index c7f5b9eb..16e3d7ac 100644
--- a/src/main/java/WayofTime/bloodmagic/item/ItemBoundShovel.java
+++ b/src/main/java/WayofTime/bloodmagic/item/ItemBoundShovel.java
@@ -66,7 +66,7 @@ public class ItemBoundShovel extends ItemBoundTool implements IMeshProvider
 
         boolean silkTouch = EnchantmentHelper.getEnchantmentLevel(Enchantments.SILK_TOUCH, stack) > 0;
         int fortuneLvl = EnchantmentHelper.getEnchantmentLevel(Enchantments.FORTUNE, stack);
-        int range = (int) (charge / 6); //Charge is a max of 30 - want 5 to be the max
+        int range = charge / 6; //Charge is a max of 30 - want 5 to be the max
 
         HashMultiset<ItemStackWrapper> drops = HashMultiset.create();
 
diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemBoundSword.java b/src/main/java/WayofTime/bloodmagic/item/ItemBoundSword.java
index 23efa140..fb92e1f1 100644
--- a/src/main/java/WayofTime/bloodmagic/item/ItemBoundSword.java
+++ b/src/main/java/WayofTime/bloodmagic/item/ItemBoundSword.java
@@ -35,7 +35,7 @@ import WayofTime.bloodmagic.api.util.helper.NBTHelper;
 import WayofTime.bloodmagic.api.util.helper.PlayerHelper;
 import WayofTime.bloodmagic.client.IMeshProvider;
 import WayofTime.bloodmagic.client.mesh.CustomMeshDefinitionActivatable;
-import WayofTime.bloodmagic.registry.ModItems;
+import WayofTime.bloodmagic.registry.RegistrarBloodMagicItems;
 import WayofTime.bloodmagic.util.helper.TextHelper;
 
 import com.google.common.base.Strings;
@@ -46,10 +46,10 @@ public class ItemBoundSword extends ItemSword implements IBindable, IActivatable
 {
     public ItemBoundSword()
     {
-        super(ModItems.BOUND_TOOL_MATERIAL);
+        super(RegistrarBloodMagicItems.BOUND_TOOL_MATERIAL);
 
-        setUnlocalizedName(Constants.Mod.MODID + ".bound.sword");
-        setCreativeTab(BloodMagic.tabBloodMagic);
+        setUnlocalizedName(BloodMagic.MODID + ".bound.sword");
+        setCreativeTab(BloodMagic.TAB_BM);
     }
 
     @Override
diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemBoundTool.java b/src/main/java/WayofTime/bloodmagic/item/ItemBoundTool.java
index ed35e9b9..a06f4815 100644
--- a/src/main/java/WayofTime/bloodmagic/item/ItemBoundTool.java
+++ b/src/main/java/WayofTime/bloodmagic/item/ItemBoundTool.java
@@ -41,7 +41,7 @@ import WayofTime.bloodmagic.api.event.BoundToolEvent;
 import WayofTime.bloodmagic.api.iface.IActivatable;
 import WayofTime.bloodmagic.api.iface.IBindable;
 import WayofTime.bloodmagic.api.util.helper.NBTHelper;
-import WayofTime.bloodmagic.registry.ModItems;
+import WayofTime.bloodmagic.registry.RegistrarBloodMagicItems;
 import WayofTime.bloodmagic.util.helper.TextHelper;
 
 import com.google.common.collect.ImmutableSet;
@@ -60,9 +60,9 @@ public class ItemBoundTool extends ItemTool implements IBindable, IActivatable
 
     public ItemBoundTool(String name, float damage, Set<Block> effectiveBlocks)
     {
-        super(damage, 1, ModItems.BOUND_TOOL_MATERIAL, effectiveBlocks);
-        setUnlocalizedName(Constants.Mod.MODID + ".bound." + name);
-        setCreativeTab(BloodMagic.tabBloodMagic);
+        super(damage, 1, RegistrarBloodMagicItems.BOUND_TOOL_MATERIAL, effectiveBlocks);
+        setUnlocalizedName(BloodMagic.MODID + ".bound." + name);
+        setCreativeTab(BloodMagic.TAB_BM);
         setHarvestLevel(name, 4);
 
         this.name = name;
diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemComponent.java b/src/main/java/WayofTime/bloodmagic/item/ItemComponent.java
index 0d4bcaa8..872943a7 100644
--- a/src/main/java/WayofTime/bloodmagic/item/ItemComponent.java
+++ b/src/main/java/WayofTime/bloodmagic/item/ItemComponent.java
@@ -15,9 +15,8 @@ import org.apache.commons.lang3.tuple.ImmutablePair;
 import org.apache.commons.lang3.tuple.Pair;
 
 import WayofTime.bloodmagic.BloodMagic;
-import WayofTime.bloodmagic.api.Constants;
 import WayofTime.bloodmagic.client.IVariantProvider;
-import WayofTime.bloodmagic.registry.ModItems;
+import WayofTime.bloodmagic.registry.RegistrarBloodMagicItems;
 
 public class ItemComponent extends Item implements IVariantProvider
 {
@@ -62,9 +61,9 @@ public class ItemComponent extends Item implements IVariantProvider
     {
         super();
 
-        setUnlocalizedName(Constants.Mod.MODID + ".baseComponent.");
+        setUnlocalizedName(BloodMagic.MODID + ".baseComponent.");
         setHasSubtypes(true);
-        setCreativeTab(BloodMagic.tabBloodMagic);
+        setCreativeTab(BloodMagic.TAB_BM);
 
         buildItemList();
     }
@@ -122,7 +121,7 @@ public class ItemComponent extends Item implements IVariantProvider
 
     public static ItemStack getStack(String name)
     {
-        return new ItemStack(ModItems.ITEM_COMPONENT, 1, names.indexOf(name));
+        return new ItemStack(RegistrarBloodMagicItems.ITEM_COMPONENT, 1, names.indexOf(name));
     }
 
     @Override
diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemDaggerOfSacrifice.java b/src/main/java/WayofTime/bloodmagic/item/ItemDaggerOfSacrifice.java
index 967218c8..d0dcd611 100644
--- a/src/main/java/WayofTime/bloodmagic/item/ItemDaggerOfSacrifice.java
+++ b/src/main/java/WayofTime/bloodmagic/item/ItemDaggerOfSacrifice.java
@@ -20,7 +20,6 @@ import org.apache.commons.lang3.tuple.Pair;
 import WayofTime.bloodmagic.BloodMagic;
 import WayofTime.bloodmagic.ConfigHandler;
 import WayofTime.bloodmagic.api.BloodMagicAPI;
-import WayofTime.bloodmagic.api.Constants;
 import WayofTime.bloodmagic.api.util.helper.PlayerSacrificeHelper;
 import WayofTime.bloodmagic.api.util.helper.PurificationHelper;
 import WayofTime.bloodmagic.client.IVariantProvider;
@@ -30,8 +29,8 @@ public class ItemDaggerOfSacrifice extends Item implements IVariantProvider
     public ItemDaggerOfSacrifice()
     {
         super();
-        setUnlocalizedName(Constants.Mod.MODID + ".daggerOfSacrifice");
-        setCreativeTab(BloodMagic.tabBloodMagic);
+        setUnlocalizedName(BloodMagic.MODID + ".daggerOfSacrifice");
+        setCreativeTab(BloodMagic.TAB_BM);
         setMaxStackSize(1);
         setFull3D();
     }
diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemDemonCrystal.java b/src/main/java/WayofTime/bloodmagic/item/ItemDemonCrystal.java
index 1eb88a7b..431ece2c 100644
--- a/src/main/java/WayofTime/bloodmagic/item/ItemDemonCrystal.java
+++ b/src/main/java/WayofTime/bloodmagic/item/ItemDemonCrystal.java
@@ -3,7 +3,7 @@ package WayofTime.bloodmagic.item;
 import java.util.ArrayList;
 import java.util.List;
 
-import lombok.Getter;
+import com.google.common.collect.Lists;
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
@@ -16,16 +16,14 @@ import org.apache.commons.lang3.tuple.ImmutablePair;
 import org.apache.commons.lang3.tuple.Pair;
 
 import WayofTime.bloodmagic.BloodMagic;
-import WayofTime.bloodmagic.api.Constants;
 import WayofTime.bloodmagic.api.soul.EnumDemonWillType;
 import WayofTime.bloodmagic.api.soul.IDiscreteDemonWill;
 import WayofTime.bloodmagic.client.IVariantProvider;
-import WayofTime.bloodmagic.registry.ModItems;
+import WayofTime.bloodmagic.registry.RegistrarBloodMagicItems;
 
 public class ItemDemonCrystal extends Item implements IDiscreteDemonWill, IVariantProvider
 {
-    @Getter
-    private static ArrayList<String> names = new ArrayList<String>();
+    public static final ArrayList<String> NAMES = Lists.newArrayList();
 
     public static final String CRYSTAL_DEFAULT = "crystalDefault";
     public static final String CRYSTAL_CORROSIVE = "crystalCorrosive";
@@ -37,39 +35,42 @@ public class ItemDemonCrystal extends Item implements IDiscreteDemonWill, IVaria
     {
         super();
 
-        setUnlocalizedName(Constants.Mod.MODID + ".demonCrystal.");
+        setUnlocalizedName(BloodMagic.MODID + ".demonCrystal.");
         setHasSubtypes(true);
-        setCreativeTab(BloodMagic.tabBloodMagic);
+        setCreativeTab(BloodMagic.TAB_BM);
 
         buildItemList();
     }
 
     private void buildItemList()
     {
-        names.add(0, CRYSTAL_DEFAULT);
-        names.add(1, CRYSTAL_CORROSIVE);
-        names.add(2, CRYSTAL_DESTRUCTIVE);
-        names.add(3, CRYSTAL_VENGEFUL);
-        names.add(4, CRYSTAL_STEADFAST);
+        NAMES.add(0, CRYSTAL_DEFAULT);
+        NAMES.add(1, CRYSTAL_CORROSIVE);
+        NAMES.add(2, CRYSTAL_DESTRUCTIVE);
+        NAMES.add(3, CRYSTAL_VENGEFUL);
+        NAMES.add(4, CRYSTAL_STEADFAST);
     }
 
     @Override
     public String getUnlocalizedName(ItemStack stack)
     {
-        return super.getUnlocalizedName(stack) + names.get(stack.getItemDamage());
+        return super.getUnlocalizedName(stack) + NAMES.get(stack.getItemDamage());
     }
 
     @Override
     @SideOnly(Side.CLIENT)
-    public void getSubItems(Item id, CreativeTabs creativeTab, NonNullList<ItemStack> list)
+    public void getSubItems(CreativeTabs creativeTab, NonNullList<ItemStack> list)
     {
-        for (int i = 0; i < names.size(); i++)
-            list.add(new ItemStack(id, 1, i));
+        if (!isInCreativeTab(creativeTab))
+            return;
+
+        for (int i = 0; i < NAMES.size(); i++)
+            list.add(new ItemStack(this, 1, i));
     }
 
     public static ItemStack getStack(String name)
     {
-        return new ItemStack(ModItems.ITEM_DEMON_CRYSTAL, 1, names.indexOf(name));
+        return new ItemStack(RegistrarBloodMagicItems.ITEM_DEMON_CRYSTAL, 1, NAMES.indexOf(name));
     }
 
     @Override
@@ -109,8 +110,8 @@ public class ItemDemonCrystal extends Item implements IDiscreteDemonWill, IVaria
     public List<Pair<Integer, String>> getVariants()
     {
         List<Pair<Integer, String>> ret = new ArrayList<Pair<Integer, String>>();
-        for (String name : names)
-            ret.add(new ImmutablePair<Integer, String>(names.indexOf(name), "type=" + name));
+        for (String name : NAMES)
+            ret.add(new ImmutablePair<Integer, String>(NAMES.indexOf(name), "type=" + name));
         return ret;
     }
 }
diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemDemonWillGauge.java b/src/main/java/WayofTime/bloodmagic/item/ItemDemonWillGauge.java
index 4b72a28a..c5490674 100644
--- a/src/main/java/WayofTime/bloodmagic/item/ItemDemonWillGauge.java
+++ b/src/main/java/WayofTime/bloodmagic/item/ItemDemonWillGauge.java
@@ -15,7 +15,6 @@ import org.apache.commons.lang3.tuple.ImmutablePair;
 import org.apache.commons.lang3.tuple.Pair;
 
 import WayofTime.bloodmagic.BloodMagic;
-import WayofTime.bloodmagic.api.Constants;
 import WayofTime.bloodmagic.api.iface.IDemonWillViewer;
 import WayofTime.bloodmagic.client.IVariantProvider;
 import WayofTime.bloodmagic.util.helper.TextHelper;
@@ -24,9 +23,9 @@ public class ItemDemonWillGauge extends Item implements IVariantProvider, IDemon
 {
     public ItemDemonWillGauge()
     {
-        setUnlocalizedName(Constants.Mod.MODID + ".willGauge");
+        setUnlocalizedName(BloodMagic.MODID + ".willGauge");
         setMaxStackSize(1);
-        setCreativeTab(BloodMagic.tabBloodMagic);
+        setCreativeTab(BloodMagic.TAB_BM);
     }
 
     @Override
diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemExperienceBook.java b/src/main/java/WayofTime/bloodmagic/item/ItemExperienceBook.java
index 38d73e31..5d236668 100644
--- a/src/main/java/WayofTime/bloodmagic/item/ItemExperienceBook.java
+++ b/src/main/java/WayofTime/bloodmagic/item/ItemExperienceBook.java
@@ -19,7 +19,6 @@ import org.apache.commons.lang3.tuple.ImmutablePair;
 import org.apache.commons.lang3.tuple.Pair;
 
 import WayofTime.bloodmagic.BloodMagic;
-import WayofTime.bloodmagic.api.Constants;
 import WayofTime.bloodmagic.api.util.helper.NBTHelper;
 import WayofTime.bloodmagic.client.IVariantProvider;
 import WayofTime.bloodmagic.util.helper.TextHelper;
@@ -28,9 +27,9 @@ public class ItemExperienceBook extends Item implements IVariantProvider
 {
     public ItemExperienceBook()
     {
-        setUnlocalizedName(Constants.Mod.MODID + ".experienceTome");
+        setUnlocalizedName(BloodMagic.MODID + ".experienceTome");
         setMaxStackSize(1);
-        setCreativeTab(BloodMagic.tabBloodMagic);
+        setCreativeTab(BloodMagic.TAB_BM);
     }
 
     @Override
diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemInscriptionTool.java b/src/main/java/WayofTime/bloodmagic/item/ItemInscriptionTool.java
index 92dcd5cf..609c71a5 100644
--- a/src/main/java/WayofTime/bloodmagic/item/ItemInscriptionTool.java
+++ b/src/main/java/WayofTime/bloodmagic/item/ItemInscriptionTool.java
@@ -4,6 +4,7 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
+import WayofTime.bloodmagic.BloodMagic;
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.entity.player.EntityPlayer;
@@ -35,7 +36,7 @@ public class ItemInscriptionTool extends ItemBindableBase implements IVariantPro
     {
         super();
 
-        setUnlocalizedName(Constants.Mod.MODID + ".scribe.");
+        setUnlocalizedName(BloodMagic.MODID + ".scribe.");
         setHasSubtypes(true);
     }
 
diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemLavaCrystal.java b/src/main/java/WayofTime/bloodmagic/item/ItemLavaCrystal.java
index d7efd026..64ff93d6 100644
--- a/src/main/java/WayofTime/bloodmagic/item/ItemLavaCrystal.java
+++ b/src/main/java/WayofTime/bloodmagic/item/ItemLavaCrystal.java
@@ -1,31 +1,26 @@
 package WayofTime.bloodmagic.item;
 
-import java.util.ArrayList;
 import java.util.List;
 
+import WayofTime.bloodmagic.BloodMagic;
+import com.google.common.collect.Lists;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.init.MobEffects;
-import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.potion.PotionEffect;
-import net.minecraftforge.fml.common.IFuelHandler;
 
-import org.apache.commons.lang3.tuple.ImmutablePair;
 import org.apache.commons.lang3.tuple.Pair;
 
-import WayofTime.bloodmagic.api.Constants;
 import WayofTime.bloodmagic.api.util.helper.NetworkHelper;
 import WayofTime.bloodmagic.api.util.helper.PlayerHelper;
 import WayofTime.bloodmagic.client.IVariantProvider;
 
-import com.google.common.base.Strings;
-
-public class ItemLavaCrystal extends ItemBindableBase implements IFuelHandler, IVariantProvider
+public class ItemLavaCrystal extends ItemBindableBase implements IVariantProvider
 {
     public ItemLavaCrystal()
     {
         super();
-        setUnlocalizedName(Constants.Mod.MODID + ".lavaCrystal");
+        setUnlocalizedName(BloodMagic.MODID + ".lavaCrystal");
     }
 
     @Override
@@ -45,50 +40,26 @@ public class ItemLavaCrystal extends ItemBindableBase implements IFuelHandler, I
     }
 
     @Override
-    public int getBurnTime(ItemStack fuel)
-    {
-        if (fuel == null)
-        {
-            return 0;
+    public int getItemBurnTime(ItemStack stack) {
+        if (getOwnerUUID(stack) == null)
+            return -1;
+
+        if (NetworkHelper.canSyphonFromContainer(stack, 25))
+            return 200;
+        else {
+            EntityPlayer player = PlayerHelper.getPlayerFromUUID(getOwnerUUID(stack));
+            if (player != null)
+                player.addPotionEffect(new PotionEffect(MobEffects.NAUSEA, 99));
         }
 
-        Item fuelItem = fuel.getItem();
-
-        if (fuelItem instanceof ItemLavaCrystal)
-        {
-//
-//            if (FMLCommonHandler.instance().getSide() == Side.CLIENT)
-//            {
-//                return 200;
-//            }
-//            System.out.println(FMLCommonHandler.instance().getSide());
-
-            if (NetworkHelper.canSyphonFromContainer(fuel, 25))
-            {
-                return 200;
-            } else
-            {
-                if (!Strings.isNullOrEmpty(this.getOwnerUUID(fuel)))
-                {
-                    EntityPlayer player = PlayerHelper.getPlayerFromUUID(this.getOwnerUUID(fuel));
-                    if (player != null)
-                    {
-                        player.addPotionEffect(new PotionEffect(MobEffects.NAUSEA, 99));
-                    }
-                }
-
-                return 0;
-            }
-        }
-
-        return 0;
+        return -1;
     }
 
     @Override
     public List<Pair<Integer, String>> getVariants()
     {
-        List<Pair<Integer, String>> ret = new ArrayList<Pair<Integer, String>>();
-        ret.add(new ImmutablePair<Integer, String>(0, "type=normal"));
+        List<Pair<Integer, String>> ret = Lists.newArrayList();
+        ret.add(Pair.of(0, "type=normal"));
         return ret;
     }
 }
diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemPotionFlask.java b/src/main/java/WayofTime/bloodmagic/item/ItemPotionFlask.java
index dede4a52..c5ab320a 100644
--- a/src/main/java/WayofTime/bloodmagic/item/ItemPotionFlask.java
+++ b/src/main/java/WayofTime/bloodmagic/item/ItemPotionFlask.java
@@ -1,6 +1,5 @@
 package WayofTime.bloodmagic.item;
 
-import java.util.ArrayList;
 import java.util.List;
 
 import WayofTime.bloodmagic.api.util.helper.NBTHelper;
@@ -26,7 +25,6 @@ import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;
 
 import WayofTime.bloodmagic.BloodMagic;
-import WayofTime.bloodmagic.api.Constants;
 
 import javax.annotation.Nullable;
 
@@ -34,8 +32,8 @@ public class ItemPotionFlask extends Item implements IMeshProvider
 {
     public ItemPotionFlask()
     {
-        setUnlocalizedName(Constants.Mod.MODID + ".potionFlask");
-        setCreativeTab(BloodMagic.tabBloodMagic);
+        setUnlocalizedName(BloodMagic.MODID + ".potionFlask");
+        setCreativeTab(BloodMagic.TAB_BM);
         setMaxStackSize(1);
         setMaxDamage(8);
         setNoRepair();
@@ -149,7 +147,7 @@ public class ItemPotionFlask extends Item implements IMeshProvider
                 boolean full = true;
                 if (stack.hasTagCompound() && stack.getTagCompound().hasKey("empty"))
                     full = false;
-                return new ModelResourceLocation(new ResourceLocation(Constants.Mod.MODID, "item/" + getRegistryName().getResourcePath()), "full=" + (full ? "true" : "false"));
+                return new ModelResourceLocation(new ResourceLocation(BloodMagic.MODID, "item/" + getRegistryName().getResourcePath()), "full=" + (full ? "true" : "false"));
             }
         };
     }
diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemRitualDiviner.java b/src/main/java/WayofTime/bloodmagic/item/ItemRitualDiviner.java
index d10e0cde..a4f33273 100644
--- a/src/main/java/WayofTime/bloodmagic/item/ItemRitualDiviner.java
+++ b/src/main/java/WayofTime/bloodmagic/item/ItemRitualDiviner.java
@@ -18,7 +18,6 @@ import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.*;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.RayTraceResult;
-import net.minecraft.util.text.TextComponentString;
 import net.minecraft.util.text.TextComponentTranslation;
 import net.minecraft.world.World;
 import net.minecraftforge.fml.relauncher.Side;
@@ -37,7 +36,7 @@ import WayofTime.bloodmagic.api.ritual.RitualComponent;
 import WayofTime.bloodmagic.api.soul.EnumDemonWillType;
 import WayofTime.bloodmagic.api.util.helper.RitualHelper;
 import WayofTime.bloodmagic.client.IVariantProvider;
-import WayofTime.bloodmagic.registry.ModBlocks;
+import WayofTime.bloodmagic.registry.RegistrarBloodMagicBlocks;
 import WayofTime.bloodmagic.tile.TileMasterRitualStone;
 import WayofTime.bloodmagic.util.ChatUtil;
 import WayofTime.bloodmagic.util.Utils;
@@ -52,8 +51,8 @@ public class ItemRitualDiviner extends Item implements IVariantProvider
 
     public ItemRitualDiviner()
     {
-        setUnlocalizedName(Constants.Mod.MODID + ".ritualDiviner");
-        setCreativeTab(BloodMagic.tabBloodMagic);
+        setUnlocalizedName(BloodMagic.MODID + ".ritualDiviner");
+        setCreativeTab(BloodMagic.TAB_BM);
         setHasSubtypes(true);
         setMaxStackSize(1);
     }
@@ -166,7 +165,7 @@ public class ItemRitualDiviner extends Item implements IVariantProvider
                             return false;
                         }
                         int meta = component.getRuneType().ordinal();
-                        IBlockState newState = ModBlocks.RITUAL_STONE.getStateFromMeta(meta);
+                        IBlockState newState = RegistrarBloodMagicBlocks.RITUAL_STONE.getStateFromMeta(meta);
                         world.setBlockState(newPos, newState);
                         return true;
                     } else
@@ -224,7 +223,7 @@ public class ItemRitualDiviner extends Item implements IVariantProvider
             if (item instanceof ItemBlock)
             {
                 Block block = ((ItemBlock) item).getBlock();
-                if (block == ModBlocks.RITUAL_STONE)
+                if (block == RegistrarBloodMagicBlocks.RITUAL_STONE)
                 {
                     newStack.shrink(1);
                     return true;
diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemRitualReader.java b/src/main/java/WayofTime/bloodmagic/item/ItemRitualReader.java
index 8ae94165..29cbb7a6 100644
--- a/src/main/java/WayofTime/bloodmagic/item/ItemRitualReader.java
+++ b/src/main/java/WayofTime/bloodmagic/item/ItemRitualReader.java
@@ -4,6 +4,7 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
+import WayofTime.bloodmagic.BloodMagic;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
@@ -38,7 +39,7 @@ public class ItemRitualReader extends Item implements IVariantProvider
     public ItemRitualReader()
     {
         super();
-        setUnlocalizedName(Constants.Mod.MODID + ".ritualReader");
+        setUnlocalizedName(BloodMagic.MODID + ".ritualReader");
         setMaxStackSize(1);
     }
 
diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemSacrificialDagger.java b/src/main/java/WayofTime/bloodmagic/item/ItemSacrificialDagger.java
index 7927fabb..a1584cb6 100644
--- a/src/main/java/WayofTime/bloodmagic/item/ItemSacrificialDagger.java
+++ b/src/main/java/WayofTime/bloodmagic/item/ItemSacrificialDagger.java
@@ -24,9 +24,6 @@ import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;
 
-import org.apache.commons.lang3.tuple.ImmutablePair;
-import org.apache.commons.lang3.tuple.Pair;
-
 import WayofTime.bloodmagic.BloodMagic;
 import WayofTime.bloodmagic.api.BloodMagicAPI;
 import WayofTime.bloodmagic.api.Constants;
@@ -34,7 +31,6 @@ import WayofTime.bloodmagic.api.event.SacrificeKnifeUsedEvent;
 import WayofTime.bloodmagic.api.util.helper.NBTHelper;
 import WayofTime.bloodmagic.api.util.helper.PlayerHelper;
 import WayofTime.bloodmagic.api.util.helper.PlayerSacrificeHelper;
-import WayofTime.bloodmagic.client.IVariantProvider;
 import WayofTime.bloodmagic.tile.TileAltar;
 import WayofTime.bloodmagic.util.helper.TextHelper;
 
@@ -48,8 +44,8 @@ public class ItemSacrificialDagger extends Item implements IMeshProvider
     {
         super();
 
-        setUnlocalizedName(Constants.Mod.MODID + ".sacrificialDagger.");
-        setCreativeTab(BloodMagic.tabBloodMagic);
+        setUnlocalizedName(BloodMagic.MODID + ".sacrificialDagger.");
+        setCreativeTab(BloodMagic.TAB_BM);
         setHasSubtypes(true);
         setMaxStackSize(1);
         setFull3D();
@@ -203,7 +199,7 @@ public class ItemSacrificialDagger extends Item implements IMeshProvider
                 if (canUseForSacrifice(stack))
                     variant = "type=ceremonial";
 
-                return new ModelResourceLocation(new ResourceLocation(Constants.Mod.MODID, "item/ItemSacrificialDagger"), variant);
+                return new ModelResourceLocation(new ResourceLocation(BloodMagic.MODID, "item/ItemSacrificialDagger"), variant);
             }
         };
     }
diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemSanguineBook.java b/src/main/java/WayofTime/bloodmagic/item/ItemSanguineBook.java
index 392f0dc2..6470657e 100644
--- a/src/main/java/WayofTime/bloodmagic/item/ItemSanguineBook.java
+++ b/src/main/java/WayofTime/bloodmagic/item/ItemSanguineBook.java
@@ -38,8 +38,8 @@ public class ItemSanguineBook extends Item implements IVariantProvider, IAltarMa
 
     public ItemSanguineBook()
     {
-        setUnlocalizedName(Constants.Mod.MODID + ".sanguineBook");
-        setCreativeTab(BloodMagic.tabBloodMagic);
+        setUnlocalizedName(BloodMagic.MODID + ".sanguineBook");
+        setCreativeTab(BloodMagic.TAB_BM);
         setMaxStackSize(1);
     }
 
diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemSlate.java b/src/main/java/WayofTime/bloodmagic/item/ItemSlate.java
index b250f98f..2a394754 100644
--- a/src/main/java/WayofTime/bloodmagic/item/ItemSlate.java
+++ b/src/main/java/WayofTime/bloodmagic/item/ItemSlate.java
@@ -1,7 +1,6 @@
 package WayofTime.bloodmagic.item;
 
 import WayofTime.bloodmagic.BloodMagic;
-import WayofTime.bloodmagic.api.Constants;
 import WayofTime.bloodmagic.client.IVariantProvider;
 import WayofTime.bloodmagic.util.helper.TextHelper;
 import net.minecraft.creativetab.CreativeTabs;
@@ -26,8 +25,8 @@ public class ItemSlate extends Item implements IVariantProvider
     {
         super();
 
-        setCreativeTab(BloodMagic.tabBloodMagic);
-        setUnlocalizedName(Constants.Mod.MODID + ".slate.");
+        setCreativeTab(BloodMagic.TAB_BM);
+        setUnlocalizedName(BloodMagic.MODID + ".slate.");
         setHasSubtypes(true);
     }
 
diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemTelepositionFocus.java b/src/main/java/WayofTime/bloodmagic/item/ItemTelepositionFocus.java
index 68697b42..1b781ac4 100644
--- a/src/main/java/WayofTime/bloodmagic/item/ItemTelepositionFocus.java
+++ b/src/main/java/WayofTime/bloodmagic/item/ItemTelepositionFocus.java
@@ -34,8 +34,8 @@ public class ItemTelepositionFocus extends ItemBindableBase implements IVariantP
     {
         super();
 
-        setUnlocalizedName(Constants.Mod.MODID + ".focus.");
-        setCreativeTab(BloodMagic.tabBloodMagic);
+        setUnlocalizedName(BloodMagic.MODID + ".focus.");
+        setCreativeTab(BloodMagic.TAB_BM);
         setMaxStackSize(1);
         setHasSubtypes(true);
     }
diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemUpgradeTome.java b/src/main/java/WayofTime/bloodmagic/item/ItemUpgradeTome.java
index 469b521a..0ed7fdaa 100644
--- a/src/main/java/WayofTime/bloodmagic/item/ItemUpgradeTome.java
+++ b/src/main/java/WayofTime/bloodmagic/item/ItemUpgradeTome.java
@@ -20,7 +20,6 @@ import org.apache.commons.lang3.tuple.ImmutablePair;
 import org.apache.commons.lang3.tuple.Pair;
 
 import WayofTime.bloodmagic.BloodMagic;
-import WayofTime.bloodmagic.api.Constants;
 import WayofTime.bloodmagic.api.livingArmour.LivingArmourHandler;
 import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade;
 import WayofTime.bloodmagic.api.util.helper.ItemHelper.LivingUpgrades;
@@ -35,8 +34,8 @@ public class ItemUpgradeTome extends Item implements IVariantProvider
     {
         super();
 
-        setCreativeTab(BloodMagic.tabUpgradeTome);
-        setUnlocalizedName(Constants.Mod.MODID + ".upgradeTome");
+        setCreativeTab(BloodMagic.TAB_TOMES);
+        setUnlocalizedName(BloodMagic.MODID + ".upgradeTome");
         setHasSubtypes(true);
         setMaxStackSize(1);
     }
@@ -82,7 +81,7 @@ public class ItemUpgradeTome extends Item implements IVariantProvider
 
         LivingArmourUpgrade upgrade = LivingUpgrades.getUpgrade(stack);
         if (upgrade != null && upgrade.isDowngrade())
-            return "item." + Constants.Mod.MODID + ".downgradeTome";
+            return "item." + BloodMagic.MODID + ".downgradeTome";
 
         return super.getUnlocalizedName(stack);
     }
diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemUpgradeTrainer.java b/src/main/java/WayofTime/bloodmagic/item/ItemUpgradeTrainer.java
index 3dd969fc..7f451541 100644
--- a/src/main/java/WayofTime/bloodmagic/item/ItemUpgradeTrainer.java
+++ b/src/main/java/WayofTime/bloodmagic/item/ItemUpgradeTrainer.java
@@ -1,7 +1,6 @@
 package WayofTime.bloodmagic.item;
 
 import WayofTime.bloodmagic.BloodMagic;
-import WayofTime.bloodmagic.api.Constants;
 import WayofTime.bloodmagic.api.iface.IUpgradeTrainer;
 import WayofTime.bloodmagic.api.livingArmour.LivingArmourHandler;
 import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade;
@@ -28,8 +27,8 @@ public class ItemUpgradeTrainer extends Item implements IUpgradeTrainer, IVarian
     {
         super();
 
-        setCreativeTab(BloodMagic.tabUpgradeTome);
-        setUnlocalizedName(Constants.Mod.MODID + ".upgradeTrainer");
+        setCreativeTab(BloodMagic.TAB_TOMES);
+        setUnlocalizedName(BloodMagic.MODID + ".upgradeTrainer");
         setHasSubtypes(true);
         setMaxStackSize(1);
     }
diff --git a/src/main/java/WayofTime/bloodmagic/item/alchemy/ItemCuttingFluid.java b/src/main/java/WayofTime/bloodmagic/item/alchemy/ItemCuttingFluid.java
index 18f1063a..c375b389 100644
--- a/src/main/java/WayofTime/bloodmagic/item/alchemy/ItemCuttingFluid.java
+++ b/src/main/java/WayofTime/bloodmagic/item/alchemy/ItemCuttingFluid.java
@@ -17,11 +17,10 @@ import org.apache.commons.lang3.tuple.ImmutablePair;
 import org.apache.commons.lang3.tuple.Pair;
 
 import WayofTime.bloodmagic.BloodMagic;
-import WayofTime.bloodmagic.api.Constants;
 import WayofTime.bloodmagic.api.iface.ICustomAlchemyConsumable;
 import WayofTime.bloodmagic.api.util.helper.NBTHelper;
 import WayofTime.bloodmagic.client.IVariantProvider;
-import WayofTime.bloodmagic.registry.ModItems;
+import WayofTime.bloodmagic.registry.RegistrarBloodMagicItems;
 import WayofTime.bloodmagic.util.helper.TextHelper;
 
 public class ItemCuttingFluid extends Item implements IVariantProvider, ICustomAlchemyConsumable
@@ -36,9 +35,9 @@ public class ItemCuttingFluid extends Item implements IVariantProvider, ICustomA
     {
         super();
 
-        setUnlocalizedName(Constants.Mod.MODID + ".cuttingFluid.");
+        setUnlocalizedName(BloodMagic.MODID + ".cuttingFluid.");
         setHasSubtypes(true);
-        setCreativeTab(BloodMagic.tabBloodMagic);
+        setCreativeTab(BloodMagic.TAB_BM);
         setMaxStackSize(1);
 
         buildItemList();
@@ -76,7 +75,7 @@ public class ItemCuttingFluid extends Item implements IVariantProvider, ICustomA
 
     public static ItemStack getStack(String name)
     {
-        return new ItemStack(ModItems.CUTTING_FLUID, 1, names.indexOf(name));
+        return new ItemStack(RegistrarBloodMagicItems.CUTTING_FLUID, 1, names.indexOf(name));
     }
 
     @Override
diff --git a/src/main/java/WayofTime/bloodmagic/item/alchemy/ItemLivingArmourPointsUpgrade.java b/src/main/java/WayofTime/bloodmagic/item/alchemy/ItemLivingArmourPointsUpgrade.java
index 6564c9fb..a4a9030e 100644
--- a/src/main/java/WayofTime/bloodmagic/item/alchemy/ItemLivingArmourPointsUpgrade.java
+++ b/src/main/java/WayofTime/bloodmagic/item/alchemy/ItemLivingArmourPointsUpgrade.java
@@ -25,11 +25,10 @@ import org.apache.commons.lang3.tuple.ImmutablePair;
 import org.apache.commons.lang3.tuple.Pair;
 
 import WayofTime.bloodmagic.BloodMagic;
-import WayofTime.bloodmagic.api.Constants;
 import WayofTime.bloodmagic.client.IVariantProvider;
 import WayofTime.bloodmagic.item.armour.ItemLivingArmour;
 import WayofTime.bloodmagic.livingArmour.LivingArmour;
-import WayofTime.bloodmagic.registry.ModItems;
+import WayofTime.bloodmagic.registry.RegistrarBloodMagicItems;
 import WayofTime.bloodmagic.util.helper.TextHelper;
 
 import com.google.common.collect.Iterables;
@@ -45,9 +44,9 @@ public class ItemLivingArmourPointsUpgrade extends Item implements IVariantProvi
     {
         super();
 
-        setUnlocalizedName(Constants.Mod.MODID + ".livingPointUpgrade.");
+        setUnlocalizedName(BloodMagic.MODID + ".livingPointUpgrade.");
         setHasSubtypes(true);
-        setCreativeTab(BloodMagic.tabBloodMagic);
+        setCreativeTab(BloodMagic.TAB_BM);
 
         buildItemList();
     }
@@ -137,7 +136,7 @@ public class ItemLivingArmourPointsUpgrade extends Item implements IVariantProvi
 
     public static ItemStack getStack(String name)
     {
-        return new ItemStack(ModItems.ITEM_POINTS_UPGRADE, 1, names.indexOf(name));
+        return new ItemStack(RegistrarBloodMagicItems.ITEM_POINTS_UPGRADE, 1, names.indexOf(name));
     }
 
     @Override
diff --git a/src/main/java/WayofTime/bloodmagic/item/armour/ItemLivingArmour.java b/src/main/java/WayofTime/bloodmagic/item/armour/ItemLivingArmour.java
index 71ff29f1..31abf8de 100644
--- a/src/main/java/WayofTime/bloodmagic/item/armour/ItemLivingArmour.java
+++ b/src/main/java/WayofTime/bloodmagic/item/armour/ItemLivingArmour.java
@@ -45,7 +45,7 @@ import WayofTime.bloodmagic.livingArmour.tracker.StatTrackerRepairing;
 import WayofTime.bloodmagic.livingArmour.upgrade.LivingArmourUpgradeElytra;
 import WayofTime.bloodmagic.network.BloodMagicPacketHandler;
 import WayofTime.bloodmagic.network.PlayerFallDistancePacketProcessor;
-import WayofTime.bloodmagic.registry.ModItems;
+import WayofTime.bloodmagic.registry.RegistrarBloodMagicItems;
 import WayofTime.bloodmagic.util.Utils;
 import WayofTime.bloodmagic.util.helper.TextHelper;
 
@@ -69,16 +69,16 @@ public class ItemLivingArmour extends ItemArmor implements ISpecialArmor, IMeshP
     public ItemLivingArmour(EntityEquipmentSlot armorType)
     {
         super(ItemArmor.ArmorMaterial.IRON, 0, armorType);
-        setUnlocalizedName(Constants.Mod.MODID + ".livingArmour.");
+        setUnlocalizedName(BloodMagic.MODID + ".livingArmour.");
 //        setMaxDamage(250);
         setMaxDamage((int) (getMaxDamage() * 1.5));
-        setCreativeTab(BloodMagic.tabBloodMagic);
+        setCreativeTab(BloodMagic.TAB_BM);
     }
 
     @Override
     public void onCreated(ItemStack stack, World world, EntityPlayer player)
     {
-        if (stack != null && !world.isRemote && stack.getItem() == ModItems.LIVING_ARMOUR_CHEST)
+        if (stack != null && !world.isRemote && stack.getItem() == RegistrarBloodMagicItems.LIVING_ARMOUR_CHEST)
         {
             Utils.setUUID(stack);
         }
@@ -87,12 +87,12 @@ public class ItemLivingArmour extends ItemArmor implements ISpecialArmor, IMeshP
     @Override
     public String getArmorTexture(ItemStack stack, Entity entity, EntityEquipmentSlot slot, String type)
     {
-        if (this == ModItems.LIVING_ARMOUR_CHEST || this == ModItems.LIVING_ARMOUR_HELMET || this == ModItems.LIVING_ARMOUR_BOOTS)
+        if (this == RegistrarBloodMagicItems.LIVING_ARMOUR_CHEST || this == RegistrarBloodMagicItems.LIVING_ARMOUR_HELMET || this == RegistrarBloodMagicItems.LIVING_ARMOUR_BOOTS)
         {
             return "bloodmagic:models/armor/livingArmour_layer_1.png";
         }
 
-        if (this == ModItems.LIVING_ARMOUR_LEGS)
+        if (this == RegistrarBloodMagicItems.LIVING_ARMOUR_LEGS)
         {
             return "bloodmagic:models/armor/livingArmour_layer_2.png";
         } else
@@ -125,13 +125,13 @@ public class ItemLivingArmour extends ItemArmor implements ISpecialArmor, IMeshP
         double armourReduction = 0.0;
         double damageAmount = 0.25;
 
-        if (this == ModItems.LIVING_ARMOUR_BOOTS || this == ModItems.LIVING_ARMOUR_HELMET)
+        if (this == RegistrarBloodMagicItems.LIVING_ARMOUR_BOOTS || this == RegistrarBloodMagicItems.LIVING_ARMOUR_HELMET)
         {
             damageAmount = 3d / 20d * 0.6;
-        } else if (this == ModItems.LIVING_ARMOUR_LEGS)
+        } else if (this == RegistrarBloodMagicItems.LIVING_ARMOUR_LEGS)
         {
             damageAmount = 6d / 20d * 0.6;
-        } else if (this == ModItems.LIVING_ARMOUR_CHEST)
+        } else if (this == RegistrarBloodMagicItems.LIVING_ARMOUR_CHEST)
         {
             damageAmount = 0.64;
         }
@@ -150,7 +150,7 @@ public class ItemLivingArmour extends ItemArmor implements ISpecialArmor, IMeshP
             return new ArmorProperties(-1, 0, 0);
         }
 
-        if (this == ModItems.LIVING_ARMOUR_CHEST)
+        if (this == RegistrarBloodMagicItems.LIVING_ARMOUR_CHEST)
         {
             armourReduction = 0.24 / 0.64; // This values puts it at iron level
 
@@ -208,22 +208,22 @@ public class ItemLivingArmour extends ItemArmor implements ISpecialArmor, IMeshP
     @Override
     public int getArmorDisplay(EntityPlayer player, ItemStack armor, int slot)
     {
-        if (armor.getItem() == ModItems.LIVING_ARMOUR_HELMET)
+        if (armor.getItem() == RegistrarBloodMagicItems.LIVING_ARMOUR_HELMET)
         {
             return 3;
         }
 
-        if (armor.getItem() == ModItems.LIVING_ARMOUR_CHEST)
+        if (armor.getItem() == RegistrarBloodMagicItems.LIVING_ARMOUR_CHEST)
         {
             return 8;
         }
 
-        if (armor.getItem() == ModItems.LIVING_ARMOUR_LEGS)
+        if (armor.getItem() == RegistrarBloodMagicItems.LIVING_ARMOUR_LEGS)
         {
             return 6;
         }
 
-        if (armor.getItem() == ModItems.LIVING_ARMOUR_BOOTS)
+        if (armor.getItem() == RegistrarBloodMagicItems.LIVING_ARMOUR_BOOTS)
         {
             return 3;
         }
@@ -234,7 +234,7 @@ public class ItemLivingArmour extends ItemArmor implements ISpecialArmor, IMeshP
     @Override
     public void damageArmor(EntityLivingBase entity, ItemStack stack, DamageSource source, int damage, int slot)
     {
-        if (this == ModItems.LIVING_ARMOUR_CHEST)
+        if (this == RegistrarBloodMagicItems.LIVING_ARMOUR_CHEST)
         {
             int preDamage = stack.getItemDamage();
             if (source.isUnblockable())
@@ -286,7 +286,7 @@ public class ItemLivingArmour extends ItemArmor implements ISpecialArmor, IMeshP
         if (!stack.hasTagCompound())
             return;
 
-        if (this == ModItems.LIVING_ARMOUR_CHEST)
+        if (this == RegistrarBloodMagicItems.LIVING_ARMOUR_CHEST)
         {
             LivingArmour armour = getLivingArmourFromStack(stack);
             for (Entry<String, LivingArmourUpgrade> entry : armour.upgradeMap.entrySet())
@@ -333,7 +333,7 @@ public class ItemLivingArmour extends ItemArmor implements ISpecialArmor, IMeshP
     {
         super.onArmorTick(world, player, stack);
 
-        if (world.isRemote && this == ModItems.LIVING_ARMOUR_CHEST)
+        if (world.isRemote && this == RegistrarBloodMagicItems.LIVING_ARMOUR_CHEST)
         {
             if (player instanceof EntityPlayerSP) //Sanity check
             {
@@ -358,7 +358,7 @@ public class ItemLivingArmour extends ItemArmor implements ISpecialArmor, IMeshP
                     if (LivingArmour.hasFullSet(player))
                     {
                         ItemStack chestStack = player.getItemStackFromSlot(EntityEquipmentSlot.CHEST);
-                        LivingArmourUpgrade upgrade = ItemLivingArmour.getUpgradeFromNBT(Constants.Mod.MODID + ".upgrade.elytra", chestStack);
+                        LivingArmourUpgrade upgrade = ItemLivingArmour.getUpgradeFromNBT(BloodMagic.MODID + ".upgrade.elytra", chestStack);
                         if (upgrade instanceof LivingArmourUpgradeElytra)
                         {
                             if (spPlayer.movementInput.jump && !spPlayer.onGround && spPlayer.motionY < 0.0D && !spPlayer.capabilities.isFlying)
@@ -384,7 +384,7 @@ public class ItemLivingArmour extends ItemArmor implements ISpecialArmor, IMeshP
             }
         }
 
-        if (this == ModItems.LIVING_ARMOUR_CHEST)
+        if (this == RegistrarBloodMagicItems.LIVING_ARMOUR_CHEST)
         {
             if (!hasLivingArmour(stack))
             {
@@ -405,7 +405,7 @@ public class ItemLivingArmour extends ItemArmor implements ISpecialArmor, IMeshP
     @Override
     public Multimap<String, AttributeModifier> getAttributeModifiers(EntityEquipmentSlot slot, ItemStack stack)
     {
-        if (this == ModItems.LIVING_ARMOUR_CHEST && isEnabled(stack) && slot == EntityEquipmentSlot.CHEST)
+        if (this == RegistrarBloodMagicItems.LIVING_ARMOUR_CHEST && isEnabled(stack) && slot == EntityEquipmentSlot.CHEST)
         {
             LivingArmour armour = ItemLivingArmour.getLivingArmourFromStack(stack);
 
@@ -431,11 +431,11 @@ public class ItemLivingArmour extends ItemArmor implements ISpecialArmor, IMeshP
             public ModelResourceLocation getModelLocation(ItemStack stack)
             {
                 assert getCustomLocation() != null;
-                if (stack.getItem() == ModItems.LIVING_ARMOUR_HELMET)
+                if (stack.getItem() == RegistrarBloodMagicItems.LIVING_ARMOUR_HELMET)
                     return new ModelResourceLocation(getCustomLocation(), "armour=head");
-                else if (stack.getItem() == ModItems.LIVING_ARMOUR_CHEST)
+                else if (stack.getItem() == RegistrarBloodMagicItems.LIVING_ARMOUR_CHEST)
                     return new ModelResourceLocation(getCustomLocation(), "armour=body");
-                else if (stack.getItem() == ModItems.LIVING_ARMOUR_LEGS)
+                else if (stack.getItem() == RegistrarBloodMagicItems.LIVING_ARMOUR_LEGS)
                     return new ModelResourceLocation(getCustomLocation(), "armour=leg");
                 else
                     return new ModelResourceLocation(getCustomLocation(), "armour=feet");
@@ -446,7 +446,7 @@ public class ItemLivingArmour extends ItemArmor implements ISpecialArmor, IMeshP
     @Override
     public ResourceLocation getCustomLocation()
     {
-        return new ResourceLocation(Constants.Mod.MODID, "item/ItemLivingArmour");
+        return new ResourceLocation(BloodMagic.MODID, "item/ItemLivingArmour");
     }
 
     @Override
diff --git a/src/main/java/WayofTime/bloodmagic/item/armour/ItemSentientArmour.java b/src/main/java/WayofTime/bloodmagic/item/armour/ItemSentientArmour.java
index d45d9f65..d1fa549b 100644
--- a/src/main/java/WayofTime/bloodmagic/item/armour/ItemSentientArmour.java
+++ b/src/main/java/WayofTime/bloodmagic/item/armour/ItemSentientArmour.java
@@ -31,7 +31,7 @@ import WayofTime.bloodmagic.api.soul.EnumDemonWillType;
 import WayofTime.bloodmagic.api.soul.PlayerDemonWillHandler;
 import WayofTime.bloodmagic.api.util.helper.NBTHelper;
 import WayofTime.bloodmagic.client.IMeshProvider;
-import WayofTime.bloodmagic.registry.ModItems;
+import WayofTime.bloodmagic.registry.RegistrarBloodMagicItems;
 
 import com.google.common.collect.HashMultimap;
 import com.google.common.collect.Multimap;
@@ -56,15 +56,15 @@ public class ItemSentientArmour extends ItemArmor implements ISpecialArmor, IMes
     public ItemSentientArmour(EntityEquipmentSlot armorType)
     {
         super(ItemArmor.ArmorMaterial.IRON, 0, armorType);
-        setUnlocalizedName(Constants.Mod.MODID + ".sentientArmour.");
+        setUnlocalizedName(BloodMagic.MODID + ".sentientArmour.");
         setMaxDamage(250);
-        setCreativeTab(BloodMagic.tabBloodMagic);
+        setCreativeTab(BloodMagic.TAB_BM);
     }
 
     @Override
     public String getArmorTexture(ItemStack stack, Entity entity, EntityEquipmentSlot slot, String type)
     {
-        if (this == ModItems.SENTIENT_ARMOUR_CHEST || this == ModItems.SENTIENT_ARMOUR_HELMET || this == ModItems.SENTIENT_ARMOUR_BOOTS)
+        if (this == RegistrarBloodMagicItems.SENTIENT_ARMOUR_CHEST || this == RegistrarBloodMagicItems.SENTIENT_ARMOUR_HELMET || this == RegistrarBloodMagicItems.SENTIENT_ARMOUR_BOOTS)
         {
             switch (this.getCurrentType(stack))
             {
@@ -82,7 +82,7 @@ public class ItemSentientArmour extends ItemArmor implements ISpecialArmor, IMes
             return "bloodmagic:models/armor/sentientArmour_layer_1.png";
         }
 
-        if (this == ModItems.SENTIENT_ARMOUR_LEGS)
+        if (this == RegistrarBloodMagicItems.SENTIENT_ARMOUR_LEGS)
         {
             switch (this.getCurrentType(stack))
             {
@@ -159,13 +159,13 @@ public class ItemSentientArmour extends ItemArmor implements ISpecialArmor, IMes
         double armourReduction = 0.0;
         double damageAmount = 0.25;
 
-        if (this == ModItems.SENTIENT_ARMOUR_BOOTS || this == ModItems.SENTIENT_ARMOUR_HELMET)
+        if (this == RegistrarBloodMagicItems.SENTIENT_ARMOUR_BOOTS || this == RegistrarBloodMagicItems.SENTIENT_ARMOUR_HELMET)
         {
             damageAmount = 3d / 20d * 0.6;
-        } else if (this == ModItems.SENTIENT_ARMOUR_LEGS)
+        } else if (this == RegistrarBloodMagicItems.SENTIENT_ARMOUR_LEGS)
         {
             damageAmount = 6d / 20d * 0.6;
-        } else if (this == ModItems.SENTIENT_ARMOUR_CHEST)
+        } else if (this == RegistrarBloodMagicItems.SENTIENT_ARMOUR_CHEST)
         {
             damageAmount = 0.64;
         }
@@ -184,7 +184,7 @@ public class ItemSentientArmour extends ItemArmor implements ISpecialArmor, IMes
             return new ArmorProperties(-1, 0, 0);
         }
 
-        if (this == ModItems.SENTIENT_ARMOUR_CHEST)
+        if (this == RegistrarBloodMagicItems.SENTIENT_ARMOUR_CHEST)
         {
             armourReduction = 0.24 / 0.64; // This values puts it at iron level
 
@@ -230,22 +230,22 @@ public class ItemSentientArmour extends ItemArmor implements ISpecialArmor, IMes
     @Override
     public int getArmorDisplay(EntityPlayer player, ItemStack armor, int slot)
     {
-        if (armor.getItem() == ModItems.SENTIENT_ARMOUR_HELMET)
+        if (armor.getItem() == RegistrarBloodMagicItems.SENTIENT_ARMOUR_HELMET)
         {
             return 3;
         }
 
-        if (armor.getItem() == ModItems.SENTIENT_ARMOUR_CHEST)
+        if (armor.getItem() == RegistrarBloodMagicItems.SENTIENT_ARMOUR_CHEST)
         {
             return 8;
         }
 
-        if (armor.getItem() == ModItems.SENTIENT_ARMOUR_LEGS)
+        if (armor.getItem() == RegistrarBloodMagicItems.SENTIENT_ARMOUR_LEGS)
         {
             return 6;
         }
 
-        if (armor.getItem() == ModItems.SENTIENT_ARMOUR_BOOTS)
+        if (armor.getItem() == RegistrarBloodMagicItems.SENTIENT_ARMOUR_BOOTS)
         {
             return 3;
         }
@@ -329,13 +329,13 @@ public class ItemSentientArmour extends ItemArmor implements ISpecialArmor, IMes
             public ModelResourceLocation getModelLocation(ItemStack stack)
             {
                 assert getCustomLocation() != null;
-                EnumDemonWillType type = ((ItemSentientArmour) ModItems.SENTIENT_ARMOUR_HELMET).getCurrentType(stack);
+                EnumDemonWillType type = ((ItemSentientArmour) RegistrarBloodMagicItems.SENTIENT_ARMOUR_HELMET).getCurrentType(stack);
                 String additional = "_" + type.getName().toLowerCase();
-                if (stack.getItem() == ModItems.SENTIENT_ARMOUR_HELMET)
+                if (stack.getItem() == RegistrarBloodMagicItems.SENTIENT_ARMOUR_HELMET)
                     return new ModelResourceLocation(getCustomLocation(), "armour=head" + additional);
-                else if (stack.getItem() == ModItems.SENTIENT_ARMOUR_CHEST)
+                else if (stack.getItem() == RegistrarBloodMagicItems.SENTIENT_ARMOUR_CHEST)
                     return new ModelResourceLocation(getCustomLocation(), "armour=body" + additional);
-                else if (stack.getItem() == ModItems.SENTIENT_ARMOUR_LEGS)
+                else if (stack.getItem() == RegistrarBloodMagicItems.SENTIENT_ARMOUR_LEGS)
                     return new ModelResourceLocation(getCustomLocation(), "armour=leg" + additional);
                 else
                     return new ModelResourceLocation(getCustomLocation(), "armour=feet" + additional);
@@ -346,7 +346,7 @@ public class ItemSentientArmour extends ItemArmor implements ISpecialArmor, IMes
     @Override
     public ResourceLocation getCustomLocation()
     {
-        return new ResourceLocation(Constants.Mod.MODID, "item/ItemSentientArmour");
+        return new ResourceLocation(BloodMagic.MODID, "item/ItemSentientArmour");
     }
 
     @Override
@@ -440,10 +440,10 @@ public class ItemSentientArmour extends ItemArmor implements ISpecialArmor, IMes
         ItemStack bootsStack = player.getItemStackFromSlot(EntityEquipmentSlot.FEET);
 
         {
-            ItemStack omegaHelmetStack = ((ItemSentientArmour) ModItems.SENTIENT_ARMOUR_HELMET).getSubstituteStack(type, will, helmetStack);
-            ItemStack omegaChestStack = ((ItemSentientArmour) ModItems.SENTIENT_ARMOUR_CHEST).getSubstituteStack(type, will, chestStack);
-            ItemStack omegaLeggingsStack = ((ItemSentientArmour) ModItems.SENTIENT_ARMOUR_LEGS).getSubstituteStack(type, will, leggingsStack);
-            ItemStack omegaBootsStack = ((ItemSentientArmour) ModItems.SENTIENT_ARMOUR_BOOTS).getSubstituteStack(type, will, bootsStack);
+            ItemStack omegaHelmetStack = ((ItemSentientArmour) RegistrarBloodMagicItems.SENTIENT_ARMOUR_HELMET).getSubstituteStack(type, will, helmetStack);
+            ItemStack omegaChestStack = ((ItemSentientArmour) RegistrarBloodMagicItems.SENTIENT_ARMOUR_CHEST).getSubstituteStack(type, will, chestStack);
+            ItemStack omegaLeggingsStack = ((ItemSentientArmour) RegistrarBloodMagicItems.SENTIENT_ARMOUR_LEGS).getSubstituteStack(type, will, leggingsStack);
+            ItemStack omegaBootsStack = ((ItemSentientArmour) RegistrarBloodMagicItems.SENTIENT_ARMOUR_BOOTS).getSubstituteStack(type, will, bootsStack);
 
             player.setItemStackToSlot(EntityEquipmentSlot.HEAD, omegaHelmetStack);
             player.setItemStackToSlot(EntityEquipmentSlot.CHEST, omegaChestStack);
diff --git a/src/main/java/WayofTime/bloodmagic/item/gear/ItemPackSacrifice.java b/src/main/java/WayofTime/bloodmagic/item/gear/ItemPackSacrifice.java
index cf9f222a..ead9db6f 100644
--- a/src/main/java/WayofTime/bloodmagic/item/gear/ItemPackSacrifice.java
+++ b/src/main/java/WayofTime/bloodmagic/item/gear/ItemPackSacrifice.java
@@ -33,8 +33,8 @@ public class ItemPackSacrifice extends ItemArmor implements IAltarManipulator, I
     {
         super(ArmorMaterial.CHAIN, 0, EntityEquipmentSlot.CHEST);
 
-        setUnlocalizedName(Constants.Mod.MODID + ".pack.sacrifice");
-        setCreativeTab(BloodMagic.tabBloodMagic);
+        setUnlocalizedName(BloodMagic.MODID + ".pack.sacrifice");
+        setCreativeTab(BloodMagic.TAB_BM);
     }
 
     @Override
diff --git a/src/main/java/WayofTime/bloodmagic/item/gear/ItemPackSelfSacrifice.java b/src/main/java/WayofTime/bloodmagic/item/gear/ItemPackSelfSacrifice.java
index bba354f1..93368f20 100644
--- a/src/main/java/WayofTime/bloodmagic/item/gear/ItemPackSelfSacrifice.java
+++ b/src/main/java/WayofTime/bloodmagic/item/gear/ItemPackSelfSacrifice.java
@@ -49,8 +49,8 @@ public class ItemPackSelfSacrifice extends ItemArmor implements IAltarManipulato
     {
         super(ArmorMaterial.CHAIN, 0, EntityEquipmentSlot.CHEST);
 
-        setUnlocalizedName(Constants.Mod.MODID + ".pack.selfSacrifice");
-        setCreativeTab(BloodMagic.tabBloodMagic);
+        setUnlocalizedName(BloodMagic.MODID + ".pack.selfSacrifice");
+        setCreativeTab(BloodMagic.TAB_BM);
     }
 
     @Override
diff --git a/src/main/java/WayofTime/bloodmagic/item/routing/ItemFluidRouterFilter.java b/src/main/java/WayofTime/bloodmagic/item/routing/ItemFluidRouterFilter.java
index 2c688aa6..df290575 100644
--- a/src/main/java/WayofTime/bloodmagic/item/routing/ItemFluidRouterFilter.java
+++ b/src/main/java/WayofTime/bloodmagic/item/routing/ItemFluidRouterFilter.java
@@ -17,7 +17,6 @@ import org.apache.commons.lang3.tuple.ImmutablePair;
 import org.apache.commons.lang3.tuple.Pair;
 
 import WayofTime.bloodmagic.BloodMagic;
-import WayofTime.bloodmagic.api.Constants;
 import WayofTime.bloodmagic.client.IVariantProvider;
 import WayofTime.bloodmagic.item.inventory.ItemInventory;
 import WayofTime.bloodmagic.routing.IFluidFilter;
@@ -33,9 +32,9 @@ public class ItemFluidRouterFilter extends Item implements IFluidFilterProvider,
     {
         super();
 
-        setUnlocalizedName(Constants.Mod.MODID + ".fluidFilter.");
+        setUnlocalizedName(BloodMagic.MODID + ".fluidFilter.");
         setHasSubtypes(true);
-        setCreativeTab(BloodMagic.tabBloodMagic);
+        setCreativeTab(BloodMagic.TAB_BM);
     }
 
     @Override
diff --git a/src/main/java/WayofTime/bloodmagic/item/routing/ItemNodeRouter.java b/src/main/java/WayofTime/bloodmagic/item/routing/ItemNodeRouter.java
index cad28fcb..7e565530 100644
--- a/src/main/java/WayofTime/bloodmagic/item/routing/ItemNodeRouter.java
+++ b/src/main/java/WayofTime/bloodmagic/item/routing/ItemNodeRouter.java
@@ -32,9 +32,9 @@ public class ItemNodeRouter extends Item implements INodeRenderer, IVariantProvi
 {
     public ItemNodeRouter()
     {
-        setUnlocalizedName(Constants.Mod.MODID + ".nodeRouter");
+        setUnlocalizedName(BloodMagic.MODID + ".nodeRouter");
         setMaxStackSize(1);
-        setCreativeTab(BloodMagic.tabBloodMagic);
+        setCreativeTab(BloodMagic.TAB_BM);
     }
 
     @Override
diff --git a/src/main/java/WayofTime/bloodmagic/item/routing/ItemRouterFilter.java b/src/main/java/WayofTime/bloodmagic/item/routing/ItemRouterFilter.java
index 5cbd10dc..be5eaef0 100644
--- a/src/main/java/WayofTime/bloodmagic/item/routing/ItemRouterFilter.java
+++ b/src/main/java/WayofTime/bloodmagic/item/routing/ItemRouterFilter.java
@@ -17,7 +17,6 @@ import org.apache.commons.lang3.tuple.ImmutablePair;
 import org.apache.commons.lang3.tuple.Pair;
 
 import WayofTime.bloodmagic.BloodMagic;
-import WayofTime.bloodmagic.api.Constants;
 import WayofTime.bloodmagic.client.IVariantProvider;
 import WayofTime.bloodmagic.item.inventory.ItemInventory;
 import WayofTime.bloodmagic.routing.DefaultItemFilter;
@@ -37,9 +36,9 @@ public class ItemRouterFilter extends Item implements IItemFilterProvider, IVari
     {
         super();
 
-        setUnlocalizedName(Constants.Mod.MODID + ".itemFilter.");
+        setUnlocalizedName(BloodMagic.MODID + ".itemFilter.");
         setHasSubtypes(true);
-        setCreativeTab(BloodMagic.tabBloodMagic);
+        setCreativeTab(BloodMagic.TAB_BM);
     }
 
     @Override
diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilAir.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilAir.java
index 29e6913b..c924da7d 100644
--- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilAir.java
+++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilAir.java
@@ -48,9 +48,9 @@ public class ItemSigilAir extends ItemSigilBase implements ISentientSwordEffectP
                 wantedVelocity += (1 + amplifier) * (0.35);
             }
 
-            player.motionX = vec.xCoord * wantedVelocity;
-            player.motionY = vec.yCoord * wantedVelocity;
-            player.motionZ = vec.zCoord * wantedVelocity;
+            player.motionX = vec.x * wantedVelocity;
+            player.motionY = vec.y * wantedVelocity;
+            player.motionZ = vec.z * wantedVelocity;
             world.playSound(null, player.posX, player.posY, player.posZ, SoundEvents.BLOCK_FIRE_EXTINGUISH, SoundCategory.BLOCKS, 0.5F, 2.6F + (world.rand.nextFloat() - world.rand.nextFloat()) * 0.8F);
         }
 
diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilBase.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilBase.java
index 9cff0cd1..8bc97fda 100644
--- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilBase.java
+++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilBase.java
@@ -17,7 +17,6 @@ import net.minecraftforge.fml.relauncher.SideOnly;
 import org.apache.commons.lang3.tuple.ImmutablePair;
 import org.apache.commons.lang3.tuple.Pair;
 
-import WayofTime.bloodmagic.api.Constants;
 import WayofTime.bloodmagic.client.IVariantProvider;
 import WayofTime.bloodmagic.util.helper.TextHelper;
 
@@ -31,8 +30,8 @@ public class ItemSigilBase extends ItemSigil implements IVariantProvider
     {
         super(lpUsed);
 
-        setUnlocalizedName(Constants.Mod.MODID + ".sigil." + name);
-        setCreativeTab(BloodMagic.tabBloodMagic);
+        setUnlocalizedName(BloodMagic.MODID + ".sigil." + name);
+        setCreativeTab(BloodMagic.TAB_BM);
 
         this.name = name;
         this.tooltipBase = "tooltip.bloodmagic.sigil." + name + ".";
diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilBloodLight.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilBloodLight.java
index ef7ef638..16270618 100644
--- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilBloodLight.java
+++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilBloodLight.java
@@ -15,7 +15,7 @@ import WayofTime.bloodmagic.api.Constants;
 import WayofTime.bloodmagic.api.util.helper.NBTHelper;
 import WayofTime.bloodmagic.api.util.helper.NetworkHelper;
 import WayofTime.bloodmagic.entity.projectile.EntityBloodLight;
-import WayofTime.bloodmagic.registry.ModBlocks;
+import WayofTime.bloodmagic.registry.RegistrarBloodMagicBlocks;
 
 public class ItemSigilBloodLight extends ItemSigilBase
 {
@@ -51,7 +51,7 @@ public class ItemSigilBloodLight extends ItemSigilBase
 
             if (world.isAirBlock(blockPos))
             {
-                world.setBlockState(blockPos, ModBlocks.BLOOD_LIGHT.getDefaultState());
+                world.setBlockState(blockPos, RegistrarBloodMagicBlocks.BLOOD_LIGHT.getDefaultState());
                 if (!world.isRemote)
                     NetworkHelper.getSoulNetwork(getOwnerUUID(stack)).syphonAndDamage(player, getLpUsed());
                 resetCooldown(stack);
diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilGreenGrove.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilGreenGrove.java
index a42dd360..95c4120b 100644
--- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilGreenGrove.java
+++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilGreenGrove.java
@@ -61,7 +61,7 @@ public class ItemSigilGreenGrove extends ItemSigilToggleableBase
                     BlockPos blockPos = new BlockPos(ix, iy, iz);
                     Block block = worldIn.getBlockState(blockPos).getBlock();
 
-                    if (!BloodMagicAPI.getGreenGroveBlacklist().contains(block))
+                    if (!BloodMagicAPI.greenGroveBlacklist.contains(block))
                     {
                         if (block instanceof IPlantable || block instanceof IGrowable)
                         {
diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilPhantomBridge.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilPhantomBridge.java
index 9dfeaec3..1317289f 100644
--- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilPhantomBridge.java
+++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilPhantomBridge.java
@@ -6,14 +6,12 @@ import java.util.Map;
 import WayofTime.bloodmagic.api.util.helper.PlayerHelper;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
-import net.minecraft.util.ActionResult;
-import net.minecraft.util.EnumActionResult;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
 
 import org.apache.commons.lang3.tuple.Pair;
 
-import WayofTime.bloodmagic.registry.ModBlocks;
+import WayofTime.bloodmagic.registry.RegistrarBloodMagicBlocks;
 
 public class ItemSigilPhantomBridge extends ItemSigilToggleableBase
 {
@@ -88,7 +86,7 @@ public class ItemSigilPhantomBridge extends ItemSigilToggleableBase
                 BlockPos blockPos = new BlockPos(ix + posX, posY + verticalOffset, iz + posZ);
 
                 if (world.isAirBlock(blockPos))
-                    world.setBlockState(blockPos, ModBlocks.PHANTOM_BLOCK.getDefaultState());
+                    world.setBlockState(blockPos, RegistrarBloodMagicBlocks.PHANTOM.getDefaultState());
             }
         }
 
diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilToggleableBase.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilToggleableBase.java
index 63692bb4..286ff886 100644
--- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilToggleableBase.java
+++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilToggleableBase.java
@@ -4,9 +4,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 import WayofTime.bloodmagic.BloodMagic;
-import WayofTime.bloodmagic.api.Constants;
 import WayofTime.bloodmagic.api.impl.ItemSigilToggleable;
-import WayofTime.bloodmagic.api.util.helper.NBTHelper;
 import WayofTime.bloodmagic.api.util.helper.PlayerHelper;
 import WayofTime.bloodmagic.client.IMeshProvider;
 import WayofTime.bloodmagic.client.mesh.CustomMeshDefinitionActivatable;
@@ -32,8 +30,8 @@ public class ItemSigilToggleableBase extends ItemSigilToggleable implements IMes
     {
         super(lpUsed);
 
-        setUnlocalizedName(Constants.Mod.MODID + ".sigil." + name);
-        setCreativeTab(BloodMagic.tabBloodMagic);
+        setUnlocalizedName(BloodMagic.MODID + ".sigil." + name);
+        setCreativeTab(BloodMagic.TAB_BM);
 
         this.name = name;
         this.tooltipBase = "tooltip.bloodmagic.sigil." + name + ".";
diff --git a/src/main/java/WayofTime/bloodmagic/item/soul/ItemMonsterSoul.java b/src/main/java/WayofTime/bloodmagic/item/soul/ItemMonsterSoul.java
index d181f80a..117b3f17 100644
--- a/src/main/java/WayofTime/bloodmagic/item/soul/ItemMonsterSoul.java
+++ b/src/main/java/WayofTime/bloodmagic/item/soul/ItemMonsterSoul.java
@@ -30,8 +30,8 @@ public class ItemMonsterSoul extends Item implements IDemonWill, IVariantProvide
     {
         super();
 
-        setUnlocalizedName(Constants.Mod.MODID + ".monsterSoul.");
-        setCreativeTab(BloodMagic.tabBloodMagic);
+        setUnlocalizedName(BloodMagic.MODID + ".monsterSoul.");
+        setCreativeTab(BloodMagic.TAB_BM);
         setHasSubtypes(true);
         setMaxStackSize(1);
     }
diff --git a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientArmourGem.java b/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientArmourGem.java
index 6b13d6b3..1a7c9e7c 100644
--- a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientArmourGem.java
+++ b/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientArmourGem.java
@@ -12,7 +12,6 @@ import net.minecraft.world.World;
 import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;
 import WayofTime.bloodmagic.BloodMagic;
-import WayofTime.bloodmagic.api.Constants;
 import WayofTime.bloodmagic.api.soul.EnumDemonWillType;
 import WayofTime.bloodmagic.api.soul.PlayerDemonWillHandler;
 import WayofTime.bloodmagic.item.armour.ItemSentientArmour;
@@ -23,8 +22,8 @@ public class ItemSentientArmourGem extends Item
     {
         super();
 
-        setCreativeTab(BloodMagic.tabBloodMagic);
-        setUnlocalizedName(Constants.Mod.MODID + ".sentientArmourGem");
+        setCreativeTab(BloodMagic.TAB_BM);
+        setUnlocalizedName(BloodMagic.MODID + ".sentientArmourGem");
         setMaxStackSize(1);
     }
 
diff --git a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientAxe.java b/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientAxe.java
index 9258b7ed..1908126c 100644
--- a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientAxe.java
+++ b/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientAxe.java
@@ -40,7 +40,7 @@ import WayofTime.bloodmagic.api.util.helper.NBTHelper;
 import WayofTime.bloodmagic.client.IMeshProvider;
 import WayofTime.bloodmagic.client.mesh.CustomMeshDefinitionMultiWill;
 import WayofTime.bloodmagic.entity.mob.EntitySentientSpecter;
-import WayofTime.bloodmagic.registry.ModItems;
+import WayofTime.bloodmagic.registry.RegistrarBloodMagicItems;
 import WayofTime.bloodmagic.util.helper.TextHelper;
 
 import com.google.common.collect.HashMultimap;
@@ -80,8 +80,8 @@ public class ItemSentientAxe extends ItemAxe implements IDemonWillWeapon, IMeshP
         setMaxDamage(getMaxDamage() * 2);
 //        super(ModItems.soulToolMaterial);
 
-        setUnlocalizedName(Constants.Mod.MODID + ".sentientAxe");
-        setCreativeTab(BloodMagic.tabBloodMagic);
+        setUnlocalizedName(BloodMagic.MODID + ".sentientAxe");
+        setCreativeTab(BloodMagic.TAB_BM);
     }
 
     @Override
@@ -100,7 +100,7 @@ public class ItemSentientAxe extends ItemAxe implements IDemonWillWeapon, IMeshP
     @Override
     public boolean getIsRepairable(ItemStack toRepair, ItemStack repair)
     {
-        return ModItems.ITEM_DEMON_CRYSTAL == repair.getItem() || super.getIsRepairable(toRepair, repair);
+        return RegistrarBloodMagicItems.ITEM_DEMON_CRYSTAL == repair.getItem() || super.getIsRepairable(toRepair, repair);
     }
 
     public void recalculatePowers(ItemStack stack, World world, EntityPlayer player)
@@ -372,7 +372,7 @@ public class ItemSentientAxe extends ItemAxe implements IDemonWillWeapon, IMeshP
 
         double willModifier = killedEntity instanceof EntitySlime ? 0.67 : 1;
 
-        IDemonWill soul = ((IDemonWill) ModItems.MONSTER_SOUL);
+        IDemonWill soul = ((IDemonWill) RegistrarBloodMagicItems.MONSTER_SOUL);
 
         EnumDemonWillType type = this.getCurrentType(stack);
 
diff --git a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientBow.java b/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientBow.java
index 366c29ba..756afb9d 100644
--- a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientBow.java
+++ b/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientBow.java
@@ -31,7 +31,7 @@ import WayofTime.bloodmagic.api.soul.PlayerDemonWillHandler;
 import WayofTime.bloodmagic.api.util.helper.NBTHelper;
 import WayofTime.bloodmagic.entity.mob.EntitySentientSpecter;
 import WayofTime.bloodmagic.entity.projectile.EntitySentientArrow;
-import WayofTime.bloodmagic.registry.ModItems;
+import WayofTime.bloodmagic.registry.RegistrarBloodMagicItems;
 
 import java.util.Locale;
 
@@ -47,8 +47,8 @@ public class ItemSentientBow extends ItemBow implements IMultiWillTool, ISentien
     public ItemSentientBow()
     {
         super();
-        setUnlocalizedName(Constants.Mod.MODID + ".sentientBow");
-        setCreativeTab(BloodMagic.tabBloodMagic);
+        setUnlocalizedName(BloodMagic.MODID + ".sentientBow");
+        setCreativeTab(BloodMagic.TAB_BM);
         this.addPropertyOverride(new ResourceLocation("pull"), new IItemPropertyGetter()
         {
             @SideOnly(Side.CLIENT)
@@ -60,7 +60,7 @@ public class ItemSentientBow extends ItemBow implements IMultiWillTool, ISentien
                 } else
                 {
                     ItemStack itemstack = entityIn.getActiveItemStack();
-                    return !itemstack.isEmpty() && itemstack.getItem() == ModItems.SENTIENT_BOW ? (float) (stack.getMaxItemUseDuration() - entityIn.getItemInUseCount()) / 20.0F : 0.0F;
+                    return !itemstack.isEmpty() && itemstack.getItem() == RegistrarBloodMagicItems.SENTIENT_BOW ? (float) (stack.getMaxItemUseDuration() - entityIn.getItemInUseCount()) / 20.0F : 0.0F;
                 }
             }
         });
@@ -77,7 +77,7 @@ public class ItemSentientBow extends ItemBow implements IMultiWillTool, ISentien
             @SideOnly(Side.CLIENT)
             public float apply(ItemStack stack, World world, EntityLivingBase entityIn)
             {
-                return ((ItemSentientBow) ModItems.SENTIENT_BOW).getCurrentType(stack).ordinal();
+                return ((ItemSentientBow) RegistrarBloodMagicItems.SENTIENT_BOW).getCurrentType(stack).ordinal();
             }
         });
     }
@@ -85,7 +85,7 @@ public class ItemSentientBow extends ItemBow implements IMultiWillTool, ISentien
     @Override
     public boolean getIsRepairable(ItemStack toRepair, ItemStack repair)
     {
-        return ModItems.ITEM_DEMON_CRYSTAL == repair.getItem() || super.getIsRepairable(toRepair, repair);
+        return RegistrarBloodMagicItems.ITEM_DEMON_CRYSTAL == repair.getItem() || super.getIsRepairable(toRepair, repair);
     }
 
     public void recalculatePowers(ItemStack stack, World world, EntityPlayer player)
diff --git a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientPickaxe.java b/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientPickaxe.java
index 42b4c6ed..d5ff992e 100644
--- a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientPickaxe.java
+++ b/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientPickaxe.java
@@ -40,7 +40,7 @@ import WayofTime.bloodmagic.api.util.helper.NBTHelper;
 import WayofTime.bloodmagic.client.IMeshProvider;
 import WayofTime.bloodmagic.client.mesh.CustomMeshDefinitionMultiWill;
 import WayofTime.bloodmagic.entity.mob.EntitySentientSpecter;
-import WayofTime.bloodmagic.registry.ModItems;
+import WayofTime.bloodmagic.registry.RegistrarBloodMagicItems;
 import WayofTime.bloodmagic.util.helper.TextHelper;
 
 import com.google.common.collect.HashMultimap;
@@ -80,8 +80,8 @@ public class ItemSentientPickaxe extends ItemPickaxe implements IDemonWillWeapon
         setMaxDamage(getMaxDamage() * 2);
 //        super(ModItems.soulToolMaterial);
 
-        setUnlocalizedName(Constants.Mod.MODID + ".sentientPickaxe");
-        setCreativeTab(BloodMagic.tabBloodMagic);
+        setUnlocalizedName(BloodMagic.MODID + ".sentientPickaxe");
+        setCreativeTab(BloodMagic.TAB_BM);
     }
 
     @Override
@@ -100,7 +100,7 @@ public class ItemSentientPickaxe extends ItemPickaxe implements IDemonWillWeapon
     @Override
     public boolean getIsRepairable(ItemStack toRepair, ItemStack repair)
     {
-        return ModItems.ITEM_DEMON_CRYSTAL == repair.getItem() ? true : super.getIsRepairable(toRepair, repair);
+        return RegistrarBloodMagicItems.ITEM_DEMON_CRYSTAL == repair.getItem() ? true : super.getIsRepairable(toRepair, repair);
     }
 
     public void recalculatePowers(ItemStack stack, World world, EntityPlayer player)
@@ -371,7 +371,7 @@ public class ItemSentientPickaxe extends ItemPickaxe implements IDemonWillWeapon
 
         double willModifier = killedEntity instanceof EntitySlime ? 0.67 : 1;
 
-        IDemonWill soul = ((IDemonWill) ModItems.MONSTER_SOUL);
+        IDemonWill soul = ((IDemonWill) RegistrarBloodMagicItems.MONSTER_SOUL);
 
         EnumDemonWillType type = this.getCurrentType(stack);
 
diff --git a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientShovel.java b/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientShovel.java
index 1863650e..cd7f8772 100644
--- a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientShovel.java
+++ b/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientShovel.java
@@ -40,7 +40,7 @@ import WayofTime.bloodmagic.api.util.helper.NBTHelper;
 import WayofTime.bloodmagic.client.IMeshProvider;
 import WayofTime.bloodmagic.client.mesh.CustomMeshDefinitionMultiWill;
 import WayofTime.bloodmagic.entity.mob.EntitySentientSpecter;
-import WayofTime.bloodmagic.registry.ModItems;
+import WayofTime.bloodmagic.registry.RegistrarBloodMagicItems;
 import WayofTime.bloodmagic.util.helper.TextHelper;
 
 import com.google.common.collect.HashMultimap;
@@ -80,8 +80,8 @@ public class ItemSentientShovel extends ItemSpade implements IDemonWillWeapon, I
         setMaxDamage(getMaxDamage() * 2);
 //        super(ModItems.soulToolMaterial);
 
-        setUnlocalizedName(Constants.Mod.MODID + ".sentientShovel");
-        setCreativeTab(BloodMagic.tabBloodMagic);
+        setUnlocalizedName(BloodMagic.MODID + ".sentientShovel");
+        setCreativeTab(BloodMagic.TAB_BM);
     }
 
     @Override
@@ -100,7 +100,7 @@ public class ItemSentientShovel extends ItemSpade implements IDemonWillWeapon, I
     @Override
     public boolean getIsRepairable(ItemStack toRepair, ItemStack repair)
     {
-        return ModItems.ITEM_DEMON_CRYSTAL == repair.getItem() || super.getIsRepairable(toRepair, repair);
+        return RegistrarBloodMagicItems.ITEM_DEMON_CRYSTAL == repair.getItem() || super.getIsRepairable(toRepair, repair);
     }
 
     public void recalculatePowers(ItemStack stack, World world, EntityPlayer player)
@@ -372,7 +372,7 @@ public class ItemSentientShovel extends ItemSpade implements IDemonWillWeapon, I
 
         double willModifier = killedEntity instanceof EntitySlime ? 0.67 : 1;
 
-        IDemonWill soul = ((IDemonWill) ModItems.MONSTER_SOUL);
+        IDemonWill soul = ((IDemonWill) RegistrarBloodMagicItems.MONSTER_SOUL);
 
         EnumDemonWillType type = this.getCurrentType(stack);
 
diff --git a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientSword.java b/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientSword.java
index 328bbebc..c91d43b2 100644
--- a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientSword.java
+++ b/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientSword.java
@@ -38,7 +38,7 @@ import WayofTime.bloodmagic.api.util.helper.NBTHelper;
 import WayofTime.bloodmagic.client.IMeshProvider;
 import WayofTime.bloodmagic.client.mesh.CustomMeshDefinitionMultiWill;
 import WayofTime.bloodmagic.entity.mob.EntitySentientSpecter;
-import WayofTime.bloodmagic.registry.ModItems;
+import WayofTime.bloodmagic.registry.RegistrarBloodMagicItems;
 import WayofTime.bloodmagic.util.helper.TextHelper;
 
 import com.google.common.collect.HashMultimap;
@@ -70,16 +70,16 @@ public class ItemSentientSword extends ItemSword implements IDemonWillWeapon, IM
 
     public ItemSentientSword()
     {
-        super(ModItems.SOUL_TOOL_MATERIAL);
+        super(RegistrarBloodMagicItems.SOUL_TOOL_MATERIAL);
 
-        setUnlocalizedName(Constants.Mod.MODID + ".sentientSword");
-        setCreativeTab(BloodMagic.tabBloodMagic);
+        setUnlocalizedName(BloodMagic.MODID + ".sentientSword");
+        setCreativeTab(BloodMagic.TAB_BM);
     }
 
     @Override
     public boolean getIsRepairable(ItemStack toRepair, ItemStack repair)
     {
-        return ModItems.ITEM_DEMON_CRYSTAL == repair.getItem() || super.getIsRepairable(toRepair, repair);
+        return RegistrarBloodMagicItems.ITEM_DEMON_CRYSTAL == repair.getItem() || super.getIsRepairable(toRepair, repair);
     }
 
     public void recalculatePowers(ItemStack stack, World world, EntityPlayer player)
@@ -343,7 +343,7 @@ public class ItemSentientSword extends ItemSword implements IDemonWillWeapon, IM
 
         double willModifier = killedEntity instanceof EntitySlime ? 0.67 : 1;
 
-        IDemonWill soul = ((IDemonWill) ModItems.MONSTER_SOUL);
+        IDemonWill soul = ((IDemonWill) RegistrarBloodMagicItems.MONSTER_SOUL);
 
         EnumDemonWillType type = this.getCurrentType(stack);
 
diff --git a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSoulGem.java b/src/main/java/WayofTime/bloodmagic/item/soul/ItemSoulGem.java
index a77b0f0d..e065e8b2 100644
--- a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSoulGem.java
+++ b/src/main/java/WayofTime/bloodmagic/item/soul/ItemSoulGem.java
@@ -37,10 +37,10 @@ public class ItemSoulGem extends Item implements IDemonWillGem, IMeshProvider, I
     {
         super();
 
-        setUnlocalizedName(Constants.Mod.MODID + ".soulGem.");
+        setUnlocalizedName(BloodMagic.MODID + ".soulGem.");
         setHasSubtypes(true);
         setMaxStackSize(1);
-        setCreativeTab(BloodMagic.tabBloodMagic);
+        setCreativeTab(BloodMagic.TAB_BM);
     }
 
     @Override
diff --git a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSoulSnare.java b/src/main/java/WayofTime/bloodmagic/item/soul/ItemSoulSnare.java
index dc61d420..4fa4a6af 100644
--- a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSoulSnare.java
+++ b/src/main/java/WayofTime/bloodmagic/item/soul/ItemSoulSnare.java
@@ -1,7 +1,6 @@
 package WayofTime.bloodmagic.item.soul;
 
 import WayofTime.bloodmagic.BloodMagic;
-import WayofTime.bloodmagic.api.Constants;
 import WayofTime.bloodmagic.client.IVariantProvider;
 import WayofTime.bloodmagic.entity.projectile.EntitySoulSnare;
 import WayofTime.bloodmagic.util.helper.TextHelper;
@@ -30,8 +29,8 @@ public class ItemSoulSnare extends Item implements IVariantProvider
     {
         super();
 
-        setUnlocalizedName(Constants.Mod.MODID + ".soulSnare.");
-        setCreativeTab(BloodMagic.tabBloodMagic);
+        setUnlocalizedName(BloodMagic.MODID + ".soulSnare.");
+        setCreativeTab(BloodMagic.TAB_BM);
         setHasSubtypes(true);
         setMaxStackSize(16);
     }
diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeBattleHungry.java b/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeBattleHungry.java
index db53c6f8..51bac32a 100644
--- a/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeBattleHungry.java
+++ b/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeBattleHungry.java
@@ -1,9 +1,9 @@
 package WayofTime.bloodmagic.livingArmour.downgrade;
 
+import WayofTime.bloodmagic.BloodMagic;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.world.World;
-import WayofTime.bloodmagic.api.Constants;
 import WayofTime.bloodmagic.api.livingArmour.ILivingArmour;
 import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade;
 
@@ -43,7 +43,7 @@ public class LivingArmourUpgradeBattleHungry extends LivingArmourUpgrade
     @Override
     public String getUniqueIdentifier()
     {
-        return Constants.Mod.MODID + ".upgrade.battleHunger";
+        return BloodMagic.MODID + ".upgrade.battleHunger";
     }
 
     @Override
diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeCrippledArm.java b/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeCrippledArm.java
index 81b646bf..489dfd4d 100644
--- a/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeCrippledArm.java
+++ b/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeCrippledArm.java
@@ -1,9 +1,9 @@
 package WayofTime.bloodmagic.livingArmour.downgrade;
 
+import WayofTime.bloodmagic.BloodMagic;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.world.World;
-import WayofTime.bloodmagic.api.Constants;
 import WayofTime.bloodmagic.api.livingArmour.ILivingArmour;
 import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade;
 
@@ -25,7 +25,7 @@ public class LivingArmourUpgradeCrippledArm extends LivingArmourUpgrade
     @Override
     public String getUniqueIdentifier()
     {
-        return Constants.Mod.MODID + ".upgrade.crippledArm";
+        return BloodMagic.MODID + ".upgrade.crippledArm";
     }
 
     @Override
diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeDigSlowdown.java b/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeDigSlowdown.java
index 8da4d5bc..22c7f835 100644
--- a/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeDigSlowdown.java
+++ b/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeDigSlowdown.java
@@ -2,13 +2,12 @@ package WayofTime.bloodmagic.livingArmour.downgrade;
 
 import java.util.HashMap;
 
+import WayofTime.bloodmagic.BloodMagic;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.world.World;
-import WayofTime.bloodmagic.api.Constants;
 import WayofTime.bloodmagic.api.livingArmour.ILivingArmour;
 import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade;
-import WayofTime.bloodmagic.livingArmour.LivingArmour;
 
 public class LivingArmourUpgradeDigSlowdown extends LivingArmourUpgrade
 {
@@ -38,7 +37,7 @@ public class LivingArmourUpgradeDigSlowdown extends LivingArmourUpgrade
     @Override
     public String getUniqueIdentifier()
     {
-        return Constants.Mod.MODID + ".upgrade.digSlowdown";
+        return BloodMagic.MODID + ".upgrade.digSlowdown";
     }
 
     @Override
diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeDisoriented.java b/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeDisoriented.java
index 81b1ae68..748e46c5 100644
--- a/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeDisoriented.java
+++ b/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeDisoriented.java
@@ -1,9 +1,9 @@
 package WayofTime.bloodmagic.livingArmour.downgrade;
 
+import WayofTime.bloodmagic.BloodMagic;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.world.World;
-import WayofTime.bloodmagic.api.Constants;
 import WayofTime.bloodmagic.api.livingArmour.ILivingArmour;
 import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade;
 
@@ -36,7 +36,7 @@ public class LivingArmourUpgradeDisoriented extends LivingArmourUpgrade
     @Override
     public String getUniqueIdentifier()
     {
-        return Constants.Mod.MODID + ".upgrade.disoriented";
+        return BloodMagic.MODID + ".upgrade.disoriented";
     }
 
     @Override
diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeMeleeDecrease.java b/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeMeleeDecrease.java
index fbbf800f..7bf7d5b7 100644
--- a/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeMeleeDecrease.java
+++ b/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeMeleeDecrease.java
@@ -1,6 +1,6 @@
 package WayofTime.bloodmagic.livingArmour.downgrade;
 
-import WayofTime.bloodmagic.api.Constants;
+import WayofTime.bloodmagic.BloodMagic;
 import WayofTime.bloodmagic.api.livingArmour.ILivingArmour;
 import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade;
 
@@ -46,7 +46,7 @@ public class LivingArmourUpgradeMeleeDecrease extends LivingArmourUpgrade
     @Override
     public String getUniqueIdentifier()
     {
-        return Constants.Mod.MODID + ".upgrade.meleeDecrease";
+        return BloodMagic.MODID + ".upgrade.meleeDecrease";
     }
 
     @Override
diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeQuenched.java b/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeQuenched.java
index acad75c6..57af0b42 100644
--- a/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeQuenched.java
+++ b/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeQuenched.java
@@ -1,9 +1,9 @@
 package WayofTime.bloodmagic.livingArmour.downgrade;
 
+import WayofTime.bloodmagic.BloodMagic;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.world.World;
-import WayofTime.bloodmagic.api.Constants;
 import WayofTime.bloodmagic.api.livingArmour.ILivingArmour;
 import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade;
 
@@ -25,7 +25,7 @@ public class LivingArmourUpgradeQuenched extends LivingArmourUpgrade
     @Override
     public String getUniqueIdentifier()
     {
-        return Constants.Mod.MODID + ".upgrade.quenched";
+        return BloodMagic.MODID + ".upgrade.quenched";
     }
 
     @Override
diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeSlippery.java b/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeSlippery.java
index cfa1f3a4..aded04f5 100644
--- a/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeSlippery.java
+++ b/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeSlippery.java
@@ -1,10 +1,10 @@
 package WayofTime.bloodmagic.livingArmour.downgrade;
 
+import WayofTime.bloodmagic.BloodMagic;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
-import WayofTime.bloodmagic.api.Constants;
 import WayofTime.bloodmagic.api.livingArmour.ILivingArmour;
 import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade;
 
@@ -34,8 +34,8 @@ public class LivingArmourUpgradeSlippery extends LivingArmourUpgrade
                     f6 = world.getBlockState(blockpos$pooledmutableblockpos).getBlock().slipperiness * 0.91F;
                 }
 
-                player.motionX /= (double) (f6 / 0.91);
-                player.motionZ /= (double) (f6 / 0.91);
+                player.motionX /= f6 / 0.91;
+                player.motionZ /= f6 / 0.91;
 
                 float f7 = 0.16277136F / (f6 * f6 * f6);
                 float f8;
@@ -48,9 +48,9 @@ public class LivingArmourUpgradeSlippery extends LivingArmourUpgrade
                     f8 = player.jumpMovementFactor;
                 }
 
-                player.moveRelative(-player.moveStrafing, -player.moveForward, f8);
+                player.moveRelative(-player.moveStrafing, -player.moveForward, f8, 0.02F);
 
-                player.moveRelative(player.moveStrafing, player.moveForward, f8 / 10);
+                player.moveRelative(player.moveStrafing, player.moveForward, f8 / 10, 0.02F);
 
                 player.motionX *= 0.90;
                 player.motionY *= 0.90;
@@ -67,7 +67,7 @@ public class LivingArmourUpgradeSlippery extends LivingArmourUpgrade
     @Override
     public String getUniqueIdentifier()
     {
-        return Constants.Mod.MODID + ".upgrade.slippery";
+        return BloodMagic.MODID + ".upgrade.slippery";
     }
 
     @Override
diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeSlowHeal.java b/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeSlowHeal.java
index 5951579a..97100bee 100644
--- a/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeSlowHeal.java
+++ b/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeSlowHeal.java
@@ -1,9 +1,9 @@
 package WayofTime.bloodmagic.livingArmour.downgrade;
 
+import WayofTime.bloodmagic.BloodMagic;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.world.World;
-import WayofTime.bloodmagic.api.Constants;
 import WayofTime.bloodmagic.api.livingArmour.ILivingArmour;
 import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade;
 
@@ -32,7 +32,7 @@ public class LivingArmourUpgradeSlowHeal extends LivingArmourUpgrade
     @Override
     public String getUniqueIdentifier()
     {
-        return Constants.Mod.MODID + ".upgrade.slowHeal";
+        return BloodMagic.MODID + ".upgrade.slowHeal";
     }
 
     @Override
diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeSlowness.java b/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeSlowness.java
index ff1dce79..bd1c9898 100644
--- a/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeSlowness.java
+++ b/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeSlowness.java
@@ -2,12 +2,12 @@ package WayofTime.bloodmagic.livingArmour.downgrade;
 
 import java.util.UUID;
 
+import WayofTime.bloodmagic.BloodMagic;
 import net.minecraft.entity.SharedMonsterAttributes;
 import net.minecraft.entity.ai.attributes.AttributeModifier;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.world.World;
-import WayofTime.bloodmagic.api.Constants;
 import WayofTime.bloodmagic.api.livingArmour.ILivingArmour;
 import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade;
 
@@ -45,7 +45,7 @@ public class LivingArmourUpgradeSlowness extends LivingArmourUpgrade
     @Override
     public String getUniqueIdentifier()
     {
-        return Constants.Mod.MODID + ".upgrade.slowness";
+        return BloodMagic.MODID + ".upgrade.slowness";
     }
 
     @Override
diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeStormTrooper.java b/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeStormTrooper.java
index 8074631d..33f589b4 100644
--- a/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeStormTrooper.java
+++ b/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeStormTrooper.java
@@ -1,9 +1,9 @@
 package WayofTime.bloodmagic.livingArmour.downgrade;
 
+import WayofTime.bloodmagic.BloodMagic;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.world.World;
-import WayofTime.bloodmagic.api.Constants;
 import WayofTime.bloodmagic.api.livingArmour.ILivingArmour;
 import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade;
 
@@ -31,7 +31,7 @@ public class LivingArmourUpgradeStormTrooper extends LivingArmourUpgrade
     @Override
     public String getUniqueIdentifier()
     {
-        return Constants.Mod.MODID + ".upgrade.stormTrooper";
+        return BloodMagic.MODID + ".upgrade.stormTrooper";
     }
 
     @Override
diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerArrowProtect.java b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerArrowProtect.java
index 64371af5..a0dff362 100644
--- a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerArrowProtect.java
+++ b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerArrowProtect.java
@@ -4,11 +4,11 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 
+import WayofTime.bloodmagic.BloodMagic;
 import WayofTime.bloodmagic.util.Utils;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.world.World;
-import WayofTime.bloodmagic.api.Constants;
 import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade;
 import WayofTime.bloodmagic.api.livingArmour.StatTracker;
 import WayofTime.bloodmagic.livingArmour.LivingArmour;
@@ -29,7 +29,7 @@ public class StatTrackerArrowProtect extends StatTracker
     @Override
     public String getUniqueIdentifier()
     {
-        return Constants.Mod.MODID + ".tracker.arrowProtect";
+        return BloodMagic.MODID + ".tracker.arrowProtect";
     }
 
     @Override
@@ -41,13 +41,13 @@ public class StatTrackerArrowProtect extends StatTracker
     @Override
     public void readFromNBT(NBTTagCompound tag)
     {
-        totalDamage = tag.getInteger(Constants.Mod.MODID + ".tracker.arrowProtect");
+        totalDamage = tag.getInteger(BloodMagic.MODID + ".tracker.arrowProtect");
     }
 
     @Override
     public void writeToNBT(NBTTagCompound tag)
     {
-        tag.setInteger(Constants.Mod.MODID + ".tracker.arrowProtect", totalDamage);
+        tag.setInteger(BloodMagic.MODID + ".tracker.arrowProtect", totalDamage);
     }
 
     @Override
@@ -105,7 +105,7 @@ public class StatTrackerArrowProtect extends StatTracker
     @Override
     public boolean providesUpgrade(String key)
     {
-        return key.equals(Constants.Mod.MODID + ".upgrade.arrowProtect");
+        return key.equals(BloodMagic.MODID + ".upgrade.arrowProtect");
     }
 
     @Override
diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerArrowShot.java b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerArrowShot.java
index 2f1da239..edbac486 100644
--- a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerArrowShot.java
+++ b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerArrowShot.java
@@ -4,10 +4,10 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 
+import WayofTime.bloodmagic.BloodMagic;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.world.World;
-import WayofTime.bloodmagic.api.Constants;
 import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade;
 import WayofTime.bloodmagic.api.livingArmour.StatTracker;
 import WayofTime.bloodmagic.livingArmour.LivingArmour;
@@ -29,7 +29,7 @@ public class StatTrackerArrowShot extends StatTracker
     @Override
     public String getUniqueIdentifier()
     {
-        return Constants.Mod.MODID + ".tracker.trickShot";
+        return BloodMagic.MODID + ".tracker.trickShot";
     }
 
     @Override
@@ -41,13 +41,13 @@ public class StatTrackerArrowShot extends StatTracker
     @Override
     public void readFromNBT(NBTTagCompound tag)
     {
-        totalShots = tag.getInteger(Constants.Mod.MODID + ".tracker.trickShot");
+        totalShots = tag.getInteger(BloodMagic.MODID + ".tracker.trickShot");
     }
 
     @Override
     public void writeToNBT(NBTTagCompound tag)
     {
-        tag.setInteger(Constants.Mod.MODID + ".tracker.trickShot", totalShots);
+        tag.setInteger(BloodMagic.MODID + ".tracker.trickShot", totalShots);
     }
 
     @Override
@@ -105,7 +105,7 @@ public class StatTrackerArrowShot extends StatTracker
     @Override
     public boolean providesUpgrade(String key)
     {
-        return key.equals(Constants.Mod.MODID + ".upgrade.arrowShot");
+        return key.equals(BloodMagic.MODID + ".upgrade.arrowShot");
     }
 
     @Override
diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerCriticalStrike.java b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerCriticalStrike.java
index 4980448d..2dfb8b41 100644
--- a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerCriticalStrike.java
+++ b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerCriticalStrike.java
@@ -4,10 +4,10 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 
+import WayofTime.bloodmagic.BloodMagic;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.world.World;
-import WayofTime.bloodmagic.api.Constants;
 import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade;
 import WayofTime.bloodmagic.api.livingArmour.StatTracker;
 import WayofTime.bloodmagic.livingArmour.LivingArmour;
@@ -29,7 +29,7 @@ public class StatTrackerCriticalStrike extends StatTracker
     @Override
     public String getUniqueIdentifier()
     {
-        return Constants.Mod.MODID + ".tracker.criticalStrike";
+        return BloodMagic.MODID + ".tracker.criticalStrike";
     }
 
     @Override
@@ -41,13 +41,13 @@ public class StatTrackerCriticalStrike extends StatTracker
     @Override
     public void readFromNBT(NBTTagCompound tag)
     {
-        totalDamageDealt = tag.getDouble(Constants.Mod.MODID + ".tracker.criticalStrike");
+        totalDamageDealt = tag.getDouble(BloodMagic.MODID + ".tracker.criticalStrike");
     }
 
     @Override
     public void writeToNBT(NBTTagCompound tag)
     {
-        tag.setDouble(Constants.Mod.MODID + ".tracker.criticalStrike", totalDamageDealt);
+        tag.setDouble(BloodMagic.MODID + ".tracker.criticalStrike", totalDamageDealt);
     }
 
     @Override
@@ -105,7 +105,7 @@ public class StatTrackerCriticalStrike extends StatTracker
     @Override
     public boolean providesUpgrade(String key)
     {
-        return key.equals(Constants.Mod.MODID + ".upgrade.criticalStrike");
+        return key.equals(BloodMagic.MODID + ".upgrade.criticalStrike");
     }
 
     @Override
diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerDigging.java b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerDigging.java
index 8241ce84..5979d7c9 100644
--- a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerDigging.java
+++ b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerDigging.java
@@ -4,10 +4,10 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 
+import WayofTime.bloodmagic.BloodMagic;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.world.World;
-import WayofTime.bloodmagic.api.Constants;
 import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade;
 import WayofTime.bloodmagic.api.livingArmour.StatTracker;
 import WayofTime.bloodmagic.livingArmour.LivingArmour;
@@ -29,7 +29,7 @@ public class StatTrackerDigging extends StatTracker
     @Override
     public String getUniqueIdentifier()
     {
-        return Constants.Mod.MODID + ".tracker.digging";
+        return BloodMagic.MODID + ".tracker.digging";
     }
 
     @Override
@@ -41,13 +41,13 @@ public class StatTrackerDigging extends StatTracker
     @Override
     public void readFromNBT(NBTTagCompound tag)
     {
-        totalBlocksDug = tag.getInteger(Constants.Mod.MODID + ".tracker.digging");
+        totalBlocksDug = tag.getInteger(BloodMagic.MODID + ".tracker.digging");
     }
 
     @Override
     public void writeToNBT(NBTTagCompound tag)
     {
-        tag.setInteger(Constants.Mod.MODID + ".tracker.digging", totalBlocksDug);
+        tag.setInteger(BloodMagic.MODID + ".tracker.digging", totalBlocksDug);
     }
 
     @Override
@@ -105,7 +105,7 @@ public class StatTrackerDigging extends StatTracker
     @Override
     public boolean providesUpgrade(String key)
     {
-        return key.equals(Constants.Mod.MODID + ".upgrade.digging");
+        return key.equals(BloodMagic.MODID + ".upgrade.digging");
     }
 
     @Override
diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerExperience.java b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerExperience.java
index cbaee6c2..5a602e47 100644
--- a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerExperience.java
+++ b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerExperience.java
@@ -4,10 +4,10 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 
+import WayofTime.bloodmagic.BloodMagic;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.world.World;
-import WayofTime.bloodmagic.api.Constants;
 import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade;
 import WayofTime.bloodmagic.api.livingArmour.StatTracker;
 import WayofTime.bloodmagic.livingArmour.LivingArmour;
@@ -29,7 +29,7 @@ public class StatTrackerExperience extends StatTracker
     @Override
     public String getUniqueIdentifier()
     {
-        return Constants.Mod.MODID + ".tracker.experienced";
+        return BloodMagic.MODID + ".tracker.experienced";
     }
 
     @Override
@@ -41,13 +41,13 @@ public class StatTrackerExperience extends StatTracker
     @Override
     public void readFromNBT(NBTTagCompound tag)
     {
-        totalExperienceGained = tag.getDouble(Constants.Mod.MODID + ".tracker.experienced");
+        totalExperienceGained = tag.getDouble(BloodMagic.MODID + ".tracker.experienced");
     }
 
     @Override
     public void writeToNBT(NBTTagCompound tag)
     {
-        tag.setDouble(Constants.Mod.MODID + ".tracker.experienced", totalExperienceGained);
+        tag.setDouble(BloodMagic.MODID + ".tracker.experienced", totalExperienceGained);
     }
 
     @Override
@@ -105,7 +105,7 @@ public class StatTrackerExperience extends StatTracker
     @Override
     public boolean providesUpgrade(String key)
     {
-        return key.equals(Constants.Mod.MODID + ".upgrade.experienced");
+        return key.equals(BloodMagic.MODID + ".upgrade.experienced");
     }
 
     @Override
diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerFallProtect.java b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerFallProtect.java
index 349ba96e..3170af53 100644
--- a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerFallProtect.java
+++ b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerFallProtect.java
@@ -4,10 +4,10 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 
+import WayofTime.bloodmagic.BloodMagic;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.world.World;
-import WayofTime.bloodmagic.api.Constants;
 import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade;
 import WayofTime.bloodmagic.api.livingArmour.StatTracker;
 import WayofTime.bloodmagic.livingArmour.LivingArmour;
@@ -29,7 +29,7 @@ public class StatTrackerFallProtect extends StatTracker
     @Override
     public String getUniqueIdentifier()
     {
-        return Constants.Mod.MODID + ".tracker.fallProtect";
+        return BloodMagic.MODID + ".tracker.fallProtect";
     }
 
     @Override
@@ -41,13 +41,13 @@ public class StatTrackerFallProtect extends StatTracker
     @Override
     public void readFromNBT(NBTTagCompound tag)
     {
-        totalDamage = tag.getInteger(Constants.Mod.MODID + ".tracker.fallProtect");
+        totalDamage = tag.getInteger(BloodMagic.MODID + ".tracker.fallProtect");
     }
 
     @Override
     public void writeToNBT(NBTTagCompound tag)
     {
-        tag.setInteger(Constants.Mod.MODID + ".tracker.fallProtect", totalDamage);
+        tag.setInteger(BloodMagic.MODID + ".tracker.fallProtect", totalDamage);
     }
 
     @Override
@@ -105,7 +105,7 @@ public class StatTrackerFallProtect extends StatTracker
     @Override
     public boolean providesUpgrade(String key)
     {
-        return key.equals(Constants.Mod.MODID + ".upgrade.fallProtect");
+        return key.equals(BloodMagic.MODID + ".upgrade.fallProtect");
     }
 
     @Override
diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerFireResist.java b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerFireResist.java
index 179870c0..4b37e65a 100644
--- a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerFireResist.java
+++ b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerFireResist.java
@@ -3,10 +3,10 @@ package WayofTime.bloodmagic.livingArmour.tracker;
 import java.util.ArrayList;
 import java.util.List;
 
+import WayofTime.bloodmagic.BloodMagic;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.world.World;
-import WayofTime.bloodmagic.api.Constants;
 import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade;
 import WayofTime.bloodmagic.api.livingArmour.StatTracker;
 import WayofTime.bloodmagic.livingArmour.LivingArmour;
@@ -22,7 +22,7 @@ public class StatTrackerFireResist extends StatTracker
     @Override
     public String getUniqueIdentifier()
     {
-        return Constants.Mod.MODID + ".tracker.fire";
+        return BloodMagic.MODID + ".tracker.fire";
     }
 
     @Override
@@ -34,13 +34,13 @@ public class StatTrackerFireResist extends StatTracker
     @Override
     public void readFromNBT(NBTTagCompound tag)
     {
-        totalFireTicks = tag.getInteger(Constants.Mod.MODID + ".tracker.fire");
+        totalFireTicks = tag.getInteger(BloodMagic.MODID + ".tracker.fire");
     }
 
     @Override
     public void writeToNBT(NBTTagCompound tag)
     {
-        tag.setInteger(Constants.Mod.MODID + ".tracker.fire", totalFireTicks);
+        tag.setInteger(BloodMagic.MODID + ".tracker.fire", totalFireTicks);
     }
 
     @Override
@@ -87,7 +87,7 @@ public class StatTrackerFireResist extends StatTracker
     @Override
     public boolean providesUpgrade(String key)
     {
-        return key.equals(Constants.Mod.MODID + ".upgrade.fireResist");
+        return key.equals(BloodMagic.MODID + ".upgrade.fireResist");
     }
 
     @Override
diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerFood.java b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerFood.java
index 18f1964f..4227f9ab 100644
--- a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerFood.java
+++ b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerFood.java
@@ -5,10 +5,10 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import WayofTime.bloodmagic.BloodMagic;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.world.World;
-import WayofTime.bloodmagic.api.Constants;
 import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade;
 import WayofTime.bloodmagic.api.livingArmour.StatTracker;
 import WayofTime.bloodmagic.livingArmour.LivingArmour;
@@ -26,7 +26,7 @@ public class StatTrackerFood extends StatTracker
     @Override
     public String getUniqueIdentifier()
     {
-        return Constants.Mod.MODID + ".tracker.foodEaten";
+        return BloodMagic.MODID + ".tracker.foodEaten";
     }
 
     @Override
@@ -38,13 +38,13 @@ public class StatTrackerFood extends StatTracker
     @Override
     public void readFromNBT(NBTTagCompound tag)
     {
-        foodEaten = tag.getInteger(Constants.Mod.MODID + ".tracker.foodEaten");
+        foodEaten = tag.getInteger(BloodMagic.MODID + ".tracker.foodEaten");
     }
 
     @Override
     public void writeToNBT(NBTTagCompound tag)
     {
-        tag.setInteger(Constants.Mod.MODID + ".tracker.foodEaten", foodEaten);
+        tag.setInteger(BloodMagic.MODID + ".tracker.foodEaten", foodEaten);
 
     }
 
@@ -107,7 +107,7 @@ public class StatTrackerFood extends StatTracker
     @Override
     public boolean providesUpgrade(String key)
     {
-        return key.equals(Constants.Mod.MODID + ".upgrade.knockback");
+        return key.equals(BloodMagic.MODID + ".upgrade.knockback");
     }
 
     @Override
diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerGraveDigger.java b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerGraveDigger.java
index f4fe2cc3..b0a7ffd4 100644
--- a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerGraveDigger.java
+++ b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerGraveDigger.java
@@ -4,10 +4,10 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 
+import WayofTime.bloodmagic.BloodMagic;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.world.World;
-import WayofTime.bloodmagic.api.Constants;
 import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade;
 import WayofTime.bloodmagic.api.livingArmour.StatTracker;
 import WayofTime.bloodmagic.livingArmour.LivingArmour;
@@ -29,7 +29,7 @@ public class StatTrackerGraveDigger extends StatTracker
     @Override
     public String getUniqueIdentifier()
     {
-        return Constants.Mod.MODID + ".tracker.graveDigger";
+        return BloodMagic.MODID + ".tracker.graveDigger";
     }
 
     @Override
@@ -41,13 +41,13 @@ public class StatTrackerGraveDigger extends StatTracker
     @Override
     public void readFromNBT(NBTTagCompound tag)
     {
-        totalDamageDealt = tag.getDouble(Constants.Mod.MODID + ".tracker.graveDigger");
+        totalDamageDealt = tag.getDouble(BloodMagic.MODID + ".tracker.graveDigger");
     }
 
     @Override
     public void writeToNBT(NBTTagCompound tag)
     {
-        tag.setDouble(Constants.Mod.MODID + ".tracker.graveDigger", totalDamageDealt);
+        tag.setDouble(BloodMagic.MODID + ".tracker.graveDigger", totalDamageDealt);
     }
 
     @Override
@@ -105,7 +105,7 @@ public class StatTrackerGraveDigger extends StatTracker
     @Override
     public boolean providesUpgrade(String key)
     {
-        return key.equals(Constants.Mod.MODID + ".upgrade.graveDigger");
+        return key.equals(BloodMagic.MODID + ".upgrade.graveDigger");
     }
 
     @Override
diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerGrimReaperSprint.java b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerGrimReaperSprint.java
index 80cdb444..fb32dfe2 100644
--- a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerGrimReaperSprint.java
+++ b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerGrimReaperSprint.java
@@ -4,10 +4,10 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 
+import WayofTime.bloodmagic.BloodMagic;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.world.World;
-import WayofTime.bloodmagic.api.Constants;
 import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade;
 import WayofTime.bloodmagic.api.livingArmour.StatTracker;
 import WayofTime.bloodmagic.livingArmour.LivingArmour;
@@ -23,7 +23,7 @@ public class StatTrackerGrimReaperSprint extends StatTracker
 
     public static void incrementCounter(LivingArmour armour)
     {
-        StatTracker tracker = armour.getTracker(Constants.Mod.MODID + ".tracker.grimReaper");
+        StatTracker tracker = armour.getTracker(BloodMagic.MODID + ".tracker.grimReaper");
         if (tracker instanceof StatTrackerGrimReaperSprint)
         {
             ((StatTrackerGrimReaperSprint) tracker).totalDeaths++;
@@ -36,7 +36,7 @@ public class StatTrackerGrimReaperSprint extends StatTracker
     @Override
     public String getUniqueIdentifier()
     {
-        return Constants.Mod.MODID + ".tracker.grimReaper";
+        return BloodMagic.MODID + ".tracker.grimReaper";
     }
 
     @Override
@@ -48,13 +48,13 @@ public class StatTrackerGrimReaperSprint extends StatTracker
     @Override
     public void readFromNBT(NBTTagCompound tag)
     {
-        totalDeaths = tag.getInteger(Constants.Mod.MODID + ".tracker.grimReaper");
+        totalDeaths = tag.getInteger(BloodMagic.MODID + ".tracker.grimReaper");
     }
 
     @Override
     public void writeToNBT(NBTTagCompound tag)
     {
-        tag.setInteger(Constants.Mod.MODID + ".tracker.grimReaper", totalDeaths);
+        tag.setInteger(BloodMagic.MODID + ".tracker.grimReaper", totalDeaths);
     }
 
     @Override
@@ -112,7 +112,7 @@ public class StatTrackerGrimReaperSprint extends StatTracker
     @Override
     public boolean providesUpgrade(String key)
     {
-        return key.equals(Constants.Mod.MODID + ".upgrade.grimReaper");
+        return key.equals(BloodMagic.MODID + ".upgrade.grimReaper");
     }
 
     @Override
diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerHealthboost.java b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerHealthboost.java
index 3e522b27..a17414aa 100644
--- a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerHealthboost.java
+++ b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerHealthboost.java
@@ -4,10 +4,10 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 
+import WayofTime.bloodmagic.BloodMagic;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.world.World;
-import WayofTime.bloodmagic.api.Constants;
 import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade;
 import WayofTime.bloodmagic.api.livingArmour.StatTracker;
 import WayofTime.bloodmagic.livingArmour.LivingArmour;
@@ -29,7 +29,7 @@ public class StatTrackerHealthboost extends StatTracker
     @Override
     public String getUniqueIdentifier()
     {
-        return Constants.Mod.MODID + ".tracker.health";
+        return BloodMagic.MODID + ".tracker.health";
     }
 
     @Override
@@ -41,13 +41,13 @@ public class StatTrackerHealthboost extends StatTracker
     @Override
     public void readFromNBT(NBTTagCompound tag)
     {
-        totalHealthGenned = tag.getDouble(Constants.Mod.MODID + ".tracker.health");
+        totalHealthGenned = tag.getDouble(BloodMagic.MODID + ".tracker.health");
     }
 
     @Override
     public void writeToNBT(NBTTagCompound tag)
     {
-        tag.setDouble(Constants.Mod.MODID + ".tracker.health", totalHealthGenned);
+        tag.setDouble(BloodMagic.MODID + ".tracker.health", totalHealthGenned);
     }
 
     @Override
@@ -105,7 +105,7 @@ public class StatTrackerHealthboost extends StatTracker
     @Override
     public boolean providesUpgrade(String key)
     {
-        return key.equals(Constants.Mod.MODID + ".upgrade.health");
+        return key.equals(BloodMagic.MODID + ".upgrade.health");
     }
 
     @Override
diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerJump.java b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerJump.java
index 4c9be523..4a789d1c 100644
--- a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerJump.java
+++ b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerJump.java
@@ -4,10 +4,10 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 
+import WayofTime.bloodmagic.BloodMagic;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.world.World;
-import WayofTime.bloodmagic.api.Constants;
 import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade;
 import WayofTime.bloodmagic.api.livingArmour.StatTracker;
 import WayofTime.bloodmagic.livingArmour.LivingArmour;
@@ -29,7 +29,7 @@ public class StatTrackerJump extends StatTracker
     @Override
     public String getUniqueIdentifier()
     {
-        return Constants.Mod.MODID + ".tracker.jump";
+        return BloodMagic.MODID + ".tracker.jump";
     }
 
     @Override
@@ -41,13 +41,13 @@ public class StatTrackerJump extends StatTracker
     @Override
     public void readFromNBT(NBTTagCompound tag)
     {
-        totalJumps = tag.getInteger(Constants.Mod.MODID + ".tracker.jump");
+        totalJumps = tag.getInteger(BloodMagic.MODID + ".tracker.jump");
     }
 
     @Override
     public void writeToNBT(NBTTagCompound tag)
     {
-        tag.setInteger(Constants.Mod.MODID + ".tracker.jump", totalJumps);
+        tag.setInteger(BloodMagic.MODID + ".tracker.jump", totalJumps);
 
     }
 
@@ -106,7 +106,7 @@ public class StatTrackerJump extends StatTracker
     @Override
     public boolean providesUpgrade(String key)
     {
-        return key.equals(Constants.Mod.MODID + ".upgrade.jump");
+        return key.equals(BloodMagic.MODID + ".upgrade.jump");
     }
 
     @Override
diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerMeleeDamage.java b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerMeleeDamage.java
index c5912864..7ecc77d2 100644
--- a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerMeleeDamage.java
+++ b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerMeleeDamage.java
@@ -4,10 +4,10 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 
+import WayofTime.bloodmagic.BloodMagic;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.world.World;
-import WayofTime.bloodmagic.api.Constants;
 import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade;
 import WayofTime.bloodmagic.api.livingArmour.StatTracker;
 import WayofTime.bloodmagic.livingArmour.LivingArmour;
@@ -29,7 +29,7 @@ public class StatTrackerMeleeDamage extends StatTracker
     @Override
     public String getUniqueIdentifier()
     {
-        return Constants.Mod.MODID + ".tracker.meleeDamage";
+        return BloodMagic.MODID + ".tracker.meleeDamage";
     }
 
     @Override
@@ -41,13 +41,13 @@ public class StatTrackerMeleeDamage extends StatTracker
     @Override
     public void readFromNBT(NBTTagCompound tag)
     {
-        totalDamageDealt = tag.getDouble(Constants.Mod.MODID + ".tracker.meleeDamage");
+        totalDamageDealt = tag.getDouble(BloodMagic.MODID + ".tracker.meleeDamage");
     }
 
     @Override
     public void writeToNBT(NBTTagCompound tag)
     {
-        tag.setDouble(Constants.Mod.MODID + ".tracker.meleeDamage", totalDamageDealt);
+        tag.setDouble(BloodMagic.MODID + ".tracker.meleeDamage", totalDamageDealt);
     }
 
     @Override
@@ -105,7 +105,7 @@ public class StatTrackerMeleeDamage extends StatTracker
     @Override
     public boolean providesUpgrade(String key)
     {
-        return key.equals(Constants.Mod.MODID + ".upgrade.meleeDamage");
+        return key.equals(BloodMagic.MODID + ".upgrade.meleeDamage");
     }
 
     @Override
diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerMovement.java b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerMovement.java
index b9e6fc60..fcf3b000 100644
--- a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerMovement.java
+++ b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerMovement.java
@@ -5,10 +5,10 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import WayofTime.bloodmagic.BloodMagic;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.world.World;
-import WayofTime.bloodmagic.api.Constants;
 import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade;
 import WayofTime.bloodmagic.api.livingArmour.StatTracker;
 import WayofTime.bloodmagic.livingArmour.LivingArmour;
@@ -27,7 +27,7 @@ public class StatTrackerMovement extends StatTracker
     @Override
     public String getUniqueIdentifier()
     {
-        return Constants.Mod.MODID + ".tracker.movement";
+        return BloodMagic.MODID + ".tracker.movement";
     }
 
     @Override
@@ -39,13 +39,13 @@ public class StatTrackerMovement extends StatTracker
     @Override
     public void readFromNBT(NBTTagCompound tag)
     {
-        totalMovement = tag.getDouble(Constants.Mod.MODID + ".tracker.movement");
+        totalMovement = tag.getDouble(BloodMagic.MODID + ".tracker.movement");
     }
 
     @Override
     public void writeToNBT(NBTTagCompound tag)
     {
-        tag.setDouble(Constants.Mod.MODID + ".tracker.movement", totalMovement);
+        tag.setDouble(BloodMagic.MODID + ".tracker.movement", totalMovement);
 
     }
 
@@ -115,7 +115,7 @@ public class StatTrackerMovement extends StatTracker
     @Override
     public boolean providesUpgrade(String key)
     {
-        return key.equals(Constants.Mod.MODID + ".upgrade.movement");
+        return key.equals(BloodMagic.MODID + ".upgrade.movement");
     }
 
     @Override
diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerNightSight.java b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerNightSight.java
index 8c0b7913..fdd9ad6b 100644
--- a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerNightSight.java
+++ b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerNightSight.java
@@ -4,11 +4,11 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 
+import WayofTime.bloodmagic.BloodMagic;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.init.MobEffects;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.world.World;
-import WayofTime.bloodmagic.api.Constants;
 import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade;
 import WayofTime.bloodmagic.api.livingArmour.StatTracker;
 import WayofTime.bloodmagic.livingArmour.LivingArmour;
@@ -33,7 +33,7 @@ public class StatTrackerNightSight extends StatTracker
     @Override
     public String getUniqueIdentifier()
     {
-        return Constants.Mod.MODID + ".tracker.nightSight";
+        return BloodMagic.MODID + ".tracker.nightSight";
     }
 
     @Override
@@ -46,15 +46,15 @@ public class StatTrackerNightSight extends StatTracker
     @Override
     public void readFromNBT(NBTTagCompound tag)
     {
-        totalDamageDealt = tag.getDouble(Constants.Mod.MODID + ".tracker.nightSight");
-        totalNightVision = tag.getInteger(Constants.Mod.MODID + ".tracker.nightSightVision");
+        totalDamageDealt = tag.getDouble(BloodMagic.MODID + ".tracker.nightSight");
+        totalNightVision = tag.getInteger(BloodMagic.MODID + ".tracker.nightSightVision");
     }
 
     @Override
     public void writeToNBT(NBTTagCompound tag)
     {
-        tag.setDouble(Constants.Mod.MODID + ".tracker.nightSight", totalDamageDealt);
-        tag.setInteger(Constants.Mod.MODID + ".tracker.nightSightVision", totalNightVision);
+        tag.setDouble(BloodMagic.MODID + ".tracker.nightSight", totalDamageDealt);
+        tag.setInteger(BloodMagic.MODID + ".tracker.nightSightVision", totalNightVision);
     }
 
     @Override
@@ -128,7 +128,7 @@ public class StatTrackerNightSight extends StatTracker
     @Override
     public boolean providesUpgrade(String key)
     {
-        return key.equals(Constants.Mod.MODID + ".upgrade.nightSight");
+        return key.equals(BloodMagic.MODID + ".upgrade.nightSight");
     }
 
     @Override
diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerPhysicalProtect.java b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerPhysicalProtect.java
index 638ee99a..a4f06f95 100644
--- a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerPhysicalProtect.java
+++ b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerPhysicalProtect.java
@@ -4,10 +4,10 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 
+import WayofTime.bloodmagic.BloodMagic;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.world.World;
-import WayofTime.bloodmagic.api.Constants;
 import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade;
 import WayofTime.bloodmagic.api.livingArmour.StatTracker;
 import WayofTime.bloodmagic.livingArmour.LivingArmour;
@@ -29,7 +29,7 @@ public class StatTrackerPhysicalProtect extends StatTracker
     @Override
     public String getUniqueIdentifier()
     {
-        return Constants.Mod.MODID + ".tracker.physicalProtect";
+        return BloodMagic.MODID + ".tracker.physicalProtect";
     }
 
     @Override
@@ -41,13 +41,13 @@ public class StatTrackerPhysicalProtect extends StatTracker
     @Override
     public void readFromNBT(NBTTagCompound tag)
     {
-        totalDamage = tag.getInteger(Constants.Mod.MODID + ".tracker.physicalProtect");
+        totalDamage = tag.getInteger(BloodMagic.MODID + ".tracker.physicalProtect");
     }
 
     @Override
     public void writeToNBT(NBTTagCompound tag)
     {
-        tag.setInteger(Constants.Mod.MODID + ".tracker.physicalProtect", totalDamage);
+        tag.setInteger(BloodMagic.MODID + ".tracker.physicalProtect", totalDamage);
     }
 
     @Override
@@ -105,7 +105,7 @@ public class StatTrackerPhysicalProtect extends StatTracker
     @Override
     public boolean providesUpgrade(String key)
     {
-        return key.equals(Constants.Mod.MODID + ".upgrade.physicalProtect");
+        return key.equals(BloodMagic.MODID + ".upgrade.physicalProtect");
     }
 
     @Override
diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerPoison.java b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerPoison.java
index 588e9a83..528f2eef 100644
--- a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerPoison.java
+++ b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerPoison.java
@@ -3,11 +3,11 @@ package WayofTime.bloodmagic.livingArmour.tracker;
 import java.util.ArrayList;
 import java.util.List;
 
+import WayofTime.bloodmagic.BloodMagic;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.init.MobEffects;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.world.World;
-import WayofTime.bloodmagic.api.Constants;
 import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade;
 import WayofTime.bloodmagic.api.livingArmour.StatTracker;
 import WayofTime.bloodmagic.livingArmour.LivingArmour;
@@ -23,7 +23,7 @@ public class StatTrackerPoison extends StatTracker
     @Override
     public String getUniqueIdentifier()
     {
-        return Constants.Mod.MODID + ".tracker.poison";
+        return BloodMagic.MODID + ".tracker.poison";
     }
 
     @Override
@@ -35,13 +35,13 @@ public class StatTrackerPoison extends StatTracker
     @Override
     public void readFromNBT(NBTTagCompound tag)
     {
-        totalPoisonTicks = tag.getInteger(Constants.Mod.MODID + ".tracker.poison");
+        totalPoisonTicks = tag.getInteger(BloodMagic.MODID + ".tracker.poison");
     }
 
     @Override
     public void writeToNBT(NBTTagCompound tag)
     {
-        tag.setInteger(Constants.Mod.MODID + ".tracker.poison", totalPoisonTicks);
+        tag.setInteger(BloodMagic.MODID + ".tracker.poison", totalPoisonTicks);
     }
 
     @Override
@@ -88,7 +88,7 @@ public class StatTrackerPoison extends StatTracker
     @Override
     public boolean providesUpgrade(String key)
     {
-        return key.equals(Constants.Mod.MODID + ".upgrade.poisonResist");
+        return key.equals(BloodMagic.MODID + ".upgrade.poisonResist");
     }
 
     @Override
diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerRepairing.java b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerRepairing.java
index 8a3271f1..c8457c24 100644
--- a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerRepairing.java
+++ b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerRepairing.java
@@ -4,10 +4,10 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 
+import WayofTime.bloodmagic.BloodMagic;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.world.World;
-import WayofTime.bloodmagic.api.Constants;
 import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade;
 import WayofTime.bloodmagic.api.livingArmour.StatTracker;
 import WayofTime.bloodmagic.livingArmour.LivingArmour;
@@ -29,7 +29,7 @@ public class StatTrackerRepairing extends StatTracker
     @Override
     public String getUniqueIdentifier()
     {
-        return Constants.Mod.MODID + ".tracker.repair";
+        return BloodMagic.MODID + ".tracker.repair";
     }
 
     @Override
@@ -41,13 +41,13 @@ public class StatTrackerRepairing extends StatTracker
     @Override
     public void readFromNBT(NBTTagCompound tag)
     {
-        totalDamage = tag.getDouble(Constants.Mod.MODID + ".tracker.repair");
+        totalDamage = tag.getDouble(BloodMagic.MODID + ".tracker.repair");
     }
 
     @Override
     public void writeToNBT(NBTTagCompound tag)
     {
-        tag.setDouble(Constants.Mod.MODID + ".tracker.repair", totalDamage);
+        tag.setDouble(BloodMagic.MODID + ".tracker.repair", totalDamage);
     }
 
     @Override
@@ -105,7 +105,7 @@ public class StatTrackerRepairing extends StatTracker
     @Override
     public boolean providesUpgrade(String key)
     {
-        return key.equals(Constants.Mod.MODID + ".upgrade.repair");
+        return key.equals(BloodMagic.MODID + ".upgrade.repair");
     }
 
     @Override
diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerSelfSacrifice.java b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerSelfSacrifice.java
index c18f9e17..26448f93 100644
--- a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerSelfSacrifice.java
+++ b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerSelfSacrifice.java
@@ -4,10 +4,10 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 
+import WayofTime.bloodmagic.BloodMagic;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.world.World;
-import WayofTime.bloodmagic.api.Constants;
 import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade;
 import WayofTime.bloodmagic.api.livingArmour.StatTracker;
 import WayofTime.bloodmagic.livingArmour.LivingArmour;
@@ -29,7 +29,7 @@ public class StatTrackerSelfSacrifice extends StatTracker
     @Override
     public String getUniqueIdentifier()
     {
-        return Constants.Mod.MODID + ".tracker.selfSacrifice";
+        return BloodMagic.MODID + ".tracker.selfSacrifice";
     }
 
     @Override
@@ -41,13 +41,13 @@ public class StatTrackerSelfSacrifice extends StatTracker
     @Override
     public void readFromNBT(NBTTagCompound tag)
     {
-        totalSacrifices = tag.getInteger(Constants.Mod.MODID + ".tracker.selfSacrifice");
+        totalSacrifices = tag.getInteger(BloodMagic.MODID + ".tracker.selfSacrifice");
     }
 
     @Override
     public void writeToNBT(NBTTagCompound tag)
     {
-        tag.setInteger(Constants.Mod.MODID + ".tracker.selfSacrifice", totalSacrifices);
+        tag.setInteger(BloodMagic.MODID + ".tracker.selfSacrifice", totalSacrifices);
 
     }
 
@@ -106,7 +106,7 @@ public class StatTrackerSelfSacrifice extends StatTracker
     @Override
     public boolean providesUpgrade(String key)
     {
-        return key.equals(Constants.Mod.MODID + ".upgrade.selfSacrifice");
+        return key.equals(BloodMagic.MODID + ".upgrade.selfSacrifice");
     }
 
     @Override
diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerSolarPowered.java b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerSolarPowered.java
index b68ef8e0..7ff2a4d7 100644
--- a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerSolarPowered.java
+++ b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerSolarPowered.java
@@ -4,10 +4,10 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 
+import WayofTime.bloodmagic.BloodMagic;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.world.World;
-import WayofTime.bloodmagic.api.Constants;
 import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade;
 import WayofTime.bloodmagic.api.livingArmour.StatTracker;
 import WayofTime.bloodmagic.livingArmour.LivingArmour;
@@ -29,7 +29,7 @@ public class StatTrackerSolarPowered extends StatTracker
     @Override
     public String getUniqueIdentifier()
     {
-        return Constants.Mod.MODID + ".tracker.solarPowered";
+        return BloodMagic.MODID + ".tracker.solarPowered";
     }
 
     @Override
@@ -41,13 +41,13 @@ public class StatTrackerSolarPowered extends StatTracker
     @Override
     public void readFromNBT(NBTTagCompound tag)
     {
-        totalHealthGenned = tag.getDouble(Constants.Mod.MODID + ".tracker.solarPowered");
+        totalHealthGenned = tag.getDouble(BloodMagic.MODID + ".tracker.solarPowered");
     }
 
     @Override
     public void writeToNBT(NBTTagCompound tag)
     {
-        tag.setDouble(Constants.Mod.MODID + ".tracker.solarPowered", totalHealthGenned);
+        tag.setDouble(BloodMagic.MODID + ".tracker.solarPowered", totalHealthGenned);
     }
 
     @Override
@@ -105,7 +105,7 @@ public class StatTrackerSolarPowered extends StatTracker
     @Override
     public boolean providesUpgrade(String key)
     {
-        return key.equals(Constants.Mod.MODID + ".upgrade.solarPowered");
+        return key.equals(BloodMagic.MODID + ".upgrade.solarPowered");
     }
 
     @Override
diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerSprintAttack.java b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerSprintAttack.java
index a3e36c19..a587a494 100644
--- a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerSprintAttack.java
+++ b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerSprintAttack.java
@@ -4,10 +4,10 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 
+import WayofTime.bloodmagic.BloodMagic;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.world.World;
-import WayofTime.bloodmagic.api.Constants;
 import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade;
 import WayofTime.bloodmagic.api.livingArmour.StatTracker;
 import WayofTime.bloodmagic.livingArmour.LivingArmour;
@@ -29,7 +29,7 @@ public class StatTrackerSprintAttack extends StatTracker
     @Override
     public String getUniqueIdentifier()
     {
-        return Constants.Mod.MODID + ".tracker.sprintAttack";
+        return BloodMagic.MODID + ".tracker.sprintAttack";
     }
 
     @Override
@@ -41,13 +41,13 @@ public class StatTrackerSprintAttack extends StatTracker
     @Override
     public void readFromNBT(NBTTagCompound tag)
     {
-        totalDamageDealt = tag.getDouble(Constants.Mod.MODID + ".tracker.sprintAttack");
+        totalDamageDealt = tag.getDouble(BloodMagic.MODID + ".tracker.sprintAttack");
     }
 
     @Override
     public void writeToNBT(NBTTagCompound tag)
     {
-        tag.setDouble(Constants.Mod.MODID + ".tracker.sprintAttack", totalDamageDealt);
+        tag.setDouble(BloodMagic.MODID + ".tracker.sprintAttack", totalDamageDealt);
     }
 
     @Override
@@ -105,7 +105,7 @@ public class StatTrackerSprintAttack extends StatTracker
     @Override
     public boolean providesUpgrade(String key)
     {
-        return key.equals(Constants.Mod.MODID + ".upgrade.sprintAttack");
+        return key.equals(BloodMagic.MODID + ".upgrade.sprintAttack");
     }
 
     @Override
diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerStepAssist.java b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerStepAssist.java
index cae6b9eb..d102438f 100644
--- a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerStepAssist.java
+++ b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerStepAssist.java
@@ -5,10 +5,10 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import WayofTime.bloodmagic.BloodMagic;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.world.World;
-import WayofTime.bloodmagic.api.Constants;
 import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade;
 import WayofTime.bloodmagic.api.livingArmour.StatTracker;
 import WayofTime.bloodmagic.livingArmour.LivingArmour;
@@ -26,7 +26,7 @@ public class StatTrackerStepAssist extends StatTracker
     @Override
     public String getUniqueIdentifier()
     {
-        return Constants.Mod.MODID + ".tracker.stepAssist";
+        return BloodMagic.MODID + ".tracker.stepAssist";
     }
 
     @Override
@@ -38,13 +38,13 @@ public class StatTrackerStepAssist extends StatTracker
     @Override
     public void readFromNBT(NBTTagCompound tag)
     {
-        totalMovement = tag.getDouble(Constants.Mod.MODID + ".tracker.stepAssist");
+        totalMovement = tag.getDouble(BloodMagic.MODID + ".tracker.stepAssist");
     }
 
     @Override
     public void writeToNBT(NBTTagCompound tag)
     {
-        tag.setDouble(Constants.Mod.MODID + ".tracker.stepAssist", totalMovement);
+        tag.setDouble(BloodMagic.MODID + ".tracker.stepAssist", totalMovement);
 
     }
 
@@ -115,7 +115,7 @@ public class StatTrackerStepAssist extends StatTracker
     @Override
     public boolean providesUpgrade(String key)
     {
-        return key.equals(Constants.Mod.MODID + ".upgrade.stepAssist");
+        return key.equals(BloodMagic.MODID + ".upgrade.stepAssist");
     }
 
     @Override
diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeArrowProtect.java b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeArrowProtect.java
index 818d8a16..b5567bea 100644
--- a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeArrowProtect.java
+++ b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeArrowProtect.java
@@ -1,9 +1,9 @@
 package WayofTime.bloodmagic.livingArmour.upgrade;
 
+import WayofTime.bloodmagic.BloodMagic;
 import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.util.DamageSource;
-import WayofTime.bloodmagic.api.Constants;
 import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade;
 
 public class LivingArmourUpgradeArrowProtect extends LivingArmourUpgrade
@@ -30,7 +30,7 @@ public class LivingArmourUpgradeArrowProtect extends LivingArmourUpgrade
     @Override
     public String getUniqueIdentifier()
     {
-        return Constants.Mod.MODID + ".upgrade.arrowProtect";
+        return BloodMagic.MODID + ".upgrade.arrowProtect";
     }
 
     @Override
diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeArrowShot.java b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeArrowShot.java
index c85e6d05..bb447592 100644
--- a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeArrowShot.java
+++ b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeArrowShot.java
@@ -1,6 +1,6 @@
 package WayofTime.bloodmagic.livingArmour.upgrade;
 
-import WayofTime.bloodmagic.api.Constants;
+import WayofTime.bloodmagic.BloodMagic;
 import WayofTime.bloodmagic.api.livingArmour.ILivingArmour;
 import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade;
 import net.minecraft.entity.player.EntityPlayer;
@@ -26,7 +26,7 @@ public class LivingArmourUpgradeArrowShot extends LivingArmourUpgrade
     @Override
     public String getUniqueIdentifier()
     {
-        return Constants.Mod.MODID + ".upgrade.arrowShot";
+        return BloodMagic.MODID + ".upgrade.arrowShot";
     }
 
     @Override
diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeCriticalStrike.java b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeCriticalStrike.java
index 5a9d1fb5..039b85a1 100644
--- a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeCriticalStrike.java
+++ b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeCriticalStrike.java
@@ -1,11 +1,11 @@
 package WayofTime.bloodmagic.livingArmour.upgrade;
 
+import WayofTime.bloodmagic.BloodMagic;
 import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.init.MobEffects;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
-import WayofTime.bloodmagic.api.Constants;
 import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade;
 
 public class LivingArmourUpgradeCriticalStrike extends LivingArmourUpgrade
@@ -39,7 +39,7 @@ public class LivingArmourUpgradeCriticalStrike extends LivingArmourUpgrade
     @Override
     public String getUniqueIdentifier()
     {
-        return Constants.Mod.MODID + ".upgrade.criticalStrike";
+        return BloodMagic.MODID + ".upgrade.criticalStrike";
     }
 
     @Override
diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeDigging.java b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeDigging.java
index 7f545d90..059f6bd0 100644
--- a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeDigging.java
+++ b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeDigging.java
@@ -2,12 +2,12 @@ package WayofTime.bloodmagic.livingArmour.upgrade;
 
 import java.util.HashMap;
 
+import WayofTime.bloodmagic.BloodMagic;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.init.MobEffects;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.potion.PotionEffect;
 import net.minecraft.world.World;
-import WayofTime.bloodmagic.api.Constants;
 import WayofTime.bloodmagic.api.livingArmour.ILivingArmour;
 import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade;
 import WayofTime.bloodmagic.livingArmour.LivingArmour;
@@ -55,7 +55,7 @@ public class LivingArmourUpgradeDigging extends LivingArmourUpgrade
     @Override
     public String getUniqueIdentifier()
     {
-        return Constants.Mod.MODID + ".upgrade.digging";
+        return BloodMagic.MODID + ".upgrade.digging";
     }
 
     @Override
diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeElytra.java b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeElytra.java
index 908bc3ee..2cd24cb8 100644
--- a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeElytra.java
+++ b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeElytra.java
@@ -1,6 +1,6 @@
 package WayofTime.bloodmagic.livingArmour.upgrade;
 
-import WayofTime.bloodmagic.api.Constants;
+import WayofTime.bloodmagic.BloodMagic;
 import WayofTime.bloodmagic.api.livingArmour.ILivingArmour;
 import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade;
 import net.minecraft.entity.player.EntityPlayer;
@@ -25,7 +25,7 @@ public class LivingArmourUpgradeElytra extends LivingArmourUpgrade
     @Override
     public String getUniqueIdentifier()
     {
-        return Constants.Mod.MODID + ".upgrade.elytra";
+        return BloodMagic.MODID + ".upgrade.elytra";
     }
 
     @Override
diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeExperience.java b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeExperience.java
index 7cab3ea4..0bf1fd38 100644
--- a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeExperience.java
+++ b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeExperience.java
@@ -1,6 +1,6 @@
 package WayofTime.bloodmagic.livingArmour.upgrade;
 
-import WayofTime.bloodmagic.api.Constants;
+import WayofTime.bloodmagic.BloodMagic;
 import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade;
 import net.minecraft.nbt.NBTTagCompound;
 
@@ -22,7 +22,7 @@ public class LivingArmourUpgradeExperience extends LivingArmourUpgrade
     @Override
     public String getUniqueIdentifier()
     {
-        return Constants.Mod.MODID + ".upgrade.experienced";
+        return BloodMagic.MODID + ".upgrade.experienced";
     }
 
     @Override
diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeFallProtect.java b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeFallProtect.java
index 39d51dc5..d5da14a8 100644
--- a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeFallProtect.java
+++ b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeFallProtect.java
@@ -1,6 +1,6 @@
 package WayofTime.bloodmagic.livingArmour.upgrade;
 
-import WayofTime.bloodmagic.api.Constants;
+import WayofTime.bloodmagic.BloodMagic;
 import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade;
 import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.nbt.NBTTagCompound;
@@ -30,7 +30,7 @@ public class LivingArmourUpgradeFallProtect extends LivingArmourUpgrade
     @Override
     public String getUniqueIdentifier()
     {
-        return Constants.Mod.MODID + ".upgrade.fallProtect";
+        return BloodMagic.MODID + ".upgrade.fallProtect";
     }
 
     @Override
diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeFireResist.java b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeFireResist.java
index 634f5b3e..05f94c2e 100644
--- a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeFireResist.java
+++ b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeFireResist.java
@@ -1,5 +1,6 @@
 package WayofTime.bloodmagic.livingArmour.upgrade;
 
+import WayofTime.bloodmagic.BloodMagic;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.init.MobEffects;
 import net.minecraft.nbt.NBTTagCompound;
@@ -9,7 +10,6 @@ import net.minecraft.world.World;
 import WayofTime.bloodmagic.api.Constants;
 import WayofTime.bloodmagic.api.livingArmour.ILivingArmour;
 import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade;
-import WayofTime.bloodmagic.util.ChatUtil;
 import WayofTime.bloodmagic.util.helper.TextHelper;
 
 public class LivingArmourUpgradeFireResist extends LivingArmourUpgrade
@@ -45,7 +45,7 @@ public class LivingArmourUpgradeFireResist extends LivingArmourUpgrade
     @Override
     public String getUniqueIdentifier()
     {
-        return Constants.Mod.MODID + ".upgrade.fireResist";
+        return BloodMagic.MODID + ".upgrade.fireResist";
     }
 
     @Override
diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeGraveDigger.java b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeGraveDigger.java
index 0c8796a4..34fcbc24 100644
--- a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeGraveDigger.java
+++ b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeGraveDigger.java
@@ -1,11 +1,11 @@
 package WayofTime.bloodmagic.livingArmour.upgrade;
 
+import WayofTime.bloodmagic.BloodMagic;
 import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemSpade;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
-import WayofTime.bloodmagic.api.Constants;
 import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade;
 
 public class LivingArmourUpgradeGraveDigger extends LivingArmourUpgrade
@@ -37,7 +37,7 @@ public class LivingArmourUpgradeGraveDigger extends LivingArmourUpgrade
     @Override
     public String getUniqueIdentifier()
     {
-        return Constants.Mod.MODID + ".upgrade.graveDigger";
+        return BloodMagic.MODID + ".upgrade.graveDigger";
     }
 
     @Override
diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeGrimReaperSprint.java b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeGrimReaperSprint.java
index 7ebd95f1..1dde6181 100644
--- a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeGrimReaperSprint.java
+++ b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeGrimReaperSprint.java
@@ -1,15 +1,14 @@
 package WayofTime.bloodmagic.livingArmour.upgrade;
 
+import WayofTime.bloodmagic.BloodMagic;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.init.MobEffects;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.potion.PotionEffect;
 import net.minecraft.util.text.TextComponentString;
 import net.minecraft.world.World;
-import WayofTime.bloodmagic.api.Constants;
 import WayofTime.bloodmagic.api.livingArmour.ILivingArmour;
 import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade;
-import WayofTime.bloodmagic.util.ChatUtil;
 import WayofTime.bloodmagic.util.helper.TextHelper;
 
 public class LivingArmourUpgradeGrimReaperSprint extends LivingArmourUpgrade
@@ -41,7 +40,7 @@ public class LivingArmourUpgradeGrimReaperSprint extends LivingArmourUpgrade
     @Override
     public String getUniqueIdentifier()
     {
-        return Constants.Mod.MODID + ".upgrade.grimReaper";
+        return BloodMagic.MODID + ".upgrade.grimReaper";
     }
 
     @Override
@@ -59,13 +58,13 @@ public class LivingArmourUpgradeGrimReaperSprint extends LivingArmourUpgrade
     @Override
     public void readFromNBT(NBTTagCompound tag)
     {
-        deathTimer = tag.getInteger(Constants.Mod.MODID + ".tracker.grimReaper");
+        deathTimer = tag.getInteger(BloodMagic.MODID + ".tracker.grimReaper");
     }
 
     @Override
     public void writeToNBT(NBTTagCompound tag)
     {
-        tag.setInteger(Constants.Mod.MODID + ".tracker.grimReaper", deathTimer);
+        tag.setInteger(BloodMagic.MODID + ".tracker.grimReaper", deathTimer);
     }
 
     @Override
diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeHealthboost.java b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeHealthboost.java
index 78a4b71b..ee231a07 100644
--- a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeHealthboost.java
+++ b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeHealthboost.java
@@ -1,6 +1,6 @@
 package WayofTime.bloodmagic.livingArmour.upgrade;
 
-import WayofTime.bloodmagic.api.Constants;
+import WayofTime.bloodmagic.BloodMagic;
 import WayofTime.bloodmagic.api.livingArmour.ILivingArmour;
 import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade;
 import com.google.common.collect.HashMultimap;
@@ -44,7 +44,7 @@ public class LivingArmourUpgradeHealthboost extends LivingArmourUpgrade
     @Override
     public String getUniqueIdentifier()
     {
-        return Constants.Mod.MODID + ".upgrade.health";
+        return BloodMagic.MODID + ".upgrade.health";
     }
 
     @Override
diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeJump.java b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeJump.java
index 0b317a1e..876a94f3 100644
--- a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeJump.java
+++ b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeJump.java
@@ -1,9 +1,9 @@
 package WayofTime.bloodmagic.livingArmour.upgrade;
 
+import WayofTime.bloodmagic.BloodMagic;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.world.World;
-import WayofTime.bloodmagic.api.Constants;
 import WayofTime.bloodmagic.api.livingArmour.ILivingArmour;
 import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade;
 
@@ -26,7 +26,7 @@ public class LivingArmourUpgradeJump extends LivingArmourUpgrade
     @Override
     public String getUniqueIdentifier()
     {
-        return Constants.Mod.MODID + ".upgrade.jump";
+        return BloodMagic.MODID + ".upgrade.jump";
     }
 
     @Override
diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeKnockbackResist.java b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeKnockbackResist.java
index 430fe22f..461b7e04 100644
--- a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeKnockbackResist.java
+++ b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeKnockbackResist.java
@@ -1,6 +1,6 @@
 package WayofTime.bloodmagic.livingArmour.upgrade;
 
-import WayofTime.bloodmagic.api.Constants;
+import WayofTime.bloodmagic.BloodMagic;
 import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade;
 import com.google.common.collect.HashMultimap;
 import com.google.common.collect.Multimap;
@@ -42,7 +42,7 @@ public class LivingArmourUpgradeKnockbackResist extends LivingArmourUpgrade
     @Override
     public String getUniqueIdentifier()
     {
-        return Constants.Mod.MODID + ".upgrade.knockback";
+        return BloodMagic.MODID + ".upgrade.knockback";
     }
 
     @Override
diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeMeleeDamage.java b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeMeleeDamage.java
index cd228a13..44ed0210 100644
--- a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeMeleeDamage.java
+++ b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeMeleeDamage.java
@@ -1,6 +1,6 @@
 package WayofTime.bloodmagic.livingArmour.upgrade;
 
-import WayofTime.bloodmagic.api.Constants;
+import WayofTime.bloodmagic.BloodMagic;
 import WayofTime.bloodmagic.api.livingArmour.ILivingArmour;
 import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade;
 import com.google.common.collect.HashMultimap;
@@ -44,7 +44,7 @@ public class LivingArmourUpgradeMeleeDamage extends LivingArmourUpgrade
     @Override
     public String getUniqueIdentifier()
     {
-        return Constants.Mod.MODID + ".upgrade.meleeDamage";
+        return BloodMagic.MODID + ".upgrade.meleeDamage";
     }
 
     @Override
diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeNightSight.java b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeNightSight.java
index 696b3c4b..662c78fb 100644
--- a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeNightSight.java
+++ b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeNightSight.java
@@ -1,5 +1,6 @@
 package WayofTime.bloodmagic.livingArmour.upgrade;
 
+import WayofTime.bloodmagic.BloodMagic;
 import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.init.MobEffects;
@@ -55,7 +56,7 @@ public class LivingArmourUpgradeNightSight extends LivingArmourUpgrade
     @Override
     public String getUniqueIdentifier()
     {
-        return Constants.Mod.MODID + ".upgrade.nightSight";
+        return BloodMagic.MODID + ".upgrade.nightSight";
     }
 
     @Override
diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradePhysicalProtect.java b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradePhysicalProtect.java
index d58094db..44fc26a9 100644
--- a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradePhysicalProtect.java
+++ b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradePhysicalProtect.java
@@ -1,6 +1,6 @@
 package WayofTime.bloodmagic.livingArmour.upgrade;
 
-import WayofTime.bloodmagic.api.Constants;
+import WayofTime.bloodmagic.BloodMagic;
 import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade;
 import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.nbt.NBTTagCompound;
@@ -19,7 +19,7 @@ public class LivingArmourUpgradePhysicalProtect extends LivingArmourUpgrade
     @Override
     public double getArmourProtection(EntityLivingBase wearer, DamageSource source)
     {
-        if (source.getEntity() != null && !source.isMagicDamage() && !source.isProjectile())
+        if (source.getTrueSource() != null && !source.isMagicDamage() && !source.isProjectile())
         {
             return protectionLevel[this.level];
         }
@@ -30,7 +30,7 @@ public class LivingArmourUpgradePhysicalProtect extends LivingArmourUpgrade
     @Override
     public String getUniqueIdentifier()
     {
-        return Constants.Mod.MODID + ".upgrade.physicalProtect";
+        return BloodMagic.MODID + ".upgrade.physicalProtect";
     }
 
     @Override
diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradePoisonResist.java b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradePoisonResist.java
index 080f7b68..fb4f7af1 100644
--- a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradePoisonResist.java
+++ b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradePoisonResist.java
@@ -1,5 +1,6 @@
 package WayofTime.bloodmagic.livingArmour.upgrade;
 
+import WayofTime.bloodmagic.BloodMagic;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.init.MobEffects;
 import net.minecraft.nbt.NBTTagCompound;
@@ -9,7 +10,6 @@ import net.minecraft.world.World;
 import WayofTime.bloodmagic.api.Constants;
 import WayofTime.bloodmagic.api.livingArmour.ILivingArmour;
 import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade;
-import WayofTime.bloodmagic.util.ChatUtil;
 import WayofTime.bloodmagic.util.helper.TextHelper;
 
 public class LivingArmourUpgradePoisonResist extends LivingArmourUpgrade
@@ -47,7 +47,7 @@ public class LivingArmourUpgradePoisonResist extends LivingArmourUpgrade
     @Override
     public String getUniqueIdentifier()
     {
-        return Constants.Mod.MODID + ".upgrade.poisonResist";
+        return BloodMagic.MODID + ".upgrade.poisonResist";
     }
 
     @Override
diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeRepairing.java b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeRepairing.java
index 00f17e9f..ac5469fc 100644
--- a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeRepairing.java
+++ b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeRepairing.java
@@ -1,11 +1,11 @@
 package WayofTime.bloodmagic.livingArmour.upgrade;
 
+import WayofTime.bloodmagic.BloodMagic;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.inventory.EntityEquipmentSlot;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.world.World;
-import WayofTime.bloodmagic.api.Constants;
 import WayofTime.bloodmagic.api.livingArmour.ILivingArmour;
 import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade;
 
@@ -52,7 +52,7 @@ public class LivingArmourUpgradeRepairing extends LivingArmourUpgrade
     @Override
     public String getUniqueIdentifier()
     {
-        return Constants.Mod.MODID + ".upgrade.repair";
+        return BloodMagic.MODID + ".upgrade.repair";
     }
 
     @Override
diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeSelfSacrifice.java b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeSelfSacrifice.java
index c711a537..7bb7c94e 100644
--- a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeSelfSacrifice.java
+++ b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeSelfSacrifice.java
@@ -1,6 +1,6 @@
 package WayofTime.bloodmagic.livingArmour.upgrade;
 
-import WayofTime.bloodmagic.api.Constants;
+import WayofTime.bloodmagic.BloodMagic;
 import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade;
 import net.minecraft.nbt.NBTTagCompound;
 
@@ -23,7 +23,7 @@ public class LivingArmourUpgradeSelfSacrifice extends LivingArmourUpgrade
     @Override
     public String getUniqueIdentifier()
     {
-        return Constants.Mod.MODID + ".upgrade.selfSacrifice";
+        return BloodMagic.MODID + ".upgrade.selfSacrifice";
     }
 
     @Override
diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeSolarPowered.java b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeSolarPowered.java
index 5196c902..73787d8c 100644
--- a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeSolarPowered.java
+++ b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeSolarPowered.java
@@ -1,5 +1,6 @@
 package WayofTime.bloodmagic.livingArmour.upgrade;
 
+import WayofTime.bloodmagic.BloodMagic;
 import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.init.MobEffects;
@@ -7,7 +8,6 @@ import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.potion.PotionEffect;
 import net.minecraft.util.DamageSource;
 import net.minecraft.world.World;
-import WayofTime.bloodmagic.api.Constants;
 import WayofTime.bloodmagic.api.livingArmour.ILivingArmour;
 import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade;
 
@@ -58,7 +58,7 @@ public class LivingArmourUpgradeSolarPowered extends LivingArmourUpgrade
     @Override
     public String getUniqueIdentifier()
     {
-        return Constants.Mod.MODID + ".upgrade.solarPowered";
+        return BloodMagic.MODID + ".upgrade.solarPowered";
     }
 
     @Override
@@ -76,13 +76,13 @@ public class LivingArmourUpgradeSolarPowered extends LivingArmourUpgrade
     @Override
     public void writeToNBT(NBTTagCompound tag)
     {
-        tag.setInteger(Constants.Mod.MODID + ".tracker.solarPowered", counter);
+        tag.setInteger(BloodMagic.MODID + ".tracker.solarPowered", counter);
     }
 
     @Override
     public void readFromNBT(NBTTagCompound tag)
     {
-        counter = tag.getInteger(Constants.Mod.MODID + ".tracker.solarPowered");
+        counter = tag.getInteger(BloodMagic.MODID + ".tracker.solarPowered");
     }
 
     @Override
diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeSpeed.java b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeSpeed.java
index 14ff3c55..3a2a61f5 100644
--- a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeSpeed.java
+++ b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeSpeed.java
@@ -2,6 +2,7 @@ package WayofTime.bloodmagic.livingArmour.upgrade;
 
 import java.util.UUID;
 
+import WayofTime.bloodmagic.BloodMagic;
 import net.minecraft.entity.SharedMonsterAttributes;
 import net.minecraft.entity.ai.attributes.AttributeModifier;
 import net.minecraft.entity.player.EntityPlayer;
@@ -9,7 +10,6 @@ import net.minecraft.init.MobEffects;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.potion.PotionEffect;
 import net.minecraft.world.World;
-import WayofTime.bloodmagic.api.Constants;
 import WayofTime.bloodmagic.api.livingArmour.ILivingArmour;
 import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade;
 
@@ -72,7 +72,7 @@ public class LivingArmourUpgradeSpeed extends LivingArmourUpgrade
     @Override
     public String getUniqueIdentifier()
     {
-        return Constants.Mod.MODID + ".upgrade.movement";
+        return BloodMagic.MODID + ".upgrade.movement";
     }
 
     @Override
diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeSprintAttack.java b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeSprintAttack.java
index 8dd3ea30..eae1a291 100644
--- a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeSprintAttack.java
+++ b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeSprintAttack.java
@@ -1,10 +1,10 @@
 package WayofTime.bloodmagic.livingArmour.upgrade;
 
+import WayofTime.bloodmagic.BloodMagic;
 import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
-import WayofTime.bloodmagic.api.Constants;
 import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade;
 
 public class LivingArmourUpgradeSprintAttack extends LivingArmourUpgrade
@@ -53,7 +53,7 @@ public class LivingArmourUpgradeSprintAttack extends LivingArmourUpgrade
     @Override
     public String getUniqueIdentifier()
     {
-        return Constants.Mod.MODID + ".upgrade.sprintAttack";
+        return BloodMagic.MODID + ".upgrade.sprintAttack";
     }
 
     @Override
diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeStepAssist.java b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeStepAssist.java
index 9971a7cf..3b43023c 100644
--- a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeStepAssist.java
+++ b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeStepAssist.java
@@ -1,5 +1,6 @@
 package WayofTime.bloodmagic.livingArmour.upgrade;
 
+import WayofTime.bloodmagic.BloodMagic;
 import WayofTime.bloodmagic.api.Constants;
 import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade;
 import net.minecraft.nbt.NBTTagCompound;
@@ -23,7 +24,7 @@ public class LivingArmourUpgradeStepAssist extends LivingArmourUpgrade
     @Override
     public String getUniqueIdentifier()
     {
-        return Constants.Mod.MODID + ".upgrade.stepAssist";
+        return BloodMagic.MODID + ".upgrade.stepAssist";
     }
 
     @Override
diff --git a/src/main/java/WayofTime/bloodmagic/meteor/Meteor.java b/src/main/java/WayofTime/bloodmagic/meteor/Meteor.java
index cb0e2aa0..9e929db6 100644
--- a/src/main/java/WayofTime/bloodmagic/meteor/Meteor.java
+++ b/src/main/java/WayofTime/bloodmagic/meteor/Meteor.java
@@ -3,15 +3,12 @@ package WayofTime.bloodmagic.meteor;
 import java.util.List;
 import java.util.Random;
 
-import lombok.Getter;
-import lombok.Setter;
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
 import WayofTime.bloodmagic.util.Utils;
 
-@Getter
 public class Meteor
 {
     private static final Random RAND = new Random();
@@ -21,8 +18,6 @@ public class Meteor
     private final float explosionStrength;
     private final int radius;
     private final int maxWeight;
-
-    @Setter
     public int version;
 
     public Meteor(ItemStack catalystStack, List<MeteorComponent> components, float explosionStrength, int radius)
@@ -94,4 +89,32 @@ public class Meteor
 
         return RAND.nextDouble() > fillerChance ? fillerBlock : null;
     }
+
+    public ItemStack getCatalystStack() {
+        return catalystStack;
+    }
+
+    public List<MeteorComponent> getComponents() {
+        return components;
+    }
+
+    public float getExplosionStrength() {
+        return explosionStrength;
+    }
+
+    public int getRadius() {
+        return radius;
+    }
+
+    public int getMaxWeight() {
+        return maxWeight;
+    }
+
+    public int getVersion() {
+        return version;
+    }
+
+    public void setVersion(int version) {
+        this.version = version;
+    }
 }
\ No newline at end of file
diff --git a/src/main/java/WayofTime/bloodmagic/meteor/MeteorComponent.java b/src/main/java/WayofTime/bloodmagic/meteor/MeteorComponent.java
index 1c230eef..3c4d7e5f 100644
--- a/src/main/java/WayofTime/bloodmagic/meteor/MeteorComponent.java
+++ b/src/main/java/WayofTime/bloodmagic/meteor/MeteorComponent.java
@@ -2,9 +2,6 @@ package WayofTime.bloodmagic.meteor;
 
 import java.util.List;
 
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-import lombok.Setter;
 import net.minecraft.block.Block;
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.init.Blocks;
@@ -15,14 +12,16 @@ import net.minecraftforge.fml.common.registry.ForgeRegistries;
 import net.minecraftforge.oredict.OreDictionary;
 import WayofTime.bloodmagic.util.Utils;
 
-@Getter
-@Setter
-@AllArgsConstructor
 public class MeteorComponent
 {
     public int weight;
     public String oreName;
 
+    public MeteorComponent(int weight, String oreName) {
+        this.weight = weight;
+        this.oreName = oreName;
+    }
+
     public IBlockState getStateFromOre()
     {
         if (oreName.contains(":"))
@@ -60,4 +59,20 @@ public class MeteorComponent
 
         return null;
     }
+
+    public int getWeight() {
+        return weight;
+    }
+
+    public void setWeight(int weight) {
+        this.weight = weight;
+    }
+
+    public String getOreName() {
+        return oreName;
+    }
+
+    public void setOreName(String oreName) {
+        this.oreName = oreName;
+    }
 }
diff --git a/src/main/java/WayofTime/bloodmagic/meteor/MeteorConfigHandler.java b/src/main/java/WayofTime/bloodmagic/meteor/MeteorConfigHandler.java
index ab2bd130..b755ff3c 100644
--- a/src/main/java/WayofTime/bloodmagic/meteor/MeteorConfigHandler.java
+++ b/src/main/java/WayofTime/bloodmagic/meteor/MeteorConfigHandler.java
@@ -32,7 +32,7 @@ public class MeteorConfigHandler
     public static void handleMeteors(boolean checkNewVersion)
     {
         if (meteorDir == null) {
-            BloodMagic.instance.getLogger().error("Attempted to handle meteor config but the folder has not been initialized. Was this run too early?");
+            BloodMagic.instance.logger.error("Attempted to handle meteor config but the folder has not been initialized. Was this run too early?");
             return;
         }
 
@@ -64,11 +64,13 @@ public class MeteorConfigHandler
             // Filter names so we can compare to defaults
             for (File meteorFile : meteorFiles)
             {
-                Meteor meteor = Serializers.GSON.fromJson(new FileReader(meteorFile), Meteor.class);
+                FileReader reader = new FileReader(meteorFile);
+                Meteor meteor = Serializers.GSON.fromJson(reader, Meteor.class);
                 meteors.add(Pair.of(FilenameUtils.removeExtension(meteorFile.getName()), meteor));
+                reader.close();
             }
 
-            if (checkNewVersion && ConfigHandler.getConfig().getBoolean("resyncOnVersionChange", "Meteors", true, "Should the default meteors be regenerated if the mod has updated them"))
+            if (checkNewVersion && ConfigHandler.config.getBoolean("resyncOnVersionChange", "Meteors", true, "Should the default meteors be regenerated if the mod has updated them"))
             {
                 Set<String> discoveredDefaults = Sets.newHashSet();
 
@@ -103,7 +105,7 @@ public class MeteorConfigHandler
             e.printStackTrace();
         }
 
-        ConfigHandler.getConfig().save();
+        ConfigHandler.config.save();
     }
 
     private static List<Pair<String, Meteor>> getDefaultMeteors()
diff --git a/src/main/java/WayofTime/bloodmagic/network/BloodMagicPacketHandler.java b/src/main/java/WayofTime/bloodmagic/network/BloodMagicPacketHandler.java
index aeb1dad6..e0847590 100644
--- a/src/main/java/WayofTime/bloodmagic/network/BloodMagicPacketHandler.java
+++ b/src/main/java/WayofTime/bloodmagic/network/BloodMagicPacketHandler.java
@@ -1,17 +1,17 @@
 package WayofTime.bloodmagic.network;
 
+import WayofTime.bloodmagic.BloodMagic;
 import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraftforge.fml.common.network.NetworkRegistry;
 import net.minecraftforge.fml.common.network.simpleimpl.IMessage;
 import net.minecraftforge.fml.common.network.simpleimpl.SimpleNetworkWrapper;
 import net.minecraftforge.fml.relauncher.Side;
-import WayofTime.bloodmagic.api.Constants;
 import WayofTime.bloodmagic.util.ChatUtil;
 
 public class BloodMagicPacketHandler
 {
-    public static final SimpleNetworkWrapper INSTANCE = new SimpleNetworkWrapper(Constants.Mod.MODID);
+    public static final SimpleNetworkWrapper INSTANCE = new SimpleNetworkWrapper(BloodMagic.MODID);
 
     public static void init()
     {
diff --git a/src/main/java/WayofTime/bloodmagic/network/KeyProcessor.java b/src/main/java/WayofTime/bloodmagic/network/KeyProcessor.java
index 4cd933f4..a41c5c70 100644
--- a/src/main/java/WayofTime/bloodmagic/network/KeyProcessor.java
+++ b/src/main/java/WayofTime/bloodmagic/network/KeyProcessor.java
@@ -41,7 +41,7 @@ public class KeyProcessor implements IMessage, IMessageHandler<KeyProcessor, IMe
     @Override
     public IMessage onMessage(KeyProcessor msg, MessageContext ctx)
     {
-        EntityPlayer entityPlayer = ctx.getServerHandler().playerEntity;
+        EntityPlayer entityPlayer = ctx.getServerHandler().player;
 
         if (entityPlayer != null)
         {
diff --git a/src/main/java/WayofTime/bloodmagic/network/PlayerFallDistancePacketProcessor.java b/src/main/java/WayofTime/bloodmagic/network/PlayerFallDistancePacketProcessor.java
index 2e1deac3..9011f034 100644
--- a/src/main/java/WayofTime/bloodmagic/network/PlayerFallDistancePacketProcessor.java
+++ b/src/main/java/WayofTime/bloodmagic/network/PlayerFallDistancePacketProcessor.java
@@ -42,7 +42,7 @@ public class PlayerFallDistancePacketProcessor implements IMessage, IMessageHand
     {
         if (ctx.side == Side.SERVER)
         {
-            message.onMessageFromClient(ctx.getServerHandler().playerEntity);
+            message.onMessageFromClient(ctx.getServerHandler().player);
         }
         return null;
     }
diff --git a/src/main/java/WayofTime/bloodmagic/network/SigilHoldingPacketProcessor.java b/src/main/java/WayofTime/bloodmagic/network/SigilHoldingPacketProcessor.java
index da7b1fcc..909573a0 100644
--- a/src/main/java/WayofTime/bloodmagic/network/SigilHoldingPacketProcessor.java
+++ b/src/main/java/WayofTime/bloodmagic/network/SigilHoldingPacketProcessor.java
@@ -43,7 +43,7 @@ public class SigilHoldingPacketProcessor implements IMessage, IMessageHandler<Si
 
         if (message.slot > -1 && message.slot < 9)
         {
-            itemStack = ctx.getServerHandler().playerEntity.inventory.getStackInSlot(message.slot);
+            itemStack = ctx.getServerHandler().player.inventory.getStackInSlot(message.slot);
         }
 
         if (!itemStack.isEmpty())
diff --git a/src/main/java/WayofTime/bloodmagic/potion/BMPotionUtils.java b/src/main/java/WayofTime/bloodmagic/potion/BMPotionUtils.java
index 4306fdfa..5e8fdc05 100644
--- a/src/main/java/WayofTime/bloodmagic/potion/BMPotionUtils.java
+++ b/src/main/java/WayofTime/bloodmagic/potion/BMPotionUtils.java
@@ -22,8 +22,6 @@ import WayofTime.bloodmagic.api.Constants;
 import WayofTime.bloodmagic.api.util.helper.NBTHelper;
 import WayofTime.bloodmagic.recipe.alchemyTable.AlchemyTablePotionAugmentRecipe;
 
-import com.google.common.base.Objects;
-
 public class BMPotionUtils
 {
     public static Random rand = new Random();
@@ -50,7 +48,7 @@ public class BMPotionUtils
             BlockPos blockPos = entity.getPosition().add(rand.nextInt(horizontalRadius * 2 + 1) - horizontalRadius, rand.nextInt(verticalRadius * 2 + 1) - verticalRadius, rand.nextInt(horizontalRadius * 2 + 1) - horizontalRadius);
             Block block = world.getBlockState(blockPos).getBlock();
 
-            if (!BloodMagicAPI.getGreenGroveBlacklist().contains(block))
+            if (!BloodMagicAPI.greenGroveBlacklist.contains(block))
             {
                 if (block instanceof IPlantable || block instanceof IGrowable)
                 {
@@ -79,7 +77,7 @@ public class BMPotionUtils
 
         if (incurredDamage > 0)
         {
-            entity.attackEntityFrom(BloodMagicAPI.getDamageSource(), (float) incurredDamage);
+            entity.attackEntityFrom(BloodMagicAPI.damageSource, (float) incurredDamage);
         }
 
         return incurredDamage;
@@ -125,7 +123,7 @@ public class BMPotionUtils
             return stack;
         } else
         {
-            NBTTagCompound nbttagcompound = (NBTTagCompound) Objects.firstNonNull(stack.getTagCompound(), new NBTTagCompound());
+            NBTTagCompound nbttagcompound = stack.hasTagCompound() ? stack.getTagCompound() : new NBTTagCompound();
             NBTTagList nbttaglist = new NBTTagList();
 
             for (PotionEffect potioneffect : effects)
diff --git a/src/main/java/WayofTime/bloodmagic/potion/PotionBloodMagic.java b/src/main/java/WayofTime/bloodmagic/potion/PotionBloodMagic.java
index 7af491ad..892ea5de 100644
--- a/src/main/java/WayofTime/bloodmagic/potion/PotionBloodMagic.java
+++ b/src/main/java/WayofTime/bloodmagic/potion/PotionBloodMagic.java
@@ -1,6 +1,6 @@
 package WayofTime.bloodmagic.potion;
 
-import WayofTime.bloodmagic.api.Constants;
+import WayofTime.bloodmagic.BloodMagic;
 import net.minecraft.client.Minecraft;
 import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.potion.Potion;
@@ -11,9 +11,9 @@ import net.minecraftforge.fml.relauncher.SideOnly;
 
 public class PotionBloodMagic extends Potion
 {
-    public static ResourceLocation texture = new ResourceLocation(Constants.Mod.MODID, "textures/misc/potions.png");
+    public static ResourceLocation texture = new ResourceLocation(BloodMagic.MODID, "textures/misc/potions.png");
 
-    public PotionBloodMagic(String name, ResourceLocation texture, boolean badEffect, int potionColor, int iconIndexX, int iconIndexY)
+    public PotionBloodMagic(String name, boolean badEffect, int potionColor, int iconIndexX, int iconIndexY)
     {
         super(badEffect, potionColor);
         this.setPotionName(name);
diff --git a/src/main/java/WayofTime/bloodmagic/potion/PotionEventHandlers.java b/src/main/java/WayofTime/bloodmagic/potion/PotionEventHandlers.java
index 382e81da..78421d2f 100644
--- a/src/main/java/WayofTime/bloodmagic/potion/PotionEventHandlers.java
+++ b/src/main/java/WayofTime/bloodmagic/potion/PotionEventHandlers.java
@@ -1,36 +1,33 @@
 package WayofTime.bloodmagic.potion;
 
 import WayofTime.bloodmagic.api.event.SacrificeKnifeUsedEvent;
-import WayofTime.bloodmagic.registry.ModPotions;
+import WayofTime.bloodmagic.registry.RegistrarBloodMagic;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.IProjectile;
 import net.minecraft.entity.projectile.EntityArrow;
 import net.minecraft.entity.projectile.EntityThrowable;
 import net.minecraft.potion.PotionEffect;
 import net.minecraft.util.math.AxisAlignedBB;
-import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.event.entity.living.EnderTeleportEvent;
 import net.minecraftforge.event.entity.living.LivingAttackEvent;
 import net.minecraftforge.event.entity.living.LivingEvent;
 import net.minecraftforge.event.entity.player.PlayerEvent;
+import net.minecraftforge.fml.common.Mod;
 import net.minecraftforge.fml.common.eventhandler.EventPriority;
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
 
 import java.util.List;
 
+@Mod.EventBusSubscriber
 public class PotionEventHandlers
 {
-    public PotionEventHandlers()
-    {
-        MinecraftForge.EVENT_BUS.register(this);
-    }
 
     @SubscribeEvent
-    public void onLivingJumpEvent(LivingEvent.LivingJumpEvent event)
+    public static void onLivingJumpEvent(LivingEvent.LivingJumpEvent event)
     {
-        if (event.getEntityLiving().isPotionActive(ModPotions.boost))
+        if (event.getEntityLiving().isPotionActive(RegistrarBloodMagic.BOOST))
         {
-            int i = event.getEntityLiving().getActivePotionEffect(ModPotions.boost).getAmplifier();
+            int i = event.getEntityLiving().getActivePotionEffect(RegistrarBloodMagic.BOOST).getAmplifier();
             event.getEntityLiving().motionY += (0.1f) * (2 + i);
         }
 
@@ -40,7 +37,7 @@ public class PotionEventHandlers
     }
 
     @SubscribeEvent
-    public void onEntityUpdate(LivingEvent.LivingUpdateEvent event)
+    public static void onEntityUpdate(LivingEvent.LivingUpdateEvent event)
     {
 //        if (event.getEntityLiving().isPotionActive(ModPotions.boost))
 //        {
@@ -58,7 +55,7 @@ public class PotionEventHandlers
 //            }
 //        }
 
-        if (event.getEntityLiving().isPotionActive(ModPotions.whirlwind))
+        if (event.getEntityLiving().isPotionActive(RegistrarBloodMagic.WHIRLWIND))
         {
             int d0 = 3;
             AxisAlignedBB axisAlignedBB = new AxisAlignedBB(event.getEntityLiving().posX - 0.5, event.getEntityLiving().posY - 0.5, event.getEntityLiving().posZ - 0.5, event.getEntityLiving().posX + 0.5, event.getEntityLiving().posY + 0.5, event.getEntityLiving().posZ + 0.5).expand(d0, d0, d0);
@@ -113,30 +110,30 @@ public class PotionEventHandlers
     }
 
     @SubscribeEvent
-    public void onPlayerRespawn(PlayerEvent.Clone event)
+    public static void onPlayerRespawn(PlayerEvent.Clone event)
     {
         if (event.isWasDeath())
-            event.getEntityPlayer().addPotionEffect(new PotionEffect(ModPotions.soulFray, 400));
+            event.getEntityPlayer().addPotionEffect(new PotionEffect(RegistrarBloodMagic.SOUL_FRAY, 400));
     }
 
     @SubscribeEvent
-    public void onSacrificeKnifeUsed(SacrificeKnifeUsedEvent event)
+    public static void onSacrificeKnifeUsed(SacrificeKnifeUsedEvent event)
     {
-        if (event.player.isPotionActive(ModPotions.soulFray))
+        if (event.player.isPotionActive(RegistrarBloodMagic.SOUL_FRAY))
             event.lpAdded = (int) (event.lpAdded * 0.1D);
     }
 
     @SubscribeEvent(priority = EventPriority.HIGHEST)
-    public void onPlayerDamageEvent(LivingAttackEvent event)
+    public static void onPlayerDamageEvent(LivingAttackEvent event)
     {
-        if (event.getEntityLiving().isPotionActive(ModPotions.whirlwind) && event.isCancelable() && event.getSource().isProjectile())
+        if (event.getEntityLiving().isPotionActive(RegistrarBloodMagic.WHIRLWIND) && event.isCancelable() && event.getSource().isProjectile())
             event.setCanceled(true);
     }
 
     @SubscribeEvent
-    public void onEndermanTeleportEvent(EnderTeleportEvent event)
+    public static void onEndermanTeleportEvent(EnderTeleportEvent event)
     {
-        if (event.getEntityLiving().isPotionActive(ModPotions.planarBinding) && event.isCancelable())
+        if (event.getEntityLiving().isPotionActive(RegistrarBloodMagic.PLANAR_BINDING) && event.isCancelable())
         {
             event.setCanceled(true);
         }
diff --git a/src/main/java/WayofTime/bloodmagic/proxy/ClientProxy.java b/src/main/java/WayofTime/bloodmagic/proxy/ClientProxy.java
index 60cac2cc..87aa212f 100644
--- a/src/main/java/WayofTime/bloodmagic/proxy/ClientProxy.java
+++ b/src/main/java/WayofTime/bloodmagic/proxy/ClientProxy.java
@@ -57,8 +57,8 @@ import WayofTime.bloodmagic.entity.projectile.EntityBloodLight;
 import WayofTime.bloodmagic.entity.projectile.EntityMeteor;
 import WayofTime.bloodmagic.entity.projectile.EntitySentientArrow;
 import WayofTime.bloodmagic.entity.projectile.EntitySoulSnare;
-import WayofTime.bloodmagic.registry.ModBlocks;
-import WayofTime.bloodmagic.registry.ModItems;
+import WayofTime.bloodmagic.registry.RegistrarBloodMagicBlocks;
+import WayofTime.bloodmagic.registry.RegistrarBloodMagicItems;
 import WayofTime.bloodmagic.tile.routing.TileRoutingNode;
 import WayofTime.bloodmagic.util.helper.InventoryRenderHelper;
 import WayofTime.bloodmagic.util.helper.InventoryRenderHelperV2;
@@ -92,10 +92,10 @@ public class ClientProxy extends CommonProxy
         renderHelper = new InventoryRenderHelper(Constants.Mod.DOMAIN);
         renderHelperV2 = new InventoryRenderHelperV2(Constants.Mod.DOMAIN);
 
-        OBJLoader.INSTANCE.addDomain(Constants.Mod.MODID);
+        OBJLoader.INSTANCE.addDomain(BloodMagic.MODID);
 
-        ModBlocks.initRenders();
-        ModItems.initRenders();
+        RegistrarBloodMagicBlocks.initRenders();
+        RegistrarBloodMagicItems.initRenders();
 
         ClientRegistry.bindTileEntitySpecialRenderer(TileInversionPillar.class, new AnimationTESR<TileInversionPillar>()
         {
@@ -155,7 +155,7 @@ public class ClientProxy extends CommonProxy
                 }
                 return -1;
             }
-        }, ModItems.SIGIL_HOLDING);
+        }, RegistrarBloodMagicItems.SIGIL_HOLDING);
         Minecraft.getMinecraft().getItemColors().registerItemColorHandler(new IItemColor()
         {
             @Override
@@ -169,7 +169,7 @@ public class ClientProxy extends CommonProxy
 
                 return PotionUtils.getPotionColorFromEffectList(PotionUtils.getEffectsFromStack(stack));
             }
-        }, ModItems.POTION_FLASK);
+        }, RegistrarBloodMagicItems.POTION_FLASK);
 
         addElytraLayer();
     }
@@ -188,7 +188,7 @@ public class ClientProxy extends CommonProxy
         {
             IVariantProvider variantProvider = (IVariantProvider) block;
             for (Pair<Integer, String> variant : variantProvider.getVariants())
-                ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(block), variant.getLeft(), new ModelResourceLocation(new ResourceLocation(Constants.Mod.MODID, name), variant.getRight()));
+                ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(block), variant.getLeft(), new ModelResourceLocation(new ResourceLocation(BloodMagic.MODID, name), variant.getRight()));
         }
     }
 
@@ -201,14 +201,14 @@ public class ClientProxy extends CommonProxy
             ModelLoader.setCustomMeshDefinition(item, meshProvider.getMeshDefinition());
             ResourceLocation resourceLocation = meshProvider.getCustomLocation();
             if (resourceLocation == null)
-                resourceLocation = new ResourceLocation(Constants.Mod.MODID, "item/" + name);
+                resourceLocation = new ResourceLocation(BloodMagic.MODID, "item/" + name);
             for (String variant : meshProvider.getVariants())
                 ModelLoader.registerItemVariants(item, new ModelResourceLocation(resourceLocation, variant));
         } else if (item instanceof IVariantProvider)
         {
             IVariantProvider variantProvider = (IVariantProvider) item;
             for (Pair<Integer, String> variant : variantProvider.getVariants())
-                ModelLoader.setCustomModelResourceLocation(item, variant.getLeft(), new ModelResourceLocation(new ResourceLocation(Constants.Mod.MODID, "item/" + name), variant.getRight()));
+                ModelLoader.setCustomModelResourceLocation(item, variant.getLeft(), new ModelResourceLocation(new ResourceLocation(BloodMagic.MODID, "item/" + name), variant.getRight()));
         }
     }
 
@@ -219,11 +219,11 @@ public class ClientProxy extends CommonProxy
         {
             RenderPlayer renderPlayer = ObfuscationReflectionHelper.getPrivateValue(RenderManager.class, renderManager, "playerRenderer", "field_178637_m");
             renderPlayer.addLayer(new LayerBloodElytra(renderPlayer));
-            BloodMagic.instance.getLogger().info("Elytra layer added");
+            BloodMagic.instance.logger.info("Elytra layer added");
         } catch (Exception e)
         {
-            BloodMagic.instance.getLogger().error("Failed to set custom Elytra Layer for Elytra Living Armour Upgrade.");
-            BloodMagic.instance.getLogger().error(e.getLocalizedMessage());
+            BloodMagic.instance.logger.error("Failed to set custom Elytra Layer for Elytra Living Armour Upgrade.");
+            BloodMagic.instance.logger.error(e.getLocalizedMessage());
         }
     }
 
diff --git a/src/main/java/WayofTime/bloodmagic/recipe/alchemyTable/AlchemyTableDyeableRecipe.java b/src/main/java/WayofTime/bloodmagic/recipe/alchemyTable/AlchemyTableDyeableRecipe.java
index d3aef56e..bc8e601b 100644
--- a/src/main/java/WayofTime/bloodmagic/recipe/alchemyTable/AlchemyTableDyeableRecipe.java
+++ b/src/main/java/WayofTime/bloodmagic/recipe/alchemyTable/AlchemyTableDyeableRecipe.java
@@ -91,7 +91,7 @@ public class AlchemyTableDyeableRecipe extends AlchemyTableRecipe
                     outputStack.setTagCompound(new NBTTagCompound());
                 }
 
-                outputStack.getTagCompound().setString(Constants.NBT.COLOR, String.valueOf(dyeColor.getMapColor().colorValue));
+                outputStack.getTagCompound().setString(Constants.NBT.COLOR, String.valueOf(dyeColor.getColorValue()));
 
                 return outputStack;
             }
diff --git a/src/main/java/WayofTime/bloodmagic/recipe/alchemyTable/AlchemyTablePotionAugmentRecipe.java b/src/main/java/WayofTime/bloodmagic/recipe/alchemyTable/AlchemyTablePotionAugmentRecipe.java
index f10586cb..9b0c084f 100644
--- a/src/main/java/WayofTime/bloodmagic/recipe/alchemyTable/AlchemyTablePotionAugmentRecipe.java
+++ b/src/main/java/WayofTime/bloodmagic/recipe/alchemyTable/AlchemyTablePotionAugmentRecipe.java
@@ -7,7 +7,7 @@ import net.minecraft.potion.Potion;
 import net.minecraft.potion.PotionEffect;
 import net.minecraft.potion.PotionUtils;
 import WayofTime.bloodmagic.potion.BMPotionUtils;
-import WayofTime.bloodmagic.registry.ModItems;
+import WayofTime.bloodmagic.registry.RegistrarBloodMagicItems;
 
 public class AlchemyTablePotionAugmentRecipe extends AlchemyTablePotionRecipe
 {
@@ -60,7 +60,7 @@ public class AlchemyTablePotionAugmentRecipe extends AlchemyTablePotionRecipe
     {
         if (inputStack == null)
         {
-            ItemStack outputStack = new ItemStack(ModItems.POTION_FLASK);
+            ItemStack outputStack = new ItemStack(RegistrarBloodMagicItems.POTION_FLASK);
 
             List<PotionEffect> effectList = new ArrayList<PotionEffect>();
             int potionLength = wantedPotion.isInstant() ? 1 : BMPotionUtils.getAugmentedLength(baseEffect.getDuration(), lengthAugment, powerAugment - baseEffect.getAmplifier());
@@ -95,7 +95,7 @@ public class AlchemyTablePotionAugmentRecipe extends AlchemyTablePotionRecipe
 
     public static ItemStack getAugmentedPotionFlask(PotionEffect baseEffect)
     {
-        ItemStack outputStack = new ItemStack(ModItems.POTION_FLASK);
+        ItemStack outputStack = new ItemStack(RegistrarBloodMagicItems.POTION_FLASK);
 
         List<PotionEffect> effectList = new ArrayList<PotionEffect>();
         effectList.add(baseEffect);
diff --git a/src/main/java/WayofTime/bloodmagic/recipe/alchemyTable/AlchemyTablePotionRecipe.java b/src/main/java/WayofTime/bloodmagic/recipe/alchemyTable/AlchemyTablePotionRecipe.java
index 23e24887..c1cdb1bc 100644
--- a/src/main/java/WayofTime/bloodmagic/recipe/alchemyTable/AlchemyTablePotionRecipe.java
+++ b/src/main/java/WayofTime/bloodmagic/recipe/alchemyTable/AlchemyTablePotionRecipe.java
@@ -9,11 +9,11 @@ import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
 import net.minecraftforge.oredict.OreDictionary;
 import WayofTime.bloodmagic.api.recipe.AlchemyTableRecipe;
-import WayofTime.bloodmagic.registry.ModItems;
+import WayofTime.bloodmagic.registry.RegistrarBloodMagicItems;
 
 public class AlchemyTablePotionRecipe extends AlchemyTableRecipe
 {
-    public static final ItemStack basePotionFlaskStack = new ItemStack(ModItems.POTION_FLASK, 1, OreDictionary.WILDCARD_VALUE);
+    public static final ItemStack basePotionFlaskStack = new ItemStack(RegistrarBloodMagicItems.POTION_FLASK, 1, OreDictionary.WILDCARD_VALUE);
     protected PotionEffect baseEffect;
 
     public static final int temporaryMaximumEffectsOnThePotionFlaskYesThisIsALongFieldItIsJustSoIRemember = 3;
@@ -50,7 +50,7 @@ public class AlchemyTablePotionRecipe extends AlchemyTableRecipe
 
             if (slot != null)
             {
-                boolean match = slot.getItem() == ModItems.POTION_FLASK;
+                boolean match = slot.getItem() == RegistrarBloodMagicItems.POTION_FLASK;
 
                 if (match)
                 {
@@ -91,7 +91,7 @@ public class AlchemyTablePotionRecipe extends AlchemyTableRecipe
                     }
 
                     if (match) {
-                        if (next instanceof ItemStack && ((ItemStack) next).getItem() == ModItems.POTION_FLASK) {
+                        if (next instanceof ItemStack && ((ItemStack) next).getItem() == RegistrarBloodMagicItems.POTION_FLASK) {
                             if (!isPotionFlaskValidInput(slot)) {
                                 break;
                             }
@@ -135,7 +135,7 @@ public class AlchemyTablePotionRecipe extends AlchemyTableRecipe
     {
         if (inputStack.isEmpty())
         {
-            ItemStack outputStack = new ItemStack(ModItems.POTION_FLASK);
+            ItemStack outputStack = new ItemStack(RegistrarBloodMagicItems.POTION_FLASK);
 
             List<PotionEffect> effectList = new ArrayList<PotionEffect>();
             effectList.add(baseEffect);
diff --git a/src/main/java/WayofTime/bloodmagic/registry/ModBlocks.java b/src/main/java/WayofTime/bloodmagic/registry/ModBlocks.java
deleted file mode 100644
index b76b8028..00000000
--- a/src/main/java/WayofTime/bloodmagic/registry/ModBlocks.java
+++ /dev/null
@@ -1,293 +0,0 @@
-package WayofTime.bloodmagic.registry;
-
-import net.minecraft.block.Block;
-import net.minecraft.block.material.Material;
-import net.minecraft.item.ItemBlock;
-import net.minecraftforge.fluids.FluidRegistry;
-import net.minecraftforge.fml.common.registry.GameRegistry;
-import net.minecraftforge.fml.relauncher.Side;
-import net.minecraftforge.fml.relauncher.SideOnly;
-import WayofTime.bloodmagic.BloodMagic;
-import WayofTime.bloodmagic.ConfigHandler;
-import WayofTime.bloodmagic.api.BloodMagicAPI;
-import WayofTime.bloodmagic.api.Constants;
-import WayofTime.bloodmagic.api.ritual.EnumRuneType;
-import WayofTime.bloodmagic.block.BlockAlchemyArray;
-import WayofTime.bloodmagic.block.BlockAlchemyTable;
-import WayofTime.bloodmagic.block.BlockAltar;
-import WayofTime.bloodmagic.block.BlockBloodLight;
-import WayofTime.bloodmagic.block.BlockBloodRune;
-import WayofTime.bloodmagic.block.BlockBloodStoneBrick;
-import WayofTime.bloodmagic.block.BlockBloodTank;
-import WayofTime.bloodmagic.block.BlockCrystal;
-import WayofTime.bloodmagic.block.BlockDemonBase;
-import WayofTime.bloodmagic.block.BlockDemonCrucible;
-import WayofTime.bloodmagic.block.BlockDemonCrystal;
-import WayofTime.bloodmagic.block.BlockDemonCrystallizer;
-import WayofTime.bloodmagic.block.BlockDemonLight;
-import WayofTime.bloodmagic.block.BlockDemonPillarBase;
-import WayofTime.bloodmagic.block.BlockDemonPillarCapBase;
-import WayofTime.bloodmagic.block.BlockDemonPylon;
-import WayofTime.bloodmagic.block.BlockDemonStairsBase;
-import WayofTime.bloodmagic.block.BlockDemonWallBase;
-import WayofTime.bloodmagic.block.BlockDimensionalPortal;
-import WayofTime.bloodmagic.block.BlockIncenseAltar;
-import WayofTime.bloodmagic.block.BlockInputRoutingNode;
-import WayofTime.bloodmagic.block.BlockInversionPillar;
-import WayofTime.bloodmagic.block.BlockInversionPillarEnd;
-import WayofTime.bloodmagic.block.BlockItemRoutingNode;
-import WayofTime.bloodmagic.block.BlockLifeEssence;
-import WayofTime.bloodmagic.block.BlockMasterRoutingNode;
-import WayofTime.bloodmagic.block.BlockMimic;
-import WayofTime.bloodmagic.block.BlockOutputRoutingNode;
-import WayofTime.bloodmagic.block.BlockPath;
-import WayofTime.bloodmagic.block.BlockPhantom;
-import WayofTime.bloodmagic.block.BlockRitualController;
-import WayofTime.bloodmagic.block.BlockRitualStone;
-import WayofTime.bloodmagic.block.BlockSoulForge;
-import WayofTime.bloodmagic.block.BlockSpectral;
-import WayofTime.bloodmagic.block.BlockTeleposer;
-import WayofTime.bloodmagic.block.enums.EnumBloodRune;
-import WayofTime.bloodmagic.block.enums.EnumBrickSize;
-import WayofTime.bloodmagic.block.enums.EnumDemonBlock1;
-import WayofTime.bloodmagic.block.enums.EnumDemonBlock2;
-import WayofTime.bloodmagic.block.enums.EnumDemonBlock3;
-import WayofTime.bloodmagic.block.enums.EnumInversionCap;
-import WayofTime.bloodmagic.block.enums.EnumMimic;
-import WayofTime.bloodmagic.block.enums.EnumPath;
-import WayofTime.bloodmagic.block.enums.EnumRitualController;
-import WayofTime.bloodmagic.block.enums.EnumSubWillType;
-import WayofTime.bloodmagic.block.enums.EnumSubWillType1;
-import WayofTime.bloodmagic.block.enums.EnumSubWillType2;
-import WayofTime.bloodmagic.block.enums.EnumSubWillType3;
-import WayofTime.bloodmagic.block.enums.EnumWillWall;
-import WayofTime.bloodmagic.item.block.ItemBlockAlchemyTable;
-import WayofTime.bloodmagic.item.block.ItemBlockBloodTank;
-import WayofTime.bloodmagic.item.block.ItemBlockDemonCrystal;
-import WayofTime.bloodmagic.item.block.base.ItemBlockEnum;
-import WayofTime.bloodmagic.tile.TileAlchemyArray;
-import WayofTime.bloodmagic.tile.TileAlchemyTable;
-import WayofTime.bloodmagic.tile.TileAltar;
-import WayofTime.bloodmagic.tile.TileBloodTank;
-import WayofTime.bloodmagic.tile.TileDemonCrucible;
-import WayofTime.bloodmagic.tile.TileDemonCrystal;
-import WayofTime.bloodmagic.tile.TileDemonCrystallizer;
-import WayofTime.bloodmagic.tile.TileDemonPylon;
-import WayofTime.bloodmagic.tile.TileDimensionalPortal;
-import WayofTime.bloodmagic.tile.TileImperfectRitualStone;
-import WayofTime.bloodmagic.tile.TileIncenseAltar;
-import WayofTime.bloodmagic.tile.TileInversionPillar;
-import WayofTime.bloodmagic.tile.TileMasterRitualStone;
-import WayofTime.bloodmagic.tile.TileMimic;
-import WayofTime.bloodmagic.tile.TilePhantomBlock;
-import WayofTime.bloodmagic.tile.TilePlinth;
-import WayofTime.bloodmagic.tile.TileSoulForge;
-import WayofTime.bloodmagic.tile.TileSpectralBlock;
-import WayofTime.bloodmagic.tile.TileTeleposer;
-import WayofTime.bloodmagic.tile.routing.TileInputRoutingNode;
-import WayofTime.bloodmagic.tile.routing.TileItemRoutingNode;
-import WayofTime.bloodmagic.tile.routing.TileMasterRoutingNode;
-import WayofTime.bloodmagic.tile.routing.TileOutputRoutingNode;
-import WayofTime.bloodmagic.util.helper.InventoryRenderHelper;
-import WayofTime.bloodmagic.util.helper.InventoryRenderHelperV2;
-
-public class ModBlocks
-{
-    public static final Block ALTAR;
-    public static final Block BLOOD_RUNE;
-    public static final Block RITUAL_CONTROLLER;
-    public static final Block RITUAL_STONE;
-    public static final Block BLOOD_LIGHT;
-    public static final Block TELEPOSER;
-    public static final Block ALCHEMY_ARRAY;
-    public static final Block SPECTRAL_BLOCK;
-    public static final Block PHANTOM_BLOCK;
-    public static final Block SOUL_FORGE;
-    public static final Block INCENSE_ALTAR;
-    public static final Block DEMON_CRUCIBLE;
-    public static final Block DEMON_PYLON;
-    public static final Block DEMON_CRYSTALLIZER;
-    public static final Block DEMON_CRYSTAL;
-    public static final Block ALCHEMY_TABLE;
-    public static final Block LIFE_ESSENCE;
-    public static final Block CRYSTAL;
-    public static final Block BLOOD_STONE;
-    public static final Block PATH_BLOCK;
-    public static final Block MASTER_ROUTING_NODE;
-    public static final Block INPUT_ROUTING_NODE;
-    public static final Block OUTPUT_ROUTING_NODE;
-    public static final Block ITEM_ROUTING_NODE;
-    public static final Block DIMENSIONAL_PORTAL;
-    public static final Block BLOOD_TANK;
-    public static final Block MIMIC;
-    public static final Block DEMON_BRICK_1;
-    public static final Block DEMON_BRICK_2;
-    public static final Block DEMON_EXTRAS;
-    public static final Block DEMON_PILLAR_1;
-    public static final Block DEMON_PILLAR_2;
-    public static final Block DEMON_PILLAR_CAP_1;
-    public static final Block DEMON_PILLAR_CAP_2;
-    public static final Block DEMON_PILLAR_CAP_3;
-    public static final Block DEMON_LIGHT;
-    public static final Block DEMON_WALL_1;
-    public static final Block DEMON_STAIRS_1;
-    public static final Block DEMON_STAIRS_2;
-    public static final Block DEMON_STAIRS_3;
-    public static final Block INVERSION_PILLAR;
-    public static final Block INVERSION_PILLAR_END;
-
-    static
-    {
-        FluidRegistry.registerFluid(BlockLifeEssence.getLifeEssence());
-        FluidRegistry.addBucketForFluid(BlockLifeEssence.getLifeEssence());
-        LIFE_ESSENCE = registerBlock(new BlockLifeEssence(), Constants.BloodMagicBlock.LIFE_ESSENCE.getRegName());
-
-        ALTAR = registerBlock(new BlockAltar(), Constants.BloodMagicBlock.ALTAR.getRegName());
-        BLOOD_RUNE = registerBlock(new ItemBlockEnum<EnumBloodRune>(new BlockBloodRune()), Constants.BloodMagicBlock.BLOOD_RUNE.getRegName());
-        RITUAL_CONTROLLER = registerBlock(new ItemBlockEnum<EnumRitualController>(new BlockRitualController()), Constants.BloodMagicBlock.RITUAL_CONTROLLER.getRegName());
-        RITUAL_STONE = registerBlock(new ItemBlockEnum<EnumRuneType>(new BlockRitualStone()), Constants.BloodMagicBlock.RITUAL_STONE.getRegName());
-        BLOOD_LIGHT = registerBlock(new BlockBloodLight(), Constants.BloodMagicBlock.BLOOD_LIGHT.getRegName());
-        TELEPOSER = registerBlock(new BlockTeleposer(), Constants.BloodMagicBlock.TELEPOSER.getRegName());
-        ALCHEMY_ARRAY = registerBlock(new BlockAlchemyArray(), Constants.BloodMagicBlock.ALCHEMY_ARRAY.getRegName());
-        SPECTRAL_BLOCK = registerBlock(new BlockSpectral(), Constants.BloodMagicBlock.SPECTRAL.getRegName());
-        PHANTOM_BLOCK = registerBlock(new BlockPhantom(), Constants.BloodMagicBlock.PHANTOM.getRegName());
-        SOUL_FORGE = registerBlock(new BlockSoulForge(), Constants.BloodMagicBlock.SOUL_FORGE.getRegName());
-        CRYSTAL = registerBlock(new ItemBlockEnum<EnumBrickSize>(new BlockCrystal()), Constants.BloodMagicBlock.CRYSTAL.getRegName());
-        BLOOD_STONE = registerBlock(new ItemBlockEnum<EnumBrickSize>(new BlockBloodStoneBrick()), Constants.BloodMagicBlock.BLOOD_STONE.getRegName());
-        MASTER_ROUTING_NODE = registerBlock(new ItemBlock(new BlockMasterRoutingNode()), Constants.BloodMagicBlock.MASTER_ROUTING_NODE.getRegName());
-        INPUT_ROUTING_NODE = registerBlock(new ItemBlock(new BlockInputRoutingNode()), Constants.BloodMagicBlock.INPUT_ROUTING_NODE.getRegName());
-        OUTPUT_ROUTING_NODE = registerBlock(new ItemBlock(new BlockOutputRoutingNode()), Constants.BloodMagicBlock.OUTPUT_ROUTING_NODE.getRegName());
-        ITEM_ROUTING_NODE = registerBlock(new ItemBlock(new BlockItemRoutingNode()), Constants.BloodMagicBlock.ITEM_ROUTING_NODE.getRegName());
-        INCENSE_ALTAR = registerBlock(new BlockIncenseAltar(), Constants.BloodMagicBlock.INCENSE_ALTAR.getRegName());
-        PATH_BLOCK = registerBlock(new ItemBlockEnum<EnumPath>(new BlockPath()), Constants.BloodMagicBlock.PATH.getRegName());
-        DEMON_CRUCIBLE = registerBlock(new BlockDemonCrucible(), Constants.BloodMagicBlock.DEMON_CRUCIBLE.getRegName());
-        DEMON_PYLON = registerBlock(new BlockDemonPylon(), Constants.BloodMagicBlock.DEMON_PYLON.getRegName());
-        DEMON_CRYSTALLIZER = registerBlock(new BlockDemonCrystallizer(), Constants.BloodMagicBlock.DEMON_CRYSTALLIZER.getRegName());
-        DEMON_CRYSTAL = registerBlock(new ItemBlockDemonCrystal(new BlockDemonCrystal()), Constants.BloodMagicBlock.DEMON_CRYSTAL.getRegName());
-
-        ALCHEMY_TABLE = registerBlock(new ItemBlockAlchemyTable(new BlockAlchemyTable()), Constants.BloodMagicBlock.ALCHEMY_TABLE.getRegName());
-
-        DIMENSIONAL_PORTAL = registerBlock(new BlockDimensionalPortal(), Constants.BloodMagicBlock.DIMENSIONAL_PORTAL.getRegName());
-        BLOOD_TANK = registerBlock(new ItemBlockBloodTank(new BlockBloodTank()), Constants.BloodMagicBlock.BLOOD_TANK.getRegName());
-
-        MIMIC = registerBlock(new ItemBlockEnum<EnumMimic>(new BlockMimic()), Constants.BloodMagicBlock.MIMIC.getRegName());
-
-        DEMON_BRICK_1 = registerBlock(new ItemBlockEnum<EnumDemonBlock1>(new BlockDemonBase<EnumDemonBlock1>("bricks1", EnumDemonBlock1.class)), Constants.BloodMagicBlock.DEMON_BRICK_1.getRegName());
-        DEMON_BRICK_2 = registerBlock(new ItemBlockEnum<EnumDemonBlock2>(new BlockDemonBase<EnumDemonBlock2>("bricks2", EnumDemonBlock2.class)), Constants.BloodMagicBlock.DEMON_BRICK_2.getRegName());
-        DEMON_EXTRAS = registerBlock(new ItemBlockEnum<EnumDemonBlock3>(new BlockDemonBase<EnumDemonBlock3>("extras", EnumDemonBlock3.class)), Constants.BloodMagicBlock.DEMON_BLOCK_EXTRA.getRegName());
-
-        DEMON_PILLAR_1 = registerBlock(new ItemBlockEnum<EnumSubWillType>(new BlockDemonPillarBase<EnumSubWillType>("pillar1", Material.ROCK, EnumSubWillType.class)), Constants.BloodMagicBlock.DEMON_PILLAR_1.getRegName());
-        DEMON_PILLAR_2 = registerBlock(new ItemBlockEnum<EnumSubWillType>(new BlockDemonPillarBase<EnumSubWillType>("pillar2", Material.ROCK, EnumSubWillType.class)), Constants.BloodMagicBlock.DEMON_PILLAR_2.getRegName());
-        DEMON_PILLAR_CAP_1 = registerBlock(new ItemBlockEnum<EnumSubWillType1>(new BlockDemonPillarCapBase<EnumSubWillType1>("pillarCap1", Material.ROCK, EnumSubWillType1.class)), Constants.BloodMagicBlock.DEMON_PILLAR_CAP_1.getRegName());
-        DEMON_PILLAR_CAP_2 = registerBlock(new ItemBlockEnum<EnumSubWillType2>(new BlockDemonPillarCapBase<EnumSubWillType2>("pillarCap2", Material.ROCK, EnumSubWillType2.class)), Constants.BloodMagicBlock.DEMON_PILLAR_CAP_2.getRegName());
-        DEMON_PILLAR_CAP_3 = registerBlock(new ItemBlockEnum<EnumSubWillType3>(new BlockDemonPillarCapBase<EnumSubWillType3>("pillarCap3", Material.ROCK, EnumSubWillType3.class)), Constants.BloodMagicBlock.DEMON_PILLAR_CAP_3.getRegName());
-
-        DEMON_LIGHT = registerBlock(new ItemBlockEnum<EnumSubWillType>(new BlockDemonLight()), Constants.BloodMagicBlock.DEMON_LIGHT.getRegName());
-
-        DEMON_WALL_1 = registerBlock(new ItemBlockEnum<EnumWillWall>(new BlockDemonWallBase<EnumWillWall>("wall1", Material.ROCK, EnumWillWall.class)), Constants.BloodMagicBlock.DEMON_WALL_1.getRegName());
-
-        DEMON_STAIRS_1 = registerBlock(new ItemBlockEnum<EnumSubWillType1>(new BlockDemonStairsBase<EnumSubWillType1>("stairs1", Material.ROCK, EnumSubWillType1.class)), Constants.BloodMagicBlock.DEMON_STAIRS_1.getRegName());
-        DEMON_STAIRS_2 = registerBlock(new ItemBlockEnum<EnumSubWillType2>(new BlockDemonStairsBase<EnumSubWillType2>("stairs2", Material.ROCK, EnumSubWillType2.class)), Constants.BloodMagicBlock.DEMON_STAIRS_2.getRegName());
-        DEMON_STAIRS_3 = registerBlock(new ItemBlockEnum<EnumSubWillType3>(new BlockDemonStairsBase<EnumSubWillType3>("stairs3", Material.ROCK, EnumSubWillType3.class)), Constants.BloodMagicBlock.DEMON_STAIRS_3.getRegName());
-
-        INVERSION_PILLAR = registerBlock(new ItemBlockEnum<EnumSubWillType>(new BlockInversionPillar()), Constants.BloodMagicBlock.INVERSION_PILLAR.getRegName());
-        INVERSION_PILLAR_END = registerBlock(new ItemBlockEnum<EnumInversionCap>(new BlockInversionPillarEnd()), Constants.BloodMagicBlock.INVERSION_PILLAR_END.getRegName());
-    }
-
-    public static void init()
-    {
-        BloodMagicAPI.addToTeleposerBlacklist(INPUT_ROUTING_NODE);
-        BloodMagicAPI.addToTranspositionBlacklist(INPUT_ROUTING_NODE);
-        BloodMagicAPI.addToTeleposerBlacklist(OUTPUT_ROUTING_NODE);
-        BloodMagicAPI.addToTranspositionBlacklist(OUTPUT_ROUTING_NODE);
-        BloodMagicAPI.addToTeleposerBlacklist(ITEM_ROUTING_NODE);
-        BloodMagicAPI.addToTranspositionBlacklist(ITEM_ROUTING_NODE);
-        BloodMagicAPI.addToTeleposerBlacklist(DEMON_CRYSTAL);
-        BloodMagicAPI.addToTranspositionBlacklist(DEMON_CRYSTAL);
-
-        initTiles();
-    }
-
-    public static void initTiles()
-    {
-        GameRegistry.registerTileEntity(TileAltar.class, Constants.Mod.MODID + ":" + TileAltar.class.getSimpleName());
-        GameRegistry.registerTileEntity(TileImperfectRitualStone.class, Constants.Mod.MODID + ":" + TileImperfectRitualStone.class.getSimpleName());
-        GameRegistry.registerTileEntity(TileMasterRitualStone.class, Constants.Mod.MODID + ":" + TileMasterRitualStone.class.getSimpleName());
-        GameRegistry.registerTileEntity(TilePlinth.class, Constants.Mod.MODID + ":" + TilePlinth.class.getSimpleName());
-        GameRegistry.registerTileEntity(TileAlchemyArray.class, Constants.Mod.MODID + ":" + TileAlchemyArray.class.getSimpleName());
-        GameRegistry.registerTileEntity(TileSpectralBlock.class, Constants.Mod.MODID + ":" + TileSpectralBlock.class.getSimpleName());
-        GameRegistry.registerTileEntity(TilePhantomBlock.class, Constants.Mod.MODID + ":" + TilePhantomBlock.class.getSimpleName());
-        GameRegistry.registerTileEntity(TileTeleposer.class, Constants.Mod.MODID + ":" + TileTeleposer.class.getSimpleName());
-        GameRegistry.registerTileEntity(TileSoulForge.class, Constants.Mod.MODID + ":" + TileSoulForge.class.getSimpleName());
-        GameRegistry.registerTileEntity(TileMasterRoutingNode.class, Constants.Mod.MODID + ":" + TileMasterRoutingNode.class.getSimpleName());
-        GameRegistry.registerTileEntity(TileInputRoutingNode.class, Constants.Mod.MODID + ":" + TileInputRoutingNode.class.getSimpleName());
-        GameRegistry.registerTileEntity(TileOutputRoutingNode.class, Constants.Mod.MODID + ":" + TileOutputRoutingNode.class.getSimpleName());
-        GameRegistry.registerTileEntity(TileItemRoutingNode.class, Constants.Mod.MODID + ":" + TileItemRoutingNode.class.getSimpleName());
-        GameRegistry.registerTileEntity(TileIncenseAltar.class, Constants.Mod.MODID + ":" + TileIncenseAltar.class.getSimpleName());
-        GameRegistry.registerTileEntity(TileDemonCrucible.class, Constants.Mod.MODID + ":" + TileDemonCrucible.class.getSimpleName());
-        GameRegistry.registerTileEntity(TileDemonPylon.class, Constants.Mod.MODID + ":" + TileDemonPylon.class.getSimpleName());
-        GameRegistry.registerTileEntity(TileDemonCrystallizer.class, Constants.Mod.MODID + ":" + TileDemonCrystallizer.class.getSimpleName());
-        GameRegistry.registerTileEntity(TileDemonCrystal.class, Constants.Mod.MODID + ":" + TileDemonCrystal.class.getSimpleName());
-        GameRegistry.registerTileEntity(TileAlchemyTable.class, Constants.Mod.MODID + ":" + TileAlchemyTable.class.getSimpleName());
-
-        GameRegistry.registerTileEntity(TileDimensionalPortal.class, Constants.Mod.MODID + ":" + TileDimensionalPortal.class.getSimpleName());
-        GameRegistry.registerTileEntity(TileBloodTank.class, Constants.Mod.MODID + ":" + TileBloodTank.class.getSimpleName());
-        GameRegistry.registerTileEntity(TileMimic.class, Constants.Mod.MODID + ":" + TileMimic.class.getSimpleName());
-        GameRegistry.registerTileEntity(TileInversionPillar.class, Constants.Mod.MODID + ":" + TileInversionPillar.class.getSimpleName());
-    }
-
-    @SideOnly(Side.CLIENT)
-    public static void initRenders()
-    {
-        InventoryRenderHelper renderHelper = BloodMagic.proxy.getRenderHelper();
-        InventoryRenderHelperV2 renderHelperV2 = BloodMagic.proxy.getRenderHelperV2();
-
-        renderHelper.fluidRender(LIFE_ESSENCE);
-
-        renderHelper.itemRender(InventoryRenderHelper.getItemFromBlock(BLOOD_LIGHT));
-        renderHelper.itemRender(InventoryRenderHelper.getItemFromBlock(ALCHEMY_ARRAY));
-        renderHelper.itemRender(InventoryRenderHelper.getItemFromBlock(OUTPUT_ROUTING_NODE));
-        renderHelper.itemRender(InventoryRenderHelper.getItemFromBlock(INPUT_ROUTING_NODE));
-        renderHelper.itemRender(InventoryRenderHelper.getItemFromBlock(MASTER_ROUTING_NODE));
-        renderHelper.itemRender(InventoryRenderHelper.getItemFromBlock(ITEM_ROUTING_NODE));
-        renderHelper.itemRender(InventoryRenderHelper.getItemFromBlock(ALCHEMY_TABLE));
-        renderHelperV2.registerRender(InventoryRenderHelper.getItemFromBlock(DEMON_CRYSTAL), 0, "ItemBlockDemonCrystal", "default");
-        renderHelperV2.registerRender(InventoryRenderHelper.getItemFromBlock(DEMON_CRYSTAL), 1, "ItemBlockDemonCrystal", "corrosive");
-        renderHelperV2.registerRender(InventoryRenderHelper.getItemFromBlock(DEMON_CRYSTAL), 2, "ItemBlockDemonCrystal", "destructive");
-        renderHelperV2.registerRender(InventoryRenderHelper.getItemFromBlock(DEMON_CRYSTAL), 3, "ItemBlockDemonCrystal", "vengeful");
-        renderHelperV2.registerRender(InventoryRenderHelper.getItemFromBlock(DEMON_CRYSTAL), 4, "ItemBlockDemonCrystal", "steadfast");
-
-        renderHelper.itemRender(InventoryRenderHelper.getItemFromBlock(DIMENSIONAL_PORTAL));
-    }
-
-    private static Block registerBlock(Block block, String name)
-    {
-        if (!ConfigHandler.blockBlacklist.contains(name))
-        {
-            if (block.getRegistryName() == null)
-                block.setRegistryName(name);
-            GameRegistry.register(block);
-            GameRegistry.register(new ItemBlock(block).setRegistryName(name));
-            BloodMagic.proxy.tryHandleBlockModel(block, name);
-        }
-
-        return block;
-    }
-
-    private static Block registerBlock(ItemBlock itemBlock, String name)
-    {
-        Block block = itemBlock.getBlock();
-
-        if (block.getRegistryName() == null)
-            block.setRegistryName(name);
-
-        if (!ConfigHandler.blockBlacklist.contains(name))
-        {
-            GameRegistry.register(block);
-            GameRegistry.register(itemBlock.setRegistryName(name));
-            BloodMagic.proxy.tryHandleBlockModel(block, name);
-        }
-
-        return block;
-    }
-}
diff --git a/src/main/java/WayofTime/bloodmagic/registry/ModCompatibility.java b/src/main/java/WayofTime/bloodmagic/registry/ModCompatibility.java
deleted file mode 100644
index 17ec3bf8..00000000
--- a/src/main/java/WayofTime/bloodmagic/registry/ModCompatibility.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package WayofTime.bloodmagic.registry;
-
-import WayofTime.bloodmagic.compat.ICompatibility;
-import WayofTime.bloodmagic.compat.waila.CompatibilityWaila;
-import net.minecraftforge.fml.common.Loader;
-
-import java.util.ArrayList;
-
-public class ModCompatibility
-{
-    private static ArrayList<ICompatibility> compatibilities = new ArrayList<ICompatibility>();
-
-    public static void registerModCompat()
-    {
-        compatibilities.add(new CompatibilityWaila());
-//        compatibilities.add(new CompatibilityThaumcraft());
-    }
-
-    public static void loadCompat(ICompatibility.InitializationPhase phase)
-    {
-        for (ICompatibility compatibility : compatibilities)
-            if (Loader.isModLoaded(compatibility.getModId()) && compatibility.enableCompat())
-                compatibility.loadCompatibility(phase);
-    }
-}
diff --git a/src/main/java/WayofTime/bloodmagic/registry/ModCorruptionBlocks.java b/src/main/java/WayofTime/bloodmagic/registry/ModCorruptionBlocks.java
index 7e4c1cbc..00f5aa8a 100644
--- a/src/main/java/WayofTime/bloodmagic/registry/ModCorruptionBlocks.java
+++ b/src/main/java/WayofTime/bloodmagic/registry/ModCorruptionBlocks.java
@@ -10,9 +10,9 @@ public class ModCorruptionBlocks
     {
         for (EnumDemonWillType type : EnumDemonWillType.values())
         {
-            CorruptionHandler.registerBlockCorruption(type, Blocks.STONE, 0, ModBlocks.DEMON_EXTRAS.getStateFromMeta(type.ordinal()));
-            CorruptionHandler.registerBlockCorruption(type, Blocks.GRASS, 0, ModBlocks.DEMON_EXTRAS.getStateFromMeta(type.ordinal()));
-            CorruptionHandler.registerBlockCorruption(type, Blocks.DIRT, 0, ModBlocks.DEMON_EXTRAS.getStateFromMeta(type.ordinal()));
+            CorruptionHandler.registerBlockCorruption(type, Blocks.STONE, 0, RegistrarBloodMagicBlocks.DEMON_EXTRAS.getStateFromMeta(type.ordinal()));
+            CorruptionHandler.registerBlockCorruption(type, Blocks.GRASS, 0, RegistrarBloodMagicBlocks.DEMON_EXTRAS.getStateFromMeta(type.ordinal()));
+            CorruptionHandler.registerBlockCorruption(type, Blocks.DIRT, 0, RegistrarBloodMagicBlocks.DEMON_EXTRAS.getStateFromMeta(type.ordinal()));
         }
     }
 }
diff --git a/src/main/java/WayofTime/bloodmagic/registry/ModEntities.java b/src/main/java/WayofTime/bloodmagic/registry/ModEntities.java
deleted file mode 100644
index acfa88d5..00000000
--- a/src/main/java/WayofTime/bloodmagic/registry/ModEntities.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package WayofTime.bloodmagic.registry;
-
-import WayofTime.bloodmagic.BloodMagic;
-import WayofTime.bloodmagic.api.Constants;
-import net.minecraft.util.ResourceLocation;
-import WayofTime.bloodmagic.entity.mob.EntityCorruptedChicken;
-import WayofTime.bloodmagic.entity.mob.EntityCorruptedSheep;
-import WayofTime.bloodmagic.entity.mob.EntityCorruptedSpider;
-import WayofTime.bloodmagic.entity.mob.EntityCorruptedZombie;
-import WayofTime.bloodmagic.entity.mob.EntityMimic;
-import WayofTime.bloodmagic.entity.mob.EntitySentientSpecter;
-import WayofTime.bloodmagic.entity.projectile.EntityBloodLight;
-import WayofTime.bloodmagic.entity.projectile.EntityMeteor;
-import WayofTime.bloodmagic.entity.projectile.EntitySentientArrow;
-import WayofTime.bloodmagic.entity.projectile.EntitySoulSnare;
-import net.minecraftforge.fml.common.registry.EntityRegistry;
-
-public class ModEntities
-{
-    public static void init()
-    {
-        int entities = 0;
-        EntityRegistry.registerModEntity(new ResourceLocation(Constants.Mod.MODID, "BloodLight"), EntityBloodLight.class, "BloodLight", ++entities, BloodMagic.instance, 16*4, 3, true);
-        EntityRegistry.registerModEntity(new ResourceLocation(Constants.Mod.MODID, "SoulSnare"), EntitySoulSnare.class, "SoulSnare", ++entities, BloodMagic.instance, 16*4, 3, true);
-        EntityRegistry.registerModEntity(new ResourceLocation(Constants.Mod.MODID, "SoulArrow"), EntitySentientArrow.class, "SoulArrow", ++entities, BloodMagic.instance, 16*4, 3, true);
-        EntityRegistry.registerModEntity(new ResourceLocation(Constants.Mod.MODID, "Meteor"), EntityMeteor.class, "Meteor", ++entities, BloodMagic.instance, 16*4, 3, true);
-        EntityRegistry.registerModEntity(new ResourceLocation(Constants.Mod.MODID, "SentientSpecter"), EntitySentientSpecter.class, "SentientSpecter", ++entities, BloodMagic.instance, 16*4, 3, true);
-        EntityRegistry.registerModEntity(new ResourceLocation(Constants.Mod.MODID, "Mimic"), EntityMimic.class, "Mimic", ++entities, BloodMagic.instance, 16*4, 3, true);
-        EntityRegistry.registerModEntity(new ResourceLocation(Constants.Mod.MODID, "CorruptedZombie"), EntityCorruptedZombie.class, "CorruptedZombie", ++entities, BloodMagic.instance, 16*4, 3, true);
-        EntityRegistry.registerModEntity(new ResourceLocation(Constants.Mod.MODID, "CorruptedSheep"), EntityCorruptedSheep.class, "CorruptedSheep", ++entities, BloodMagic.instance, 16*4, 3, true);
-        EntityRegistry.registerModEntity(new ResourceLocation(Constants.Mod.MODID, "CorruptedChicken"), EntityCorruptedChicken.class, "CorruptedChicken", ++entities, BloodMagic.instance, 16*4, 3, true);
-        EntityRegistry.registerModEntity(new ResourceLocation(Constants.Mod.MODID, "CorruptedSpider"), EntityCorruptedSpider.class, "CorruptedSpider", ++entities, BloodMagic.instance, 16*4, 3, true);
-    }
-}
diff --git a/src/main/java/WayofTime/bloodmagic/registry/ModItems.java b/src/main/java/WayofTime/bloodmagic/registry/ModItems.java
deleted file mode 100644
index 6a624790..00000000
--- a/src/main/java/WayofTime/bloodmagic/registry/ModItems.java
+++ /dev/null
@@ -1,336 +0,0 @@
-package WayofTime.bloodmagic.registry;
-
-import net.minecraft.client.renderer.ItemMeshDefinition;
-import net.minecraft.client.renderer.block.model.ModelResourceLocation;
-import net.minecraft.inventory.EntityEquipmentSlot;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.ResourceLocation;
-import net.minecraftforge.client.model.ModelLoader;
-import net.minecraftforge.common.util.EnumHelper;
-import net.minecraftforge.fml.common.IFuelHandler;
-import net.minecraftforge.fml.common.registry.GameRegistry;
-import net.minecraftforge.fml.relauncher.Side;
-import net.minecraftforge.fml.relauncher.SideOnly;
-import WayofTime.bloodmagic.BloodMagic;
-import WayofTime.bloodmagic.ConfigHandler;
-import WayofTime.bloodmagic.api.Constants;
-import WayofTime.bloodmagic.api.orb.BloodOrb;
-import WayofTime.bloodmagic.api.registry.OrbRegistry;
-import WayofTime.bloodmagic.item.ItemActivationCrystal;
-import WayofTime.bloodmagic.item.ItemAltarMaker;
-import WayofTime.bloodmagic.item.ItemArcaneAshes;
-import WayofTime.bloodmagic.item.ItemBloodOrb;
-import WayofTime.bloodmagic.item.ItemBloodShard;
-import WayofTime.bloodmagic.item.ItemBoundAxe;
-import WayofTime.bloodmagic.item.ItemBoundPickaxe;
-import WayofTime.bloodmagic.item.ItemBoundShovel;
-import WayofTime.bloodmagic.item.ItemBoundSword;
-import WayofTime.bloodmagic.item.ItemComponent;
-import WayofTime.bloodmagic.item.ItemDaggerOfSacrifice;
-import WayofTime.bloodmagic.item.ItemDemonCrystal;
-import WayofTime.bloodmagic.item.ItemDemonWillGauge;
-import WayofTime.bloodmagic.item.ItemExperienceBook;
-import WayofTime.bloodmagic.item.ItemInscriptionTool;
-import WayofTime.bloodmagic.item.ItemLavaCrystal;
-import WayofTime.bloodmagic.item.ItemRitualDiviner;
-import WayofTime.bloodmagic.item.ItemRitualReader;
-import WayofTime.bloodmagic.item.ItemSacrificialDagger;
-import WayofTime.bloodmagic.item.ItemSanguineBook;
-import WayofTime.bloodmagic.item.ItemSlate;
-import WayofTime.bloodmagic.item.ItemTelepositionFocus;
-import WayofTime.bloodmagic.item.ItemUpgradeTome;
-import WayofTime.bloodmagic.item.ItemUpgradeTrainer;
-import WayofTime.bloodmagic.item.alchemy.ItemCuttingFluid;
-import WayofTime.bloodmagic.item.alchemy.ItemLivingArmourPointsUpgrade;
-import WayofTime.bloodmagic.item.armour.ItemLivingArmour;
-import WayofTime.bloodmagic.item.armour.ItemSentientArmour;
-import WayofTime.bloodmagic.item.gear.ItemPackSacrifice;
-import WayofTime.bloodmagic.item.gear.ItemPackSelfSacrifice;
-import WayofTime.bloodmagic.item.routing.ItemFluidRouterFilter;
-import WayofTime.bloodmagic.item.routing.ItemNodeRouter;
-import WayofTime.bloodmagic.item.routing.ItemRouterFilter;
-import WayofTime.bloodmagic.item.sigil.ItemSigilAir;
-import WayofTime.bloodmagic.item.sigil.ItemSigilBloodLight;
-import WayofTime.bloodmagic.item.sigil.ItemSigilBounce;
-import WayofTime.bloodmagic.item.sigil.ItemSigilClaw;
-import WayofTime.bloodmagic.item.sigil.ItemSigilCompression;
-import WayofTime.bloodmagic.item.sigil.ItemSigilDivination;
-import WayofTime.bloodmagic.item.sigil.ItemSigilElementalAffinity;
-import WayofTime.bloodmagic.item.sigil.ItemSigilEnderSeverance;
-import WayofTime.bloodmagic.item.sigil.ItemSigilFastMiner;
-import WayofTime.bloodmagic.item.sigil.ItemSigilFrost;
-import WayofTime.bloodmagic.item.sigil.ItemSigilGreenGrove;
-import WayofTime.bloodmagic.item.sigil.ItemSigilHaste;
-import WayofTime.bloodmagic.item.sigil.ItemSigilHolding;
-import WayofTime.bloodmagic.item.sigil.ItemSigilLava;
-import WayofTime.bloodmagic.item.sigil.ItemSigilMagnetism;
-import WayofTime.bloodmagic.item.sigil.ItemSigilPhantomBridge;
-import WayofTime.bloodmagic.item.sigil.ItemSigilSeer;
-import WayofTime.bloodmagic.item.sigil.ItemSigilSuppression;
-import WayofTime.bloodmagic.item.sigil.ItemSigilTeleposition;
-import WayofTime.bloodmagic.item.sigil.ItemSigilTransposition;
-import WayofTime.bloodmagic.item.sigil.ItemSigilVoid;
-import WayofTime.bloodmagic.item.sigil.ItemSigilWater;
-import WayofTime.bloodmagic.item.sigil.ItemSigilWhirlwind;
-import WayofTime.bloodmagic.item.soul.ItemMonsterSoul;
-import WayofTime.bloodmagic.item.soul.ItemSentientArmourGem;
-import WayofTime.bloodmagic.item.soul.ItemSentientAxe;
-import WayofTime.bloodmagic.item.soul.ItemSentientBow;
-import WayofTime.bloodmagic.item.soul.ItemSentientPickaxe;
-import WayofTime.bloodmagic.item.soul.ItemSentientShovel;
-import WayofTime.bloodmagic.item.soul.ItemSentientSword;
-import WayofTime.bloodmagic.item.soul.ItemSoulGem;
-import WayofTime.bloodmagic.item.soul.ItemSoulSnare;
-import WayofTime.bloodmagic.item.ItemPotionFlask;
-import WayofTime.bloodmagic.util.helper.InventoryRenderHelper;
-
-public class ModItems
-{
-    public static final BloodOrb ORB_WEAK;
-    public static final BloodOrb ORB_APPRENTICE;
-    public static final BloodOrb ORB_MAGICIAN;
-    public static final BloodOrb ORB_MASTER;
-    public static final BloodOrb ORB_ARCHMAGE;
-    public static final BloodOrb ORB_TRANSCENDENT;
-
-    public static final Item BLOOD_ORB;
-    public static final Item ACTIVATION_CRYSTAL;
-    public static final Item SLATE;
-    public static final Item INSCRIPTION_TOOL;
-    public static final Item SACRIFICIAL_DAGGER;
-    public static final Item PACK_SELF_SACRIFICE;
-    public static final Item PACK_SACRIFICE;
-    public static final Item DAGGER_OF_SACRIFICE;
-    public static final Item RITUAL_DIVINER;
-    public static final Item RITUAL_READER;
-    public static final Item LAVA_CRYSTAL;
-    public static final Item BOUND_SWORD;
-    public static final Item BOUND_PICKAXE;
-    public static final Item BOUND_AXE;
-    public static final Item BOUND_SHOVEL;
-    public static final Item SIGIL_DIVINATION;
-    public static final Item SIGIL_AIR;
-    public static final Item SIGIL_WATER;
-    public static final Item SIGIL_LAVA;
-    public static final Item SIGIL_VOID;
-    public static final Item SIGIL_GREEN_GROVE;
-    public static final Item SIGIL_BLOOD_LIGHT;
-    public static final Item SIGIL_ELEMENTAL_AFFINITY;
-    public static final Item SIGIL_HASTE;
-    public static final Item SIGIL_MAGNETISM;
-    public static final Item SIGIL_SUPPRESSION;
-    public static final Item SIGIL_FAST_MINER;
-    public static final Item SIGIL_SEER;
-    public static final Item SIGIL_ENDER_SEVERANCE;
-    public static final Item SIGIL_WHIRLWIND;
-    public static final Item SIGIL_PHANTOM_BRIDGE;
-    public static final Item SIGIL_COMPRESSION;
-    public static final Item SIGIL_HOLDING;
-    public static final Item SIGIL_TELEPOSITION;
-    public static final Item SIGIL_TRANSPOSITION;
-    public static final Item SIGIL_CLAW;
-    public static final Item SIGIL_BOUNCE;
-    public static final Item SIGIL_FROST;
-    public static final Item ITEM_COMPONENT;
-    public static final Item ITEM_DEMON_CRYSTAL;
-    public static final Item TELEPOSITION_FOCUS;
-    public static final Item EXPERIENCE_TOME;
-    public static final Item BLOOD_SHARD;
-    public static final Item LIVING_ARMOUR_HELMET;
-    public static final Item LIVING_ARMOUR_CHEST;
-    public static final Item LIVING_ARMOUR_LEGS;
-    public static final Item LIVING_ARMOUR_BOOTS;
-    public static final Item SENTIENT_ARMOUR_HELMET;
-    public static final Item SENTIENT_ARMOUR_CHEST;
-    public static final Item SENTIENT_ARMOUR_LEGS;
-    public static final Item SENTIENT_ARMOUR_BOOTS;
-    public static final Item ALTAR_MAKER;
-    public static final Item UPGRADE_TOME;
-    public static final Item UPGRADE_TRAINER;
-    public static final Item ARCANE_ASHES;
-    public static final Item MONSTER_SOUL;
-    public static final Item SOUL_GEM;
-    public static final Item SOUL_SNARE;
-    public static final Item SENTIENT_SWORD;
-    public static final Item SENTIENT_BOW;
-    public static final Item SENTIENT_ARMOUR_GEM;
-    public static final Item SENTIENT_AXE;
-    public static final Item SENTIENT_PICKAXE;
-    public static final Item SENTIENT_SHOVEL;
-    public static final Item NODE_ROUTER;
-    public static final Item BASE_ITEM_FILTER;
-    public static final Item BASE_FLUID_FILTER;
-    public static final Item CUTTING_FLUID;
-    public static final Item SANGUINE_BOOK;
-    public static final Item ITEM_POINTS_UPGRADE;
-    public static final Item DEMON_WILL_GAUGE;
-    public static final Item POTION_FLASK;
-
-    public static final Item.ToolMaterial BOUND_TOOL_MATERIAL = EnumHelper.addToolMaterial("BoundToolMaterial", 4, 1, 10, 8, 50);
-    public static final Item.ToolMaterial SOUL_TOOL_MATERIAL = EnumHelper.addToolMaterial("SoulToolMaterial", 4, 520, 7, 8, 50);
-
-    static
-    {
-        BLOOD_ORB = registerItem(new ItemBloodOrb(), Constants.BloodMagicItem.BLOOD_ORB.getRegName());
-        ORB_WEAK = new BloodOrb("weak", 1, 5000);
-        ORB_APPRENTICE = new BloodOrb("apprentice", 2, 25000);
-        ORB_MAGICIAN = new BloodOrb("magician", 3, 150000);
-        ORB_MASTER = new BloodOrb("master", 4, 1000000);
-        ORB_ARCHMAGE = new BloodOrb("archmage", 5, 10000000);
-        ORB_TRANSCENDENT = new BloodOrb("transcendent", 6, 30000000);
-
-        ACTIVATION_CRYSTAL = registerItem(new ItemActivationCrystal(), Constants.BloodMagicItem.ACTIVATION_CRYSTAL.getRegName());
-        SLATE = registerItem(new ItemSlate(), Constants.BloodMagicItem.SLATE.getRegName());
-        INSCRIPTION_TOOL = registerItem(new ItemInscriptionTool(), Constants.BloodMagicItem.INSCRIPTION_TOOL.getRegName());
-
-        SACRIFICIAL_DAGGER = registerItem(new ItemSacrificialDagger(), Constants.BloodMagicItem.SACRIFICIAL_DAGGER.getRegName());
-        PACK_SACRIFICE = registerItem(new ItemPackSacrifice(), Constants.BloodMagicItem.SACRIFICE_PACK.getRegName());
-        PACK_SELF_SACRIFICE = registerItem(new ItemPackSelfSacrifice(), Constants.BloodMagicItem.SELF_SACRIFICE_PACK.getRegName());
-        DAGGER_OF_SACRIFICE = registerItem(new ItemDaggerOfSacrifice(), Constants.BloodMagicItem.DAGGER_OF_SACRIFICE.getRegName());
-
-        RITUAL_DIVINER = registerItem(new ItemRitualDiviner(), Constants.BloodMagicItem.RITUAL_DIVINER.getRegName());
-        RITUAL_READER = registerItem(new ItemRitualReader(), Constants.BloodMagicItem.RITUAL_READER.getRegName());
-
-        LAVA_CRYSTAL = registerItem(new ItemLavaCrystal(), Constants.BloodMagicItem.LAVA_CRYSTAL.getRegName());
-
-        BOUND_SWORD = registerItem(new ItemBoundSword(), Constants.BloodMagicItem.BOUND_SWORD.getRegName());
-        BOUND_PICKAXE = registerItem(new ItemBoundPickaxe(), Constants.BloodMagicItem.BOUND_PICKAXE.getRegName());
-        BOUND_AXE = registerItem(new ItemBoundAxe(), Constants.BloodMagicItem.BOUND_AXE.getRegName());
-        BOUND_SHOVEL = registerItem(new ItemBoundShovel(), Constants.BloodMagicItem.BOUND_SHOVEL.getRegName());
-
-        SIGIL_DIVINATION = registerItem(new ItemSigilDivination(), Constants.BloodMagicItem.SIGIL_DIVINATION.getRegName());
-        SIGIL_AIR = registerItem(new ItemSigilAir(), Constants.BloodMagicItem.SIGIL_AIR.getRegName());
-        SIGIL_WATER = registerItem(new ItemSigilWater(), Constants.BloodMagicItem.SIGIL_WATER.getRegName());
-        SIGIL_LAVA = registerItem(new ItemSigilLava(), Constants.BloodMagicItem.SIGIL_LAVA.getRegName());
-        SIGIL_VOID = registerItem(new ItemSigilVoid(), Constants.BloodMagicItem.SIGIL_VOID.getRegName());
-        SIGIL_GREEN_GROVE = registerItem(new ItemSigilGreenGrove(), Constants.BloodMagicItem.SIGIL_GREEN_GROVE.getRegName());
-        SIGIL_BLOOD_LIGHT = registerItem(new ItemSigilBloodLight(), Constants.BloodMagicItem.SIGIL_BLOOD_LIGHT.getRegName());
-        SIGIL_ELEMENTAL_AFFINITY = registerItem(new ItemSigilElementalAffinity(), Constants.BloodMagicItem.SIGIL_ELEMENTAL_AFFINITY.getRegName());
-        SIGIL_MAGNETISM = registerItem(new ItemSigilMagnetism(), Constants.BloodMagicItem.SIGIL_MAGNETISM.getRegName());
-        SIGIL_SUPPRESSION = registerItem(new ItemSigilSuppression(), Constants.BloodMagicItem.SIGIL_SUPPRESION.getRegName());
-        SIGIL_HASTE = registerItem(new ItemSigilHaste(), Constants.BloodMagicItem.SIGIL_HASTE.getRegName());
-        SIGIL_FAST_MINER = registerItem(new ItemSigilFastMiner(), Constants.BloodMagicItem.SIGIL_FAST_MINER.getRegName());
-        SIGIL_SEER = registerItem(new ItemSigilSeer(), Constants.BloodMagicItem.SIGIL_SEER.getRegName());
-        SIGIL_PHANTOM_BRIDGE = registerItem(new ItemSigilPhantomBridge(), Constants.BloodMagicItem.SIGIL_PHANTOM_BRIDGE.getRegName());
-        SIGIL_WHIRLWIND = registerItem(new ItemSigilWhirlwind(), Constants.BloodMagicItem.SIGIL_WHIRLWIND.getRegName());
-        SIGIL_COMPRESSION = registerItem(new ItemSigilCompression(), Constants.BloodMagicItem.SIGIL_COMPRESSION.getRegName());
-        SIGIL_ENDER_SEVERANCE = registerItem(new ItemSigilEnderSeverance(), Constants.BloodMagicItem.SIGIL_ENDER_SEVERANCE.getRegName());
-        SIGIL_HOLDING = registerItem(new ItemSigilHolding(), Constants.BloodMagicItem.SIGIL_HOLDING.getRegName());
-
-        SIGIL_TELEPOSITION = registerItem(new ItemSigilTeleposition(), Constants.BloodMagicItem.SIGIL_TELEPOSITION.getRegName());
-        SIGIL_TRANSPOSITION = registerItem(new ItemSigilTransposition(), Constants.BloodMagicItem.SIGIL_TRANSPOSITION.getRegName());
-
-        SIGIL_CLAW = registerItem(new ItemSigilClaw(), Constants.BloodMagicItem.SIGIL_CLAW.getRegName());
-        SIGIL_BOUNCE = registerItem(new ItemSigilBounce(), Constants.BloodMagicItem.SIGIL_BOUNCE.getRegName());
-        SIGIL_FROST = registerItem(new ItemSigilFrost(), Constants.BloodMagicItem.SIGIL_FROST.getRegName());
-
-        ITEM_COMPONENT = registerItem(new ItemComponent(), Constants.BloodMagicItem.COMPONENT.getRegName());
-        ITEM_DEMON_CRYSTAL = registerItem(new ItemDemonCrystal(), Constants.BloodMagicItem.DEMON_CRYSTAL.getRegName());
-        TELEPOSITION_FOCUS = registerItem(new ItemTelepositionFocus(), Constants.BloodMagicItem.TELEPOSITION_FOCUS.getRegName());
-        EXPERIENCE_TOME = registerItem(new ItemExperienceBook(), Constants.BloodMagicItem.EXPERIENCE_TOME.getRegName());
-
-        BLOOD_SHARD = registerItem(new ItemBloodShard(), Constants.BloodMagicItem.BLOOD_SHARD.getRegName());
-
-        LIVING_ARMOUR_HELMET = registerItem(new ItemLivingArmour(EntityEquipmentSlot.HEAD), "ItemLivingArmourHelmet");
-        LIVING_ARMOUR_CHEST = registerItem(new ItemLivingArmour(EntityEquipmentSlot.CHEST), "ItemLivingArmourChest");
-        LIVING_ARMOUR_LEGS = registerItem(new ItemLivingArmour(EntityEquipmentSlot.LEGS), "ItemLivingArmourLegs");
-        LIVING_ARMOUR_BOOTS = registerItem(new ItemLivingArmour(EntityEquipmentSlot.FEET), "ItemLivingArmourBoots");
-
-        SENTIENT_ARMOUR_HELMET = registerItem(new ItemSentientArmour(EntityEquipmentSlot.HEAD), "ItemSentientArmourHelmet");
-        SENTIENT_ARMOUR_CHEST = registerItem(new ItemSentientArmour(EntityEquipmentSlot.CHEST), "ItemSentientArmourChest");
-        SENTIENT_ARMOUR_LEGS = registerItem(new ItemSentientArmour(EntityEquipmentSlot.LEGS), "ItemSentientArmourLegs");
-        SENTIENT_ARMOUR_BOOTS = registerItem(new ItemSentientArmour(EntityEquipmentSlot.FEET), "ItemSentientArmourBoots");
-
-        ALTAR_MAKER = registerItem(new ItemAltarMaker(), Constants.BloodMagicItem.ALTAR_MAKER.getRegName());
-        UPGRADE_TOME = registerItem(new ItemUpgradeTome(), Constants.BloodMagicItem.UPGRADE_TOME.getRegName());
-        UPGRADE_TRAINER = registerItem(new ItemUpgradeTrainer(), Constants.BloodMagicItem.UPGRADE_TRAINER.getRegName());
-
-        ARCANE_ASHES = registerItem(new ItemArcaneAshes(), Constants.BloodMagicItem.ARCANE_ASHES.getRegName());
-        MONSTER_SOUL = registerItem(new ItemMonsterSoul(), Constants.BloodMagicItem.MONSTER_SOUL.getRegName());
-        SOUL_GEM = registerItem(new ItemSoulGem(), Constants.BloodMagicItem.SOUL_GEM.getRegName());
-        SOUL_SNARE = registerItem(new ItemSoulSnare(), Constants.BloodMagicItem.SOUL_SNARE.getRegName());
-
-        SENTIENT_SWORD = registerItem(new ItemSentientSword(), Constants.BloodMagicItem.SENTIENT_SWORD.getRegName());
-        SENTIENT_BOW = registerItem(new ItemSentientBow(), Constants.BloodMagicItem.SENTIENT_BOW.getRegName());
-        SENTIENT_ARMOUR_GEM = registerItem(new ItemSentientArmourGem(), Constants.BloodMagicItem.SENTIENT_ARMOR_GEM.getRegName());
-        SENTIENT_AXE = registerItem(new ItemSentientAxe(), Constants.BloodMagicItem.SENTIENT_AXE.getRegName());
-        SENTIENT_PICKAXE = registerItem(new ItemSentientPickaxe(), Constants.BloodMagicItem.SENTIENT_PICKAXE.getRegName());
-        SENTIENT_SHOVEL = registerItem(new ItemSentientShovel(), Constants.BloodMagicItem.SENTIENT_SHOVEL.getRegName());
-
-        NODE_ROUTER = registerItem(new ItemNodeRouter(), Constants.BloodMagicItem.NODE_ROUTER.getRegName());
-        BASE_ITEM_FILTER = registerItem(new ItemRouterFilter(), Constants.BloodMagicItem.ROUTER_FILTER.getRegName());
-        BASE_FLUID_FILTER = registerItem(new ItemFluidRouterFilter(), Constants.BloodMagicItem.FLUID_ROUTER_FILTER.getRegName());
-
-        CUTTING_FLUID = registerItem(new ItemCuttingFluid(), Constants.BloodMagicItem.CUTTING_FLUID.getRegName());
-
-        SANGUINE_BOOK = registerItem(new ItemSanguineBook(), Constants.BloodMagicItem.SANGUINE_BOOK.getRegName());
-
-        ITEM_POINTS_UPGRADE = registerItem(new ItemLivingArmourPointsUpgrade(), Constants.BloodMagicItem.ARMOUR_POINTS_UPGRADE.getRegName());
-
-        DEMON_WILL_GAUGE = registerItem(new ItemDemonWillGauge(), Constants.BloodMagicItem.DEMON_WILL_GAUGE.getRegName());
-
-        POTION_FLASK = registerItem(new ItemPotionFlask(), Constants.BloodMagicItem.POTION_FLASK.getRegName());
-    }
-
-    public static void init()
-    {
-        OrbRegistry.registerOrb(ORB_WEAK);
-        OrbRegistry.registerOrb(ORB_APPRENTICE);
-        OrbRegistry.registerOrb(ORB_MAGICIAN);
-        OrbRegistry.registerOrb(ORB_MASTER);
-        OrbRegistry.registerOrb(ORB_ARCHMAGE);
-        OrbRegistry.registerOrb(ORB_TRANSCENDENT);
-
-        GameRegistry.registerFuelHandler((IFuelHandler) LAVA_CRYSTAL);
-    }
-
-    @SideOnly(Side.CLIENT)
-    public static void initRenders()
-    {
-        InventoryRenderHelper renderHelper = BloodMagic.proxy.getRenderHelper();
-
-        final ResourceLocation holdingLoc = new ResourceLocation("bloodmagic", "item/ItemSigilHolding");
-        ModelLoader.setCustomMeshDefinition(SIGIL_HOLDING, new ItemMeshDefinition()
-        {
-            @Override
-            public ModelResourceLocation getModelLocation(ItemStack stack)
-            {
-                if (stack.hasTagCompound() && stack.getTagCompound().hasKey(Constants.NBT.COLOR))
-                    return new ModelResourceLocation(holdingLoc, "type=color");
-                return new ModelResourceLocation(holdingLoc, "type=normal");
-            }
-        });
-        ModelLoader.registerItemVariants(SIGIL_HOLDING, new ModelResourceLocation(holdingLoc, "type=normal"));
-        ModelLoader.registerItemVariants(SIGIL_HOLDING, new ModelResourceLocation(holdingLoc, "type=color"));
-
-        renderHelper.itemRenderAll(BLOOD_ORB);
-        OrbRegistry.registerOrbTexture(ORB_WEAK, new ResourceLocation(Constants.Mod.DOMAIN + "ItemBloodOrbWeak"));
-        OrbRegistry.registerOrbTexture(ORB_APPRENTICE, new ResourceLocation(Constants.Mod.DOMAIN + "ItemBloodOrbApprentice"));
-        OrbRegistry.registerOrbTexture(ORB_MAGICIAN, new ResourceLocation(Constants.Mod.DOMAIN + "ItemBloodOrbMagician"));
-        OrbRegistry.registerOrbTexture(ORB_MASTER, new ResourceLocation(Constants.Mod.DOMAIN + "ItemBloodOrbMaster"));
-        OrbRegistry.registerOrbTexture(ORB_ARCHMAGE, new ResourceLocation(Constants.Mod.DOMAIN + "ItemBloodOrbArchmage"));
-        OrbRegistry.registerOrbTexture(ORB_TRANSCENDENT, new ResourceLocation(Constants.Mod.DOMAIN + "ItemBloodOrbTranscendent"));
-
-        renderHelper.itemRender(SENTIENT_BOW, 0, "ItemSentientBow");
-//        renderHelper.itemRender(sentientBow, 1, "ItemSentientBow_pulling_0");
-//        renderHelper.itemRender(sentientBow, 2, "ItemSentientBow_pulling_1");
-//        renderHelper.itemRender(sentientBow, 3, "ItemSentientBow_pulling_2");
-
-        renderHelper.itemRender(SENTIENT_ARMOUR_GEM, 0, "ItemSentientArmourGem0");
-        renderHelper.itemRender(SENTIENT_ARMOUR_GEM, 1, "ItemSentientArmourGem1");
-    }
-
-    private static Item registerItem(Item item, String name)
-    {
-        if (!ConfigHandler.itemBlacklist.contains(name))
-        {
-            if (item.getRegistryName() == null)
-                item.setRegistryName(name);
-            GameRegistry.register(item);
-            BloodMagic.proxy.tryHandleItemModel(item, name);
-        }
-
-        return item;
-    }
-}
diff --git a/src/main/java/WayofTime/bloodmagic/registry/ModPotions.java b/src/main/java/WayofTime/bloodmagic/registry/ModPotions.java
deleted file mode 100644
index 915b5037..00000000
--- a/src/main/java/WayofTime/bloodmagic/registry/ModPotions.java
+++ /dev/null
@@ -1,68 +0,0 @@
-package WayofTime.bloodmagic.registry;
-
-import net.minecraft.potion.Potion;
-import net.minecraft.util.ResourceLocation;
-import net.minecraftforge.fml.common.registry.GameRegistry;
-import WayofTime.bloodmagic.api.util.helper.PlayerSacrificeHelper;
-import WayofTime.bloodmagic.potion.PotionBloodMagic;
-import WayofTime.bloodmagic.potion.PotionEventHandlers;
-
-public class ModPotions
-{
-    public static Potion drowning;
-    public static Potion boost;
-    public static Potion heavyHeart;
-    public static Potion whirlwind;
-    public static Potion planarBinding;
-    public static Potion soulSnare;
-    public static Potion soulFray;
-    public static Potion fireFuse;
-    public static Potion constrict;
-    public static Potion plantLeech;
-    public static Potion deafness;
-
-    public static Potion bounce;
-    public static Potion cling;
-    public static Potion sacrificialLamb;
-
-    public static void init()
-    {
-        new PotionEventHandlers();
-
-        // TODO FUTURE MAKE POTION TEXTURES
-
-        // final String resourceLocation = Constants.Mod.MODID +
-        // ":textures/potions/";
-
-        // drowning = new PotionBloodMagic("Drowning", new
-        // ResourceLocation(resourceLocation +
-        // drowning.getName().toLowerCase()), true, 0, 0, 0);
-        boost = registerPotion("Boost", new ResourceLocation("boost"), false, 0xFFFFFF, 0, 1);
-        // new ResourceLocation(resourceLocation +
-        // boost.getName().toLowerCase())
-
-        whirlwind = registerPotion("Whirlwind", new ResourceLocation("whirlwind"), false, 0, 1, 0);
-        planarBinding = registerPotion("Planar Binding", new ResourceLocation("planarBinding"), false, 0, 2, 0);
-        soulSnare = registerPotion("Soul Snare", new ResourceLocation("soulSnare"), false, 0xFFFFFF, 3, 0);
-        soulFray = registerPotion("Soul Fray", new ResourceLocation("soulFray"), true, 0xFFFFFF, 4, 0);
-        PlayerSacrificeHelper.soulFrayId = soulFray;
-
-        fireFuse = registerPotion("Fire Fuse", new ResourceLocation("fireFuse"), true, 0xFF3333, 5, 0);
-        constrict = registerPotion("Constriction", new ResourceLocation("constrict"), true, 0x000000, 6, 0);
-        plantLeech = registerPotion("Plant Leech", new ResourceLocation("plantLeech"), true, 0x000000, 7, 0);
-        deafness = registerPotion("Deaf", new ResourceLocation("deafness"), true, 0x000000, 0, 1);
-        bounce = registerPotion("Bounce", new ResourceLocation("bounce"), false, 0x000000, 1, 1);
-        cling = registerPotion("Cling", new ResourceLocation("cling"), false, 0x000000, 2, 1);
-        sacrificialLamb = registerPotion("S. Lamb", new ResourceLocation("lamb"), false, 0x000000, 3, 1);
-        // heavyHeart = new PotionBloodMagic("Heavy Heart", new
-        // ResourceLocation(resourceLocation +
-        // heavyHeart.getName().toLowerCase()), true, 0, 0, 0);
-    }
-
-    protected static Potion registerPotion(String name, ResourceLocation location, boolean badEffect, int potionColour, int x, int y)
-    {
-        Potion potion = new PotionBloodMagic(name, location, badEffect, potionColour, x, y);
-        GameRegistry.register(potion.setRegistryName(location.getResourcePath()));
-        return potion;
-    }
-}
diff --git a/src/main/java/WayofTime/bloodmagic/registry/ModRecipes.java b/src/main/java/WayofTime/bloodmagic/registry/ModRecipes.java
index b059e375..998a7c07 100644
--- a/src/main/java/WayofTime/bloodmagic/registry/ModRecipes.java
+++ b/src/main/java/WayofTime/bloodmagic/registry/ModRecipes.java
@@ -1,15 +1,23 @@
 package WayofTime.bloodmagic.registry;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.util.*;
 import java.util.Map.Entry;
 
+import WayofTime.bloodmagic.ConfigHandler;
+import WayofTime.bloodmagic.block.enums.EnumBloodRune;
+import WayofTime.bloodmagic.item.soul.ItemSoulGem;
 import WayofTime.bloodmagic.tile.TileBloodTank;
+import com.google.common.collect.ImmutableMap;
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+import net.minecraft.block.Block;
 import net.minecraft.init.Blocks;
 import net.minecraft.init.Items;
 import net.minecraft.init.MobEffects;
+import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.item.crafting.FurnaceRecipes;
 import net.minecraft.potion.PotionEffect;
@@ -19,9 +27,6 @@ import net.minecraft.util.text.TextComponentTranslation;
 import net.minecraftforge.common.ForgeModContainer;
 import net.minecraftforge.fml.common.registry.GameRegistry;
 import net.minecraftforge.oredict.OreDictionary;
-import net.minecraftforge.oredict.RecipeSorter;
-import net.minecraftforge.oredict.ShapedOreRecipe;
-import net.minecraftforge.oredict.ShapelessOreRecipe;
 
 import org.apache.commons.lang3.tuple.Pair;
 
@@ -33,15 +38,11 @@ import WayofTime.bloodmagic.alchemyArray.AlchemyArrayEffectMovement;
 import WayofTime.bloodmagic.alchemyArray.AlchemyArrayEffectSigil;
 import WayofTime.bloodmagic.alchemyArray.AlchemyArrayEffectSkeletonTurret;
 import WayofTime.bloodmagic.alchemyArray.AlchemyArrayEffectUpdraft;
-import WayofTime.bloodmagic.api.Constants;
 import WayofTime.bloodmagic.api.altar.EnumAltarTier;
 import WayofTime.bloodmagic.api.compress.CompressionRegistry;
 import WayofTime.bloodmagic.api.iface.ISigil;
-import WayofTime.bloodmagic.api.livingArmour.LivingArmourHandler;
 import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade;
 import WayofTime.bloodmagic.api.recipe.AlchemyTableCustomRecipe;
-import WayofTime.bloodmagic.api.recipe.ShapedBloodOrbRecipe;
-import WayofTime.bloodmagic.api.recipe.ShapelessBloodOrbRecipe;
 import WayofTime.bloodmagic.api.registry.AlchemyArrayRecipeRegistry;
 import WayofTime.bloodmagic.api.registry.AlchemyTableRecipeRegistry;
 import WayofTime.bloodmagic.api.registry.AltarRecipeRegistry;
@@ -49,7 +50,6 @@ import WayofTime.bloodmagic.api.registry.LivingArmourDowngradeRecipeRegistry;
 import WayofTime.bloodmagic.api.registry.OrbRegistry;
 import WayofTime.bloodmagic.api.registry.TartaricForgeRecipeRegistry;
 import WayofTime.bloodmagic.api.ritual.EnumRuneType;
-import WayofTime.bloodmagic.block.enums.EnumBloodRune;
 import WayofTime.bloodmagic.client.render.alchemyArray.AttractorAlchemyCircleRenderer;
 import WayofTime.bloodmagic.client.render.alchemyArray.BindingAlchemyCircleRenderer;
 import WayofTime.bloodmagic.client.render.alchemyArray.DualAlchemyCircleRenderer;
@@ -62,7 +62,6 @@ import WayofTime.bloodmagic.item.ItemComponent;
 import WayofTime.bloodmagic.item.ItemDemonCrystal;
 import WayofTime.bloodmagic.item.alchemy.ItemCuttingFluid;
 import WayofTime.bloodmagic.item.alchemy.ItemLivingArmourPointsUpgrade;
-import WayofTime.bloodmagic.item.soul.ItemSoulGem;
 import WayofTime.bloodmagic.livingArmour.downgrade.LivingArmourUpgradeBattleHungry;
 import WayofTime.bloodmagic.livingArmour.downgrade.LivingArmourUpgradeCrippledArm;
 import WayofTime.bloodmagic.livingArmour.downgrade.LivingArmourUpgradeDigSlowdown;
@@ -85,9 +84,6 @@ public class ModRecipes
 
     public static void init()
     {
-        RecipeSorter.register(Constants.Mod.DOMAIN + "shapedorb", ShapedBloodOrbRecipe.class, RecipeSorter.Category.SHAPED, "before:minecraft:shapeless");
-        RecipeSorter.register(Constants.Mod.DOMAIN + "shapelessorb", ShapelessBloodOrbRecipe.class, RecipeSorter.Category.SHAPELESS, "after:minecraft:shapeless");
-
         initOreDict();
         addFurnaceRecipes();
         addCraftingRecipes();
@@ -115,118 +111,118 @@ public class ModRecipes
 
     public static void addCraftingRecipes()
     {
-        GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.SOUL_FORGE), "i i", "sgs", "sos", 'i', "ingotIron", 's', "stone", 'g', "ingotGold", 'o', "blockIron"));
-        GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.SACRIFICIAL_DAGGER), "aaa", " ba", "c a", 'a', "blockGlass", 'b', "ingotGold", 'c', "ingotIron"));
-        GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.ALTAR), "a a", "aba", "cdc", 'a', "stone", 'b', Blocks.FURNACE, 'c', "ingotGold", 'd', new ItemStack(ModItems.MONSTER_SOUL)));
-        GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.PACK_SELF_SACRIFICE), "aba", "cdc", "aea", 'a', "blockGlass", 'b', Items.BUCKET, 'c', Items.FLINT, 'd', Items.LEATHER_CHESTPLATE, 'e', ModItems.SLATE));
-        GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.PACK_SACRIFICE), "aba", "cdc", "aea", 'a', "blockGlass", 'b', Items.BUCKET, 'c', "ingotIron", 'd', Items.LEATHER_CHESTPLATE, 'e', ModItems.SLATE));
-        GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.RITUAL_DIVINER), "dfd", "ase", "dwd", 'f', EnumRuneType.FIRE.getScribeStack(), 'a', EnumRuneType.AIR.getScribeStack(), 'w', EnumRuneType.WATER.getScribeStack(), 'e', EnumRuneType.EARTH.getScribeStack(), 'd', "gemDiamond", 's', "stickWood"));
-        GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.RITUAL_DIVINER, 1, 1), " S ", "tdt", " S ", 'S', new ItemStack(ModItems.SLATE, 1, 3), 't', EnumRuneType.DUSK.getScribeStack(), 'd', new ItemStack(ModItems.RITUAL_DIVINER)));
-        GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.BLOOD_STONE, 4, 1), "aa", "aa", 'a', new ItemStack(ModBlocks.BLOOD_STONE)));
-        GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModBlocks.BLOOD_STONE, 16), "stone", new ItemStack(ModItems.BLOOD_SHARD)));
-        GameRegistry.addShapelessRecipe(new ItemStack(ModItems.ACTIVATION_CRYSTAL, 1, 1), new ItemStack(Items.NETHER_STAR), OrbRegistry.getOrbStack(ModItems.ORB_ARCHMAGE));
-        GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.SOUL_SNARE, 4, 0), "sis", "iri", "sis", 's', "string", 'i', "ingotIron", 'r', "dustRedstone"));
+        addShapedRecipe(new ItemStack(RegistrarBloodMagicBlocks.SOUL_FORGE), "i i", "sgs", "sos", 'i', "ingotIron", 's', "stone", 'g', "ingotGold", 'o', "blockIron");
+        addShapedRecipe(new ItemStack(RegistrarBloodMagicItems.SACRIFICIAL_DAGGER), "aaa", " ba", "c a", 'a', "blockGlass", 'b', "ingotGold", 'c', "ingotIron");
+        addShapedRecipe(new ItemStack(RegistrarBloodMagicBlocks.ALTAR), "a a", "aba", "cdc", 'a', "stone", 'b', Blocks.FURNACE, 'c', "ingotGold", 'd', new ItemStack(RegistrarBloodMagicItems.MONSTER_SOUL));
+        addShapedRecipe(new ItemStack(RegistrarBloodMagicItems.PACK_SELF_SACRIFICE), "aba", "cdc", "aea", 'a', "blockGlass", 'b', Items.BUCKET, 'c', Items.FLINT, 'd', Items.LEATHER_CHESTPLATE, 'e', RegistrarBloodMagicItems.SLATE);
+        addShapedRecipe(new ItemStack(RegistrarBloodMagicItems.PACK_SACRIFICE), "aba", "cdc", "aea", 'a', "blockGlass", 'b', Items.BUCKET, 'c', "ingotIron", 'd', Items.LEATHER_CHESTPLATE, 'e', RegistrarBloodMagicItems.SLATE);
+        addShapedRecipe(new ItemStack(RegistrarBloodMagicItems.RITUAL_DIVINER), "dfd", "ase", "dwd", 'f', EnumRuneType.FIRE.getScribeStack(), 'a', EnumRuneType.AIR.getScribeStack(), 'w', EnumRuneType.WATER.getScribeStack(), 'e', EnumRuneType.EARTH.getScribeStack(), 'd', "gemDiamond", 's', "stickWood");
+        addShapedRecipe(new ItemStack(RegistrarBloodMagicItems.RITUAL_DIVINER, 1, 1), " S ", "tdt", " S ", 'S', new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 3), 't', EnumRuneType.DUSK.getScribeStack(), 'd', new ItemStack(RegistrarBloodMagicItems.RITUAL_DIVINER));
+        addShapedRecipe(new ItemStack(RegistrarBloodMagicBlocks.DECORATIVE_BRICK, 4, 1), "aa", "aa", 'a', new ItemStack(RegistrarBloodMagicBlocks.DECORATIVE_BRICK));
+        addShapelessRecipe(new ItemStack(RegistrarBloodMagicBlocks.DECORATIVE_BRICK, 16), "stone", new ItemStack(RegistrarBloodMagicItems.BLOOD_SHARD));
+        addShapelessRecipe(new ItemStack(RegistrarBloodMagicItems.ACTIVATION_CRYSTAL, 1, 1), new ItemStack(Items.NETHER_STAR), OrbRegistry.getOrbStack(RegistrarBloodMagic.ORB_ARCHMAGE));
+        addShapedRecipe(new ItemStack(RegistrarBloodMagicItems.SOUL_SNARE, 4, 0), "sis", "iri", "sis", 's', "string", 'i', "ingotIron", 'r', "dustRedstone");
 
-        GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.BLOOD_TANK), "RBR", "G G", "RRR", 'R', new ItemStack(ModBlocks.BLOOD_RUNE), 'B', ModBlocks.BLOOD_STONE, 'G', "blockGlass"));
+        addShapedRecipe(new ItemStack(RegistrarBloodMagicBlocks.BLOOD_TANK), "RBR", "G G", "RRR", 'R', new ItemStack(RegistrarBloodMagicBlocks.BLOOD_RUNE), 'B', RegistrarBloodMagicBlocks.DECORATIVE_BRICK, 'G', "blockGlass");
         for (int i = 1; i < TileBloodTank.CAPACITIES.length; i++)
-            GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.BLOOD_TANK, 1, i), "RBR", "T T", "RRR", 'R', new ItemStack(ModBlocks.BLOOD_RUNE), 'B', ModBlocks.BLOOD_STONE, 'T', new ItemStack(ModBlocks.BLOOD_TANK, 1, i - 1)));
+            addShapedRecipe(new ItemStack(RegistrarBloodMagicBlocks.BLOOD_TANK, 1, i), "RBR", "T T", "RRR", 'R', new ItemStack(RegistrarBloodMagicBlocks.BLOOD_RUNE), 'B', RegistrarBloodMagicBlocks.DECORATIVE_BRICK, 'T', new ItemStack(RegistrarBloodMagicBlocks.BLOOD_TANK, 1, i - 1));
 
-        GameRegistry.addShapelessRecipe(new ItemStack(ModItems.TELEPOSITION_FOCUS, 1, 2), new ItemStack(ModItems.TELEPOSITION_FOCUS, 1, 1), new ItemStack(ModItems.BLOOD_SHARD));
-        GameRegistry.addShapelessRecipe(new ItemStack(ModItems.TELEPOSITION_FOCUS, 1, 3), new ItemStack(ModItems.TELEPOSITION_FOCUS, 1, 2), new ItemStack(ModItems.BLOOD_SHARD, 1, 1));
-        GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.TELEPOSER), "ggg", "efe", "ggg", 'g', "ingotGold", 'e', new ItemStack(Items.ENDER_PEARL), 'f', ModItems.TELEPOSITION_FOCUS));
+        addShapelessRecipe(new ItemStack(RegistrarBloodMagicItems.TELEPOSITION_FOCUS, 1, 2), new ItemStack(RegistrarBloodMagicItems.TELEPOSITION_FOCUS, 1, 1), new ItemStack(RegistrarBloodMagicItems.BLOOD_SHARD));
+        addShapelessRecipe(new ItemStack(RegistrarBloodMagicItems.TELEPOSITION_FOCUS, 1, 3), new ItemStack(RegistrarBloodMagicItems.TELEPOSITION_FOCUS, 1, 2), new ItemStack(RegistrarBloodMagicItems.BLOOD_SHARD, 1, 1));
+        addShapedRecipe(new ItemStack(RegistrarBloodMagicBlocks.TELEPOSER), "ggg", "efe", "ggg", 'g', "ingotGold", 'e', new ItemStack(Items.ENDER_PEARL), 'f', RegistrarBloodMagicItems.TELEPOSITION_FOCUS);
 
-        GameRegistry.addRecipe(new ShapedBloodOrbRecipe(new ItemStack(ModItems.LAVA_CRYSTAL), "aba", "bcb", "ded", 'a', "blockGlass", 'b', Items.LAVA_BUCKET, 'c', OrbRegistry.getOrbStack(ModItems.ORB_WEAK), 'd', Blocks.OBSIDIAN, 'e', "gemDiamond"));
-        GameRegistry.addRecipe(new ShapedBloodOrbRecipe(new ItemStack(ModBlocks.BLOOD_RUNE), "aaa", "bcb", "aaa", 'a', "stone", 'b', ModItems.SLATE, 'c', OrbRegistry.getOrbStack(ModItems.ORB_WEAK)));
-        GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.BLOOD_RUNE, 1, 1), "aba", "cdc", "aba", 'a', "stone", 'b', ModItems.SLATE, 'c', Items.SUGAR, 'd', new ItemStack(ModBlocks.BLOOD_RUNE))); //Speed
-//        GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.bloodRune, 1, 2), "aba", "cdc", "aba", 'a', "stone", 'b', ModItems.slate, 'c', Items.sugar, 'd', new ItemStack(ModBlocks.bloodRune))); //Efficiency
-        GameRegistry.addRecipe(new ShapedBloodOrbRecipe(new ItemStack(ModBlocks.BLOOD_RUNE, 1, 3), "aba", "cdc", "aea", 'a', "stone", 'b', new ItemStack(ModItems.SLATE, 1, 1), 'c', "ingotGold", 'd', new ItemStack(ModBlocks.BLOOD_RUNE), 'e', OrbRegistry.getOrbStack(ModItems.ORB_APPRENTICE))); //Sacrifice
-        GameRegistry.addRecipe(new ShapedBloodOrbRecipe(new ItemStack(ModBlocks.BLOOD_RUNE, 1, 4), "aba", "cdc", "aea", 'a', "stone", 'b', new ItemStack(ModItems.SLATE, 1, 1), 'c', "dustGlowstone", 'd', new ItemStack(ModBlocks.BLOOD_RUNE), 'e', OrbRegistry.getOrbStack(ModItems.ORB_APPRENTICE))); //Self-Sacrifice
-        GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.BLOOD_RUNE, 1, 5), "aba", "bcb", "ada", 'a', "stone", 'b', Items.WATER_BUCKET, 'c', new ItemStack(ModBlocks.BLOOD_RUNE), 'd', new ItemStack(ModItems.SLATE, 1, 2))); //Displacement
-        GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.BLOOD_RUNE, 1, 6), "aba", "bcb", "ada", 'a', "stone", 'b', Items.BUCKET, 'c', new ItemStack(ModBlocks.BLOOD_RUNE), 'd', new ItemStack(ModItems.SLATE, 1, 2))); //Capacity
-        GameRegistry.addRecipe(new ShapedBloodOrbRecipe(new ItemStack(ModBlocks.BLOOD_RUNE, 1, 7), "aba", "cdc", "aea", 'a', Blocks.OBSIDIAN, 'b', new ItemStack(ModItems.SLATE, 1, 3), 'c', Items.BUCKET, 'd', new ItemStack(ModBlocks.BLOOD_RUNE, 1, 6), 'e', OrbRegistry.getOrbStack(ModItems.ORB_MASTER))); //Augmented Capacity
-        GameRegistry.addRecipe(new ShapedBloodOrbRecipe(new ItemStack(ModBlocks.BLOOD_RUNE, 1, 8), "aba", "cdc", "aba", 'a', "stone", 'b', OrbRegistry.getOrbStack(ModItems.ORB_WEAK), 'c', new ItemStack(ModBlocks.BLOOD_RUNE), 'd', OrbRegistry.getOrbStack(ModItems.ORB_MASTER))); //Orb
-        GameRegistry.addRecipe(new ShapedBloodOrbRecipe(new ItemStack(ModBlocks.BLOOD_RUNE, 1, 9), "aba", "cdc", "aea", 'a', Items.BUCKET, 'b', new ItemStack(ModItems.SLATE, 1, 3), 'c', "ingotGold", 'd', new ItemStack(ModBlocks.BLOOD_RUNE, 1, 1), 'e', OrbRegistry.getOrbStack(ModItems.ORB_MASTER))); //Acceleration
-        GameRegistry.addRecipe(new ShapedBloodOrbRecipe(new ItemStack(ModBlocks.BLOOD_RUNE, 1, 10), "RsR", "GrG", "ReR", 'G', "glowstone", 's', new ItemStack(ModItems.SLATE, 1, 3), 'R', "dustRedstone", 'r', new ItemStack(ModBlocks.BLOOD_RUNE, 1), 'e', OrbRegistry.getOrbStack(ModItems.ORB_MASTER))); //Charging
-        GameRegistry.addRecipe(new ShapedBloodOrbRecipe(new ItemStack(ModBlocks.RITUAL_STONE, 4), "aba", "bcb", "aba", 'a', Blocks.OBSIDIAN, 'b', new ItemStack(ModItems.SLATE, 1, 1), 'c', OrbRegistry.getOrbStack(ModItems.ORB_APPRENTICE)));
-        GameRegistry.addRecipe(new ShapedBloodOrbRecipe(new ItemStack(ModBlocks.RITUAL_CONTROLLER), "aba", "bcb", "aba", 'a', Blocks.OBSIDIAN, 'b', ModBlocks.RITUAL_STONE, 'c', OrbRegistry.getOrbStack(ModItems.ORB_MAGICIAN)));
-        GameRegistry.addRecipe(new ShapedBloodOrbRecipe(new ItemStack(ModBlocks.RITUAL_CONTROLLER, 1, 1), "aba", "bcb", "aba", 'a', Blocks.OBSIDIAN, 'b', "stone", 'c', OrbRegistry.getOrbStack(ModItems.ORB_WEAK)));
-        GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModBlocks.RITUAL_CONTROLLER, 1, 2), new ItemStack(ModBlocks.RITUAL_CONTROLLER), new ItemStack(Blocks.REDSTONE_TORCH), new ItemStack(ModItems.SLATE)));
-        GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModBlocks.RITUAL_CONTROLLER), new ItemStack(ModBlocks.RITUAL_CONTROLLER, 1, 2)));
+//        GameRegistry.addRecipe(new ShapedBloodOrbRecipe(new ItemStack(RegistrarBloodMagicItems.LAVA_CRYSTAL), "aba", "bcb", "ded", 'a', "blockGlass", 'b', Items.LAVA_BUCKET, 'c', OrbRegistry.getOrbStack(RegistrarBloodMagic.ORB_WEAK), 'd', Blocks.OBSIDIAN, 'e', "gemDiamond"));
+//        GameRegistry.addRecipe(new ShapedBloodOrbRecipe(new ItemStack(RegistrarBloodMagicBlocks.BLOOD_RUNE), "aaa", "bcb", "aaa", 'a', "stone", 'b', RegistrarBloodMagicItems.SLATE, 'c', OrbRegistry.getOrbStack(RegistrarBloodMagic.ORB_WEAK)));
+        addShapedRecipe(new ItemStack(RegistrarBloodMagicBlocks.BLOOD_RUNE, 1, 1), "aba", "cdc", "aba", 'a', "stone", 'b', RegistrarBloodMagicItems.SLATE, 'c', Items.SUGAR, 'd', new ItemStack(RegistrarBloodMagicBlocks.BLOOD_RUNE)); //Speed
+//        addShapedRecipe(new ItemStack(RegistrarBloodMagicBlocks.bloodRune, 1, 2), "aba", "cdc", "aba", 'a', "stone", 'b', RegistrarBloodMagicItems.slate, 'c', Items.sugar, 'd', new ItemStack(RegistrarBloodMagicBlocks.bloodRune))); //Efficiency
+//        GameRegistry.addRecipe(new ShapedBloodOrbRecipe(new ItemStack(RegistrarBloodMagicBlocks.BLOOD_RUNE, 1, 3), "aba", "cdc", "aea", 'a', "stone", 'b', new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 1), 'c', "ingotGold", 'd', new ItemStack(RegistrarBloodMagicBlocks.BLOOD_RUNE), 'e', OrbRegistry.getOrbStack(RegistrarBloodMagicItems.ORB_APPRENTICE))); //Sacrifice
+//        GameRegistry.addRecipe(new ShapedBloodOrbRecipe(new ItemStack(RegistrarBloodMagicBlocks.BLOOD_RUNE, 1, 4), "aba", "cdc", "aea", 'a', "stone", 'b', new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 1), 'c', "dustGlowstone", 'd', new ItemStack(RegistrarBloodMagicBlocks.BLOOD_RUNE), 'e', OrbRegistry.getOrbStack(RegistrarBloodMagicItems.ORB_APPRENTICE))); //Self-Sacrifice
+        addShapedRecipe(new ItemStack(RegistrarBloodMagicBlocks.BLOOD_RUNE, 1, 5), "aba", "bcb", "ada", 'a', "stone", 'b', Items.WATER_BUCKET, 'c', new ItemStack(RegistrarBloodMagicBlocks.BLOOD_RUNE), 'd', new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 2)); //Displacement
+        addShapedRecipe(new ItemStack(RegistrarBloodMagicBlocks.BLOOD_RUNE, 1, 6), "aba", "bcb", "ada", 'a', "stone", 'b', Items.BUCKET, 'c', new ItemStack(RegistrarBloodMagicBlocks.BLOOD_RUNE), 'd', new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 2)); //Capacity
+//        GameRegistry.addRecipe(new ShapedBloodOrbRecipe(new ItemStack(RegistrarBloodMagicBlocks.BLOOD_RUNE, 1, 7), "aba", "cdc", "aea", 'a', Blocks.OBSIDIAN, 'b', new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 3), 'c', Items.BUCKET, 'd', new ItemStack(RegistrarBloodMagicBlocks.BLOOD_RUNE, 1, 6), 'e', OrbRegistry.getOrbStack(RegistrarBloodMagicItems.ORB_MASTER))); //Augmented Capacity
+//        GameRegistry.addRecipe(new ShapedBloodOrbRecipe(new ItemStack(RegistrarBloodMagicBlocks.BLOOD_RUNE, 1, 8), "aba", "cdc", "aba", 'a', "stone", 'b', OrbRegistry.getOrbStack(RegistrarBloodMagic.ORB_WEAK), 'c', new ItemStack(RegistrarBloodMagicBlocks.BLOOD_RUNE), 'd', OrbRegistry.getOrbStack(RegistrarBloodMagicItems.ORB_MASTER))); //Orb
+//        GameRegistry.addRecipe(new ShapedBloodOrbRecipe(new ItemStack(RegistrarBloodMagicBlocks.BLOOD_RUNE, 1, 9), "aba", "cdc", "aea", 'a', Items.BUCKET, 'b', new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 3), 'c', "ingotGold", 'd', new ItemStack(RegistrarBloodMagicBlocks.BLOOD_RUNE, 1, 1), 'e', OrbRegistry.getOrbStack(RegistrarBloodMagicItems.ORB_MASTER))); //Acceleration
+//        GameRegistry.addRecipe(new ShapedBloodOrbRecipe(new ItemStack(RegistrarBloodMagicBlocks.BLOOD_RUNE, 1, 10), "RsR", "GrG", "ReR", 'G', "glowstone", 's', new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 3), 'R', "dustRedstone", 'r', new ItemStack(RegistrarBloodMagicBlocks.BLOOD_RUNE, 1), 'e', OrbRegistry.getOrbStack(RegistrarBloodMagicItems.ORB_MASTER))); //Charging
+//        GameRegistry.addRecipe(new ShapedBloodOrbRecipe(new ItemStack(RegistrarBloodMagicBlocks.RITUAL_STONE, 4), "aba", "bcb", "aba", 'a', Blocks.OBSIDIAN, 'b', new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 1), 'c', OrbRegistry.getOrbStack(RegistrarBloodMagicItems.ORB_APPRENTICE)));
+//        GameRegistry.addRecipe(new ShapedBloodOrbRecipe(new ItemStack(RegistrarBloodMagicBlocks.RITUAL_CONTROLLER), "aba", "bcb", "aba", 'a', Blocks.OBSIDIAN, 'b', RegistrarBloodMagicBlocks.RITUAL_STONE, 'c', OrbRegistry.getOrbStack(RegistrarBloodMagicItems.ORB_MAGICIAN)));
+//        GameRegistry.addRecipe(new ShapedBloodOrbRecipe(new ItemStack(RegistrarBloodMagicBlocks.RITUAL_CONTROLLER, 1, 1), "aba", "bcb", "aba", 'a', Blocks.OBSIDIAN, 'b', "stone", 'c', OrbRegistry.getOrbStack(RegistrarBloodMagic.ORB_WEAK)));
+        addShapelessRecipe(new ItemStack(RegistrarBloodMagicBlocks.RITUAL_CONTROLLER, 1, 2), new ItemStack(RegistrarBloodMagicBlocks.RITUAL_CONTROLLER), new ItemStack(Blocks.REDSTONE_TORCH), new ItemStack(RegistrarBloodMagicItems.SLATE));
+        addShapelessRecipe(new ItemStack(RegistrarBloodMagicBlocks.RITUAL_CONTROLLER), new ItemStack(RegistrarBloodMagicBlocks.RITUAL_CONTROLLER, 1, 2));
 
-        GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.BASE_ITEM_FILTER, 1, 0), "sgs", "gfg", "sgs", 'f', ItemComponent.getStack(ItemComponent.COMPONENT_FRAME_PART), 'g', "blockGlass", 's', "stickWood"));
-        GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.BASE_ITEM_FILTER, 1, 1), "sgs", "gfg", "sgs", 'f', ItemComponent.getStack(ItemComponent.COMPONENT_FRAME_PART), 'g', "dyeYellow", 's', "stickWood"));
-        GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.BASE_ITEM_FILTER, 1, 2), "sgs", "gfg", "sgs", 'f', ItemComponent.getStack(ItemComponent.COMPONENT_FRAME_PART), 'g', "dyeGreen", 's', "stickWood"));
-        GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.BASE_ITEM_FILTER, 1, 3), "sgs", "gfg", "sgs", 'f', ItemComponent.getStack(ItemComponent.COMPONENT_FRAME_PART), 'g', "dyePurple", 's', "stickWood"));
+        addShapedRecipe(new ItemStack(RegistrarBloodMagicItems.BASE_ITEM_FILTER, 1, 0), "sgs", "gfg", "sgs", 'f', ItemComponent.getStack(ItemComponent.COMPONENT_FRAME_PART), 'g', "blockGlass", 's', "stickWood");
+        addShapedRecipe(new ItemStack(RegistrarBloodMagicItems.BASE_ITEM_FILTER, 1, 1), "sgs", "gfg", "sgs", 'f', ItemComponent.getStack(ItemComponent.COMPONENT_FRAME_PART), 'g', "dyeYellow", 's', "stickWood");
+        addShapedRecipe(new ItemStack(RegistrarBloodMagicItems.BASE_ITEM_FILTER, 1, 2), "sgs", "gfg", "sgs", 'f', ItemComponent.getStack(ItemComponent.COMPONENT_FRAME_PART), 'g', "dyeGreen", 's', "stickWood");
+        addShapedRecipe(new ItemStack(RegistrarBloodMagicItems.BASE_ITEM_FILTER, 1, 3), "sgs", "gfg", "sgs", 'f', ItemComponent.getStack(ItemComponent.COMPONENT_FRAME_PART), 'g', "dyePurple", 's', "stickWood");
 
-        GameRegistry.addRecipe(new ShapedBloodOrbRecipe(new ItemStack(ModItems.UPGRADE_TRAINER), "ngn", "ioi", "ngn", 'o', OrbRegistry.getOrbStack(ModItems.ORB_MASTER), 'i', "ingotIron", 'n', "nuggetGold", 'g', "ingotGold"));
+//        GameRegistry.addRecipe(new ShapedBloodOrbRecipe(new ItemStack(RegistrarBloodMagicItems.UPGRADE_TRAINER), "ngn", "ioi", "ngn", 'o', OrbRegistry.getOrbStack(RegistrarBloodMagic.ORB_MASTER), 'i', "ingotIron", 'n', "nuggetGold", 'g', "ingotGold"));
 
-        GameRegistry.addRecipe(new ShapedBloodOrbRecipe(new ItemStack(ModBlocks.INCENSE_ALTAR), "s s", "shs", "coc", 'o', OrbRegistry.getOrbStack(ModItems.ORB_WEAK), 's', "stone", 'c', "cobblestone", 'h', new ItemStack(Items.COAL, 1, 1)));
-        GameRegistry.addRecipe(new ShapelessBloodOrbRecipe(new ItemStack(ModBlocks.PATH_BLOCK, 4, 0), "plankWood", "plankWood", "plankWood", "plankWood", OrbRegistry.getOrbStack(ModItems.ORB_APPRENTICE)));
-        GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModBlocks.PATH_BLOCK, 4, 1), new ItemStack(ModBlocks.PATH_BLOCK, 1, 0), new ItemStack(ModBlocks.PATH_BLOCK, 1, 0), new ItemStack(ModBlocks.PATH_BLOCK, 1, 0), new ItemStack(ModBlocks.PATH_BLOCK, 1, 0)));
-        GameRegistry.addRecipe(new ShapelessBloodOrbRecipe(new ItemStack(ModBlocks.PATH_BLOCK, 4, 2), "stone", "stone", "stone", "stone", OrbRegistry.getOrbStack(ModItems.ORB_MAGICIAN)));
-        GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModBlocks.PATH_BLOCK, 4, 3), new ItemStack(ModBlocks.PATH_BLOCK, 1, 2), new ItemStack(ModBlocks.PATH_BLOCK, 1, 2), new ItemStack(ModBlocks.PATH_BLOCK, 1, 2), new ItemStack(ModBlocks.PATH_BLOCK, 1, 2)));
-        GameRegistry.addRecipe(new ShapelessBloodOrbRecipe(new ItemStack(ModBlocks.PATH_BLOCK, 4, 4), new ItemStack(ModBlocks.PATH_BLOCK, 1, 2), new ItemStack(ModBlocks.PATH_BLOCK, 1, 2), new ItemStack(ModBlocks.PATH_BLOCK, 1, 2), new ItemStack(ModBlocks.PATH_BLOCK, 1, 2), OrbRegistry.getOrbStack(ModItems.ORB_MASTER)));
-        GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModBlocks.PATH_BLOCK, 4, 5), new ItemStack(ModBlocks.PATH_BLOCK, 1, 4), new ItemStack(ModBlocks.PATH_BLOCK, 1, 4), new ItemStack(ModBlocks.PATH_BLOCK, 1, 4), new ItemStack(ModBlocks.PATH_BLOCK, 1, 4)));
-        GameRegistry.addRecipe(new ShapelessBloodOrbRecipe(new ItemStack(ModBlocks.PATH_BLOCK, 4, 6), Blocks.OBSIDIAN, Blocks.OBSIDIAN, Blocks.OBSIDIAN, Blocks.OBSIDIAN, OrbRegistry.getOrbStack(ModItems.ORB_ARCHMAGE)));
-        GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModBlocks.PATH_BLOCK, 4, 7), new ItemStack(ModBlocks.PATH_BLOCK, 1, 6), new ItemStack(ModBlocks.PATH_BLOCK, 1, 6), new ItemStack(ModBlocks.PATH_BLOCK, 1, 6), new ItemStack(ModBlocks.PATH_BLOCK, 1, 6)));
+//        GameRegistry.addRecipe(new ShapedBloodOrbRecipe(new ItemStack(RegistrarBloodMagicBlocks.INCENSE_ALTAR), "s s", "shs", "coc", 'o', OrbRegistry.getOrbStack(RegistrarBloodMagic.ORB_WEAK), 's', "stone", 'c', "cobblestone", 'h', new ItemStack(Items.COAL, 1, 1)));
+//        GameRegistry.addRecipe(new ShapelessBloodOrbRecipe(new ItemStack(RegistrarBloodMagicBlocks.PATH, 4, 0), "plankWood", "plankWood", "plankWood", "plankWood", OrbRegistry.getOrbStack(RegistrarBloodMagic.ORB_APPRENTICE)));
+        addShapelessRecipe(new ItemStack(RegistrarBloodMagicBlocks.PATH, 4, 1), new ItemStack(RegistrarBloodMagicBlocks.PATH, 1, 0), new ItemStack(RegistrarBloodMagicBlocks.PATH, 1, 0), new ItemStack(RegistrarBloodMagicBlocks.PATH, 1, 0), new ItemStack(RegistrarBloodMagicBlocks.PATH, 1, 0));
+//        GameRegistry.addRecipe(new ShapelessBloodOrbRecipe(new ItemStack(RegistrarBloodMagicBlocks.PATH, 4, 2), "stone", "stone", "stone", "stone", OrbRegistry.getOrbStack(RegistrarBloodMagic.ORB_MAGICIAN)));
+        addShapelessRecipe(new ItemStack(RegistrarBloodMagicBlocks.PATH, 4, 3), new ItemStack(RegistrarBloodMagicBlocks.PATH, 1, 2), new ItemStack(RegistrarBloodMagicBlocks.PATH, 1, 2), new ItemStack(RegistrarBloodMagicBlocks.PATH, 1, 2), new ItemStack(RegistrarBloodMagicBlocks.PATH, 1, 2));
+//        GameRegistry.addRecipe(new ShapelessBloodOrbRecipe(new ItemStack(RegistrarBloodMagicBlocks.PATH, 4, 4), new ItemStack(RegistrarBloodMagicBlocks.PATH, 1, 2), new ItemStack(RegistrarBloodMagicBlocks.PATH, 1, 2), new ItemStack(RegistrarBloodMagicBlocks.PATH, 1, 2), new ItemStack(RegistrarBloodMagicBlocks.PATH, 1, 2), OrbRegistry.getOrbStack(RegistrarBloodMagicItems.ORB_MASTER)));
+        addShapelessRecipe(new ItemStack(RegistrarBloodMagicBlocks.PATH, 4, 5), new ItemStack(RegistrarBloodMagicBlocks.PATH, 1, 4), new ItemStack(RegistrarBloodMagicBlocks.PATH, 1, 4), new ItemStack(RegistrarBloodMagicBlocks.PATH, 1, 4), new ItemStack(RegistrarBloodMagicBlocks.PATH, 1, 4));
+//        GameRegistry.addRecipe(new ShapelessBloodOrbRecipe(new ItemStack(RegistrarBloodMagicBlocks.PATH, 4, 6), Blocks.OBSIDIAN, Blocks.OBSIDIAN, Blocks.OBSIDIAN, Blocks.OBSIDIAN, OrbRegistry.getOrbStack(RegistrarBloodMagic.ORB_ARCHMAGE)));
+        addShapelessRecipe(new ItemStack(RegistrarBloodMagicBlocks.PATH, 4, 7), new ItemStack(RegistrarBloodMagicBlocks.PATH, 1, 6), new ItemStack(RegistrarBloodMagicBlocks.PATH, 1, 6), new ItemStack(RegistrarBloodMagicBlocks.PATH, 1, 6), new ItemStack(RegistrarBloodMagicBlocks.PATH, 1, 6));
 
-        GameRegistry.addRecipe(new ShapedBloodOrbRecipe(new ItemStack(ModItems.EXPERIENCE_TOME), "ses", "lbl", "gog", 'o', OrbRegistry.getOrbStack(ModItems.ORB_MAGICIAN), 'e', Blocks.LAPIS_BLOCK, 'l', new ItemStack(ModItems.SLATE, 1, 2), 'b', Items.ENCHANTED_BOOK, 's', "string", 'g', "ingotGold"));
-        GameRegistry.addRecipe(new ShapedBloodOrbRecipe(new ItemStack(ModItems.RITUAL_READER), "gog", "isi", " s ", 's', new ItemStack(ModItems.SLATE, 1, 3), 'g', "blockGlass", 'i', "ingotGold", 'o', OrbRegistry.getOrbStack(ModItems.ORB_MASTER)));
-
-        GameRegistry.addRecipe(new ShapedBloodOrbRecipe(new ItemStack(ModBlocks.ALCHEMY_TABLE), "sss", "wbw", "gog", 's', "stone", 'w', "plankWood", 'b', Items.BLAZE_ROD, 'g', "ingotGold", 'o', OrbRegistry.getOrbStack(ModItems.ORB_WEAK)));
+//        GameRegistry.addRecipe(new ShapedBloodOrbRecipe(new ItemStack(RegistrarBloodMagicItems.EXPERIENCE_TOME), "ses", "lbl", "gog", 'o', OrbRegistry.getOrbStack(RegistrarBloodMagic.ORB_MAGICIAN), 'e', Blocks.LAPIS_BLOCK, 'l', new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 2), 'b', Items.ENCHANTED_BOOK, 's', "string", 'g', "ingotGold"));
+//        GameRegistry.addRecipe(new ShapedBloodOrbRecipe(new ItemStack(RegistrarBloodMagicItems.RITUAL_READER), "gog", "isi", " s ", 's', new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 3), 'g', "blockGlass", 'i', "ingotGold", 'o', OrbRegistry.getOrbStack(RegistrarBloodMagicItems.ORB_MASTER)));
+//
+//        GameRegistry.addRecipe(new ShapedBloodOrbRecipe(new ItemStack(RegistrarBloodMagicBlocks.ALCHEMY_TABLE), "sss", "wbw", "gog", 's', "stone", 'w', "plankWood", 'b', Items.BLAZE_ROD, 'g', "ingotGold", 'o', OrbRegistry.getOrbStack(RegistrarBloodMagicItems.ORB_WEAK)));
 
         for (int i = 1; i < EnumBloodRune.values().length; i++)
-            GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModBlocks.BLOOD_RUNE), new ItemStack(ModBlocks.BLOOD_RUNE, 1, i)));
+            addShapelessRecipe(new ItemStack(RegistrarBloodMagicBlocks.BLOOD_RUNE), new ItemStack(RegistrarBloodMagicBlocks.BLOOD_RUNE, 1, i));
 
         for (int i = 0; i < ItemSoulGem.names.length; i++)
         {
-            for (int j = 0; j < ItemDemonCrystal.getNames().size(); j++)
+            for (int j = 0; j < ItemDemonCrystal.NAMES.size(); j++)
             {
-                ItemStack baseGemStack = new ItemStack(ModItems.SOUL_GEM, 1, i);
-                ItemStack newGemStack = new ItemStack(ModItems.SOUL_GEM, 1, i);
+                ItemStack baseGemStack = new ItemStack(RegistrarBloodMagicItems.SOUL_GEM, 1, i);
+                ItemStack newGemStack = new ItemStack(RegistrarBloodMagicItems.SOUL_GEM, 1, i);
 
-                ItemStack crystalStack = new ItemStack(ModItems.ITEM_DEMON_CRYSTAL, 1, j);
+                ItemStack crystalStack = new ItemStack(RegistrarBloodMagicItems.ITEM_DEMON_CRYSTAL, 1, j);
 
-                ((ItemSoulGem) ModItems.SOUL_GEM).setCurrentType(((ItemDemonCrystal) ModItems.ITEM_DEMON_CRYSTAL).getType(crystalStack), newGemStack);
-                GameRegistry.addShapelessRecipe(newGemStack, baseGemStack, crystalStack);
+                ((ItemSoulGem) RegistrarBloodMagicItems.SOUL_GEM).setCurrentType(((ItemDemonCrystal) RegistrarBloodMagicItems.ITEM_DEMON_CRYSTAL).getType(crystalStack), newGemStack);
+                addShapelessRecipe(newGemStack, baseGemStack, crystalStack);
             }
         }
 
-        GameRegistry.addRecipe(new ShapedBloodOrbRecipe(new ItemStack(ModBlocks.MIMIC, 4, 0), "b b", " r ", "bob", 'b', new ItemStack(ModBlocks.BLOOD_STONE), 'r', new ItemStack(ModBlocks.BLOOD_RUNE), 'o', OrbRegistry.getOrbStack(ModItems.ORB_MAGICIAN)));
-        GameRegistry.addRecipe(new ShapedBloodOrbRecipe(new ItemStack(ModBlocks.MIMIC, 4, 1), "bsb", "srs", "bob", 'b', new ItemStack(ModBlocks.BLOOD_STONE), 'r', new ItemStack(ModBlocks.BLOOD_RUNE), 's', "stone", 'o', OrbRegistry.getOrbStack(ModItems.ORB_MAGICIAN)));
-        GameRegistry.addRecipe(new ShapedBloodOrbRecipe(new ItemStack(ModBlocks.MIMIC, 4, 2), "bsb", "srs", "bob", 'b', new ItemStack(ModBlocks.BLOOD_STONE), 'r', new ItemStack(ModBlocks.BLOOD_RUNE), 's', "blockGlass", 'o', OrbRegistry.getOrbStack(ModItems.ORB_MAGICIAN)));
-        GameRegistry.addRecipe(new ShapedBloodOrbRecipe(new ItemStack(ModBlocks.MIMIC, 2, 3), "bnb", "trt", "bob", 'b', new ItemStack(ModBlocks.BLOOD_STONE), 'r', new ItemStack(ModBlocks.BLOOD_RUNE), 'n', "glowstone", 't', "torch", 'o', OrbRegistry.getOrbStack(ModItems.ORB_MAGICIAN)));
+//        GameRegistry.addRecipe(new ShapedBloodOrbRecipe(new ItemStack(RegistrarBloodMagicBlocks.MIMIC, 4, 0), "b b", " r ", "bob", 'b', new ItemStack(RegistrarBloodMagicBlocks.DECORATIVE_BRICK), 'r', new ItemStack(RegistrarBloodMagicBlocks.BLOOD_RUNE), 'o', OrbRegistry.getOrbStack(RegistrarBloodMagicItems.ORB_MAGICIAN)));
+//        GameRegistry.addRecipe(new ShapedBloodOrbRecipe(new ItemStack(RegistrarBloodMagicBlocks.MIMIC, 4, 1), "bsb", "srs", "bob", 'b', new ItemStack(RegistrarBloodMagicBlocks.DECORATIVE_BRICK), 'r', new ItemStack(RegistrarBloodMagicBlocks.BLOOD_RUNE), 's', "stone", 'o', OrbRegistry.getOrbStack(RegistrarBloodMagicItems.ORB_MAGICIAN)));
+//        GameRegistry.addRecipe(new ShapedBloodOrbRecipe(new ItemStack(RegistrarBloodMagicBlocks.MIMIC, 4, 2), "bsb", "srs", "bob", 'b', new ItemStack(RegistrarBloodMagicBlocks.DECORATIVE_BRICK), 'r', new ItemStack(RegistrarBloodMagicBlocks.BLOOD_RUNE), 's', "blockGlass", 'o', OrbRegistry.getOrbStack(RegistrarBloodMagicItems.ORB_MAGICIAN)));
+//        GameRegistry.addRecipe(new ShapedBloodOrbRecipe(new ItemStack(RegistrarBloodMagicBlocks.MIMIC, 2, 3), "bnb", "trt", "bob", 'b', new ItemStack(RegistrarBloodMagicBlocks.DECORATIVE_BRICK), 'r', new ItemStack(RegistrarBloodMagicBlocks.BLOOD_RUNE), 'n', "glowstone", 't', "torch", 'o', OrbRegistry.getOrbStack(RegistrarBloodMagicItems.ORB_MAGICIAN)));
 
         for (int i = 0; i < 5; i++)
         {
-            ItemStack crystalStack = new ItemStack(ModItems.ITEM_DEMON_CRYSTAL, 1, i);
-            ItemStack baseStoneStack = new ItemStack(ModBlocks.DEMON_EXTRAS, 1, i);
-            ItemStack baseStoneStackCrafted = new ItemStack(ModBlocks.DEMON_EXTRAS, 16, i);
-            ItemStack polishedStoneStack = new ItemStack(ModBlocks.DEMON_EXTRAS, 1, i + 5);
-            ItemStack willBrickStack = new ItemStack(ModBlocks.DEMON_BRICK_1, 1, i);
-            ItemStack willBrickStackCrafted = new ItemStack(ModBlocks.DEMON_BRICK_1, 4, i);
+            ItemStack crystalStack = new ItemStack(RegistrarBloodMagicItems.ITEM_DEMON_CRYSTAL, 1, i);
+            ItemStack baseStoneStack = new ItemStack(RegistrarBloodMagicBlocks.DEMON_EXTRAS, 1, i);
+            ItemStack baseStoneStackCrafted = new ItemStack(RegistrarBloodMagicBlocks.DEMON_EXTRAS, 16, i);
+            ItemStack polishedStoneStack = new ItemStack(RegistrarBloodMagicBlocks.DEMON_EXTRAS, 1, i + 5);
+            ItemStack willBrickStack = new ItemStack(RegistrarBloodMagicBlocks.DEMON_BRICK_1, 1, i);
+            ItemStack willBrickStackCrafted = new ItemStack(RegistrarBloodMagicBlocks.DEMON_BRICK_1, 4, i);
 
-            ItemStack willSmallBrickStack = new ItemStack(ModBlocks.DEMON_BRICK_2, 1, i);
-            ItemStack willSmallBrickStackCrafted = new ItemStack(ModBlocks.DEMON_BRICK_2, 1, i);
-            ItemStack pillarStack = new ItemStack(ModBlocks.DEMON_PILLAR_1, 1, i);
-            ItemStack pillarStackCrafted = new ItemStack(ModBlocks.DEMON_PILLAR_1, 6, i);
+            ItemStack willSmallBrickStack = new ItemStack(RegistrarBloodMagicBlocks.DEMON_BRICK_2, 1, i);
+            ItemStack willSmallBrickStackCrafted = new ItemStack(RegistrarBloodMagicBlocks.DEMON_BRICK_2, 1, i);
+            ItemStack pillarStack = new ItemStack(RegistrarBloodMagicBlocks.DEMON_PILLAR_1, 1, i);
+            ItemStack pillarStackCrafted = new ItemStack(RegistrarBloodMagicBlocks.DEMON_PILLAR_1, 6, i);
 
-            GameRegistry.addRecipe(new ShapelessOreRecipe(baseStoneStackCrafted, crystalStack, "stone", "stone", "stone", "stone", "stone", "stone", "stone", "stone"));
-            GameRegistry.addRecipe(willBrickStackCrafted, "ss", "ss", 's', baseStoneStack);
-            GameRegistry.addRecipe(willSmallBrickStackCrafted, "ss", "ss", 's', willBrickStack);
-            GameRegistry.addRecipe(new ItemStack(ModBlocks.DEMON_BRICK_2, 9, i + 5), "scs", "ccc", "scs", 's', baseStoneStack, 'c', willBrickStack);
-            GameRegistry.addRecipe(new ItemStack(ModBlocks.DEMON_BRICK_2, 9, i + 10), "scs", "coc", "scs", 's', baseStoneStack, 'c', willBrickStack, 'o', crystalStack);
-            GameRegistry.addRecipe(pillarStackCrafted, "ss", "ss", "ss", 's', polishedStoneStack);
-            GameRegistry.addRecipe(new ItemStack(ModBlocks.DEMON_PILLAR_2, 8, i), "ppp", "pcp", "ppp", 'p', pillarStack, 'c', crystalStack);
+            addShapelessRecipe(baseStoneStackCrafted, crystalStack, "stone", "stone", "stone", "stone", "stone", "stone", "stone", "stone");
+            addShapedRecipe(willBrickStackCrafted, "ss", "ss", 's', baseStoneStack);
+            addShapedRecipe(willSmallBrickStackCrafted, "ss", "ss", 's', willBrickStack);
+            addShapedRecipe(new ItemStack(RegistrarBloodMagicBlocks.DEMON_BRICK_2, 9, i + 5), "scs", "ccc", "scs", 's', baseStoneStack, 'c', willBrickStack);
+            addShapedRecipe(new ItemStack(RegistrarBloodMagicBlocks.DEMON_BRICK_2, 9, i + 10), "scs", "coc", "scs", 's', baseStoneStack, 'c', willBrickStack, 'o', crystalStack);
+            addShapedRecipe(pillarStackCrafted, "ss", "ss", "ss", 's', polishedStoneStack);
+            addShapedRecipe(new ItemStack(RegistrarBloodMagicBlocks.DEMON_PILLAR_2, 8, i), "ppp", "pcp", "ppp", 'p', pillarStack, 'c', crystalStack);
 
-            GameRegistry.addRecipe(new ItemStack(ModBlocks.DEMON_WALL_1, 6, i), "sss", "sss", 's', willBrickStack);
-            GameRegistry.addRecipe(new ItemStack(ModBlocks.DEMON_WALL_1, 6, i + 5), "sss", "sss", 's', willSmallBrickStack);
-            GameRegistry.addRecipe(new ItemStack(ModBlocks.DEMON_WALL_1, 6, i + 10), "sss", "sss", 's', polishedStoneStack);
+            addShapedRecipe(new ItemStack(RegistrarBloodMagicBlocks.DEMON_WALL_1, 6, i), "sss", "sss", 's', willBrickStack);
+            addShapedRecipe(new ItemStack(RegistrarBloodMagicBlocks.DEMON_WALL_1, 6, i + 5), "sss", "sss", 's', willSmallBrickStack);
+            addShapedRecipe(new ItemStack(RegistrarBloodMagicBlocks.DEMON_WALL_1, 6, i + 10), "sss", "sss", 's', polishedStoneStack);
 
-            GameRegistry.addRecipe(new ItemStack(i < 2 ? ModBlocks.DEMON_STAIRS_1 : (i < 4 ? ModBlocks.DEMON_STAIRS_2 : ModBlocks.DEMON_STAIRS_3), 8, i % 2), "s  ", "ss ", "sss", 's', polishedStoneStack);
-            GameRegistry.addRecipe(new ItemStack(i < 2 ? ModBlocks.DEMON_PILLAR_CAP_1 : (i < 4 ? ModBlocks.DEMON_PILLAR_CAP_2 : ModBlocks.DEMON_PILLAR_CAP_3), 6, i % 2), "sss", "sss", 's', pillarStack);
+            addShapedRecipe(new ItemStack(i < 2 ? RegistrarBloodMagicBlocks.DEMON_STAIRS_1 : (i < 4 ? RegistrarBloodMagicBlocks.DEMON_STAIRS_2 : RegistrarBloodMagicBlocks.DEMON_STAIRS_3), 8, i % 2), "s  ", "ss ", "sss", 's', polishedStoneStack);
+            addShapedRecipe(new ItemStack(i < 2 ? RegistrarBloodMagicBlocks.DEMON_PILLAR_CAP_1 : (i < 4 ? RegistrarBloodMagicBlocks.DEMON_PILLAR_CAP_2 : RegistrarBloodMagicBlocks.DEMON_PILLAR_CAP_3), 6, i % 2), "sss", "sss", 's', pillarStack);
 
-            GameRegistry.addRecipe(new ItemStack(ModBlocks.DEMON_LIGHT, 5, i), "sgs", "ggg", "sgs", 's', polishedStoneStack, 'g', Blocks.GLOWSTONE);
+            addShapedRecipe(new ItemStack(RegistrarBloodMagicBlocks.DEMON_LIGHT, 5, i), "sgs", "ggg", "sgs", 's', polishedStoneStack, 'g', Blocks.GLOWSTONE);
 
             GameRegistry.addSmelting(baseStoneStack, polishedStoneStack, 0.15f);
         }
@@ -235,81 +231,81 @@ public class ModRecipes
     public static void addAltarRecipes()
     {
         // ONE
-        AltarRecipeRegistry.registerFillRecipe(OrbRegistry.getOrbStack(ModItems.ORB_WEAK), EnumAltarTier.ONE, ModItems.ORB_WEAK.getCapacity(), 2, 1);
-        AltarRecipeRegistry.registerRecipe(new AltarRecipeRegistry.AltarRecipe(new ItemStack(Items.DIAMOND), OrbRegistry.getOrbStack(ModItems.ORB_WEAK), EnumAltarTier.ONE, 2000, 2, 1));
-        AltarRecipeRegistry.registerRecipe(new AltarRecipeRegistry.AltarRecipe(new ItemStack(Blocks.STONE), new ItemStack(ModItems.SLATE), EnumAltarTier.ONE, 1000, 5, 5));
+        AltarRecipeRegistry.registerFillRecipe(OrbRegistry.getOrbStack(RegistrarBloodMagic.ORB_WEAK), EnumAltarTier.ONE, RegistrarBloodMagic.ORB_WEAK.getCapacity(), 2, 1);
+        AltarRecipeRegistry.registerRecipe(new AltarRecipeRegistry.AltarRecipe(new ItemStack(Items.DIAMOND), OrbRegistry.getOrbStack(RegistrarBloodMagic.ORB_WEAK), EnumAltarTier.ONE, 2000, 2, 1));
+        AltarRecipeRegistry.registerRecipe(new AltarRecipeRegistry.AltarRecipe(new ItemStack(Blocks.STONE), new ItemStack(RegistrarBloodMagicItems.SLATE), EnumAltarTier.ONE, 1000, 5, 5));
         AltarRecipeRegistry.registerRecipe(new AltarRecipeRegistry.AltarRecipe(new ItemStack(Items.BUCKET), new ItemStack(ForgeModContainer.getInstance().universalBucket), EnumAltarTier.ONE, 1000, 5, 0));
-        AltarRecipeRegistry.registerRecipe(new AltarRecipeRegistry.AltarRecipe(new ItemStack(Items.BOOK), new ItemStack(ModItems.SANGUINE_BOOK), EnumAltarTier.ONE, 1000, 20, 0));
+        AltarRecipeRegistry.registerRecipe(new AltarRecipeRegistry.AltarRecipe(new ItemStack(Items.BOOK), new ItemStack(RegistrarBloodMagicItems.SANGUINE_BOOK), EnumAltarTier.ONE, 1000, 20, 0));
 
         // TWO
-        AltarRecipeRegistry.registerFillRecipe(OrbRegistry.getOrbStack(ModItems.ORB_APPRENTICE), EnumAltarTier.TWO, ModItems.ORB_APPRENTICE.getCapacity(), 5, 5);
-        AltarRecipeRegistry.registerRecipe(new AltarRecipeRegistry.AltarRecipe(new ItemStack(Blocks.REDSTONE_BLOCK), OrbRegistry.getOrbStack(ModItems.ORB_APPRENTICE), EnumAltarTier.TWO, 5000, 5, 5));
-        AltarRecipeRegistry.registerRecipe(new AltarRecipeRegistry.AltarRecipe(new ItemStack(ModItems.SLATE), new ItemStack(ModItems.SLATE, 1, 1), EnumAltarTier.TWO, 2000, 5, 5));
-        AltarRecipeRegistry.registerRecipe(new AltarRecipeRegistry.AltarRecipe(new ItemStack(Items.IRON_SWORD), new ItemStack(ModItems.DAGGER_OF_SACRIFICE), EnumAltarTier.TWO, 3000, 5, 5));
+        AltarRecipeRegistry.registerFillRecipe(OrbRegistry.getOrbStack(RegistrarBloodMagic.ORB_APPRENTICE), EnumAltarTier.TWO, RegistrarBloodMagic.ORB_APPRENTICE.getCapacity(), 5, 5);
+        AltarRecipeRegistry.registerRecipe(new AltarRecipeRegistry.AltarRecipe(new ItemStack(Blocks.REDSTONE_BLOCK), OrbRegistry.getOrbStack(RegistrarBloodMagic.ORB_APPRENTICE), EnumAltarTier.TWO, 5000, 5, 5));
+        AltarRecipeRegistry.registerRecipe(new AltarRecipeRegistry.AltarRecipe(new ItemStack(RegistrarBloodMagicItems.SLATE), new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 1), EnumAltarTier.TWO, 2000, 5, 5));
+        AltarRecipeRegistry.registerRecipe(new AltarRecipeRegistry.AltarRecipe(new ItemStack(Items.IRON_SWORD), new ItemStack(RegistrarBloodMagicItems.DAGGER_OF_SACRIFICE), EnumAltarTier.TWO, 3000, 5, 5));
 
         // THREE
-        AltarRecipeRegistry.registerFillRecipe(OrbRegistry.getOrbStack(ModItems.ORB_MAGICIAN), EnumAltarTier.THREE, ModItems.ORB_MAGICIAN.getCapacity(), 15, 15);
-        AltarRecipeRegistry.registerRecipe(new AltarRecipeRegistry.AltarRecipe(new ItemStack(Blocks.GOLD_BLOCK), OrbRegistry.getOrbStack(ModItems.ORB_MAGICIAN), EnumAltarTier.THREE, 25000, 20, 20));
-        AltarRecipeRegistry.registerRecipe(new AltarRecipeRegistry.AltarRecipe(new ItemStack(ModItems.SLATE, 1, 1), new ItemStack(ModItems.SLATE, 1, 2), EnumAltarTier.THREE, 5000, 15, 10));
+        AltarRecipeRegistry.registerFillRecipe(OrbRegistry.getOrbStack(RegistrarBloodMagic.ORB_MAGICIAN), EnumAltarTier.THREE, RegistrarBloodMagic.ORB_MAGICIAN.getCapacity(), 15, 15);
+        AltarRecipeRegistry.registerRecipe(new AltarRecipeRegistry.AltarRecipe(new ItemStack(Blocks.GOLD_BLOCK), OrbRegistry.getOrbStack(RegistrarBloodMagic.ORB_MAGICIAN), EnumAltarTier.THREE, 25000, 20, 20));
+        AltarRecipeRegistry.registerRecipe(new AltarRecipeRegistry.AltarRecipe(new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 1), new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 2), EnumAltarTier.THREE, 5000, 15, 10));
         AltarRecipeRegistry.registerRecipe(new AltarRecipeRegistry.AltarRecipe(new ItemStack(Blocks.OBSIDIAN), EnumRuneType.EARTH.getScribeStack(), EnumAltarTier.THREE, 1000, 5, 5));
         AltarRecipeRegistry.registerRecipe(new AltarRecipeRegistry.AltarRecipe(new ItemStack(Blocks.LAPIS_BLOCK), EnumRuneType.WATER.getScribeStack(), EnumAltarTier.THREE, 1000, 5, 5));
         AltarRecipeRegistry.registerRecipe(new AltarRecipeRegistry.AltarRecipe(new ItemStack(Items.MAGMA_CREAM), EnumRuneType.FIRE.getScribeStack(), EnumAltarTier.THREE, 1000, 5, 5));
         AltarRecipeRegistry.registerRecipe(new AltarRecipeRegistry.AltarRecipe(new ItemStack(Items.GHAST_TEAR), EnumRuneType.AIR.getScribeStack(), EnumAltarTier.THREE, 1000, 5, 5));
-        AltarRecipeRegistry.registerRecipe(new AltarRecipeRegistry.AltarRecipe(new ItemStack(ModItems.LAVA_CRYSTAL), new ItemStack(ModItems.ACTIVATION_CRYSTAL), EnumAltarTier.THREE, 10000, 20, 10));
+        AltarRecipeRegistry.registerRecipe(new AltarRecipeRegistry.AltarRecipe(new ItemStack(RegistrarBloodMagicItems.LAVA_CRYSTAL), new ItemStack(RegistrarBloodMagicItems.ACTIVATION_CRYSTAL), EnumAltarTier.THREE, 10000, 20, 10));
 
         // FOUR
-        AltarRecipeRegistry.registerFillRecipe(OrbRegistry.getOrbStack(ModItems.ORB_MASTER), EnumAltarTier.FOUR, ModItems.ORB_MASTER.getCapacity(), 25, 25);
-        AltarRecipeRegistry.registerRecipe(new AltarRecipeRegistry.AltarRecipe(new ItemStack(ModItems.BLOOD_SHARD), OrbRegistry.getOrbStack(ModItems.ORB_MASTER), EnumAltarTier.FOUR, 25000, 30, 50));
-        AltarRecipeRegistry.registerRecipe(new AltarRecipeRegistry.AltarRecipe(new ItemStack(ModItems.SLATE, 1, 2), new ItemStack(ModItems.SLATE, 1, 3), EnumAltarTier.FOUR, 15000, 20, 20));
+        AltarRecipeRegistry.registerFillRecipe(OrbRegistry.getOrbStack(RegistrarBloodMagic.ORB_MASTER), EnumAltarTier.FOUR, RegistrarBloodMagic.ORB_MASTER.getCapacity(), 25, 25);
+        AltarRecipeRegistry.registerRecipe(new AltarRecipeRegistry.AltarRecipe(new ItemStack(RegistrarBloodMagicItems.BLOOD_SHARD), OrbRegistry.getOrbStack(RegistrarBloodMagic.ORB_MASTER), EnumAltarTier.FOUR, 25000, 30, 50));
+        AltarRecipeRegistry.registerRecipe(new AltarRecipeRegistry.AltarRecipe(new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 2), new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 3), EnumAltarTier.FOUR, 15000, 20, 20));
         AltarRecipeRegistry.registerRecipe(new AltarRecipeRegistry.AltarRecipe(new ItemStack(Blocks.COAL_BLOCK), EnumRuneType.DUSK.getScribeStack(), EnumAltarTier.FOUR, 2000, 20, 10));
-        AltarRecipeRegistry.registerRecipe(new AltarRecipeRegistry.AltarRecipe(new ItemStack(Items.ENDER_PEARL), new ItemStack(ModItems.TELEPOSITION_FOCUS), EnumAltarTier.FOUR, 2000, 10, 10));
-        AltarRecipeRegistry.registerRecipe(new AltarRecipeRegistry.AltarRecipe(new ItemStack(ModItems.TELEPOSITION_FOCUS), new ItemStack(ModItems.TELEPOSITION_FOCUS, 1, 1), EnumAltarTier.FOUR, 10000, 20, 10));
+        AltarRecipeRegistry.registerRecipe(new AltarRecipeRegistry.AltarRecipe(new ItemStack(Items.ENDER_PEARL), new ItemStack(RegistrarBloodMagicItems.TELEPOSITION_FOCUS), EnumAltarTier.FOUR, 2000, 10, 10));
+        AltarRecipeRegistry.registerRecipe(new AltarRecipeRegistry.AltarRecipe(new ItemStack(RegistrarBloodMagicItems.TELEPOSITION_FOCUS), new ItemStack(RegistrarBloodMagicItems.TELEPOSITION_FOCUS, 1, 1), EnumAltarTier.FOUR, 10000, 20, 10));
 
         // FIVE
-        AltarRecipeRegistry.registerFillRecipe(OrbRegistry.getOrbStack(ModItems.ORB_ARCHMAGE), EnumAltarTier.FIVE, ModItems.ORB_ARCHMAGE.getCapacity(), 50, 50);
-        AltarRecipeRegistry.registerRecipe(new AltarRecipeRegistry.AltarRecipe(new ItemStack(Items.NETHER_STAR), OrbRegistry.getOrbStack(ModItems.ORB_ARCHMAGE), EnumAltarTier.FIVE, 80000, 50, 100));
-        AltarRecipeRegistry.registerRecipe(new AltarRecipeRegistry.AltarRecipe(new ItemStack(ModItems.SLATE, 1, 3), new ItemStack(ModItems.SLATE, 1, 4), EnumAltarTier.FIVE, 30000, 40, 100));
+        AltarRecipeRegistry.registerFillRecipe(OrbRegistry.getOrbStack(RegistrarBloodMagic.ORB_ARCHMAGE), EnumAltarTier.FIVE, RegistrarBloodMagic.ORB_ARCHMAGE.getCapacity(), 50, 50);
+        AltarRecipeRegistry.registerRecipe(new AltarRecipeRegistry.AltarRecipe(new ItemStack(Items.NETHER_STAR), OrbRegistry.getOrbStack(RegistrarBloodMagic.ORB_ARCHMAGE), EnumAltarTier.FIVE, 80000, 50, 100));
+        AltarRecipeRegistry.registerRecipe(new AltarRecipeRegistry.AltarRecipe(new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 3), new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 4), EnumAltarTier.FIVE, 30000, 40, 100));
 
         // SIX
-        AltarRecipeRegistry.registerFillRecipe(OrbRegistry.getOrbStack(ModItems.ORB_TRANSCENDENT), EnumAltarTier.SIX, ModItems.ORB_TRANSCENDENT.getCapacity(), 50, 50);
-        AltarRecipeRegistry.registerRecipe(new AltarRecipeRegistry.AltarRecipe(new ItemStack(ModBlocks.CRYSTAL), OrbRegistry.getOrbStack(ModItems.ORB_TRANSCENDENT), EnumAltarTier.SIX, 200000, 100, 200));
+        AltarRecipeRegistry.registerFillRecipe(OrbRegistry.getOrbStack(RegistrarBloodMagic.ORB_TRANSCENDENT), EnumAltarTier.SIX, RegistrarBloodMagic.ORB_TRANSCENDENT.getCapacity(), 50, 50);
+        AltarRecipeRegistry.registerRecipe(new AltarRecipeRegistry.AltarRecipe(new ItemStack(RegistrarBloodMagicBlocks.DECORATIVE_BRICK, 1, 2), OrbRegistry.getOrbStack(RegistrarBloodMagic.ORB_TRANSCENDENT), EnumAltarTier.SIX, 200000, 100, 200));
         AltarRecipeRegistry.registerRecipe(new AltarRecipeRegistry.AltarRecipe(new ItemStack(Blocks.GLOWSTONE), EnumRuneType.DAWN.getScribeStack(), EnumAltarTier.SIX, 200000, 100, 200));
     }
 
     public static void addAlchemyArrayRecipes()
     {
-        AlchemyArrayRecipeRegistry.registerRecipe(ItemComponent.getStack(ItemComponent.REAGENT_BINDING), new ItemStack(Items.DIAMOND_SWORD), new AlchemyArrayEffectBinding("boundSword", Utils.setUnbreakable(new ItemStack(ModItems.BOUND_SWORD))), new BindingAlchemyCircleRenderer());
-        AlchemyArrayRecipeRegistry.registerRecipe(ItemComponent.getStack(ItemComponent.REAGENT_BINDING), new ItemStack(Items.DIAMOND_AXE), new AlchemyArrayEffectBinding("boundAxe", Utils.setUnbreakable(new ItemStack(ModItems.BOUND_AXE))));
-        AlchemyArrayRecipeRegistry.registerRecipe(ItemComponent.getStack(ItemComponent.REAGENT_BINDING), new ItemStack(Items.DIAMOND_PICKAXE), new AlchemyArrayEffectBinding("boundPickaxe", Utils.setUnbreakable(new ItemStack(ModItems.BOUND_PICKAXE))));
-        AlchemyArrayRecipeRegistry.registerRecipe(ItemComponent.getStack(ItemComponent.REAGENT_BINDING), new ItemStack(Items.DIAMOND_SHOVEL), new AlchemyArrayEffectBinding("boundShovel", Utils.setUnbreakable(new ItemStack(ModItems.BOUND_SHOVEL))));
-        AlchemyArrayRecipeRegistry.registerRecipe(ItemComponent.getStack(ItemComponent.REAGENT_BINDING), new ItemStack(Items.IRON_HELMET), new AlchemyArrayEffectBinding("livingHelmet", new ItemStack(ModItems.LIVING_ARMOUR_HELMET)));
-        AlchemyArrayRecipeRegistry.registerRecipe(ItemComponent.getStack(ItemComponent.REAGENT_BINDING), new ItemStack(Items.IRON_CHESTPLATE), new AlchemyArrayEffectBinding("livingChest", new ItemStack(ModItems.LIVING_ARMOUR_CHEST)));
-        AlchemyArrayRecipeRegistry.registerRecipe(ItemComponent.getStack(ItemComponent.REAGENT_BINDING), new ItemStack(Items.IRON_LEGGINGS), new AlchemyArrayEffectBinding("livingLegs", new ItemStack(ModItems.LIVING_ARMOUR_LEGS)));
-        AlchemyArrayRecipeRegistry.registerRecipe(ItemComponent.getStack(ItemComponent.REAGENT_BINDING), new ItemStack(Items.IRON_BOOTS), new AlchemyArrayEffectBinding("livingBoots", new ItemStack(ModItems.LIVING_ARMOUR_BOOTS)));
+        AlchemyArrayRecipeRegistry.registerRecipe(ItemComponent.getStack(ItemComponent.REAGENT_BINDING), new ItemStack(Items.DIAMOND_SWORD), new AlchemyArrayEffectBinding("boundSword", Utils.setUnbreakable(new ItemStack(RegistrarBloodMagicItems.BOUND_SWORD))), new BindingAlchemyCircleRenderer());
+        AlchemyArrayRecipeRegistry.registerRecipe(ItemComponent.getStack(ItemComponent.REAGENT_BINDING), new ItemStack(Items.DIAMOND_AXE), new AlchemyArrayEffectBinding("boundAxe", Utils.setUnbreakable(new ItemStack(RegistrarBloodMagicItems.BOUND_AXE))));
+        AlchemyArrayRecipeRegistry.registerRecipe(ItemComponent.getStack(ItemComponent.REAGENT_BINDING), new ItemStack(Items.DIAMOND_PICKAXE), new AlchemyArrayEffectBinding("boundPickaxe", Utils.setUnbreakable(new ItemStack(RegistrarBloodMagicItems.BOUND_PICKAXE))));
+        AlchemyArrayRecipeRegistry.registerRecipe(ItemComponent.getStack(ItemComponent.REAGENT_BINDING), new ItemStack(Items.DIAMOND_SHOVEL), new AlchemyArrayEffectBinding("boundShovel", Utils.setUnbreakable(new ItemStack(RegistrarBloodMagicItems.BOUND_SHOVEL))));
+        AlchemyArrayRecipeRegistry.registerRecipe(ItemComponent.getStack(ItemComponent.REAGENT_BINDING), new ItemStack(Items.IRON_HELMET), new AlchemyArrayEffectBinding("livingHelmet", new ItemStack(RegistrarBloodMagicItems.LIVING_ARMOUR_HELMET)));
+        AlchemyArrayRecipeRegistry.registerRecipe(ItemComponent.getStack(ItemComponent.REAGENT_BINDING), new ItemStack(Items.IRON_CHESTPLATE), new AlchemyArrayEffectBinding("livingChest", new ItemStack(RegistrarBloodMagicItems.LIVING_ARMOUR_CHEST)));
+        AlchemyArrayRecipeRegistry.registerRecipe(ItemComponent.getStack(ItemComponent.REAGENT_BINDING), new ItemStack(Items.IRON_LEGGINGS), new AlchemyArrayEffectBinding("livingLegs", new ItemStack(RegistrarBloodMagicItems.LIVING_ARMOUR_LEGS)));
+        AlchemyArrayRecipeRegistry.registerRecipe(ItemComponent.getStack(ItemComponent.REAGENT_BINDING), new ItemStack(Items.IRON_BOOTS), new AlchemyArrayEffectBinding("livingBoots", new ItemStack(RegistrarBloodMagicItems.LIVING_ARMOUR_BOOTS)));
 
-        AlchemyArrayRecipeRegistry.registerCraftingRecipe(new ItemStack(Items.REDSTONE), new ItemStack(ModItems.SLATE), new ItemStack(ModItems.SIGIL_DIVINATION), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/DivinationSigil.png"));
+        AlchemyArrayRecipeRegistry.registerCraftingRecipe(new ItemStack(Items.REDSTONE), new ItemStack(RegistrarBloodMagicItems.SLATE), new ItemStack(RegistrarBloodMagicItems.SIGIL_DIVINATION), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/DivinationSigil.png"));
 
-        AlchemyArrayRecipeRegistry.registerCraftingRecipe(ItemComponent.getStack(ItemComponent.REAGENT_WATER), new ItemStack(ModItems.SLATE), new ItemStack(ModItems.SIGIL_WATER), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/WaterSigil.png"));
-        AlchemyArrayRecipeRegistry.registerCraftingRecipe(ItemComponent.getStack(ItemComponent.REAGENT_LAVA), new ItemStack(ModItems.SLATE), new ItemStack(ModItems.SIGIL_LAVA), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/LavaSigil.png"));
-        AlchemyArrayRecipeRegistry.registerCraftingRecipe(ItemComponent.getStack(ItemComponent.REAGENT_AIR), new ItemStack(ModItems.SLATE, 1, 1), new ItemStack(ModItems.SIGIL_AIR), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/AirSigil.png"));
-        AlchemyArrayRecipeRegistry.registerCraftingRecipe(ItemComponent.getStack(ItemComponent.REAGENT_FASTMINER), new ItemStack(ModItems.SLATE, 1, 1), new ItemStack(ModItems.SIGIL_FAST_MINER), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/FastMinerSigil.png"));
-        AlchemyArrayRecipeRegistry.registerCraftingRecipe(ItemComponent.getStack(ItemComponent.REAGENT_VOID), new ItemStack(ModItems.SLATE, 1, 1), new ItemStack(ModItems.SIGIL_VOID), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/VoidSigil.png"));
-        AlchemyArrayRecipeRegistry.registerCraftingRecipe(ItemComponent.getStack(ItemComponent.REAGENT_GROWTH), new ItemStack(ModItems.SLATE, 1, 1), new ItemStack(ModItems.SIGIL_GREEN_GROVE), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/GrowthSigil.png"));
-        AlchemyArrayRecipeRegistry.registerCraftingRecipe(ItemComponent.getStack(ItemComponent.REAGENT_AFFINITY), new ItemStack(ModItems.SLATE, 1, 2), new ItemStack(ModItems.SIGIL_ELEMENTAL_AFFINITY), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/ElementalAffinitySigil.png"));
-        AlchemyArrayRecipeRegistry.registerCraftingRecipe(ItemComponent.getStack(ItemComponent.REAGENT_SIGHT), new ItemStack(ModItems.SLATE, 1, 1), new ItemStack(ModItems.SIGIL_SEER), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/SightSigil.png"));
-        AlchemyArrayRecipeRegistry.registerCraftingRecipe(ItemComponent.getStack(ItemComponent.REAGENT_HOLDING), new ItemStack(ModItems.SLATE, 1, 2), new ItemStack(ModItems.SIGIL_HOLDING), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/WIPArray.png"));
-        AlchemyArrayRecipeRegistry.registerCraftingRecipe(ItemComponent.getStack(ItemComponent.REAGENT_BLOODLIGHT), new ItemStack(ModItems.SLATE, 1, 2), new ItemStack(ModItems.SIGIL_BLOOD_LIGHT), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/LightSigil.png"));
-        AlchemyArrayRecipeRegistry.registerCraftingRecipe(ItemComponent.getStack(ItemComponent.REAGENT_MAGNETISM), new ItemStack(ModItems.SLATE, 1, 2), new ItemStack(ModItems.SIGIL_MAGNETISM), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/MagnetismSigil.png"));
-        AlchemyArrayRecipeRegistry.registerCraftingRecipe(ItemComponent.getStack(ItemComponent.REAGENT_SUPPRESSION), new ItemStack(ModItems.SLATE, 1, 3), new ItemStack(ModItems.SIGIL_SUPPRESSION), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/SuppressionSigil.png"));
-        AlchemyArrayRecipeRegistry.registerCraftingRecipe(ItemComponent.getStack(ItemComponent.REAGENT_HASTE), new ItemStack(ModItems.SLATE, 1, 3), new ItemStack(ModItems.SIGIL_HASTE), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/WIPArray.png"));
-        AlchemyArrayRecipeRegistry.registerCraftingRecipe(ItemComponent.getStack(ItemComponent.REAGENT_BRIDGE), new ItemStack(ModItems.SLATE, 1, 3), new ItemStack(ModItems.SIGIL_PHANTOM_BRIDGE), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/WIPArray.png"));
-        AlchemyArrayRecipeRegistry.registerCraftingRecipe(ItemComponent.getStack(ItemComponent.REAGENT_COMPRESSION), new ItemStack(ModItems.SLATE, 1, 3), new ItemStack(ModItems.SIGIL_COMPRESSION), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/WIPArray.png"));
-        AlchemyArrayRecipeRegistry.registerCraftingRecipe(ItemComponent.getStack(ItemComponent.REAGENT_SEVERANCE), new ItemStack(ModItems.SLATE, 1, 3), new ItemStack(ModItems.SIGIL_ENDER_SEVERANCE), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/WIPArray.png"));
-        AlchemyArrayRecipeRegistry.registerCraftingRecipe(ItemComponent.getStack(ItemComponent.REAGENT_TELEPOSITION), new ItemStack(ModItems.SLATE, 1, 3), new ItemStack(ModItems.SIGIL_TELEPOSITION), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/WIPArray.png"));
-        AlchemyArrayRecipeRegistry.registerCraftingRecipe(ItemComponent.getStack(ItemComponent.REAGENT_TRANSPOSITION), new ItemStack(ModItems.SLATE, 1, 3), new ItemStack(ModItems.SIGIL_TRANSPOSITION), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/WIPArray.png"));
-        AlchemyArrayRecipeRegistry.registerCraftingRecipe(ItemComponent.getStack(ItemComponent.REAGENT_CLAW), new ItemStack(ModItems.SLATE, 1, 2), new ItemStack(ModItems.SIGIL_CLAW), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/WIPArray.png"));
-        AlchemyArrayRecipeRegistry.registerCraftingRecipe(ItemComponent.getStack(ItemComponent.REAGENT_BOUNCE), new ItemStack(ModItems.SLATE, 1, 1), new ItemStack(ModItems.SIGIL_BOUNCE), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/WIPArray.png"));
-        AlchemyArrayRecipeRegistry.registerCraftingRecipe(ItemComponent.getStack(ItemComponent.REAGENT_FROST), new ItemStack(ModItems.SLATE, 1, 1), new ItemStack(ModItems.SIGIL_FROST), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/WIPArray.png"));
+        AlchemyArrayRecipeRegistry.registerCraftingRecipe(ItemComponent.getStack(ItemComponent.REAGENT_WATER), new ItemStack(RegistrarBloodMagicItems.SLATE), new ItemStack(RegistrarBloodMagicItems.SIGIL_WATER), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/WaterSigil.png"));
+        AlchemyArrayRecipeRegistry.registerCraftingRecipe(ItemComponent.getStack(ItemComponent.REAGENT_LAVA), new ItemStack(RegistrarBloodMagicItems.SLATE), new ItemStack(RegistrarBloodMagicItems.SIGIL_LAVA), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/LavaSigil.png"));
+        AlchemyArrayRecipeRegistry.registerCraftingRecipe(ItemComponent.getStack(ItemComponent.REAGENT_AIR), new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 1), new ItemStack(RegistrarBloodMagicItems.SIGIL_AIR), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/AirSigil.png"));
+        AlchemyArrayRecipeRegistry.registerCraftingRecipe(ItemComponent.getStack(ItemComponent.REAGENT_FASTMINER), new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 1), new ItemStack(RegistrarBloodMagicItems.SIGIL_FAST_MINER), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/FastMinerSigil.png"));
+        AlchemyArrayRecipeRegistry.registerCraftingRecipe(ItemComponent.getStack(ItemComponent.REAGENT_VOID), new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 1), new ItemStack(RegistrarBloodMagicItems.SIGIL_VOID), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/VoidSigil.png"));
+        AlchemyArrayRecipeRegistry.registerCraftingRecipe(ItemComponent.getStack(ItemComponent.REAGENT_GROWTH), new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 1), new ItemStack(RegistrarBloodMagicItems.SIGIL_GREEN_GROVE), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/GrowthSigil.png"));
+        AlchemyArrayRecipeRegistry.registerCraftingRecipe(ItemComponent.getStack(ItemComponent.REAGENT_AFFINITY), new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 2), new ItemStack(RegistrarBloodMagicItems.SIGIL_ELEMENTAL_AFFINITY), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/ElementalAffinitySigil.png"));
+        AlchemyArrayRecipeRegistry.registerCraftingRecipe(ItemComponent.getStack(ItemComponent.REAGENT_SIGHT), new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 1), new ItemStack(RegistrarBloodMagicItems.SIGIL_SEER), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/SightSigil.png"));
+        AlchemyArrayRecipeRegistry.registerCraftingRecipe(ItemComponent.getStack(ItemComponent.REAGENT_HOLDING), new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 2), new ItemStack(RegistrarBloodMagicItems.SIGIL_HOLDING), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/WIPArray.png"));
+        AlchemyArrayRecipeRegistry.registerCraftingRecipe(ItemComponent.getStack(ItemComponent.REAGENT_BLOODLIGHT), new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 2), new ItemStack(RegistrarBloodMagicItems.SIGIL_BLOOD_LIGHT), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/LightSigil.png"));
+        AlchemyArrayRecipeRegistry.registerCraftingRecipe(ItemComponent.getStack(ItemComponent.REAGENT_MAGNETISM), new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 2), new ItemStack(RegistrarBloodMagicItems.SIGIL_MAGNETISM), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/MagnetismSigil.png"));
+        AlchemyArrayRecipeRegistry.registerCraftingRecipe(ItemComponent.getStack(ItemComponent.REAGENT_SUPPRESSION), new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 3), new ItemStack(RegistrarBloodMagicItems.SIGIL_SUPPRESSION), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/SuppressionSigil.png"));
+        AlchemyArrayRecipeRegistry.registerCraftingRecipe(ItemComponent.getStack(ItemComponent.REAGENT_HASTE), new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 3), new ItemStack(RegistrarBloodMagicItems.SIGIL_HASTE), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/WIPArray.png"));
+        AlchemyArrayRecipeRegistry.registerCraftingRecipe(ItemComponent.getStack(ItemComponent.REAGENT_BRIDGE), new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 3), new ItemStack(RegistrarBloodMagicItems.SIGIL_PHANTOM_BRIDGE), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/WIPArray.png"));
+        AlchemyArrayRecipeRegistry.registerCraftingRecipe(ItemComponent.getStack(ItemComponent.REAGENT_COMPRESSION), new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 3), new ItemStack(RegistrarBloodMagicItems.SIGIL_COMPRESSION), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/WIPArray.png"));
+        AlchemyArrayRecipeRegistry.registerCraftingRecipe(ItemComponent.getStack(ItemComponent.REAGENT_SEVERANCE), new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 3), new ItemStack(RegistrarBloodMagicItems.SIGIL_ENDER_SEVERANCE), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/WIPArray.png"));
+        AlchemyArrayRecipeRegistry.registerCraftingRecipe(ItemComponent.getStack(ItemComponent.REAGENT_TELEPOSITION), new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 3), new ItemStack(RegistrarBloodMagicItems.SIGIL_TELEPOSITION), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/WIPArray.png"));
+        AlchemyArrayRecipeRegistry.registerCraftingRecipe(ItemComponent.getStack(ItemComponent.REAGENT_TRANSPOSITION), new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 3), new ItemStack(RegistrarBloodMagicItems.SIGIL_TRANSPOSITION), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/WIPArray.png"));
+        AlchemyArrayRecipeRegistry.registerCraftingRecipe(ItemComponent.getStack(ItemComponent.REAGENT_CLAW), new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 2), new ItemStack(RegistrarBloodMagicItems.SIGIL_CLAW), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/WIPArray.png"));
+        AlchemyArrayRecipeRegistry.registerCraftingRecipe(ItemComponent.getStack(ItemComponent.REAGENT_BOUNCE), new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 1), new ItemStack(RegistrarBloodMagicItems.SIGIL_BOUNCE), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/WIPArray.png"));
+        AlchemyArrayRecipeRegistry.registerCraftingRecipe(ItemComponent.getStack(ItemComponent.REAGENT_FROST), new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 1), new ItemStack(RegistrarBloodMagicItems.SIGIL_FROST), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/WIPArray.png"));
 
         AlchemyArrayRecipeRegistry.registerRecipe(new ItemStack(Items.ROTTEN_FLESH), new ItemStack(Items.ROTTEN_FLESH), new AlchemyArrayEffectAttractor("attractor"), new AttractorAlchemyCircleRenderer());
         AlchemyArrayRecipeRegistry.registerRecipe(new ItemStack(Items.FEATHER), new ItemStack(Items.REDSTONE), new AlchemyArrayEffectMovement("movement"), new StaticAlchemyCircleRenderer(new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/MovementArray.png")));
@@ -318,7 +314,7 @@ public class ModRecipes
 
         AlchemyArrayRecipeRegistry.registerRecipe(new ItemStack(Items.ARROW), new ItemStack(Items.FEATHER), new AlchemyArrayEffectSkeletonTurret("skeletonTurret"), new DualAlchemyCircleRenderer(new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/SkeletonTurret1.png"), new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/SkeletonTurret2.png")));
 
-        AlchemyArrayRecipeRegistry.registerRecipe(ItemComponent.getStack(ItemComponent.REAGENT_FASTMINER), new ItemStack(Items.IRON_PICKAXE), new AlchemyArrayEffectSigil("fastMiner", (ISigil) ModItems.SIGIL_FAST_MINER), new SingleAlchemyCircleRenderer(new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/FastMinerSigil.png")));
+        AlchemyArrayRecipeRegistry.registerRecipe(ItemComponent.getStack(ItemComponent.REAGENT_FASTMINER), new ItemStack(Items.IRON_PICKAXE), new AlchemyArrayEffectSigil("fastMiner", (ISigil) RegistrarBloodMagicItems.SIGIL_FAST_MINER), new SingleAlchemyCircleRenderer(new ResourceLocation("bloodmagic", "textures/models/AlchemyArrays/FastMinerSigil.png")));
 
     }
 
@@ -333,32 +329,32 @@ public class ModRecipes
         CompressionRegistry.registerItemThreshold(new ItemStack(Blocks.COBBLESTONE), 64);
         stopwatch.stop();
 
-        BloodMagic.instance.getLogger().info("Added compression recipes in {}", stopwatch);
+        BloodMagic.instance.logger.info("Added compression recipes in {}", stopwatch);
     }
 
     public static void addSoulForgeRecipes()
     {
-        TartaricForgeRecipeRegistry.registerRecipe(new ItemStack(ModItems.SOUL_GEM), 1, 1, "dustRedstone", "ingotGold", "blockGlass", "dyeBlue");
-        TartaricForgeRecipeRegistry.registerRecipe(new ItemStack(ModItems.SOUL_GEM, 1, 1), 60, 20, new ItemStack(ModItems.SOUL_GEM), "gemDiamond", "blockRedstone", "blockLapis");
-        TartaricForgeRecipeRegistry.registerRecipe(new ItemStack(ModItems.SOUL_GEM, 1, 2), 240, 50, new ItemStack(ModItems.SOUL_GEM, 1, 1), "gemDiamond", "blockGold", new ItemStack(ModItems.SLATE, 1, 2));
-        TartaricForgeRecipeRegistry.registerRecipe(new ItemStack(ModItems.SOUL_GEM, 1, 3), 1000, 100, new ItemStack(ModItems.SOUL_GEM, 1, 2), new ItemStack(ModItems.SLATE, 1, 3), new ItemStack(ModItems.BLOOD_SHARD), ItemDemonCrystal.getStack(ItemDemonCrystal.CRYSTAL_DEFAULT));
-        TartaricForgeRecipeRegistry.registerRecipe(new ItemStack(ModItems.SOUL_GEM, 1, 4), 4000, 500, new ItemStack(ModItems.SOUL_GEM, 1, 3), Items.NETHER_STAR);
-        TartaricForgeRecipeRegistry.registerRecipe(new ItemStack(ModItems.SENTIENT_SWORD), 0, 0, new ItemStack(ModItems.SOUL_GEM), new ItemStack(Items.IRON_SWORD));
-        TartaricForgeRecipeRegistry.registerRecipe(new ItemStack(ModItems.SENTIENT_AXE), 0, 0, new ItemStack(ModItems.SOUL_GEM), new ItemStack(Items.IRON_AXE));
-        TartaricForgeRecipeRegistry.registerRecipe(new ItemStack(ModItems.SENTIENT_PICKAXE), 0, 0, new ItemStack(ModItems.SOUL_GEM), new ItemStack(Items.IRON_PICKAXE));
-        TartaricForgeRecipeRegistry.registerRecipe(new ItemStack(ModItems.SENTIENT_SHOVEL), 0, 0, new ItemStack(ModItems.SOUL_GEM), new ItemStack(Items.IRON_SHOVEL));
-        TartaricForgeRecipeRegistry.registerRecipe(new ItemStack(ModItems.SENTIENT_BOW), 70, 0, new ItemStack(Items.BOW), new ItemStack(ModItems.SOUL_GEM, 1, 1), "string", "string");
-        TartaricForgeRecipeRegistry.registerRecipe(new ItemStack(ModItems.ARCANE_ASHES), 0, 0, "dustRedstone", "dyeWhite", "gunpowder", Items.COAL);
+        TartaricForgeRecipeRegistry.registerRecipe(new ItemStack(RegistrarBloodMagicItems.SOUL_GEM), 1, 1, "dustRedstone", "ingotGold", "blockGlass", "dyeBlue");
+        TartaricForgeRecipeRegistry.registerRecipe(new ItemStack(RegistrarBloodMagicItems.SOUL_GEM, 1, 1), 60, 20, new ItemStack(RegistrarBloodMagicItems.SOUL_GEM), "gemDiamond", "blockRedstone", "blockLapis");
+        TartaricForgeRecipeRegistry.registerRecipe(new ItemStack(RegistrarBloodMagicItems.SOUL_GEM, 1, 2), 240, 50, new ItemStack(RegistrarBloodMagicItems.SOUL_GEM, 1, 1), "gemDiamond", "blockGold", new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 2));
+        TartaricForgeRecipeRegistry.registerRecipe(new ItemStack(RegistrarBloodMagicItems.SOUL_GEM, 1, 3), 1000, 100, new ItemStack(RegistrarBloodMagicItems.SOUL_GEM, 1, 2), new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 3), new ItemStack(RegistrarBloodMagicItems.BLOOD_SHARD), ItemDemonCrystal.getStack(ItemDemonCrystal.CRYSTAL_DEFAULT));
+        TartaricForgeRecipeRegistry.registerRecipe(new ItemStack(RegistrarBloodMagicItems.SOUL_GEM, 1, 4), 4000, 500, new ItemStack(RegistrarBloodMagicItems.SOUL_GEM, 1, 3), Items.NETHER_STAR);
+        TartaricForgeRecipeRegistry.registerRecipe(new ItemStack(RegistrarBloodMagicItems.SENTIENT_SWORD), 0, 0, new ItemStack(RegistrarBloodMagicItems.SOUL_GEM), new ItemStack(Items.IRON_SWORD));
+        TartaricForgeRecipeRegistry.registerRecipe(new ItemStack(RegistrarBloodMagicItems.SENTIENT_AXE), 0, 0, new ItemStack(RegistrarBloodMagicItems.SOUL_GEM), new ItemStack(Items.IRON_AXE));
+        TartaricForgeRecipeRegistry.registerRecipe(new ItemStack(RegistrarBloodMagicItems.SENTIENT_PICKAXE), 0, 0, new ItemStack(RegistrarBloodMagicItems.SOUL_GEM), new ItemStack(Items.IRON_PICKAXE));
+        TartaricForgeRecipeRegistry.registerRecipe(new ItemStack(RegistrarBloodMagicItems.SENTIENT_SHOVEL), 0, 0, new ItemStack(RegistrarBloodMagicItems.SOUL_GEM), new ItemStack(Items.IRON_SHOVEL));
+        TartaricForgeRecipeRegistry.registerRecipe(new ItemStack(RegistrarBloodMagicItems.SENTIENT_BOW), 70, 0, new ItemStack(Items.BOW), new ItemStack(RegistrarBloodMagicItems.SOUL_GEM, 1, 1), "string", "string");
+        TartaricForgeRecipeRegistry.registerRecipe(new ItemStack(RegistrarBloodMagicItems.ARCANE_ASHES), 0, 0, "dustRedstone", "dyeWhite", "gunpowder", Items.COAL);
         TartaricForgeRecipeRegistry.registerRecipe(ItemComponent.getStack(ItemComponent.REAGENT_WATER), 10, 3, new ItemStack(Items.SUGAR), new ItemStack(Items.WATER_BUCKET), new ItemStack(Items.WATER_BUCKET));
         TartaricForgeRecipeRegistry.registerRecipe(ItemComponent.getStack(ItemComponent.REAGENT_LAVA), 32, 10, Items.LAVA_BUCKET, "dustRedstone", "cobblestone", "blockCoal");
         TartaricForgeRecipeRegistry.registerRecipe(ItemComponent.getStack(ItemComponent.REAGENT_VOID), 64, 10, Items.BUCKET, "string", "string", "gunpowder");
         TartaricForgeRecipeRegistry.registerRecipe(ItemComponent.getStack(ItemComponent.REAGENT_GROWTH), 128, 20, "treeSapling", "treeSapling", "sugarcane", Items.SUGAR);
         TartaricForgeRecipeRegistry.registerRecipe(ItemComponent.getStack(ItemComponent.REAGENT_AIR), 128, 20, Items.GHAST_TEAR, "feather", "feather");
-        TartaricForgeRecipeRegistry.registerRecipe(ItemComponent.getStack(ItemComponent.REAGENT_SIGHT), 64, 0, ModItems.SIGIL_DIVINATION, "blockGlass", "blockGlass", "dustGlowstone");
+        TartaricForgeRecipeRegistry.registerRecipe(ItemComponent.getStack(ItemComponent.REAGENT_SIGHT), 64, 0, RegistrarBloodMagicItems.SIGIL_DIVINATION, "blockGlass", "blockGlass", "dustGlowstone");
         TartaricForgeRecipeRegistry.registerRecipe(ItemComponent.getStack(ItemComponent.REAGENT_HOLDING), 64, 20, "chestWood", "leather", "string", "string");
         TartaricForgeRecipeRegistry.registerRecipe(ItemComponent.getStack(ItemComponent.REAGENT_FASTMINER), 128, 10, Items.IRON_PICKAXE, Items.IRON_AXE, Items.IRON_SHOVEL, Items.GUNPOWDER);
-        TartaricForgeRecipeRegistry.registerRecipe(ItemComponent.getStack(ItemComponent.REAGENT_AFFINITY), 300, 30, ModItems.SIGIL_WATER, ModItems.SIGIL_AIR, ModItems.SIGIL_LAVA, Blocks.OBSIDIAN);
-        TartaricForgeRecipeRegistry.registerRecipe(ItemComponent.getStack(ItemComponent.REAGENT_SUPPRESSION), 500, 50, ModBlocks.TELEPOSER, Items.WATER_BUCKET, Items.LAVA_BUCKET, Items.BLAZE_ROD);
+        TartaricForgeRecipeRegistry.registerRecipe(ItemComponent.getStack(ItemComponent.REAGENT_AFFINITY), 300, 30, RegistrarBloodMagicItems.SIGIL_WATER, RegistrarBloodMagicItems.SIGIL_AIR, RegistrarBloodMagicItems.SIGIL_LAVA, Blocks.OBSIDIAN);
+        TartaricForgeRecipeRegistry.registerRecipe(ItemComponent.getStack(ItemComponent.REAGENT_SUPPRESSION), 500, 50, RegistrarBloodMagicBlocks.TELEPOSER, Items.WATER_BUCKET, Items.LAVA_BUCKET, Items.BLAZE_ROD);
         TartaricForgeRecipeRegistry.registerRecipe(ItemComponent.getStack(ItemComponent.REAGENT_BINDING), 400, 10, "dustGlowstone", "dustRedstone", "nuggetGold", Items.GUNPOWDER);
         TartaricForgeRecipeRegistry.registerRecipe(ItemComponent.getStack(ItemComponent.REAGENT_BLOODLIGHT), 300, 10, "glowstone", Blocks.TORCH, "dustRedstone", "dustRedstone");
         TartaricForgeRecipeRegistry.registerRecipe(ItemComponent.getStack(ItemComponent.REAGENT_MAGNETISM), 600, 10, "string", "ingotGold", "blockIron", "ingotGold");
@@ -366,31 +362,31 @@ public class ModRecipes
         TartaricForgeRecipeRegistry.registerRecipe(ItemComponent.getStack(ItemComponent.REAGENT_BRIDGE), 600, 50, Blocks.SOUL_SAND, Blocks.SOUL_SAND, "stone", Blocks.OBSIDIAN);
         TartaricForgeRecipeRegistry.registerRecipe(ItemComponent.getStack(ItemComponent.REAGENT_SEVERANCE), 800, 70, Items.ENDER_EYE, Items.ENDER_PEARL, "ingotGold", "ingotGold");
         TartaricForgeRecipeRegistry.registerRecipe(ItemComponent.getStack(ItemComponent.REAGENT_COMPRESSION), 2000, 200, "blockIron", "blockGold", Blocks.OBSIDIAN, "cobblestone");
-        TartaricForgeRecipeRegistry.registerRecipe(ItemComponent.getStack(ItemComponent.REAGENT_TELEPOSITION), 1500, 200, ModBlocks.TELEPOSER, "glowstone", "blockRedstone", "ingotGold");
-        TartaricForgeRecipeRegistry.registerRecipe(ItemComponent.getStack(ItemComponent.REAGENT_TRANSPOSITION), 1500, 200, ModBlocks.TELEPOSER, "gemDiamond", Items.ENDER_PEARL, Blocks.OBSIDIAN);
+        TartaricForgeRecipeRegistry.registerRecipe(ItemComponent.getStack(ItemComponent.REAGENT_TELEPOSITION), 1500, 200, RegistrarBloodMagicBlocks.TELEPOSER, "glowstone", "blockRedstone", "ingotGold");
+        TartaricForgeRecipeRegistry.registerRecipe(ItemComponent.getStack(ItemComponent.REAGENT_TRANSPOSITION), 1500, 200, RegistrarBloodMagicBlocks.TELEPOSER, "gemDiamond", Items.ENDER_PEARL, Blocks.OBSIDIAN);
         TartaricForgeRecipeRegistry.registerRecipe(ItemComponent.getStack(ItemComponent.REAGENT_CLAW), 800, 120, Items.FLINT, Items.FLINT, ItemCuttingFluid.getStack(ItemCuttingFluid.BASIC));
         TartaricForgeRecipeRegistry.registerRecipe(ItemComponent.getStack(ItemComponent.REAGENT_BOUNCE), 200, 20, Blocks.SLIME_BLOCK, Blocks.SLIME_BLOCK, Items.LEATHER, "string");
         TartaricForgeRecipeRegistry.registerRecipe(ItemComponent.getStack(ItemComponent.REAGENT_FROST), 80, 10, Blocks.ICE, Items.SNOWBALL, Items.SNOWBALL, "dustRedstone");
 
-        TartaricForgeRecipeRegistry.registerRecipe(new ItemStack(ModItems.SENTIENT_ARMOUR_GEM), 240, 150, Items.DIAMOND_CHESTPLATE, new ItemStack(ModItems.SOUL_GEM, 1, 1), Blocks.IRON_BLOCK, Blocks.OBSIDIAN);
+        TartaricForgeRecipeRegistry.registerRecipe(new ItemStack(RegistrarBloodMagicItems.SENTIENT_ARMOUR_GEM), 240, 150, Items.DIAMOND_CHESTPLATE, new ItemStack(RegistrarBloodMagicItems.SOUL_GEM, 1, 1), Blocks.IRON_BLOCK, Blocks.OBSIDIAN);
 
-        TartaricForgeRecipeRegistry.registerRecipe(ItemComponent.getStack(ItemComponent.COMPONENT_FRAME_PART), 400, 10, "blockGlass", "stone", new ItemStack(ModItems.SLATE));
-        TartaricForgeRecipeRegistry.registerRecipe(new ItemStack(ModItems.NODE_ROUTER), 400, 5, "stickWood", new ItemStack(ModItems.SLATE, 1, 1), "gemLapis", "gemLapis");
-        TartaricForgeRecipeRegistry.registerRecipe(new ItemStack(ModBlocks.ITEM_ROUTING_NODE), 400, 5, "dustGlowstone", "dustRedstone", "blockGlass", "stone");
-        TartaricForgeRecipeRegistry.registerRecipe(new ItemStack(ModBlocks.OUTPUT_ROUTING_NODE), 400, 25, "dustGlowstone", "dustRedstone", "ingotIron", new ItemStack(ModBlocks.ITEM_ROUTING_NODE));
-        TartaricForgeRecipeRegistry.registerRecipe(new ItemStack(ModBlocks.INPUT_ROUTING_NODE), 400, 25, "dustGlowstone", "dustRedstone", "ingotGold", new ItemStack(ModBlocks.ITEM_ROUTING_NODE));
-        TartaricForgeRecipeRegistry.registerRecipe(new ItemStack(ModBlocks.MASTER_ROUTING_NODE), 400, 200, "blockIron", "gemDiamond", new ItemStack(ModItems.SLATE, 1, 2));
+        TartaricForgeRecipeRegistry.registerRecipe(ItemComponent.getStack(ItemComponent.COMPONENT_FRAME_PART), 400, 10, "blockGlass", "stone", new ItemStack(RegistrarBloodMagicItems.SLATE));
+        TartaricForgeRecipeRegistry.registerRecipe(new ItemStack(RegistrarBloodMagicItems.NODE_ROUTER), 400, 5, "stickWood", new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 1), "gemLapis", "gemLapis");
+        TartaricForgeRecipeRegistry.registerRecipe(new ItemStack(RegistrarBloodMagicBlocks.ITEM_ROUTING_NODE), 400, 5, "dustGlowstone", "dustRedstone", "blockGlass", "stone");
+        TartaricForgeRecipeRegistry.registerRecipe(new ItemStack(RegistrarBloodMagicBlocks.OUTPUT_ROUTING_NODE), 400, 25, "dustGlowstone", "dustRedstone", "ingotIron", new ItemStack(RegistrarBloodMagicBlocks.ITEM_ROUTING_NODE));
+        TartaricForgeRecipeRegistry.registerRecipe(new ItemStack(RegistrarBloodMagicBlocks.INPUT_ROUTING_NODE), 400, 25, "dustGlowstone", "dustRedstone", "ingotGold", new ItemStack(RegistrarBloodMagicBlocks.ITEM_ROUTING_NODE));
+        TartaricForgeRecipeRegistry.registerRecipe(new ItemStack(RegistrarBloodMagicBlocks.MASTER_ROUTING_NODE), 400, 200, "blockIron", "gemDiamond", new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 2));
 
-        TartaricForgeRecipeRegistry.registerRecipe(new ItemStack(ModBlocks.DEMON_CRYSTAL, 1, 0), 1200, 100, ItemDemonCrystal.getStack(ItemDemonCrystal.CRYSTAL_DEFAULT), ItemDemonCrystal.getStack(ItemDemonCrystal.CRYSTAL_DEFAULT), ItemDemonCrystal.getStack(ItemDemonCrystal.CRYSTAL_DEFAULT), ItemDemonCrystal.getStack(ItemDemonCrystal.CRYSTAL_DEFAULT));
-        TartaricForgeRecipeRegistry.registerRecipe(new ItemStack(ModBlocks.DEMON_CRYSTAL, 1, 1), 1200, 100, ItemDemonCrystal.getStack(ItemDemonCrystal.CRYSTAL_CORROSIVE), ItemDemonCrystal.getStack(ItemDemonCrystal.CRYSTAL_CORROSIVE), ItemDemonCrystal.getStack(ItemDemonCrystal.CRYSTAL_CORROSIVE), ItemDemonCrystal.getStack(ItemDemonCrystal.CRYSTAL_CORROSIVE));
-        TartaricForgeRecipeRegistry.registerRecipe(new ItemStack(ModBlocks.DEMON_CRYSTAL, 1, 2), 1200, 100, ItemDemonCrystal.getStack(ItemDemonCrystal.CRYSTAL_DESTRUCTIVE), ItemDemonCrystal.getStack(ItemDemonCrystal.CRYSTAL_DESTRUCTIVE), ItemDemonCrystal.getStack(ItemDemonCrystal.CRYSTAL_DESTRUCTIVE), ItemDemonCrystal.getStack(ItemDemonCrystal.CRYSTAL_DESTRUCTIVE));
-        TartaricForgeRecipeRegistry.registerRecipe(new ItemStack(ModBlocks.DEMON_CRYSTAL, 1, 3), 1200, 100, ItemDemonCrystal.getStack(ItemDemonCrystal.CRYSTAL_VENGEFUL), ItemDemonCrystal.getStack(ItemDemonCrystal.CRYSTAL_VENGEFUL), ItemDemonCrystal.getStack(ItemDemonCrystal.CRYSTAL_VENGEFUL), ItemDemonCrystal.getStack(ItemDemonCrystal.CRYSTAL_VENGEFUL));
-        TartaricForgeRecipeRegistry.registerRecipe(new ItemStack(ModBlocks.DEMON_CRYSTAL, 1, 4), 1200, 100, ItemDemonCrystal.getStack(ItemDemonCrystal.CRYSTAL_STEADFAST), ItemDemonCrystal.getStack(ItemDemonCrystal.CRYSTAL_STEADFAST), ItemDemonCrystal.getStack(ItemDemonCrystal.CRYSTAL_STEADFAST), ItemDemonCrystal.getStack(ItemDemonCrystal.CRYSTAL_STEADFAST));
+        TartaricForgeRecipeRegistry.registerRecipe(new ItemStack(RegistrarBloodMagicBlocks.DEMON_CRYSTAL, 1, 0), 1200, 100, ItemDemonCrystal.getStack(ItemDemonCrystal.CRYSTAL_DEFAULT), ItemDemonCrystal.getStack(ItemDemonCrystal.CRYSTAL_DEFAULT), ItemDemonCrystal.getStack(ItemDemonCrystal.CRYSTAL_DEFAULT), ItemDemonCrystal.getStack(ItemDemonCrystal.CRYSTAL_DEFAULT));
+        TartaricForgeRecipeRegistry.registerRecipe(new ItemStack(RegistrarBloodMagicBlocks.DEMON_CRYSTAL, 1, 1), 1200, 100, ItemDemonCrystal.getStack(ItemDemonCrystal.CRYSTAL_CORROSIVE), ItemDemonCrystal.getStack(ItemDemonCrystal.CRYSTAL_CORROSIVE), ItemDemonCrystal.getStack(ItemDemonCrystal.CRYSTAL_CORROSIVE), ItemDemonCrystal.getStack(ItemDemonCrystal.CRYSTAL_CORROSIVE));
+        TartaricForgeRecipeRegistry.registerRecipe(new ItemStack(RegistrarBloodMagicBlocks.DEMON_CRYSTAL, 1, 2), 1200, 100, ItemDemonCrystal.getStack(ItemDemonCrystal.CRYSTAL_DESTRUCTIVE), ItemDemonCrystal.getStack(ItemDemonCrystal.CRYSTAL_DESTRUCTIVE), ItemDemonCrystal.getStack(ItemDemonCrystal.CRYSTAL_DESTRUCTIVE), ItemDemonCrystal.getStack(ItemDemonCrystal.CRYSTAL_DESTRUCTIVE));
+        TartaricForgeRecipeRegistry.registerRecipe(new ItemStack(RegistrarBloodMagicBlocks.DEMON_CRYSTAL, 1, 3), 1200, 100, ItemDemonCrystal.getStack(ItemDemonCrystal.CRYSTAL_VENGEFUL), ItemDemonCrystal.getStack(ItemDemonCrystal.CRYSTAL_VENGEFUL), ItemDemonCrystal.getStack(ItemDemonCrystal.CRYSTAL_VENGEFUL), ItemDemonCrystal.getStack(ItemDemonCrystal.CRYSTAL_VENGEFUL));
+        TartaricForgeRecipeRegistry.registerRecipe(new ItemStack(RegistrarBloodMagicBlocks.DEMON_CRYSTAL, 1, 4), 1200, 100, ItemDemonCrystal.getStack(ItemDemonCrystal.CRYSTAL_STEADFAST), ItemDemonCrystal.getStack(ItemDemonCrystal.CRYSTAL_STEADFAST), ItemDemonCrystal.getStack(ItemDemonCrystal.CRYSTAL_STEADFAST), ItemDemonCrystal.getStack(ItemDemonCrystal.CRYSTAL_STEADFAST));
 
-        TartaricForgeRecipeRegistry.registerRecipe(new ItemStack(ModBlocks.DEMON_CRUCIBLE), 400, 100, Items.CAULDRON, "stone", "gemLapis", "gemDiamond");
-        TartaricForgeRecipeRegistry.registerRecipe(new ItemStack(ModBlocks.DEMON_PYLON), 400, 50, "blockIron", "stone", "gemLapis", ModItems.ITEM_DEMON_CRYSTAL);
-        TartaricForgeRecipeRegistry.registerRecipe(new ItemStack(ModBlocks.DEMON_CRYSTALLIZER), 500, 100, ModBlocks.SOUL_FORGE, "stone", "gemLapis", "blockGlass");
-        TartaricForgeRecipeRegistry.registerRecipe(new ItemStack(ModItems.DEMON_WILL_GAUGE), 400, 50, "ingotGold", "dustRedstone", "blockGlass", ModItems.ITEM_DEMON_CRYSTAL);
+        TartaricForgeRecipeRegistry.registerRecipe(new ItemStack(RegistrarBloodMagicBlocks.DEMON_CRUCIBLE), 400, 100, Items.CAULDRON, "stone", "gemLapis", "gemDiamond");
+        TartaricForgeRecipeRegistry.registerRecipe(new ItemStack(RegistrarBloodMagicBlocks.DEMON_PYLON), 400, 50, "blockIron", "stone", "gemLapis", RegistrarBloodMagicItems.ITEM_DEMON_CRYSTAL);
+        TartaricForgeRecipeRegistry.registerRecipe(new ItemStack(RegistrarBloodMagicBlocks.DEMON_CRYSTALLIZER), 500, 100, RegistrarBloodMagicBlocks.SOUL_FORGE, "stone", "gemLapis", "blockGlass");
+        TartaricForgeRecipeRegistry.registerRecipe(new ItemStack(RegistrarBloodMagicItems.DEMON_WILL_GAUGE), 400, 50, "ingotGold", "dustRedstone", "blockGlass", RegistrarBloodMagicItems.ITEM_DEMON_CRYSTAL);
     }
 
     public static void addAlchemyTableRecipes()
@@ -436,11 +432,11 @@ public class ModRecipes
         AlchemyTableRecipeRegistry.registerRecipe(ItemComponent.getStack(ItemComponent.NEURO_TOXIN), 1000, 100, 2, new ItemStack(Items.FISH, 1, 3));
         AlchemyTableRecipeRegistry.registerRecipe(ItemComponent.getStack(ItemComponent.ANTISEPTIC, 2), 1000, 200, 2, ItemComponent.getStack(ItemComponent.PLANT_OIL), "nuggetGold", "cropWheat", Items.SUGAR, Blocks.BROWN_MUSHROOM, Blocks.RED_MUSHROOM);
 
-        AlchemyTableRecipeRegistry.registerRecipe(ItemLivingArmourPointsUpgrade.getStack(ItemLivingArmourPointsUpgrade.DRAFT_ANGELUS), 20000, 400, 3, ItemComponent.getStack(ItemComponent.NEURO_TOXIN), ItemComponent.getStack(ItemComponent.ANTISEPTIC), "dustGold", Items.FERMENTED_SPIDER_EYE, new ItemStack(ModItems.BLOOD_SHARD, 1, 0), Items.GHAST_TEAR);
+        AlchemyTableRecipeRegistry.registerRecipe(ItemLivingArmourPointsUpgrade.getStack(ItemLivingArmourPointsUpgrade.DRAFT_ANGELUS), 20000, 400, 3, ItemComponent.getStack(ItemComponent.NEURO_TOXIN), ItemComponent.getStack(ItemComponent.ANTISEPTIC), "dustGold", Items.FERMENTED_SPIDER_EYE, new ItemStack(RegistrarBloodMagicItems.BLOOD_SHARD, 1, 0), Items.GHAST_TEAR);
 
-        AlchemyTableRecipeRegistry.registerRecipe(new AlchemyTableDyeableRecipe(0, 100, 0, new ItemStack(ModItems.SIGIL_HOLDING)));
+        AlchemyTableRecipeRegistry.registerRecipe(new AlchemyTableDyeableRecipe(0, 100, 0, new ItemStack(RegistrarBloodMagicItems.SIGIL_HOLDING)));
 
-        AlchemyTableRecipeRegistry.registerRecipe(new ItemStack(ModItems.POTION_FLASK), 1000, 200, 2, new ItemStack(Items.POTIONITEM), "cropNetherWart", "dustRedstone", "dustGlowstone");
+        AlchemyTableRecipeRegistry.registerRecipe(new ItemStack(RegistrarBloodMagicItems.POTION_FLASK), 1000, 200, 2, new ItemStack(Items.POTIONITEM), "cropNetherWart", "dustRedstone", "dustGlowstone");
         AlchemyTableRecipeRegistry.registerRecipe(ItemComponent.getStack(ItemComponent.CATALYST_LENGTH_1), 1000, 100, 2, "gunpowder", "cropNetherWart", "gemLapis");
         AlchemyTableRecipeRegistry.registerRecipe(ItemComponent.getStack(ItemComponent.CATALYST_POWER_1), 1000, 100, 2, "gunpowder", "cropNetherWart", "dustRedstone");
     }
@@ -484,11 +480,11 @@ public class ModRecipes
         addPotionRecipe(1000, 1, new ItemStack(Items.REDSTONE), new PotionEffect(MobEffects.HASTE, 2 * 60 * 20));
         addPotionRecipe(1000, 1, new ItemStack(Items.GLASS_BOTTLE), new PotionEffect(MobEffects.INVISIBILITY, 2 * 60 * 20));
         addPotionRecipe(1000, 1, new ItemStack(Items.POISONOUS_POTATO), new PotionEffect(MobEffects.SATURATION, 1));
-        addPotionRecipe(1000, 1, new ItemStack(ModItems.BLOOD_SHARD, 1, 0), new PotionEffect(MobEffects.HEALTH_BOOST, 2 * 60 * 20));
-        addPotionRecipe(1000, 1, new ItemStack(Blocks.SLIME_BLOCK), new PotionEffect(ModPotions.bounce, 2 * 60 * 20));
-        addPotionRecipe(1000, 1, new ItemStack(Items.STRING), new PotionEffect(ModPotions.cling, 2 * 60 * 20));
+        addPotionRecipe(1000, 1, new ItemStack(RegistrarBloodMagicItems.BLOOD_SHARD, 1, 0), new PotionEffect(MobEffects.HEALTH_BOOST, 2 * 60 * 20));
+        addPotionRecipe(1000, 1, new ItemStack(Blocks.SLIME_BLOCK), new PotionEffect(RegistrarBloodMagic.BOUNCE, 2 * 60 * 20));
+        addPotionRecipe(1000, 1, new ItemStack(Items.STRING), new PotionEffect(RegistrarBloodMagic.CLING, 2 * 60 * 20));
 
-        addPotionRecipe(1000, 1, new ItemStack(Items.BEETROOT), new PotionEffect(ModPotions.deafness, 450));
+        addPotionRecipe(1000, 1, new ItemStack(Items.BEETROOT), new PotionEffect(RegistrarBloodMagic.DEAFNESS, 450));
 
 //        AlchemyTableRecipeRegistry.registerRecipe(new AlchemyTablePotionRecipe(5000, 100, 4, new ItemStack(Blocks.SLIME_BLOCK), new PotionEffect(ModPotions.bounce, 15 * 60 * 20)));
 //        AlchemyTableRecipeRegistry.registerRecipe(new AlchemyTablePotionRecipe(5000, 100, 4, new ItemStack("string"), new PotionEffect(ModPotions.bounce, 15 * 60 * 20)));
@@ -572,34 +568,192 @@ public class ModRecipes
         switch (tier)
         {
         case 0:
-            LivingArmourDowngradeRecipeRegistry.registerRecipe(upgrade, stack, "ingotIron", new ItemStack(ModItems.SLATE, 1, 0));
+            LivingArmourDowngradeRecipeRegistry.registerRecipe(upgrade, stack, "ingotIron", new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 0));
             break;
         case 1:
-            LivingArmourDowngradeRecipeRegistry.registerRecipe(upgrade, stack, "dustRedstone", "dustRedstone", "ingotIron", new ItemStack(ModItems.SLATE, 1, 0));
+            LivingArmourDowngradeRecipeRegistry.registerRecipe(upgrade, stack, "dustRedstone", "dustRedstone", "ingotIron", new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 0));
             break;
         case 2:
-            LivingArmourDowngradeRecipeRegistry.registerRecipe(upgrade, stack, "ingotGold", "gemLapis", "gemLapis", new ItemStack(ModItems.SLATE, 1, 1));
+            LivingArmourDowngradeRecipeRegistry.registerRecipe(upgrade, stack, "ingotGold", "gemLapis", "gemLapis", new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 1));
             break;
         case 3:
-            LivingArmourDowngradeRecipeRegistry.registerRecipe(upgrade, stack, Blocks.VINE, "dyeRed", Items.GOLDEN_CARROT, new ItemStack(ModItems.SLATE, 1, 1));
+            LivingArmourDowngradeRecipeRegistry.registerRecipe(upgrade, stack, Blocks.VINE, "dyeRed", Items.GOLDEN_CARROT, new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 1));
             break;
         case 4:
-            LivingArmourDowngradeRecipeRegistry.registerRecipe(upgrade, stack, Items.GOLDEN_APPLE, "treeSapling", "treeSapling", new ItemStack(ModItems.SLATE, 1, 2));
+            LivingArmourDowngradeRecipeRegistry.registerRecipe(upgrade, stack, Items.GOLDEN_APPLE, "treeSapling", "treeSapling", new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 2));
             break;
         case 5:
-            LivingArmourDowngradeRecipeRegistry.registerRecipe(upgrade, stack, Blocks.IRON_BLOCK, Blocks.REDSTONE_BLOCK, new ItemStack(ModItems.SLATE, 1, 2));
+            LivingArmourDowngradeRecipeRegistry.registerRecipe(upgrade, stack, Blocks.IRON_BLOCK, Blocks.REDSTONE_BLOCK, new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 2));
             break;
         case 6:
-            LivingArmourDowngradeRecipeRegistry.registerRecipe(upgrade, stack, Blocks.IRON_BLOCK, Blocks.GLOWSTONE, "ingotGold", "ingotGold", new ItemStack(ModItems.SLATE, 1, 3));
+            LivingArmourDowngradeRecipeRegistry.registerRecipe(upgrade, stack, Blocks.IRON_BLOCK, Blocks.GLOWSTONE, "ingotGold", "ingotGold", new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 3));
             break;
         case 7:
-            LivingArmourDowngradeRecipeRegistry.registerRecipe(upgrade, stack, Blocks.GOLD_BLOCK, Blocks.LAPIS_BLOCK, "gemDiamond", new ItemStack(ModItems.SLATE, 1, 3));
+            LivingArmourDowngradeRecipeRegistry.registerRecipe(upgrade, stack, Blocks.GOLD_BLOCK, Blocks.LAPIS_BLOCK, "gemDiamond", new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 3));
             break;
         case 8:
-            LivingArmourDowngradeRecipeRegistry.registerRecipe(upgrade, stack, Items.DRAGON_BREATH, "gemDiamond", new ItemStack(ModItems.SLATE, 1, 4));
+            LivingArmourDowngradeRecipeRegistry.registerRecipe(upgrade, stack, Items.DRAGON_BREATH, "gemDiamond", new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 4));
             break;
         case 9:
-            LivingArmourDowngradeRecipeRegistry.registerRecipe(upgrade, stack, Items.NETHER_STAR, "gemDiamond", "gemDiamond", new ItemStack(ModItems.SLATE, 1, 4));
+            LivingArmourDowngradeRecipeRegistry.registerRecipe(upgrade, stack, Items.NETHER_STAR, "gemDiamond", "gemDiamond", new ItemStack(RegistrarBloodMagicItems.SLATE, 1, 4));
+        }
+    }
+
+    private static final Gson GSON = new GsonBuilder().setPrettyPrinting().create();
+    private static File RECIPE_DIR = null;
+    private static final Set<String> USED_OD_NAMES = new TreeSet<>();
+
+    private static void setupDir() {
+        if (RECIPE_DIR == null) {
+            RECIPE_DIR = ConfigHandler.config.getConfigFile().toPath().resolve("../recipes/").toFile();
+        }
+
+        if (!RECIPE_DIR.exists()) {
+            RECIPE_DIR.mkdir();
+        }
+    }
+
+    private static void addShapedRecipe(ItemStack result, Object... components) {
+        setupDir();
+
+        // GameRegistry.addShapedRecipe(result, components);
+
+        Map<String, Object> json = new HashMap<>();
+
+        List<String> pattern = new ArrayList<>();
+        int i = 0;
+        while (i < components.length && components[i] instanceof String) {
+            pattern.add((String) components[i]);
+            i++;
+        }
+        json.put("pattern", pattern);
+
+        boolean isOreDict = false;
+        Map<String, Map<String, Object>> key = new HashMap<>();
+        Character curKey = null;
+        for (; i < components.length; i++) {
+            Object o = components[i];
+            if (o instanceof Character) {
+                if (curKey != null)
+                    throw new IllegalArgumentException("Provided two char keys in a row");
+                curKey = (Character) o;
+            } else {
+                if (curKey == null)
+                    throw new IllegalArgumentException("Providing object without a char key");
+                if (o instanceof String)
+                    isOreDict = true;
+                key.put(Character.toString(curKey), serializeItem(o));
+                curKey = null;
+            }
+        }
+        json.put("key", key);
+        json.put("type", isOreDict ? "forge:ore_shaped" : "minecraft:crafting_shaped");
+        json.put("result", serializeItem(result));
+
+        // names the json the same name as the output's registry name
+        // repeatedly adds _alt if a file already exists
+        // janky I know but it works
+        String suffix = result.getItem().getHasSubtypes() ? "_" + result.getItemDamage() : "";
+        File f = new File(RECIPE_DIR, result.getItem().getRegistryName().getResourcePath() + suffix + ".json");
+
+        while (f.exists()) {
+            suffix += "_alt";
+            f = new File(RECIPE_DIR, result.getItem().getRegistryName().getResourcePath() + suffix + ".json");
+        }
+
+        try (FileWriter w = new FileWriter(f)) {
+            GSON.toJson(json, w);
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+    }
+
+    private static void addShapelessRecipe(ItemStack result, Object... components)
+    {
+        setupDir();
+
+        // addShapelessRecipe(result, components);
+
+        Map<String, Object> json = new HashMap<>();
+
+        boolean isOreDict = false;
+        List<Map<String, Object>> ingredients = new ArrayList<>();
+        for (Object o : components) {
+            if (o instanceof String)
+                isOreDict = true;
+            ingredients.add(serializeItem(o));
+        }
+        json.put("ingredients", ingredients);
+        json.put("type", isOreDict ? "forge:ore_shapeless" : "minecraft:crafting_shapeless");
+        json.put("result", serializeItem(result));
+
+        // names the json the same name as the output's registry name
+        // repeatedly adds _alt if a file already exists
+        // janky I know but it works
+        String suffix = result.getItem().getHasSubtypes() ? "_" + result.getItemDamage() : "";
+        File f = new File(RECIPE_DIR, result.getItem().getRegistryName().getResourcePath() + suffix + ".json");
+
+        while (f.exists()) {
+            suffix += "_alt";
+            f = new File(RECIPE_DIR, result.getItem().getRegistryName().getResourcePath() + suffix + ".json");
+        }
+
+
+        try (FileWriter w = new FileWriter(f)) {
+            GSON.toJson(json, w);
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+    }
+
+    private static Map<String, Object> serializeItem(Object thing) {
+        if (thing instanceof Item) {
+            return serializeItem(new ItemStack((Item) thing));
+        }
+        if (thing instanceof Block) {
+            return serializeItem(new ItemStack((Block) thing));
+        }
+        if (thing instanceof ItemStack) {
+            ItemStack stack = (ItemStack) thing;
+            Map<String, Object> ret = new HashMap<>();
+            ret.put("item", stack.getItem().getRegistryName().toString());
+            if (stack.getItem().getHasSubtypes() || stack.getItemDamage() != 0) {
+                ret.put("data", stack.getItemDamage());
+            }
+            if (stack.getCount() > 1) {
+                ret.put("count", stack.getCount());
+            }
+
+            if (stack.hasTagCompound()) {
+                throw new IllegalArgumentException("nbt not implemented");
+            }
+
+            return ret;
+        }
+        if (thing instanceof String) {
+            Map<String, Object> ret = new HashMap<>();
+            USED_OD_NAMES.add((String) thing);
+            ret.put("item", "#" + ((String) thing).toUpperCase(Locale.ROOT));
+            return ret;
+        }
+
+        throw new IllegalArgumentException("Not a block, item, stack, or od name");
+    }
+
+    private static void generateConstants() {
+        List<Map<String, Object>> json = new ArrayList<>();
+        for (String s : USED_OD_NAMES) {
+            Map<String, Object> entry = new HashMap<>();
+            entry.put("name", s.toUpperCase(Locale.ROOT));
+            entry.put("ingredient", ImmutableMap.of("type", "forge:ore_dict", "ore", s));
+            json.add(entry);
+        }
+
+        try (FileWriter w = new FileWriter(new File(RECIPE_DIR, "_constants.json"))) {
+            GSON.toJson(json, w);
+        } catch (IOException e) {
+            e.printStackTrace();
+     
         }
     }
 }
diff --git a/src/main/java/WayofTime/bloodmagic/registry/RegistrarBloodMagic.java b/src/main/java/WayofTime/bloodmagic/registry/RegistrarBloodMagic.java
new file mode 100644
index 00000000..9d73e45f
--- /dev/null
+++ b/src/main/java/WayofTime/bloodmagic/registry/RegistrarBloodMagic.java
@@ -0,0 +1,130 @@
+package WayofTime.bloodmagic.registry;
+
+import WayofTime.bloodmagic.BloodMagic;
+import WayofTime.bloodmagic.api.orb.BloodOrb;
+import WayofTime.bloodmagic.api.registry.OrbRegistry;
+import WayofTime.bloodmagic.entity.mob.*;
+import WayofTime.bloodmagic.entity.projectile.*;
+import WayofTime.bloodmagic.potion.PotionBloodMagic;
+import net.minecraft.client.renderer.block.model.ModelResourceLocation;
+import net.minecraft.init.MobEffects;
+import net.minecraft.potion.Potion;
+import net.minecraft.util.ResourceLocation;
+import net.minecraftforge.client.model.ModelLoader;
+import net.minecraftforge.event.RegistryEvent;
+import net.minecraftforge.fml.common.Mod;
+import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
+import net.minecraftforge.fml.common.registry.EntityEntry;
+import net.minecraftforge.fml.common.registry.EntityRegistry;
+import net.minecraftforge.fml.common.registry.GameRegistry;
+import net.minecraftforge.registries.IForgeRegistry;
+import net.minecraftforge.registries.RegistryBuilder;
+
+@Mod.EventBusSubscriber(modid = BloodMagic.MODID)
+@GameRegistry.ObjectHolder(BloodMagic.MODID)
+public class RegistrarBloodMagic {
+
+    @GameRegistry.ObjectHolder("weak")
+    public static final BloodOrb ORB_WEAK = new BloodOrb("", 0, 0);
+    @GameRegistry.ObjectHolder("apprentice")
+    public static final BloodOrb ORB_APPRENTICE = new BloodOrb("", 0, 0);
+    @GameRegistry.ObjectHolder("magician")
+    public static final BloodOrb ORB_MAGICIAN = new BloodOrb("", 0, 0);
+    @GameRegistry.ObjectHolder("master")
+    public static final BloodOrb ORB_MASTER = new BloodOrb("", 0, 0);
+    @GameRegistry.ObjectHolder("archmage")
+    public static final BloodOrb ORB_ARCHMAGE = new BloodOrb("", 0, 0);
+    @GameRegistry.ObjectHolder("transcendent")
+    public static final BloodOrb ORB_TRANSCENDENT = new BloodOrb("", 0, 0);
+
+    public static final Potion BOOST = MobEffects.HASTE;
+    public static final Potion WHIRLWIND = MobEffects.HASTE;
+    public static final Potion PLANAR_BINDING = MobEffects.HASTE;
+    public static final Potion SOUL_SNARE = MobEffects.HASTE;
+    public static final Potion SOUL_FRAY = MobEffects.HASTE;
+    public static final Potion FIRE_FUSE = MobEffects.HASTE;
+    public static final Potion CONSTRICT = MobEffects.HASTE;
+    public static final Potion PLANT_LEECH = MobEffects.HASTE;
+    public static final Potion DEAFNESS = MobEffects.HASTE;
+    public static final Potion BOUNCE = MobEffects.HASTE;
+    public static final Potion CLING = MobEffects.HASTE;
+    public static final Potion SACRIFICIAL_LAMB = MobEffects.HASTE;
+
+    public static IForgeRegistry<BloodOrb> BLOOD_ORBS = null;
+
+    @SubscribeEvent
+    public static void registerBloodOrbs(RegistryEvent.Register<BloodOrb> event) {
+        event.getRegistry().registerAll(
+                new BloodOrb("weak", 1, 5000).setRegistryName("weak"),
+                new BloodOrb("apprentice", 2, 25000).setRegistryName("apprentice"),
+                new BloodOrb("magician", 3, 150000).setRegistryName("magician"),
+                new BloodOrb("master", 4, 1000000).setRegistryName("master"),
+                new BloodOrb("archmage", 5, 10000000).setRegistryName("archmage"),
+                new BloodOrb("transcendent", 6, 30000000).setRegistryName("transcendent")
+        );
+    }
+
+    @SubscribeEvent
+    public static void registerPotions(RegistryEvent.Register<Potion> event) {
+        event.getRegistry().registerAll(
+                new PotionBloodMagic("Boost", false, 0xFFFFFF, 0, 1).setRegistryName("boost"),
+                new PotionBloodMagic("Planar Binding", false, 0, 2, 0).setRegistryName("planar_binding"),
+                new PotionBloodMagic("Soul Snare", false, 0xFFFFFF, 3, 0).setRegistryName("soul_snare"),
+                new PotionBloodMagic("Soul Fray", true, 0xFFFFFF, 4, 0).setRegistryName("soul_fray"),
+                new PotionBloodMagic("Fire Fuse", true, 0xFF3333, 5, 0).setRegistryName("fire_fuse"),
+                new PotionBloodMagic("Constriction", true, 0x000000, 6, 0).setRegistryName("constriction"),
+                new PotionBloodMagic("Plant Leech", true, 0x000000, 7, 0).setRegistryName("plant_leech"),
+                new PotionBloodMagic("Deaf", true, 0x000000, 0, 1).setRegistryName("deafness"),
+                new PotionBloodMagic("Bounce", false, 0x000000, 1, 1).setRegistryName("bounce"),
+                new PotionBloodMagic("Cling", false, 0x000000, 2, 1).setRegistryName("cling"),
+                new PotionBloodMagic("S. Lamb", false, 0x000000, 3, 1).setRegistryName("sacrificial_lamb")
+        );
+    }
+
+    @SubscribeEvent
+    public static void registerEntities(RegistryEvent.Register<EntityEntry> event) {
+        int entities = 0;
+        EntityRegistry.registerModEntity(new ResourceLocation(BloodMagic.MODID, "BloodLight"), EntityBloodLight.class, "BloodLight", ++entities, BloodMagic.instance, 16*4, 3, true);
+        EntityRegistry.registerModEntity(new ResourceLocation(BloodMagic.MODID, "SoulSnare"), EntitySoulSnare.class, "SoulSnare", ++entities, BloodMagic.instance, 16*4, 3, true);
+        EntityRegistry.registerModEntity(new ResourceLocation(BloodMagic.MODID, "SoulArrow"), EntitySentientArrow.class, "SoulArrow", ++entities, BloodMagic.instance, 16*4, 3, true);
+        EntityRegistry.registerModEntity(new ResourceLocation(BloodMagic.MODID, "Meteor"), EntityMeteor.class, "Meteor", ++entities, BloodMagic.instance, 16*4, 3, true);
+        EntityRegistry.registerModEntity(new ResourceLocation(BloodMagic.MODID, "SentientSpecter"), EntitySentientSpecter.class, "SentientSpecter", ++entities, BloodMagic.instance, 16*4, 3, true);
+        EntityRegistry.registerModEntity(new ResourceLocation(BloodMagic.MODID, "Mimic"), EntityMimic.class, "Mimic", ++entities, BloodMagic.instance, 16*4, 3, true);
+        EntityRegistry.registerModEntity(new ResourceLocation(BloodMagic.MODID, "CorruptedZombie"), EntityCorruptedZombie.class, "CorruptedZombie", ++entities, BloodMagic.instance, 16*4, 3, true);
+        EntityRegistry.registerModEntity(new ResourceLocation(BloodMagic.MODID, "CorruptedSheep"), EntityCorruptedSheep.class, "CorruptedSheep", ++entities, BloodMagic.instance, 16*4, 3, true);
+        EntityRegistry.registerModEntity(new ResourceLocation(BloodMagic.MODID, "CorruptedChicken"), EntityCorruptedChicken.class, "CorruptedChicken", ++entities, BloodMagic.instance, 16*4, 3, true);
+        EntityRegistry.registerModEntity(new ResourceLocation(BloodMagic.MODID, "CorruptedSpider"), EntityCorruptedSpider.class, "CorruptedSpider", ++entities, BloodMagic.instance, 16*4, 3, true);
+    }
+
+    @SubscribeEvent
+    public static void onRegistryCreation(RegistryEvent.NewRegistry event) {
+        BLOOD_ORBS = new RegistryBuilder<BloodOrb>()
+                .setName(new ResourceLocation(BloodMagic.MODID, "blood_orb"))
+                .setIDRange(0, Short.MAX_VALUE)
+                .setType(BloodOrb.class)
+                .addCallback((IForgeRegistry.AddCallback<BloodOrb>) (owner, stage, id, obj, oldObj) -> OrbRegistry.tierMap.put(obj.getTier(), OrbRegistry.getOrbStack(obj)))
+                .create();
+    }
+
+    @SubscribeEvent
+    public static void registerModels() {
+        for (BloodOrb orb : BLOOD_ORBS) {
+            ModelResourceLocation modelLocation = orb.getModelLocation();
+            if (modelLocation == null)
+                modelLocation = new ModelResourceLocation(orb.getRegistryName(), "inventory");
+
+            ModelLoader.registerItemVariants(RegistrarBloodMagicItems.BLOOD_ORB, modelLocation);
+        }
+
+        ModelLoader.setCustomMeshDefinition(RegistrarBloodMagicItems.BLOOD_ORB, stack -> {
+            if (!stack.hasTagCompound())
+                return new ModelResourceLocation(ORB_WEAK.getRegistryName(), "inventory");
+
+            BloodOrb orb = BLOOD_ORBS.getValue(new ResourceLocation(stack.getTagCompound().getString("orb")));
+            if (orb == null || orb.getModelLocation() == null)
+                return new ModelResourceLocation(ORB_WEAK.getRegistryName(), "inventory");
+
+            return orb.getModelLocation();
+        });
+    }
+}
diff --git a/src/main/java/WayofTime/bloodmagic/registry/RegistrarBloodMagicBlocks.java b/src/main/java/WayofTime/bloodmagic/registry/RegistrarBloodMagicBlocks.java
new file mode 100644
index 00000000..0b2bee5c
--- /dev/null
+++ b/src/main/java/WayofTime/bloodmagic/registry/RegistrarBloodMagicBlocks.java
@@ -0,0 +1,189 @@
+package WayofTime.bloodmagic.registry;
+
+import WayofTime.bloodmagic.api.BloodMagicAPI;
+import WayofTime.bloodmagic.block.*;
+import com.google.common.collect.Sets;
+import net.minecraft.block.Block;
+import net.minecraft.block.material.Material;
+import net.minecraft.init.Blocks;
+import net.minecraftforge.event.RegistryEvent;
+import net.minecraftforge.fluids.FluidRegistry;
+import net.minecraftforge.fml.common.Mod;
+import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
+import net.minecraftforge.fml.common.registry.GameRegistry;
+import WayofTime.bloodmagic.BloodMagic;
+import WayofTime.bloodmagic.block.enums.EnumDemonBlock1;
+import WayofTime.bloodmagic.block.enums.EnumDemonBlock2;
+import WayofTime.bloodmagic.block.enums.EnumDemonBlock3;
+import WayofTime.bloodmagic.block.enums.EnumSubWillType;
+import WayofTime.bloodmagic.block.enums.EnumSubWillType1;
+import WayofTime.bloodmagic.block.enums.EnumSubWillType2;
+import WayofTime.bloodmagic.block.enums.EnumSubWillType3;
+import WayofTime.bloodmagic.block.enums.EnumWillWall;
+import WayofTime.bloodmagic.tile.TileAlchemyArray;
+import WayofTime.bloodmagic.tile.TileAlchemyTable;
+import WayofTime.bloodmagic.tile.TileAltar;
+import WayofTime.bloodmagic.tile.TileBloodTank;
+import WayofTime.bloodmagic.tile.TileDemonCrucible;
+import WayofTime.bloodmagic.tile.TileDemonCrystal;
+import WayofTime.bloodmagic.tile.TileDemonCrystallizer;
+import WayofTime.bloodmagic.tile.TileDemonPylon;
+import WayofTime.bloodmagic.tile.TileDimensionalPortal;
+import WayofTime.bloodmagic.tile.TileImperfectRitualStone;
+import WayofTime.bloodmagic.tile.TileIncenseAltar;
+import WayofTime.bloodmagic.tile.TileInversionPillar;
+import WayofTime.bloodmagic.tile.TileMasterRitualStone;
+import WayofTime.bloodmagic.tile.TileMimic;
+import WayofTime.bloodmagic.tile.TilePhantomBlock;
+import WayofTime.bloodmagic.tile.TileSoulForge;
+import WayofTime.bloodmagic.tile.TileSpectralBlock;
+import WayofTime.bloodmagic.tile.TileTeleposer;
+import WayofTime.bloodmagic.tile.routing.TileInputRoutingNode;
+import WayofTime.bloodmagic.tile.routing.TileItemRoutingNode;
+import WayofTime.bloodmagic.tile.routing.TileMasterRoutingNode;
+import WayofTime.bloodmagic.tile.routing.TileOutputRoutingNode;
+
+import java.util.Set;
+
+@Mod.EventBusSubscriber(modid = BloodMagic.MODID)
+@GameRegistry.ObjectHolder(BloodMagic.MODID)
+@SuppressWarnings("unused")
+public class RegistrarBloodMagicBlocks
+{
+    public static final Block ALTAR = Blocks.AIR;
+    public static final Block BLOOD_RUNE = Blocks.AIR;
+    public static final Block RITUAL_CONTROLLER = Blocks.AIR;
+    public static final Block RITUAL_STONE = Blocks.AIR;
+    public static final Block BLOOD_LIGHT = Blocks.AIR;
+    public static final Block TELEPOSER = Blocks.AIR;
+    public static final Block ALCHEMY_ARRAY = Blocks.AIR;
+    public static final Block SPECTRAL = Blocks.AIR;
+    public static final Block PHANTOM = Blocks.AIR;
+    public static final Block SOUL_FORGE = Blocks.AIR;
+    public static final Block INCENSE_ALTAR = Blocks.AIR;
+    public static final Block DEMON_CRUCIBLE = Blocks.AIR;
+    public static final Block DEMON_PYLON = Blocks.AIR;
+    public static final Block DEMON_CRYSTALLIZER = Blocks.AIR;
+    public static final Block DEMON_CRYSTAL = Blocks.AIR;
+    public static final Block ALCHEMY_TABLE = Blocks.AIR;
+    public static final Block LIFE_ESSENCE = Blocks.AIR;
+    public static final Block DECORATIVE_BRICK = Blocks.AIR;
+    public static final Block PATH = Blocks.AIR;
+    public static final Block MASTER_ROUTING_NODE = Blocks.AIR;
+    public static final Block INPUT_ROUTING_NODE = Blocks.AIR;
+    public static final Block OUTPUT_ROUTING_NODE = Blocks.AIR;
+    public static final Block ITEM_ROUTING_NODE = Blocks.AIR;
+    public static final Block DIMENSIONAL_PORTAL = Blocks.AIR;
+    public static final Block BLOOD_TANK = Blocks.AIR;
+    public static final Block MIMIC = Blocks.AIR;
+    public static final Block DEMON_BRICK_1 = Blocks.AIR;
+    public static final Block DEMON_BRICK_2 = Blocks.AIR;
+    public static final Block DEMON_EXTRAS = Blocks.AIR;
+    public static final Block DEMON_PILLAR_1 = Blocks.AIR;
+    public static final Block DEMON_PILLAR_2 = Blocks.AIR;
+    public static final Block DEMON_PILLAR_CAP_1 = Blocks.AIR;
+    public static final Block DEMON_PILLAR_CAP_2 = Blocks.AIR;
+    public static final Block DEMON_PILLAR_CAP_3 = Blocks.AIR;
+    public static final Block DEMON_LIGHT = Blocks.AIR;
+    public static final Block DEMON_WALL_1 = Blocks.AIR;
+    public static final Block DEMON_STAIRS_1 = Blocks.AIR;
+    public static final Block DEMON_STAIRS_2 = Blocks.AIR;
+    public static final Block DEMON_STAIRS_3 = Blocks.AIR;
+    public static final Block INVERSION_PILLAR = Blocks.AIR;
+    public static final Block INVERSION_PILLAR_END = Blocks.AIR;
+
+    static Set<Block> blocks;
+
+    @SubscribeEvent
+    public static void registerBlocks(RegistryEvent.Register<Block> event)
+    {
+        FluidRegistry.registerFluid(BlockLifeEssence.getLifeEssence());
+        FluidRegistry.addBucketForFluid(BlockLifeEssence.getLifeEssence());
+        
+        blocks = Sets.newHashSet(
+                new BlockAltar().setRegistryName("altar"),
+                new BlockBloodRune().setRegistryName("blood_rune"),
+                new BlockRitualController().setRegistryName("ritual_controller"),
+                new BlockRitualStone().setRegistryName("ritual_stone"),
+                new BlockBloodLight().setRegistryName("blood_light"),
+                new BlockTeleposer().setRegistryName("teleposer"),
+                new BlockAlchemyArray().setRegistryName("alchemy_array"),
+                new BlockSpectral().setRegistryName("spectral"),
+                new BlockPhantom().setRegistryName("phantom"),
+                new BlockSoulForge().setRegistryName("soul_forge"),
+                new BlockIncenseAltar().setRegistryName("incense_altar"),
+                new BlockDemonCrucible().setRegistryName("demon_crucible"),
+                new BlockDemonPylon().setRegistryName("demon_pylon"),
+                new BlockDemonCrystallizer().setRegistryName("demon_crystallizer"),
+                new BlockDemonCrystal().setRegistryName("demon_crystal"),
+                new BlockAlchemyTable().setRegistryName("alchemy_table"),
+                new BlockLifeEssence().setRegistryName("life_essence"),
+                new BlockDecorative().setRegistryName("decorative_brick"),
+                new BlockPath().setRegistryName("path"),
+                new BlockMasterRoutingNode().setRegistryName("master_routing_node"),
+                new BlockInputRoutingNode().setRegistryName("input_routing_node"),
+                new BlockOutputRoutingNode().setRegistryName("output_routing_node"),
+                new BlockItemRoutingNode().setRegistryName("item_routing_node"),
+                new BlockDimensionalPortal().setRegistryName("dimensional_portal"),
+                new BlockBloodTank().setRegistryName("blood_tank"),
+                new BlockMimic().setRegistryName("mimic"),
+                new BlockDemonBase<>("bricks1", EnumDemonBlock1.class).setRegistryName("demon_brick_1"),
+                new BlockDemonBase<>("bricks2", EnumDemonBlock2.class).setRegistryName("demon_brick_2"),
+                new BlockDemonBase<>("extras", EnumDemonBlock3.class).setRegistryName("demon_extras"),
+                new BlockDemonPillarBase<>("pillar1", Material.ROCK, EnumSubWillType.class).setRegistryName("demon_pillar_1"),
+                new BlockDemonPillarBase<>("pillar2", Material.ROCK, EnumSubWillType.class).setRegistryName("demon_pillar_2"),
+                new BlockDemonPillarCapBase<>("pillarCap1", Material.ROCK, EnumSubWillType1.class).setRegistryName("demon_pillar_cap_1"),
+                new BlockDemonPillarCapBase<>("pillarCap2", Material.ROCK, EnumSubWillType2.class).setRegistryName("demon_pillar_cap_2"),
+                new BlockDemonPillarCapBase<>("pillarCap3", Material.ROCK, EnumSubWillType3.class).setRegistryName("demon_pillar_cap_3"),
+                new BlockDemonLight().setRegistryName("demon_light"),
+                new BlockDemonWallBase<>("wall1", Material.ROCK, EnumWillWall.class).setRegistryName("demon_wall_1"),
+                new BlockDemonStairsBase<>("stairs1", Material.ROCK, EnumSubWillType1.class).setRegistryName("demon_stairs_1"),
+                new BlockDemonStairsBase<>("stairs2", Material.ROCK, EnumSubWillType2.class).setRegistryName("demon_stairs_2"),
+                new BlockDemonStairsBase<>("stairs3", Material.ROCK, EnumSubWillType3.class).setRegistryName("demon_stairs_3"),
+                new BlockInversionPillar().setRegistryName("inversion_pillar"),
+                new BlockInversionPillarEnd().setRegistryName("inversion_pillar_end")
+        );
+
+        event.getRegistry().registerAll(blocks.toArray(new Block[0]));
+
+        registerTiles();
+    }
+
+    private static void registerTiles()
+    {
+        GameRegistry.registerTileEntity(TileAltar.class, BloodMagic.MODID + ":" + TileAltar.class.getSimpleName());
+        GameRegistry.registerTileEntity(TileImperfectRitualStone.class, BloodMagic.MODID + ":" + TileImperfectRitualStone.class.getSimpleName());
+        GameRegistry.registerTileEntity(TileMasterRitualStone.class, BloodMagic.MODID + ":" + TileMasterRitualStone.class.getSimpleName());
+        GameRegistry.registerTileEntity(TileAlchemyArray.class, BloodMagic.MODID + ":" + TileAlchemyArray.class.getSimpleName());
+        GameRegistry.registerTileEntity(TileSpectralBlock.class, BloodMagic.MODID + ":" + TileSpectralBlock.class.getSimpleName());
+        GameRegistry.registerTileEntity(TilePhantomBlock.class, BloodMagic.MODID + ":" + TilePhantomBlock.class.getSimpleName());
+        GameRegistry.registerTileEntity(TileTeleposer.class, BloodMagic.MODID + ":" + TileTeleposer.class.getSimpleName());
+        GameRegistry.registerTileEntity(TileSoulForge.class, BloodMagic.MODID + ":" + TileSoulForge.class.getSimpleName());
+        GameRegistry.registerTileEntity(TileMasterRoutingNode.class, BloodMagic.MODID + ":" + TileMasterRoutingNode.class.getSimpleName());
+        GameRegistry.registerTileEntity(TileInputRoutingNode.class, BloodMagic.MODID + ":" + TileInputRoutingNode.class.getSimpleName());
+        GameRegistry.registerTileEntity(TileOutputRoutingNode.class, BloodMagic.MODID + ":" + TileOutputRoutingNode.class.getSimpleName());
+        GameRegistry.registerTileEntity(TileItemRoutingNode.class, BloodMagic.MODID + ":" + TileItemRoutingNode.class.getSimpleName());
+        GameRegistry.registerTileEntity(TileIncenseAltar.class, BloodMagic.MODID + ":" + TileIncenseAltar.class.getSimpleName());
+        GameRegistry.registerTileEntity(TileDemonCrucible.class, BloodMagic.MODID + ":" + TileDemonCrucible.class.getSimpleName());
+        GameRegistry.registerTileEntity(TileDemonPylon.class, BloodMagic.MODID + ":" + TileDemonPylon.class.getSimpleName());
+        GameRegistry.registerTileEntity(TileDemonCrystallizer.class, BloodMagic.MODID + ":" + TileDemonCrystallizer.class.getSimpleName());
+        GameRegistry.registerTileEntity(TileDemonCrystal.class, BloodMagic.MODID + ":" + TileDemonCrystal.class.getSimpleName());
+        GameRegistry.registerTileEntity(TileAlchemyTable.class, BloodMagic.MODID + ":" + TileAlchemyTable.class.getSimpleName());
+
+        GameRegistry.registerTileEntity(TileDimensionalPortal.class, BloodMagic.MODID + ":" + TileDimensionalPortal.class.getSimpleName());
+        GameRegistry.registerTileEntity(TileBloodTank.class, BloodMagic.MODID + ":" + TileBloodTank.class.getSimpleName());
+        GameRegistry.registerTileEntity(TileMimic.class, BloodMagic.MODID + ":" + TileMimic.class.getSimpleName());
+        GameRegistry.registerTileEntity(TileInversionPillar.class, BloodMagic.MODID + ":" + TileInversionPillar.class.getSimpleName());
+    }
+
+    public static void registerBlacklists() {
+        BloodMagicAPI.addToTeleposerBlacklist(INPUT_ROUTING_NODE);
+        BloodMagicAPI.addToTranspositionBlacklist(INPUT_ROUTING_NODE);
+        BloodMagicAPI.addToTeleposerBlacklist(OUTPUT_ROUTING_NODE);
+        BloodMagicAPI.addToTranspositionBlacklist(OUTPUT_ROUTING_NODE);
+        BloodMagicAPI.addToTeleposerBlacklist(ITEM_ROUTING_NODE);
+        BloodMagicAPI.addToTranspositionBlacklist(ITEM_ROUTING_NODE);
+        BloodMagicAPI.addToTeleposerBlacklist(DEMON_CRYSTAL);
+        BloodMagicAPI.addToTranspositionBlacklist(DEMON_CRYSTAL);
+    }
+}
diff --git a/src/main/java/WayofTime/bloodmagic/registry/RegistrarBloodMagicItems.java b/src/main/java/WayofTime/bloodmagic/registry/RegistrarBloodMagicItems.java
new file mode 100644
index 00000000..ed3fa1db
--- /dev/null
+++ b/src/main/java/WayofTime/bloodmagic/registry/RegistrarBloodMagicItems.java
@@ -0,0 +1,231 @@
+package WayofTime.bloodmagic.registry;
+
+import WayofTime.bloodmagic.block.IBMBlock;
+import WayofTime.bloodmagic.client.IVariantProvider;
+import com.google.common.collect.Sets;
+import net.minecraft.client.renderer.block.model.ModelResourceLocation;
+import net.minecraft.init.Items;
+import net.minecraft.inventory.EntityEquipmentSlot;
+import net.minecraft.item.Item;
+import net.minecraft.util.ResourceLocation;
+import net.minecraftforge.client.event.ModelRegistryEvent;
+import net.minecraftforge.client.model.ModelLoader;
+import net.minecraftforge.common.util.EnumHelper;
+import net.minecraftforge.event.RegistryEvent;
+import net.minecraftforge.fml.common.Mod;
+import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
+import net.minecraftforge.fml.common.registry.GameRegistry;
+import net.minecraftforge.fml.relauncher.Side;
+import net.minecraftforge.fml.relauncher.SideOnly;
+import WayofTime.bloodmagic.BloodMagic;
+import WayofTime.bloodmagic.item.*;
+import WayofTime.bloodmagic.item.alchemy.ItemCuttingFluid;
+import WayofTime.bloodmagic.item.alchemy.ItemLivingArmourPointsUpgrade;
+import WayofTime.bloodmagic.item.armour.ItemLivingArmour;
+import WayofTime.bloodmagic.item.armour.ItemSentientArmour;
+import WayofTime.bloodmagic.item.gear.ItemPackSacrifice;
+import WayofTime.bloodmagic.item.gear.ItemPackSelfSacrifice;
+import WayofTime.bloodmagic.item.routing.ItemFluidRouterFilter;
+import WayofTime.bloodmagic.item.routing.ItemNodeRouter;
+import WayofTime.bloodmagic.item.routing.ItemRouterFilter;
+import WayofTime.bloodmagic.item.sigil.*;
+import WayofTime.bloodmagic.item.soul.*;
+import org.apache.commons.lang3.tuple.Pair;
+
+import java.util.Set;
+
+@Mod.EventBusSubscriber(modid = BloodMagic.MODID)
+@GameRegistry.ObjectHolder(BloodMagic.MODID)
+@SuppressWarnings("unchecked")
+public class RegistrarBloodMagicItems
+{
+    public static final Item BLOOD_ORB = Items.AIR;
+    public static final Item ACTIVATION_CRYSTAL = Items.AIR;
+    public static final Item SLATE = Items.AIR;
+    public static final Item INSCRIPTION_TOOL = Items.AIR;
+    public static final Item SACRIFICIAL_DAGGER = Items.AIR;
+    public static final Item PACK_SELF_SACRIFICE = Items.AIR;
+    public static final Item PACK_SACRIFICE = Items.AIR;
+    public static final Item DAGGER_OF_SACRIFICE = Items.AIR;
+    public static final Item RITUAL_DIVINER = Items.AIR;
+    public static final Item RITUAL_READER = Items.AIR;
+    public static final Item LAVA_CRYSTAL = Items.AIR;
+    public static final Item BOUND_SWORD = Items.AIR;
+    public static final Item BOUND_PICKAXE = Items.AIR;
+    public static final Item BOUND_AXE = Items.AIR;
+    public static final Item BOUND_SHOVEL = Items.AIR;
+    public static final Item SIGIL_DIVINATION = Items.AIR;
+    public static final Item SIGIL_AIR = Items.AIR;
+    public static final Item SIGIL_WATER = Items.AIR;
+    public static final Item SIGIL_LAVA = Items.AIR;
+    public static final Item SIGIL_VOID = Items.AIR;
+    public static final Item SIGIL_GREEN_GROVE = Items.AIR;
+    public static final Item SIGIL_BLOOD_LIGHT = Items.AIR;
+    public static final Item SIGIL_ELEMENTAL_AFFINITY = Items.AIR;
+    public static final Item SIGIL_HASTE = Items.AIR;
+    public static final Item SIGIL_MAGNETISM = Items.AIR;
+    public static final Item SIGIL_SUPPRESSION = Items.AIR;
+    public static final Item SIGIL_FAST_MINER = Items.AIR;
+    public static final Item SIGIL_SEER = Items.AIR;
+    public static final Item SIGIL_ENDER_SEVERANCE = Items.AIR;
+    public static final Item SIGIL_WHIRLWIND = Items.AIR;
+    public static final Item SIGIL_PHANTOM_BRIDGE = Items.AIR;
+    public static final Item SIGIL_COMPRESSION = Items.AIR;
+    public static final Item SIGIL_HOLDING = Items.AIR;
+    public static final Item SIGIL_TELEPOSITION = Items.AIR;
+    public static final Item SIGIL_TRANSPOSITION = Items.AIR;
+    public static final Item SIGIL_CLAW = Items.AIR;
+    public static final Item SIGIL_BOUNCE = Items.AIR;
+    public static final Item SIGIL_FROST = Items.AIR;
+    public static final Item ITEM_COMPONENT = Items.AIR;
+    public static final Item ITEM_DEMON_CRYSTAL = Items.AIR;
+    public static final Item TELEPOSITION_FOCUS = Items.AIR;
+    public static final Item EXPERIENCE_TOME = Items.AIR;
+    public static final Item BLOOD_SHARD = Items.AIR;
+    public static final Item LIVING_ARMOUR_HELMET = Items.AIR;
+    public static final Item LIVING_ARMOUR_CHEST = Items.AIR;
+    public static final Item LIVING_ARMOUR_LEGS = Items.AIR;
+    public static final Item LIVING_ARMOUR_BOOTS = Items.AIR;
+    public static final Item SENTIENT_ARMOUR_HELMET = Items.AIR;
+    public static final Item SENTIENT_ARMOUR_CHEST = Items.AIR;
+    public static final Item SENTIENT_ARMOUR_LEGS = Items.AIR;
+    public static final Item SENTIENT_ARMOUR_BOOTS = Items.AIR;
+    public static final Item ALTAR_MAKER = Items.AIR;
+    public static final Item UPGRADE_TOME = Items.AIR;
+    public static final Item UPGRADE_TRAINER = Items.AIR;
+    public static final Item ARCANE_ASHES = Items.AIR;
+    public static final Item MONSTER_SOUL = Items.AIR;
+    public static final Item SOUL_GEM = Items.AIR;
+    public static final Item SOUL_SNARE = Items.AIR;
+    public static final Item SENTIENT_SWORD = Items.AIR;
+    public static final Item SENTIENT_BOW = Items.AIR;
+    public static final Item SENTIENT_ARMOUR_GEM = Items.AIR;
+    public static final Item SENTIENT_AXE = Items.AIR;
+    public static final Item SENTIENT_PICKAXE = Items.AIR;
+    public static final Item SENTIENT_SHOVEL = Items.AIR;
+    public static final Item NODE_ROUTER = Items.AIR;
+    public static final Item BASE_ITEM_FILTER = Items.AIR;
+    public static final Item BASE_FLUID_FILTER = Items.AIR;
+    public static final Item CUTTING_FLUID = Items.AIR;
+    public static final Item SANGUINE_BOOK = Items.AIR;
+    public static final Item ITEM_POINTS_UPGRADE = Items.AIR;
+    public static final Item DEMON_WILL_GAUGE = Items.AIR;
+    public static final Item POTION_FLASK = Items.AIR;
+
+    public static Item.ToolMaterial BOUND_TOOL_MATERIAL = EnumHelper.addToolMaterial("bound", 4, 1, 10, 8, 50);
+    public static Item.ToolMaterial SOUL_TOOL_MATERIAL = EnumHelper.addToolMaterial("demonic", 4, 520, 7, 8, 50);
+
+    private static Set<Item> items;
+
+    @SubscribeEvent
+    public static void registerItems(RegistryEvent.Register<Item> event)
+    {
+        items = Sets.newHashSet(
+                new ItemBloodOrb().setRegistryName("blood_orb"),
+                new ItemActivationCrystal().setRegistryName("activation_crystal"),
+                new ItemSlate().setRegistryName("slate"),
+                new ItemInscriptionTool().setRegistryName("inscription_tool"),
+                new ItemSacrificialDagger().setRegistryName("sacrificial_dagger"),
+                new ItemPackSacrifice().setRegistryName("sacrificial_pack"),
+                new ItemPackSelfSacrifice().setRegistryName("pack_of_sacrifice"),
+                new ItemDaggerOfSacrifice().setRegistryName("dagger_of_sacrifice"),
+                new ItemRitualDiviner().setRegistryName("ritual_diviner"),
+                new ItemRitualReader().setRegistryName("ritual_reader"),
+                new ItemLavaCrystal().setRegistryName("lava_crystal"),
+                new ItemBoundSword().setRegistryName("bound_sword"),
+                new ItemBoundPickaxe().setRegistryName("bound_pickaxe"),
+                new ItemBoundAxe().setRegistryName("bound_axe"),
+                new ItemBoundShovel().setRegistryName("bound_shovel"),
+                new ItemSigilDivination().setRegistryName("sigil_divination"),
+                new ItemSigilAir().setRegistryName("sigil_air"),
+                new ItemSigilWater().setRegistryName("sigil_water"),
+                new ItemSigilLava().setRegistryName("sigil_lava"),
+                new ItemSigilVoid().setRegistryName("sigil_void"),
+                new ItemSigilGreenGrove().setRegistryName("sigil_growth"),
+                new ItemSigilBloodLight().setRegistryName("sigil_light"),
+                new ItemSigilElementalAffinity().setRegistryName("sigil_elemental"),
+                new ItemSigilMagnetism().setRegistryName("sigil_magnetism"),
+                new ItemSigilSuppression().setRegistryName("sigil_suppression"),
+                new ItemSigilHaste().setRegistryName("sigil_haste"),
+                new ItemSigilFastMiner().setRegistryName("sigil_fast_miner"),
+                new ItemSigilSeer().setRegistryName("sigil_seer"),
+                new ItemSigilPhantomBridge().setRegistryName("sigil_bridge"),
+                new ItemSigilWhirlwind().setRegistryName("sigil_whirlwind"),
+                new ItemSigilCompression().setRegistryName("sigil_compression"),
+                new ItemSigilEnderSeverance().setRegistryName("sigil_severance"),
+                new ItemSigilHolding().setRegistryName("sigil_holding"),
+                new ItemSigilTeleposition().setRegistryName("sigil_teleposition"),
+                new ItemSigilTransposition().setRegistryName("sigil_transposition"),
+                new ItemSigilClaw().setRegistryName("sigil_claw"),
+                new ItemSigilBounce().setRegistryName("sigil_bounce"),
+                new ItemSigilFrost().setRegistryName("sigil_frost"),
+                new ItemComponent().setRegistryName("component"),
+                new ItemDemonCrystal().setRegistryName("demon_crystal"),
+                new ItemTelepositionFocus().setRegistryName("teleposition_focus"),
+                new ItemExperienceBook().setRegistryName("experience_book"),
+                new ItemBloodShard().setRegistryName("blood_shard"),
+                new ItemLivingArmour(EntityEquipmentSlot.HEAD).setRegistryName("living_helm"),
+                new ItemLivingArmour(EntityEquipmentSlot.CHEST).setRegistryName("living_chest"),
+                new ItemLivingArmour(EntityEquipmentSlot.LEGS).setRegistryName("living_leggings"),
+                new ItemLivingArmour(EntityEquipmentSlot.FEET).setRegistryName("living_boots"),
+                new ItemSentientArmour(EntityEquipmentSlot.HEAD).setRegistryName("sentient_helm"),
+                new ItemSentientArmour(EntityEquipmentSlot.CHEST).setRegistryName("sentient_chest"),
+                new ItemSentientArmour(EntityEquipmentSlot.LEGS).setRegistryName("sentient_leggings"),
+                new ItemSentientArmour(EntityEquipmentSlot.FEET).setRegistryName("sentient_boots"),
+                new ItemAltarMaker().setRegistryName("altar_maker"),
+                new ItemUpgradeTome().setRegistryName("upgrade_tome"),
+                new ItemUpgradeTrainer().setRegistryName("upgrade_trainer"),
+                new ItemArcaneAshes().setRegistryName("arcane_ashes"),
+                new ItemMonsterSoul().setRegistryName("monster_soul"),
+                new ItemSoulGem().setRegistryName("soul_gem"),
+                new ItemSoulSnare().setRegistryName("soul_snare"),
+                new ItemSentientSword().setRegistryName("sentient_sword"),
+                new ItemSentientBow().setRegistryName("sentient_bow"),
+                new ItemSentientArmourGem().setRegistryName("armour_gem"),
+                new ItemSentientAxe().setRegistryName("sentient_axe"),
+                new ItemSentientPickaxe().setRegistryName("sentient_pickaxe"),
+                new ItemSentientShovel().setRegistryName("sentient_shovel"),
+                new ItemNodeRouter().setRegistryName("node_router"),
+                new ItemRouterFilter().setRegistryName("router_filter"),
+                new ItemFluidRouterFilter().setRegistryName("fluid_router_filter"),
+                new ItemCuttingFluid().setRegistryName("cutting_fluid"),
+                new ItemSanguineBook().setRegistryName("sanguine_book"),
+                new ItemLivingArmourPointsUpgrade().setRegistryName("living_armor_point_upgrade"),
+                new ItemDemonWillGauge().setRegistryName("demon_will_gauge"),
+                new ItemPotionFlask().setRegistryName("potion_flask")
+        );
+
+        RegistrarBloodMagicBlocks.blocks.stream().filter(block -> block instanceof IBMBlock && ((IBMBlock) block).getItem() != null).forEach(block -> {
+            IBMBlock bmBlock = (IBMBlock) block;
+            items.add(bmBlock.getItem().setRegistryName(block.getRegistryName()));
+        });
+
+        event.getRegistry().registerAll(items.toArray(new Item[0]));
+    }
+
+    @SideOnly(Side.CLIENT)
+    @SubscribeEvent
+    public static void registerRenders(ModelRegistryEvent event)
+    {
+        items.stream().filter(i -> i instanceof IVariantProvider).forEach(item -> {
+            IVariantProvider variantProvider = (IVariantProvider) item;
+            for (Pair<Integer, String> variant : variantProvider.getVariants())
+                ModelLoader.setCustomModelResourceLocation(item, variant.getLeft(), new ModelResourceLocation(item.getRegistryName(), variant.getRight()));
+        });
+
+        RegistrarBloodMagicBlocks.blocks.stream().filter(i -> i instanceof IVariantProvider).forEach(block -> {
+            IVariantProvider variantProvider = (IVariantProvider) block;
+            for (Pair<Integer, String> variant : variantProvider.getVariants())
+                ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(block), variant.getLeft(), new ModelResourceLocation(block.getRegistryName(), variant.getRight()));
+        });
+
+        final ResourceLocation holdingLoc = new ResourceLocation("bloodmagic", "item/ItemSigilHolding");
+        ModelLoader.setCustomMeshDefinition(SIGIL_HOLDING, stack -> {
+            if (stack.hasTagCompound() && stack.getTagCompound().hasKey("color"))
+                return new ModelResourceLocation(holdingLoc, "type=color");
+            return new ModelResourceLocation(holdingLoc, "type=normal");
+        });
+        ModelLoader.registerItemVariants(SIGIL_HOLDING, new ModelResourceLocation(holdingLoc, "type=normal"));
+        ModelLoader.registerItemVariants(SIGIL_HOLDING, new ModelResourceLocation(holdingLoc, "type=color"));
+    }
+}
diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualAltarBuilder.java b/src/main/java/WayofTime/bloodmagic/ritual/RitualAltarBuilder.java
index 4a148a97..4855b98b 100644
--- a/src/main/java/WayofTime/bloodmagic/ritual/RitualAltarBuilder.java
+++ b/src/main/java/WayofTime/bloodmagic/ritual/RitualAltarBuilder.java
@@ -1,7 +1,7 @@
 package WayofTime.bloodmagic.ritual;
 
+import WayofTime.bloodmagic.BloodMagic;
 import WayofTime.bloodmagic.api.BlockStack;
-import WayofTime.bloodmagic.api.Constants;
 import WayofTime.bloodmagic.api.altar.AltarComponent;
 import WayofTime.bloodmagic.api.altar.EnumAltarComponent;
 import WayofTime.bloodmagic.api.altar.EnumAltarTier;
@@ -10,7 +10,7 @@ import WayofTime.bloodmagic.api.ritual.IMasterRitualStone;
 import WayofTime.bloodmagic.api.ritual.Ritual;
 import WayofTime.bloodmagic.api.ritual.RitualComponent;
 import WayofTime.bloodmagic.block.BlockBloodRune;
-import WayofTime.bloodmagic.registry.ModBlocks;
+import WayofTime.bloodmagic.registry.RegistrarBloodMagicBlocks;
 import WayofTime.bloodmagic.util.Utils;
 import net.minecraft.block.Block;
 import net.minecraft.entity.effect.EntityLightningBolt;
@@ -38,7 +38,7 @@ public class RitualAltarBuilder extends Ritual
 
     public RitualAltarBuilder()
     {
-        super("ritualAltarBuilder", 0, 450, "ritual." + Constants.Mod.MODID + ".altarBuilderRitual");
+        super("ritualAltarBuilder", 0, 450, "ritual." + BloodMagic.MODID + ".altarBuilderRitual");
     }
 
     @Override
@@ -61,9 +61,9 @@ public class RitualAltarBuilder extends Ritual
             altarComponentsIterator = new ArrayList<AltarComponent>(EnumAltarTier.SIX.getAltarComponents()).iterator();
         }
 
-        if (world.getBlockState(altarPos).getBlock().isReplaceable(world, altarPos) && hasItem(tileEntity, Item.getItemFromBlock(ModBlocks.ALTAR), 0, true))
+        if (world.getBlockState(altarPos).getBlock().isReplaceable(world, altarPos) && hasItem(tileEntity, Item.getItemFromBlock(RegistrarBloodMagicBlocks.ALTAR), 0, true))
         {
-            world.setBlockState(altarPos, ModBlocks.ALTAR.getDefaultState());
+            world.setBlockState(altarPos, RegistrarBloodMagicBlocks.ALTAR.getDefaultState());
             lightning(world, altarPos);
             masterRitualStone.getOwnerNetwork().syphon(getRefreshCost());
         }
@@ -290,7 +290,7 @@ public class RitualAltarBuilder extends Ritual
                     if (!itemHandler.getStackInSlot(i).isEmpty() && itemHandler.getStackInSlot(i).getItem() instanceof ItemBlock && !(Block.getBlockFromItem(itemHandler.getStackInSlot(i).getItem()) instanceof BlockBloodRune) && itemHandler.extractItem(i, 1, true) != null)
                     {
                         Block block = Block.getBlockFromItem(itemHandler.getStackInSlot(i).getItem());
-                        if (block != null && block != Blocks.GLOWSTONE && block != ModBlocks.BLOOD_STONE && block != ModBlocks.CRYSTAL)
+                        if (block != null && block != Blocks.GLOWSTONE && block != RegistrarBloodMagicBlocks.DECORATIVE_BRICK && block != RegistrarBloodMagicBlocks.CRYSTAL)
                         {
                             BlockStack blockStack = new BlockStack(block, itemHandler.getStackInSlot(i).getItemDamage());
                             itemHandler.extractItem(i, 1, false);
@@ -306,7 +306,7 @@ public class RitualAltarBuilder extends Ritual
                     if (!inv.getStackInSlot(i).isEmpty() && inv.getStackInSlot(i).getItem() instanceof ItemBlock && !(Block.getBlockFromItem(inv.getStackInSlot(i).getItem()) instanceof BlockBloodRune))
                     {
                         Block block = Block.getBlockFromItem(inv.getStackInSlot(i).getItem());
-                        if (block != Blocks.GLOWSTONE && block != ModBlocks.BLOOD_STONE && block != ModBlocks.CRYSTAL)
+                        if (block != Blocks.GLOWSTONE && block != RegistrarBloodMagicBlocks.DECORATIVE_BRICK && block != RegistrarBloodMagicBlocks.CRYSTAL)
                         {
                             BlockStack blockStack = new BlockStack(block, inv.getStackInSlot(i).getItemDamage());
                             inv.decrStackSize(i, 1);
diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualAnimalGrowth.java b/src/main/java/WayofTime/bloodmagic/ritual/RitualAnimalGrowth.java
index 525d0a93..f6c2b484 100644
--- a/src/main/java/WayofTime/bloodmagic/ritual/RitualAnimalGrowth.java
+++ b/src/main/java/WayofTime/bloodmagic/ritual/RitualAnimalGrowth.java
@@ -3,6 +3,7 @@ package WayofTime.bloodmagic.ritual;
 import java.util.ArrayList;
 import java.util.List;
 
+import WayofTime.bloodmagic.BloodMagic;
 import net.minecraft.entity.passive.EntityAnimal;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
@@ -14,7 +15,6 @@ import net.minecraft.util.text.ITextComponent;
 import net.minecraft.util.text.TextComponentTranslation;
 import net.minecraft.world.World;
 import net.minecraftforge.items.IItemHandler;
-import WayofTime.bloodmagic.api.Constants;
 import WayofTime.bloodmagic.api.ritual.AreaDescriptor;
 import WayofTime.bloodmagic.api.ritual.EnumRuneType;
 import WayofTime.bloodmagic.api.ritual.IMasterRitualStone;
@@ -40,7 +40,7 @@ public class RitualAnimalGrowth extends Ritual
 
     public RitualAnimalGrowth()
     {
-        super("ritualAnimalGrowth", 0, 10000, "ritual." + Constants.Mod.MODID + ".animalGrowthRitual");
+        super("ritualAnimalGrowth", 0, 10000, "ritual." + BloodMagic.MODID + ".animalGrowthRitual");
         addBlockRange(GROWTH_RANGE, new AreaDescriptor.Rectangle(new BlockPos(-2, 1, -2), 5, 2, 5));
         addBlockRange(CHEST_RANGE, new AreaDescriptor.Rectangle(new BlockPos(0, 1, 0), 1));
 
diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualArmourEvolve.java b/src/main/java/WayofTime/bloodmagic/ritual/RitualArmourEvolve.java
index caff98f0..0872e9bc 100644
--- a/src/main/java/WayofTime/bloodmagic/ritual/RitualArmourEvolve.java
+++ b/src/main/java/WayofTime/bloodmagic/ritual/RitualArmourEvolve.java
@@ -1,6 +1,6 @@
 package WayofTime.bloodmagic.ritual;
 
-import WayofTime.bloodmagic.api.Constants;
+import WayofTime.bloodmagic.BloodMagic;
 import WayofTime.bloodmagic.api.ritual.*;
 import WayofTime.bloodmagic.item.armour.ItemLivingArmour;
 import WayofTime.bloodmagic.livingArmour.LivingArmour;
@@ -20,7 +20,7 @@ public class RitualArmourEvolve extends Ritual
 
     public RitualArmourEvolve()
     {
-        super("ritualArmourEvolve", 0, 50000, "ritual." + Constants.Mod.MODID + ".armourEvolveRitual");
+        super("ritualArmourEvolve", 0, 50000, "ritual." + BloodMagic.MODID + ".armourEvolveRitual");
         addBlockRange(CHECK_RANGE, new AreaDescriptor.Rectangle(new BlockPos(0, 1, 0), 1, 2, 1));
     }
 
diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualCobblestone.java b/src/main/java/WayofTime/bloodmagic/ritual/RitualCobblestone.java
index 10f6a51f..0977427b 100644
--- a/src/main/java/WayofTime/bloodmagic/ritual/RitualCobblestone.java
+++ b/src/main/java/WayofTime/bloodmagic/ritual/RitualCobblestone.java
@@ -1,6 +1,6 @@
 package WayofTime.bloodmagic.ritual;
 
-import WayofTime.bloodmagic.api.Constants;
+import WayofTime.bloodmagic.BloodMagic;
 import WayofTime.bloodmagic.api.ritual.*;
 import WayofTime.bloodmagic.item.ItemComponent;
 import WayofTime.bloodmagic.tile.TileAlchemyArray;
@@ -19,7 +19,7 @@ public class RitualCobblestone extends Ritual
 
     public RitualCobblestone()
     {
-        super("ritualCobblestone", 0, 500, "ritual." + Constants.Mod.MODID + ".cobblestoneRitual");
+        super("ritualCobblestone", 0, 500, "ritual." + BloodMagic.MODID + ".cobblestoneRitual");
         addBlockRange(COBBLESTONE_RANGE, new AreaDescriptor.Cross(new BlockPos(0, 1, 0), 1));
     }
 
diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualContainment.java b/src/main/java/WayofTime/bloodmagic/ritual/RitualContainment.java
index 2ee8aa2f..250439a2 100644
--- a/src/main/java/WayofTime/bloodmagic/ritual/RitualContainment.java
+++ b/src/main/java/WayofTime/bloodmagic/ritual/RitualContainment.java
@@ -1,6 +1,6 @@
 package WayofTime.bloodmagic.ritual;
 
-import WayofTime.bloodmagic.api.Constants;
+import WayofTime.bloodmagic.BloodMagic;
 import WayofTime.bloodmagic.api.ritual.*;
 import WayofTime.bloodmagic.api.util.helper.PlayerHelper;
 import net.minecraft.entity.EntityLivingBase;
@@ -16,7 +16,7 @@ public class RitualContainment extends Ritual
 
     public RitualContainment()
     {
-        super("ritualContainment", 0, 2000, "ritual." + Constants.Mod.MODID + ".containmentRitual");
+        super("ritualContainment", 0, 2000, "ritual." + BloodMagic.MODID + ".containmentRitual");
         addBlockRange(CONTAINMENT_RANGE, new AreaDescriptor.Rectangle(new BlockPos(-3, 0, -3), 7));
         setMaximumVolumeAndDistanceOfRange(CONTAINMENT_RANGE, 0, 10, 10);
     }
diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualCrushing.java b/src/main/java/WayofTime/bloodmagic/ritual/RitualCrushing.java
index 4fa14bc1..1b1d752c 100644
--- a/src/main/java/WayofTime/bloodmagic/ritual/RitualCrushing.java
+++ b/src/main/java/WayofTime/bloodmagic/ritual/RitualCrushing.java
@@ -6,6 +6,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 
+import WayofTime.bloodmagic.BloodMagic;
 import net.minecraft.block.Block;
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.entity.player.EntityPlayer;
@@ -19,7 +20,6 @@ import net.minecraft.world.World;
 
 import org.apache.commons.lang3.tuple.Pair;
 
-import WayofTime.bloodmagic.api.Constants;
 import WayofTime.bloodmagic.api.compress.CompressionRegistry;
 import WayofTime.bloodmagic.api.recipe.AlchemyTableRecipe;
 import WayofTime.bloodmagic.api.registry.AlchemyTableRecipeRegistry;
@@ -30,7 +30,7 @@ import WayofTime.bloodmagic.api.ritual.Ritual;
 import WayofTime.bloodmagic.api.ritual.RitualComponent;
 import WayofTime.bloodmagic.api.soul.EnumDemonWillType;
 import WayofTime.bloodmagic.demonAura.WorldDemonWillHandler;
-import WayofTime.bloodmagic.registry.ModBlocks;
+import WayofTime.bloodmagic.registry.RegistrarBloodMagicBlocks;
 import WayofTime.bloodmagic.util.Utils;
 
 public class RitualCrushing extends Ritual
@@ -51,7 +51,7 @@ public class RitualCrushing extends Ritual
 
     public RitualCrushing()
     {
-        super("ritualCrushing", 0, 5000, "ritual." + Constants.Mod.MODID + ".crushingRitual");
+        super("ritualCrushing", 0, 5000, "ritual." + BloodMagic.MODID + ".crushingRitual");
         addBlockRange(CRUSHING_RANGE, new AreaDescriptor.Rectangle(new BlockPos(-1, -3, -1), 3));
         addBlockRange(CHEST_RANGE, new AreaDescriptor.Rectangle(new BlockPos(0, 1, 0), 1));
 
@@ -117,7 +117,7 @@ public class RitualCrushing extends Ritual
 
             IBlockState state = world.getBlockState(newPos);
             Block block = state.getBlock();
-            if (block.equals(ModBlocks.RITUAL_CONTROLLER) || block.equals(ModBlocks.RITUAL_STONE) || block.getBlockHardness(state, world, newPos) == -1.0F || Utils.isBlockLiquid(state))
+            if (block.equals(RegistrarBloodMagicBlocks.RITUAL_CONTROLLER) || block.equals(RegistrarBloodMagicBlocks.RITUAL_STONE) || block.getBlockHardness(state, world, newPos) == -1.0F || Utils.isBlockLiquid(state))
             {
                 continue;
             }
diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualCrystalHarvest.java b/src/main/java/WayofTime/bloodmagic/ritual/RitualCrystalHarvest.java
index 0aa5202c..797f5eed 100644
--- a/src/main/java/WayofTime/bloodmagic/ritual/RitualCrystalHarvest.java
+++ b/src/main/java/WayofTime/bloodmagic/ritual/RitualCrystalHarvest.java
@@ -2,11 +2,11 @@ package WayofTime.bloodmagic.ritual;
 
 import java.util.ArrayList;
 
+import WayofTime.bloodmagic.BloodMagic;
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
-import WayofTime.bloodmagic.api.Constants;
 import WayofTime.bloodmagic.api.ritual.AreaDescriptor;
 import WayofTime.bloodmagic.api.ritual.EnumRuneType;
 import WayofTime.bloodmagic.api.ritual.IMasterRitualStone;
@@ -20,7 +20,7 @@ public class RitualCrystalHarvest extends Ritual
 
     public RitualCrystalHarvest()
     {
-        super("ritualCrystalHarvest", 0, 40000, "ritual." + Constants.Mod.MODID + ".crystalHarvestRitual");
+        super("ritualCrystalHarvest", 0, 40000, "ritual." + BloodMagic.MODID + ".crystalHarvestRitual");
         addBlockRange(CRYSTAL_RANGE, new AreaDescriptor.Rectangle(new BlockPos(-3, 2, -3), 7, 5, 7));
 
         setMaximumVolumeAndDistanceOfRange(CRYSTAL_RANGE, 250, 5, 7);
diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualExpulsion.java b/src/main/java/WayofTime/bloodmagic/ritual/RitualExpulsion.java
index 1f746fa7..e0e30068 100644
--- a/src/main/java/WayofTime/bloodmagic/ritual/RitualExpulsion.java
+++ b/src/main/java/WayofTime/bloodmagic/ritual/RitualExpulsion.java
@@ -4,6 +4,7 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Random;
 
+import WayofTime.bloodmagic.BloodMagic;
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.entity.player.EntityPlayer;
@@ -17,7 +18,6 @@ import net.minecraft.world.World;
 import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.event.entity.living.EnderTeleportEvent;
 import net.minecraftforge.items.IItemHandler;
-import WayofTime.bloodmagic.api.Constants;
 import WayofTime.bloodmagic.api.iface.IBindable;
 import WayofTime.bloodmagic.api.ritual.AreaDescriptor;
 import WayofTime.bloodmagic.api.ritual.EnumRuneType;
@@ -35,7 +35,7 @@ public class RitualExpulsion extends Ritual
 
     public RitualExpulsion()
     {
-        super("ritualExpulsion", 0, 10000, "ritual." + Constants.Mod.MODID + ".expulsionRitual");
+        super("ritualExpulsion", 0, 10000, "ritual." + BloodMagic.MODID + ".expulsionRitual");
         addBlockRange(EXPULSION_RANGE, new AreaDescriptor.Rectangle(new BlockPos(-12, 0, -12), 25));
         setMaximumVolumeAndDistanceOfRange(EXPULSION_RANGE, 0, 12, 12);
     }
diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualFeatheredKnife.java b/src/main/java/WayofTime/bloodmagic/ritual/RitualFeatheredKnife.java
index 7f0b4e57..774a77c7 100644
--- a/src/main/java/WayofTime/bloodmagic/ritual/RitualFeatheredKnife.java
+++ b/src/main/java/WayofTime/bloodmagic/ritual/RitualFeatheredKnife.java
@@ -3,6 +3,7 @@ package WayofTime.bloodmagic.ritual;
 import java.util.ArrayList;
 import java.util.List;
 
+import WayofTime.bloodmagic.BloodMagic;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.inventory.EntityEquipmentSlot;
 import net.minecraft.item.ItemStack;
@@ -14,7 +15,6 @@ import net.minecraft.util.text.ITextComponent;
 import net.minecraft.util.text.TextComponentTranslation;
 import net.minecraft.world.World;
 import WayofTime.bloodmagic.ConfigHandler;
-import WayofTime.bloodmagic.api.Constants;
 import WayofTime.bloodmagic.api.altar.IBloodAltar;
 import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade;
 import WayofTime.bloodmagic.api.ritual.AreaDescriptor;
@@ -48,7 +48,7 @@ public class RitualFeatheredKnife extends Ritual
 
     public RitualFeatheredKnife()
     {
-        super("ritualFeatheredKnife", 0, 25000, "ritual." + Constants.Mod.MODID + ".featheredKnifeRitual");
+        super("ritualFeatheredKnife", 0, 25000, "ritual." + BloodMagic.MODID + ".featheredKnifeRitual");
         addBlockRange(ALTAR_RANGE, new AreaDescriptor.Rectangle(new BlockPos(-5, -10, -5), 11, 21, 11));
         addBlockRange(DAMAGE_RANGE, new AreaDescriptor.Rectangle(new BlockPos(-15, -20, -15), 31, 41, 31));
 
@@ -161,7 +161,7 @@ public class RitualFeatheredKnife extends Ritual
                         LivingArmour armour = ItemLivingArmour.getLivingArmour(chestStack);
                         if (armour != null)
                         {
-                            LivingArmourUpgrade upgrade = ItemLivingArmour.getUpgrade(Constants.Mod.MODID + ".upgrade.selfSacrifice", chestStack);
+                            LivingArmourUpgrade upgrade = ItemLivingArmour.getUpgrade(BloodMagic.MODID + ".upgrade.selfSacrifice", chestStack);
 
                             if (upgrade instanceof LivingArmourUpgradeSelfSacrifice)
                             {
diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualFelling.java b/src/main/java/WayofTime/bloodmagic/ritual/RitualFelling.java
index 69ccff60..fd8a1e74 100644
--- a/src/main/java/WayofTime/bloodmagic/ritual/RitualFelling.java
+++ b/src/main/java/WayofTime/bloodmagic/ritual/RitualFelling.java
@@ -1,11 +1,10 @@
 package WayofTime.bloodmagic.ritual;
 
-import WayofTime.bloodmagic.api.Constants;
+import WayofTime.bloodmagic.BloodMagic;
 import WayofTime.bloodmagic.api.ritual.*;
 import WayofTime.bloodmagic.util.Utils;
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.entity.item.EntityItem;
-import net.minecraft.inventory.IInventory;
 import net.minecraft.item.ItemStack;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.math.BlockPos;
@@ -31,7 +30,7 @@ public class RitualFelling extends Ritual
 
     public RitualFelling()
     {
-        super("ritualFelling", 0, 20000, "ritual." + Constants.Mod.MODID + ".fellingRitual");
+        super("ritualFelling", 0, 20000, "ritual." + BloodMagic.MODID + ".fellingRitual");
         addBlockRange(FELLING_RANGE, new AreaDescriptor.Rectangle(new BlockPos(-10, -3, -10), new BlockPos(11, 27, 11)));
         addBlockRange(CHEST_RANGE, new AreaDescriptor.Rectangle(new BlockPos(0, 1, 0), 1));
 
diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualForsakenSoul.java b/src/main/java/WayofTime/bloodmagic/ritual/RitualForsakenSoul.java
index 9d00ddca..32f20fe1 100644
--- a/src/main/java/WayofTime/bloodmagic/ritual/RitualForsakenSoul.java
+++ b/src/main/java/WayofTime/bloodmagic/ritual/RitualForsakenSoul.java
@@ -3,6 +3,7 @@ package WayofTime.bloodmagic.ritual;
 import java.util.ArrayList;
 import java.util.List;
 
+import WayofTime.bloodmagic.BloodMagic;
 import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.entity.passive.EntityAnimal;
 import net.minecraft.entity.player.EntityPlayer;
@@ -13,7 +14,6 @@ import net.minecraft.util.math.AxisAlignedBB;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
 import WayofTime.bloodmagic.ConfigHandler;
-import WayofTime.bloodmagic.api.Constants;
 import WayofTime.bloodmagic.api.ritual.AreaDescriptor;
 import WayofTime.bloodmagic.api.ritual.EnumRuneType;
 import WayofTime.bloodmagic.api.ritual.IMasterRitualStone;
@@ -36,7 +36,7 @@ public class RitualForsakenSoul extends Ritual
 
     public RitualForsakenSoul()
     {
-        super("ritualForsakenSoul", 0, 40000, "ritual." + Constants.Mod.MODID + ".forsakenSoulRitual");
+        super("ritualForsakenSoul", 0, 40000, "ritual." + BloodMagic.MODID + ".forsakenSoulRitual");
         addBlockRange(CRYSTAL_RANGE, new AreaDescriptor.Rectangle(new BlockPos(-3, 2, -3), 7, 5, 7));
         addBlockRange(DAMAGE_RANGE, new AreaDescriptor.Rectangle(new BlockPos(-10, -10, -10), 21));
 
diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualFullStomach.java b/src/main/java/WayofTime/bloodmagic/ritual/RitualFullStomach.java
index 3490031e..00d72cb5 100644
--- a/src/main/java/WayofTime/bloodmagic/ritual/RitualFullStomach.java
+++ b/src/main/java/WayofTime/bloodmagic/ritual/RitualFullStomach.java
@@ -1,6 +1,6 @@
 package WayofTime.bloodmagic.ritual;
 
-import WayofTime.bloodmagic.api.Constants;
+import WayofTime.bloodmagic.BloodMagic;
 import WayofTime.bloodmagic.api.ritual.*;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.inventory.IInventory;
@@ -22,7 +22,7 @@ public class RitualFullStomach extends Ritual
 
     public RitualFullStomach()
     {
-        super("ritualFullStomach", 0, 100000, "ritual." + Constants.Mod.MODID + ".fullStomachRitual");
+        super("ritualFullStomach", 0, 100000, "ritual." + BloodMagic.MODID + ".fullStomachRitual");
         addBlockRange(FILL_RANGE, new AreaDescriptor.Rectangle(new BlockPos(-25, -25, -25), 51));
         addBlockRange(CHEST_RANGE, new AreaDescriptor.Rectangle(new BlockPos(0, 1, 0), 1));
 
diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualGreenGrove.java b/src/main/java/WayofTime/bloodmagic/ritual/RitualGreenGrove.java
index 8ad1cfdd..0bd2cebf 100644
--- a/src/main/java/WayofTime/bloodmagic/ritual/RitualGreenGrove.java
+++ b/src/main/java/WayofTime/bloodmagic/ritual/RitualGreenGrove.java
@@ -4,6 +4,7 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Random;
 
+import WayofTime.bloodmagic.BloodMagic;
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockFarmland;
 import net.minecraft.block.IGrowable;
@@ -19,7 +20,6 @@ import net.minecraft.util.text.TextComponentTranslation;
 import net.minecraft.world.World;
 import net.minecraftforge.common.IPlantable;
 import WayofTime.bloodmagic.api.BloodMagicAPI;
-import WayofTime.bloodmagic.api.Constants;
 import WayofTime.bloodmagic.api.ritual.AreaDescriptor;
 import WayofTime.bloodmagic.api.ritual.EnumRuneType;
 import WayofTime.bloodmagic.api.ritual.IMasterRitualStone;
@@ -51,7 +51,7 @@ public class RitualGreenGrove extends Ritual
 
     public RitualGreenGrove()
     {
-        super("ritualGreenGrove", 0, 5000, "ritual." + Constants.Mod.MODID + ".greenGroveRitual");
+        super("ritualGreenGrove", 0, 5000, "ritual." + BloodMagic.MODID + ".greenGroveRitual");
         addBlockRange(GROW_RANGE, new AreaDescriptor.Rectangle(new BlockPos(-1, 2, -1), 3, 1, 3));
         addBlockRange(LEECH_RANGE, new AreaDescriptor.Rectangle(new BlockPos(0, 0, 0), 1));
         addBlockRange(HYDRATE_RANGE, new AreaDescriptor.Rectangle(new BlockPos(0, 0, 0), 1));
@@ -106,7 +106,7 @@ public class RitualGreenGrove extends Ritual
             IBlockState state = world.getBlockState(newPos);
             Block block = state.getBlock();
 
-            if (!BloodMagicAPI.getGreenGroveBlacklist().contains(block))
+            if (!BloodMagicAPI.greenGroveBlacklist.contains(block))
             {
                 if (block instanceof IPlantable || block instanceof IGrowable)
                 {
diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualHarvest.java b/src/main/java/WayofTime/bloodmagic/ritual/RitualHarvest.java
index fb5065de..abc6dea5 100644
--- a/src/main/java/WayofTime/bloodmagic/ritual/RitualHarvest.java
+++ b/src/main/java/WayofTime/bloodmagic/ritual/RitualHarvest.java
@@ -1,7 +1,7 @@
 package WayofTime.bloodmagic.ritual;
 
+import WayofTime.bloodmagic.BloodMagic;
 import WayofTime.bloodmagic.api.BlockStack;
-import WayofTime.bloodmagic.api.Constants;
 import WayofTime.bloodmagic.api.iface.IHarvestHandler;
 import WayofTime.bloodmagic.api.registry.HarvestRegistry;
 import WayofTime.bloodmagic.api.ritual.*;
@@ -27,7 +27,7 @@ public class RitualHarvest extends Ritual
 
     public RitualHarvest()
     {
-        super("ritualHarvest", 0, 20000, "ritual." + Constants.Mod.MODID + ".harvestRitual");
+        super("ritualHarvest", 0, 20000, "ritual." + BloodMagic.MODID + ".harvestRitual");
         addBlockRange(HARVEST_RANGE, new AreaDescriptor.Rectangle(new BlockPos(-4, 1, -4), 9, 5, 9));
         setMaximumVolumeAndDistanceOfRange(HARVEST_RANGE, 0, 15, 15);
     }
diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualInterdiction.java b/src/main/java/WayofTime/bloodmagic/ritual/RitualInterdiction.java
index a9965c40..57255109 100644
--- a/src/main/java/WayofTime/bloodmagic/ritual/RitualInterdiction.java
+++ b/src/main/java/WayofTime/bloodmagic/ritual/RitualInterdiction.java
@@ -1,6 +1,6 @@
 package WayofTime.bloodmagic.ritual;
 
-import WayofTime.bloodmagic.api.Constants;
+import WayofTime.bloodmagic.BloodMagic;
 import WayofTime.bloodmagic.api.ritual.*;
 import WayofTime.bloodmagic.api.util.helper.PlayerHelper;
 import net.minecraft.entity.EntityLivingBase;
@@ -16,7 +16,7 @@ public class RitualInterdiction extends Ritual
 
     public RitualInterdiction()
     {
-        super("ritualInterdiction", 0, 1000, "ritual." + Constants.Mod.MODID + ".interdictionRitual");
+        super("ritualInterdiction", 0, 1000, "ritual." + BloodMagic.MODID + ".interdictionRitual");
         addBlockRange(INTERDICTION_RANGE, new AreaDescriptor.Rectangle(new BlockPos(-2, 0, -2), 5));
         setMaximumVolumeAndDistanceOfRange(INTERDICTION_RANGE, 0, 10, 10);
     }
diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualJumping.java b/src/main/java/WayofTime/bloodmagic/ritual/RitualJumping.java
index e71dd53a..5cc64b52 100644
--- a/src/main/java/WayofTime/bloodmagic/ritual/RitualJumping.java
+++ b/src/main/java/WayofTime/bloodmagic/ritual/RitualJumping.java
@@ -1,6 +1,6 @@
 package WayofTime.bloodmagic.ritual;
 
-import WayofTime.bloodmagic.api.Constants;
+import WayofTime.bloodmagic.BloodMagic;
 import WayofTime.bloodmagic.api.ritual.*;
 import WayofTime.bloodmagic.util.Utils;
 import net.minecraft.entity.EntityLivingBase;
@@ -17,7 +17,7 @@ public class RitualJumping extends Ritual
 
     public RitualJumping()
     {
-        super("ritualJump", 0, 5000, "ritual." + Constants.Mod.MODID + ".jumpRitual");
+        super("ritualJump", 0, 5000, "ritual." + BloodMagic.MODID + ".jumpRitual");
         addBlockRange(JUMP_RANGE, new AreaDescriptor.Rectangle(new BlockPos(-1, 1, -1), 3, 1, 3));
         setMaximumVolumeAndDistanceOfRange(JUMP_RANGE, 0, 5, 5);
     }
diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualLava.java b/src/main/java/WayofTime/bloodmagic/ritual/RitualLava.java
index 22e688c9..2dbd107e 100644
--- a/src/main/java/WayofTime/bloodmagic/ritual/RitualLava.java
+++ b/src/main/java/WayofTime/bloodmagic/ritual/RitualLava.java
@@ -3,6 +3,7 @@ package WayofTime.bloodmagic.ritual;
 import java.util.ArrayList;
 import java.util.List;
 
+import WayofTime.bloodmagic.BloodMagic;
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.entity.player.EntityPlayer;
@@ -20,7 +21,6 @@ import net.minecraftforge.fluids.FluidStack;
 import net.minecraftforge.fluids.capability.CapabilityFluidHandler;
 import net.minecraftforge.fluids.capability.IFluidHandler;
 import WayofTime.bloodmagic.api.BloodMagicAPI;
-import WayofTime.bloodmagic.api.Constants;
 import WayofTime.bloodmagic.api.ritual.AreaDescriptor;
 import WayofTime.bloodmagic.api.ritual.EnumRuneType;
 import WayofTime.bloodmagic.api.ritual.IMasterRitualStone;
@@ -49,7 +49,7 @@ public class RitualLava extends Ritual
 
     public RitualLava()
     {
-        super("ritualLava", 0, 10000, "ritual." + Constants.Mod.MODID + ".lavaRitual");
+        super("ritualLava", 0, 10000, "ritual." + BloodMagic.MODID + ".lavaRitual");
         addBlockRange(LAVA_RANGE, new AreaDescriptor.Rectangle(new BlockPos(0, 1, 0), 1));
         addBlockRange(FIRE_FUSE_RANGE, new AreaDescriptor.Rectangle(new BlockPos(-2, -2, -2), 5));
         addBlockRange(FIRE_RESIST_RANGE, new AreaDescriptor.Rectangle(new BlockPos(0, 0, 0), 1));
@@ -231,7 +231,7 @@ public class RitualLava extends Ritual
 
                 if (!entity.isDead && entity.hurtTime <= 0 && Utils.isImmuneToFireDamage(entity))
                 {
-                    if (entity.attackEntityFrom(BloodMagicAPI.getDamageSource(), damage))
+                    if (entity.attackEntityFrom(BloodMagicAPI.damageSource, damage))
                     {
                         corrosiveDrained += corrosiveWillDrain;
                         corrosiveWill -= corrosiveWillDrain;
diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualLivingArmourDowngrade.java b/src/main/java/WayofTime/bloodmagic/ritual/RitualLivingArmourDowngrade.java
index e1d3fe8a..c6e26ab9 100644
--- a/src/main/java/WayofTime/bloodmagic/ritual/RitualLivingArmourDowngrade.java
+++ b/src/main/java/WayofTime/bloodmagic/ritual/RitualLivingArmourDowngrade.java
@@ -3,6 +3,7 @@ package WayofTime.bloodmagic.ritual;
 import java.util.ArrayList;
 import java.util.List;
 
+import WayofTime.bloodmagic.BloodMagic;
 import net.minecraft.entity.effect.EntityLightningBolt;
 import net.minecraft.entity.item.EntityItemFrame;
 import net.minecraft.entity.player.EntityPlayer;
@@ -16,7 +17,6 @@ import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.text.ITextComponent;
 import net.minecraft.world.World;
 import net.minecraftforge.items.IItemHandler;
-import WayofTime.bloodmagic.api.Constants;
 import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade;
 import WayofTime.bloodmagic.api.recipe.LivingArmourDowngradeRecipe;
 import WayofTime.bloodmagic.api.registry.LivingArmourDowngradeRecipeRegistry;
@@ -37,7 +37,7 @@ public class RitualLivingArmourDowngrade extends Ritual
 
     public RitualLivingArmourDowngrade()
     {
-        super("ritualDowngrade", 0, 10000, "ritual." + Constants.Mod.MODID + ".downgradeRitual");
+        super("ritualDowngrade", 0, 10000, "ritual." + BloodMagic.MODID + ".downgradeRitual");
         addBlockRange(DOWNGRADE_RANGE, new AreaDescriptor.Rectangle(new BlockPos(-3, 0, -3), 7));
     }
 
diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualMagnetic.java b/src/main/java/WayofTime/bloodmagic/ritual/RitualMagnetic.java
index 972b7157..ab176dc3 100644
--- a/src/main/java/WayofTime/bloodmagic/ritual/RitualMagnetic.java
+++ b/src/main/java/WayofTime/bloodmagic/ritual/RitualMagnetic.java
@@ -4,6 +4,7 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Map;
 
+import WayofTime.bloodmagic.BloodMagic;
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockOre;
 import net.minecraft.block.BlockRedstoneOre;
@@ -16,7 +17,6 @@ import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
 import net.minecraftforge.oredict.OreDictionary;
 import WayofTime.bloodmagic.api.BlockStack;
-import WayofTime.bloodmagic.api.Constants;
 import WayofTime.bloodmagic.api.ritual.AreaDescriptor;
 import WayofTime.bloodmagic.api.ritual.EnumRuneType;
 import WayofTime.bloodmagic.api.ritual.IMasterRitualStone;
@@ -35,7 +35,7 @@ public class RitualMagnetic extends Ritual
 
     public RitualMagnetic()
     {
-        super("ritualMagnetic", 0, 5000, "ritual." + Constants.Mod.MODID + ".magneticRitual");
+        super("ritualMagnetic", 0, 5000, "ritual." + BloodMagic.MODID + ".magneticRitual");
         addBlockRange(PLACEMENT_RANGE, new AreaDescriptor.Rectangle(new BlockPos(-1, 1, -1), 3));
         setMaximumVolumeAndDistanceOfRange(PLACEMENT_RANGE, 50, 4, 4);
     }
diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualMeteor.java b/src/main/java/WayofTime/bloodmagic/ritual/RitualMeteor.java
index e115111a..72090b53 100644
--- a/src/main/java/WayofTime/bloodmagic/ritual/RitualMeteor.java
+++ b/src/main/java/WayofTime/bloodmagic/ritual/RitualMeteor.java
@@ -3,11 +3,11 @@ package WayofTime.bloodmagic.ritual;
 import java.util.ArrayList;
 import java.util.List;
 
+import WayofTime.bloodmagic.BloodMagic;
 import net.minecraft.entity.item.EntityItem;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
-import WayofTime.bloodmagic.api.Constants;
 import WayofTime.bloodmagic.api.ritual.AreaDescriptor;
 import WayofTime.bloodmagic.api.ritual.EnumRuneType;
 import WayofTime.bloodmagic.api.ritual.IMasterRitualStone;
@@ -25,7 +25,7 @@ public class RitualMeteor extends Ritual
 
     public RitualMeteor()
     {
-        super("ritualMeteor", 0, 1000000, "ritual." + Constants.Mod.MODID + ".meteorRitual");
+        super("ritualMeteor", 0, 1000000, "ritual." + BloodMagic.MODID + ".meteorRitual");
         addBlockRange(ITEM_RANGE, new AreaDescriptor.Rectangle(new BlockPos(0, 1, 0), 1));
         setMaximumVolumeAndDistanceOfRange(ITEM_RANGE, 0, 10, 10);
     }
@@ -57,7 +57,7 @@ public class RitualMeteor extends Ritual
 
         for (EntityItem entityItem : itemList)
         {
-            ItemStack stack = entityItem.getEntityItem();
+            ItemStack stack = entityItem.getItem();
             if (MeteorRegistry.hasMeteorForItem(stack))
             {
                 EntityMeteor meteor = new EntityMeteor(world, pos.getX(), 260, pos.getZ(), 0, -0.1, 0, radiusModifier, explosionModifier, fillerChance);
diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualPlacer.java b/src/main/java/WayofTime/bloodmagic/ritual/RitualPlacer.java
index fb21568b..28abcbb3 100644
--- a/src/main/java/WayofTime/bloodmagic/ritual/RitualPlacer.java
+++ b/src/main/java/WayofTime/bloodmagic/ritual/RitualPlacer.java
@@ -1,6 +1,6 @@
 package WayofTime.bloodmagic.ritual;
 
-import WayofTime.bloodmagic.api.Constants;
+import WayofTime.bloodmagic.BloodMagic;
 import WayofTime.bloodmagic.api.ritual.*;
 import net.minecraft.block.Block;
 import net.minecraft.block.state.IBlockState;
@@ -22,7 +22,7 @@ public class RitualPlacer extends Ritual
 
     public RitualPlacer()
     {
-        super("ritualPlacer", 0, 5000, "ritual." + Constants.Mod.MODID + ".placerRitual");
+        super("ritualPlacer", 0, 5000, "ritual." + BloodMagic.MODID + ".placerRitual");
         addBlockRange(PLACER_RANGE, new AreaDescriptor.Rectangle(new BlockPos(-2, 0, -2), 5, 1, 5));
         addBlockRange(CHEST_RANGE, new AreaDescriptor.Rectangle(new BlockPos(0, 1, 0), 1));
 
diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualPortal.java b/src/main/java/WayofTime/bloodmagic/ritual/RitualPortal.java
index 215e313a..6e4855cc 100644
--- a/src/main/java/WayofTime/bloodmagic/ritual/RitualPortal.java
+++ b/src/main/java/WayofTime/bloodmagic/ritual/RitualPortal.java
@@ -1,12 +1,12 @@
 package WayofTime.bloodmagic.ritual;
 
-import WayofTime.bloodmagic.api.Constants;
+import WayofTime.bloodmagic.BloodMagic;
 import WayofTime.bloodmagic.api.ritual.EnumRuneType;
 import WayofTime.bloodmagic.api.ritual.IMasterRitualStone;
 import WayofTime.bloodmagic.api.ritual.Ritual;
 import WayofTime.bloodmagic.api.ritual.RitualComponent;
 import WayofTime.bloodmagic.api.teleport.PortalLocation;
-import WayofTime.bloodmagic.registry.ModBlocks;
+import WayofTime.bloodmagic.registry.RegistrarBloodMagicBlocks;
 import WayofTime.bloodmagic.ritual.portal.LocationsHandler;
 import WayofTime.bloodmagic.tile.TileDimensionalPortal;
 import net.minecraft.block.state.IBlockState;
@@ -29,7 +29,7 @@ public class RitualPortal extends Ritual
 
     public RitualPortal()
     {
-        super("ritualPortal", 0, 50000, "ritual." + Constants.Mod.MODID + ".portalRitual");
+        super("ritualPortal", 0, 50000, "ritual." + BloodMagic.MODID + ".portalRitual");
         portalRitualTag = new NBTTagCompound();
     }
 
@@ -55,7 +55,7 @@ public class RitualPortal extends Ritual
                 {
                     for (int k = z - 2; k <= z + 2; k++)
                     {
-                        if (!world.isAirBlock(new BlockPos(i, y, k)) && !(getBlockState(world, i, y, k).getBlock() == ModBlocks.RITUAL_STONE))
+                        if (!world.isAirBlock(new BlockPos(i, y, k)) && !(getBlockState(world, i, y, k).getBlock() == RegistrarBloodMagicBlocks.RITUAL_STONE))
                         {
                             blockState = getBlockState(world, i, y, k);
                             name = addStringToEnd(name, ForgeRegistries.BLOCKS.getKey(blockState.getBlock()) + String.valueOf(blockState.getBlock().getMetaFromState(blockState)));
@@ -64,7 +64,7 @@ public class RitualPortal extends Ritual
                 }
                 for (int j = y + 1; j <= y + 5; j++)
                 {
-                    if (!world.isAirBlock(new BlockPos(x - 3, j, z)) && !(getBlockState(world, x - 3, j, z).getBlock() == ModBlocks.RITUAL_STONE))
+                    if (!world.isAirBlock(new BlockPos(x - 3, j, z)) && !(getBlockState(world, x - 3, j, z).getBlock() == RegistrarBloodMagicBlocks.RITUAL_STONE))
                     {
                         blockState = getBlockState(world, x - 3, j, z);
                         name = addStringToEnd(name, ForgeRegistries.BLOCKS.getKey(blockState.getBlock()) + String.valueOf(blockState.getBlock().getMetaFromState(blockState)));
@@ -72,7 +72,7 @@ public class RitualPortal extends Ritual
                 }
                 for (int j = y + 1; j <= y + 5; j++)
                 {
-                    if (!world.isAirBlock(new BlockPos(x + 3, j, z)) && !(getBlockState(world, x + 3, j, z) == ModBlocks.RITUAL_STONE))
+                    if (!world.isAirBlock(new BlockPos(x + 3, j, z)) && !(getBlockState(world, x + 3, j, z) == RegistrarBloodMagicBlocks.RITUAL_STONE))
                     {
                         blockState = getBlockState(world, x + 3, j, z);
                         name = addStringToEnd(name, ForgeRegistries.BLOCKS.getKey(blockState.getBlock()) + String.valueOf(blockState.getBlock().getMetaFromState(blockState)));
@@ -84,7 +84,7 @@ public class RitualPortal extends Ritual
                 {
                     for (int i = x - 2; i <= x + 2; i++)
                     {
-                        if (!world.isAirBlock(new BlockPos(i, y, k)) && !(getBlockState(world, i, y, k).getBlock() == ModBlocks.RITUAL_STONE))
+                        if (!world.isAirBlock(new BlockPos(i, y, k)) && !(getBlockState(world, i, y, k).getBlock() == RegistrarBloodMagicBlocks.RITUAL_STONE))
                         {
                             blockState = getBlockState(world, i, y, k);
                             name = addStringToEnd(name, ForgeRegistries.BLOCKS.getKey(blockState.getBlock()) + String.valueOf(blockState.getBlock().getMetaFromState(blockState)));
@@ -93,7 +93,7 @@ public class RitualPortal extends Ritual
                 }
                 for (int j = y + 1; j <= y + 5; j++)
                 {
-                    if (!world.isAirBlock(new BlockPos(x, j, z - 3)) && !(getBlockState(world, x, j, z - 3).getBlock() == ModBlocks.RITUAL_STONE))
+                    if (!world.isAirBlock(new BlockPos(x, j, z - 3)) && !(getBlockState(world, x, j, z - 3).getBlock() == RegistrarBloodMagicBlocks.RITUAL_STONE))
                     {
                         blockState = getBlockState(world, x, j, z - 3);
                         name = addStringToEnd(name, ForgeRegistries.BLOCKS.getKey(blockState.getBlock()) + String.valueOf(blockState.getBlock().getMetaFromState(blockState)));
@@ -101,7 +101,7 @@ public class RitualPortal extends Ritual
                 }
                 for (int j = y + 1; j <= y + 5; j++)
                 {
-                    if (!world.isAirBlock(new BlockPos(x, j, z + 3)) && !(getBlockState(world, x, j, z + 3).getBlock() == ModBlocks.RITUAL_STONE))
+                    if (!world.isAirBlock(new BlockPos(x, j, z + 3)) && !(getBlockState(world, x, j, z + 3).getBlock() == RegistrarBloodMagicBlocks.RITUAL_STONE))
                     {
                         blockState = getBlockState(world, x, j, z + 3);
                         name = addStringToEnd(name, ForgeRegistries.BLOCKS.getKey(blockState.getBlock()) + String.valueOf(blockState.getBlock().getMetaFromState(blockState)));
@@ -142,7 +142,7 @@ public class RitualPortal extends Ritual
 
                     if (world.isAirBlock(tempPos))
                     {
-                        IBlockState blockState = ModBlocks.DIMENSIONAL_PORTAL.getStateFromMeta(0);
+                        IBlockState blockState = RegistrarBloodMagicBlocks.DIMENSIONAL_PORTAL.getStateFromMeta(0);
                         world.setBlockState(tempPos, blockState, 3);
 
                         if (world.getTileEntity(tempPos) != null && world.getTileEntity(tempPos) instanceof TileDimensionalPortal)
@@ -163,7 +163,7 @@ public class RitualPortal extends Ritual
                     BlockPos tempPos = new BlockPos(x, j, k);
                     if (world.isAirBlock(tempPos))
                     {
-                        IBlockState blockState = ModBlocks.DIMENSIONAL_PORTAL.getStateFromMeta(1);
+                        IBlockState blockState = RegistrarBloodMagicBlocks.DIMENSIONAL_PORTAL.getStateFromMeta(1);
                         world.setBlockState(tempPos, blockState, 3);
 
                         if (world.getTileEntity(tempPos) != null && world.getTileEntity(tempPos) instanceof TileDimensionalPortal)
@@ -196,7 +196,7 @@ public class RitualPortal extends Ritual
             {
                 for (int j = y + 1; j <= y + 3; j++)
                 {
-                    if (getBlockState(world, i, j, z).getBlock() == ModBlocks.DIMENSIONAL_PORTAL)
+                    if (getBlockState(world, i, j, z).getBlock() == RegistrarBloodMagicBlocks.DIMENSIONAL_PORTAL)
                     {
                         world.setBlockToAir(new BlockPos(i, j, z));
                     }
@@ -208,7 +208,7 @@ public class RitualPortal extends Ritual
             {
                 for (int j = y + 1; j <= y + 3; j++)
                 {
-                    if (getBlockState(world, x, j, k).getBlock() == ModBlocks.DIMENSIONAL_PORTAL)
+                    if (getBlockState(world, x, j, k).getBlock() == RegistrarBloodMagicBlocks.DIMENSIONAL_PORTAL)
                     {
                         world.setBlockToAir(new BlockPos(x, j, k));
                     }
diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualPump.java b/src/main/java/WayofTime/bloodmagic/ritual/RitualPump.java
index 48ef6552..ca63f12a 100644
--- a/src/main/java/WayofTime/bloodmagic/ritual/RitualPump.java
+++ b/src/main/java/WayofTime/bloodmagic/ritual/RitualPump.java
@@ -1,6 +1,6 @@
 package WayofTime.bloodmagic.ritual;
 
-import WayofTime.bloodmagic.api.Constants;
+import WayofTime.bloodmagic.BloodMagic;
 import WayofTime.bloodmagic.api.ritual.*;
 import com.google.common.collect.Lists;
 import net.minecraft.block.BlockLiquid;
@@ -31,7 +31,7 @@ public class RitualPump extends Ritual
 
     public RitualPump()
     {
-        super("ritualPump", 0, 500, "ritual." + Constants.Mod.MODID + ".pumpRitual");
+        super("ritualPump", 0, 500, "ritual." + BloodMagic.MODID + ".pumpRitual");
         addBlockRange(PUMP_RANGE, new AreaDescriptor.Rectangle(new BlockPos(-16, -16, -16), new BlockPos(17, 17, 17)));
 
         setMaximumVolumeAndDistanceOfRange(PUMP_RANGE, 0, 16, 16);
diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualRegeneration.java b/src/main/java/WayofTime/bloodmagic/ritual/RitualRegeneration.java
index 8a3df796..5e7fd81d 100644
--- a/src/main/java/WayofTime/bloodmagic/ritual/RitualRegeneration.java
+++ b/src/main/java/WayofTime/bloodmagic/ritual/RitualRegeneration.java
@@ -4,6 +4,7 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
+import WayofTime.bloodmagic.BloodMagic;
 import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.init.MobEffects;
@@ -12,7 +13,6 @@ import net.minecraft.util.math.AxisAlignedBB;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
 import WayofTime.bloodmagic.api.BloodMagicAPI;
-import WayofTime.bloodmagic.api.Constants;
 import WayofTime.bloodmagic.api.ritual.AreaDescriptor;
 import WayofTime.bloodmagic.api.ritual.EnumRuneType;
 import WayofTime.bloodmagic.api.ritual.IMasterRitualStone;
@@ -33,7 +33,7 @@ public class RitualRegeneration extends Ritual
 
     public RitualRegeneration()
     {
-        super("ritualRegeneration", 0, 25000, "ritual." + Constants.Mod.MODID + ".regenerationRitual");
+        super("ritualRegeneration", 0, 25000, "ritual." + BloodMagic.MODID + ".regenerationRitual");
         addBlockRange(HEAL_RANGE, new AreaDescriptor.Rectangle(new BlockPos(-15, -15, -15), 31));
         addBlockRange(VAMPIRE_RANGE, new AreaDescriptor.Rectangle(new BlockPos(-15, -15, -15), 31));
 
@@ -105,7 +105,7 @@ public class RitualRegeneration extends Ritual
 
                         float currentHealth = damagedEntity.getHealth();
 
-                        damagedEntity.attackEntityFrom(BloodMagicAPI.getDamageSource(), Math.min(player.getMaxHealth() - player.getHealth(), syphonedHealthAmount));
+                        damagedEntity.attackEntityFrom(BloodMagicAPI.damageSource, Math.min(player.getMaxHealth() - player.getHealth(), syphonedHealthAmount));
 
                         float healthDifference = currentHealth - damagedEntity.getHealth();
                         if (healthDifference > 0)
diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualSpeed.java b/src/main/java/WayofTime/bloodmagic/ritual/RitualSpeed.java
index e2bccc13..a2de3a23 100644
--- a/src/main/java/WayofTime/bloodmagic/ritual/RitualSpeed.java
+++ b/src/main/java/WayofTime/bloodmagic/ritual/RitualSpeed.java
@@ -3,6 +3,7 @@ package WayofTime.bloodmagic.ritual;
 import java.util.ArrayList;
 import java.util.List;
 
+import WayofTime.bloodmagic.BloodMagic;
 import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.util.EnumFacing;
@@ -10,7 +11,6 @@ import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.text.ITextComponent;
 import net.minecraft.util.text.TextComponentTranslation;
 import net.minecraft.world.World;
-import WayofTime.bloodmagic.api.Constants;
 import WayofTime.bloodmagic.api.ritual.AreaDescriptor;
 import WayofTime.bloodmagic.api.ritual.EnumRuneType;
 import WayofTime.bloodmagic.api.ritual.IMasterRitualStone;
@@ -30,7 +30,7 @@ public class RitualSpeed extends Ritual
 
     public RitualSpeed()
     {
-        super("ritualSpeed", 0, 1000, "ritual." + Constants.Mod.MODID + ".speedRitual");
+        super("ritualSpeed", 0, 1000, "ritual." + BloodMagic.MODID + ".speedRitual");
         addBlockRange(SPEED_RANGE, new AreaDescriptor.Rectangle(new BlockPos(-2, 1, -2), new BlockPos(2, 5, 2)));
         setMaximumVolumeAndDistanceOfRange(SPEED_RANGE, 0, 2, 5);
     }
diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualSuppression.java b/src/main/java/WayofTime/bloodmagic/ritual/RitualSuppression.java
index 872e7964..9c593771 100644
--- a/src/main/java/WayofTime/bloodmagic/ritual/RitualSuppression.java
+++ b/src/main/java/WayofTime/bloodmagic/ritual/RitualSuppression.java
@@ -2,11 +2,11 @@ package WayofTime.bloodmagic.ritual;
 
 import java.util.ArrayList;
 
+import WayofTime.bloodmagic.BloodMagic;
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
-import WayofTime.bloodmagic.api.Constants;
 import WayofTime.bloodmagic.api.ritual.AreaDescriptor;
 import WayofTime.bloodmagic.api.ritual.EnumRuneType;
 import WayofTime.bloodmagic.api.ritual.IMasterRitualStone;
@@ -21,7 +21,7 @@ public class RitualSuppression extends Ritual
 
     public RitualSuppression()
     {
-        super("ritualSuppression", 0, 10000, "ritual." + Constants.Mod.MODID + ".suppressionRitual");
+        super("ritualSuppression", 0, 10000, "ritual." + BloodMagic.MODID + ".suppressionRitual");
         addBlockRange(SUPPRESSION_RANGE, new AreaDescriptor.HemiSphere(new BlockPos(0, 0, 0), 10));
     }
 
diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualUpgradeRemove.java b/src/main/java/WayofTime/bloodmagic/ritual/RitualUpgradeRemove.java
index 79dacbe7..9e43019e 100644
--- a/src/main/java/WayofTime/bloodmagic/ritual/RitualUpgradeRemove.java
+++ b/src/main/java/WayofTime/bloodmagic/ritual/RitualUpgradeRemove.java
@@ -5,13 +5,13 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map.Entry;
 
+import WayofTime.bloodmagic.BloodMagic;
 import net.minecraft.entity.effect.EntityLightningBolt;
 import net.minecraft.entity.item.EntityItem;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
-import WayofTime.bloodmagic.api.Constants;
 import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade;
 import WayofTime.bloodmagic.api.livingArmour.StatTracker;
 import WayofTime.bloodmagic.api.ritual.AreaDescriptor;
@@ -22,7 +22,7 @@ import WayofTime.bloodmagic.api.ritual.RitualComponent;
 import WayofTime.bloodmagic.api.util.helper.ItemHelper.LivingUpgrades;
 import WayofTime.bloodmagic.item.armour.ItemLivingArmour;
 import WayofTime.bloodmagic.livingArmour.LivingArmour;
-import WayofTime.bloodmagic.registry.ModItems;
+import WayofTime.bloodmagic.registry.RegistrarBloodMagicItems;
 
 import com.google.common.collect.Iterables;
 
@@ -32,7 +32,7 @@ public class RitualUpgradeRemove extends Ritual
 
     public RitualUpgradeRemove()
     {
-        super("ritualUpgradeRemove", 0, 25000, "ritual." + Constants.Mod.MODID + ".upgradeRemoveRitual");
+        super("ritualUpgradeRemove", 0, 25000, "ritual." + BloodMagic.MODID + ".upgradeRemoveRitual");
         addBlockRange(CHECK_RANGE, new AreaDescriptor.Rectangle(new BlockPos(0, 1, 0), 1, 2, 1));
     }
 
@@ -70,7 +70,7 @@ public class RitualUpgradeRemove extends Ritual
                         LivingArmourUpgrade upgrade = entry.getValue();
                         String upgradeKey = entry.getKey();
 
-                        ItemStack upgradeStack = new ItemStack(ModItems.UPGRADE_TOME);
+                        ItemStack upgradeStack = new ItemStack(RegistrarBloodMagicItems.UPGRADE_TOME);
                         LivingUpgrades.setKey(upgradeStack, upgradeKey);
                         LivingUpgrades.setLevel(upgradeStack, upgrade.getUpgradeLevel());
 
diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualWater.java b/src/main/java/WayofTime/bloodmagic/ritual/RitualWater.java
index ac8c8112..9d4dcbc6 100644
--- a/src/main/java/WayofTime/bloodmagic/ritual/RitualWater.java
+++ b/src/main/java/WayofTime/bloodmagic/ritual/RitualWater.java
@@ -1,6 +1,6 @@
 package WayofTime.bloodmagic.ritual;
 
-import WayofTime.bloodmagic.api.Constants;
+import WayofTime.bloodmagic.BloodMagic;
 import WayofTime.bloodmagic.api.ritual.*;
 import net.minecraft.init.Blocks;
 import net.minecraft.util.math.BlockPos;
@@ -14,7 +14,7 @@ public class RitualWater extends Ritual
 
     public RitualWater()
     {
-        super("ritualWater", 0, 500, "ritual." + Constants.Mod.MODID + ".waterRitual");
+        super("ritualWater", 0, 500, "ritual." + BloodMagic.MODID + ".waterRitual");
         addBlockRange(WATER_RANGE, new AreaDescriptor.Rectangle(new BlockPos(0, 1, 0), 1));
         setMaximumVolumeAndDistanceOfRange(WATER_RANGE, 9, 3, 3);
     }
diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualWellOfSuffering.java b/src/main/java/WayofTime/bloodmagic/ritual/RitualWellOfSuffering.java
index c914019f..28d2bc0e 100644
--- a/src/main/java/WayofTime/bloodmagic/ritual/RitualWellOfSuffering.java
+++ b/src/main/java/WayofTime/bloodmagic/ritual/RitualWellOfSuffering.java
@@ -1,8 +1,8 @@
 package WayofTime.bloodmagic.ritual;
 
+import WayofTime.bloodmagic.BloodMagic;
 import WayofTime.bloodmagic.ConfigHandler;
 import WayofTime.bloodmagic.api.BloodMagicAPI;
-import WayofTime.bloodmagic.api.Constants;
 import WayofTime.bloodmagic.api.ritual.*;
 import WayofTime.bloodmagic.tile.TileAltar;
 import net.minecraft.entity.EntityLivingBase;
@@ -27,7 +27,7 @@ public class RitualWellOfSuffering extends Ritual
 
     public RitualWellOfSuffering()
     {
-        super("ritualWellOfSuffering", 0, 40000, "ritual." + Constants.Mod.MODID + ".wellOfSufferingRitual");
+        super("ritualWellOfSuffering", 0, 40000, "ritual." + BloodMagic.MODID + ".wellOfSufferingRitual");
         addBlockRange(ALTAR_RANGE, new AreaDescriptor.Rectangle(new BlockPos(-5, -10, -5), 11, 21, 11));
         addBlockRange(DAMAGE_RANGE, new AreaDescriptor.Rectangle(new BlockPos(-10, -10, -10), 21));
 
@@ -89,7 +89,7 @@ public class RitualWellOfSuffering extends Ritual
                     continue;
 
                 String simpleClassName = entity.getClass().getSimpleName();
-                if (BloodMagicAPI.getEntitySacrificeValues().containsKey(simpleClassName) && BloodMagicAPI.getEntitySacrificeValues().get(simpleClassName) <= 0)
+                if (BloodMagicAPI.entitySacrificeValues.containsKey(simpleClassName) && BloodMagicAPI.entitySacrificeValues.get(simpleClassName) <= 0)
                     continue;
 
                 if (entity.isEntityAlive() && !(entity instanceof EntityPlayer))
@@ -103,8 +103,8 @@ public class RitualWellOfSuffering extends Ritual
                         if (ConfigHandler.entitySacrificeValues.containsKey(entityName))
                             lifeEssenceRatio = ConfigHandler.entitySacrificeValues.get(entityName);
 
-                        if (BloodMagicAPI.getEntitySacrificeValues().containsKey(entityName))
-                            lifeEssenceRatio = BloodMagicAPI.getEntitySacrificeValues().get(entityName);
+                        if (BloodMagicAPI.entitySacrificeValues.containsKey(entityName))
+                            lifeEssenceRatio = BloodMagicAPI.entitySacrificeValues.get(entityName);
 
                         if (entity.isChild())
                             lifeEssenceRatio *= 0.5F;
diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualZephyr.java b/src/main/java/WayofTime/bloodmagic/ritual/RitualZephyr.java
index 7769fc49..30a252f1 100644
--- a/src/main/java/WayofTime/bloodmagic/ritual/RitualZephyr.java
+++ b/src/main/java/WayofTime/bloodmagic/ritual/RitualZephyr.java
@@ -3,13 +3,13 @@ package WayofTime.bloodmagic.ritual;
 import java.util.ArrayList;
 import java.util.List;
 
+import WayofTime.bloodmagic.BloodMagic;
 import net.minecraft.entity.item.EntityItem;
 import net.minecraft.item.ItemStack;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.EnumFacing;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
-import WayofTime.bloodmagic.api.Constants;
 import WayofTime.bloodmagic.api.ritual.AreaDescriptor;
 import WayofTime.bloodmagic.api.ritual.EnumRuneType;
 import WayofTime.bloodmagic.api.ritual.IMasterRitualStone;
@@ -24,7 +24,7 @@ public class RitualZephyr extends Ritual
 
     public RitualZephyr()
     {
-        super("ritualZephyr", 0, 1000, "ritual." + Constants.Mod.MODID + ".zephyrRitual");
+        super("ritualZephyr", 0, 1000, "ritual." + BloodMagic.MODID + ".zephyrRitual");
         addBlockRange(ZEPHYR_RANGE, new AreaDescriptor.Rectangle(new BlockPos(-5, -5, -5), 11));
         addBlockRange(CHEST_RANGE, new AreaDescriptor.Rectangle(new BlockPos(0, 1, 0), 1));
 
@@ -60,7 +60,7 @@ public class RitualZephyr extends Ritual
                     continue;
                 }
 
-                ItemStack copyStack = entityItem.getEntityItem().copy();
+                ItemStack copyStack = entityItem.getItem().copy();
                 int originalAmount = copyStack.getCount();
                 ItemStack newStack = Utils.insertStackIntoTile(copyStack, tileInventory, EnumFacing.DOWN);
 
@@ -70,7 +70,7 @@ public class RitualZephyr extends Ritual
                     if (newStack.isEmpty())
                         entityItem.setDead();
 
-                    entityItem.getEntityItem().setCount(newStack.getCount());
+                    entityItem.getItem().setCount(newStack.getCount());
                 }
 
                 if (newStack.isEmpty())
diff --git a/src/main/java/WayofTime/bloodmagic/ritual/harvest/HarvestHandlerPlantable.java b/src/main/java/WayofTime/bloodmagic/ritual/harvest/HarvestHandlerPlantable.java
index 9da9a653..acef5d0a 100644
--- a/src/main/java/WayofTime/bloodmagic/ritual/harvest/HarvestHandlerPlantable.java
+++ b/src/main/java/WayofTime/bloodmagic/ritual/harvest/HarvestHandlerPlantable.java
@@ -131,20 +131,11 @@ public class HarvestHandlerPlantable implements IHarvestHandler
                 HarvestRegistry.registerStandardCrop(crop, crop.getMaxAge());
             }
         } catch (NoSuchMethodException e) {
-            BloodMagic.instance.getLogger().error("HarvestCraft integration cancelled; unable to find crop name mapper");
-            return;
+            BloodMagic.instance.logger.error("HarvestCraft integration cancelled; unable to find crop name mapper");
         } catch (IllegalAccessException e) {
-            BloodMagic.instance.getLogger().error("HarvestCraft integration cancelled; crop name lookup broke");
-            return;
+            BloodMagic.instance.logger.error("HarvestCraft integration cancelled; crop name lookup broke");
         } catch (InvocationTargetException e) {
-            BloodMagic.instance.getLogger().error("HarvestCraft integration cancelled; crop name lookup broke");
-            return;
-        } catch (ReflectionHelper.UnableToFindClassException e) {
-            BloodMagic.instance.getLogger().error("HarvestCraft integration cancelled; unable to find crop registry");
-            return;
-        } catch (ReflectionHelper.UnableToFindFieldException e) {
-            BloodMagic.instance.getLogger().error("HarvestCraft integration cancelled; unable to find crop names in registry");
-            return;
+            BloodMagic.instance.logger.error("HarvestCraft integration cancelled; crop name lookup broke");
         }
     }
 }
diff --git a/src/main/java/WayofTime/bloodmagic/ritual/imperfect/ImperfectRitualDay.java b/src/main/java/WayofTime/bloodmagic/ritual/imperfect/ImperfectRitualDay.java
index 3e9859bb..810c5d33 100644
--- a/src/main/java/WayofTime/bloodmagic/ritual/imperfect/ImperfectRitualDay.java
+++ b/src/main/java/WayofTime/bloodmagic/ritual/imperfect/ImperfectRitualDay.java
@@ -1,7 +1,7 @@
 package WayofTime.bloodmagic.ritual.imperfect;
 
+import WayofTime.bloodmagic.BloodMagic;
 import WayofTime.bloodmagic.api.BlockStack;
-import WayofTime.bloodmagic.api.Constants;
 import WayofTime.bloodmagic.api.ritual.imperfect.IImperfectRitualStone;
 import WayofTime.bloodmagic.api.ritual.imperfect.ImperfectRitual;
 import net.minecraft.entity.player.EntityPlayer;
@@ -11,7 +11,7 @@ public class ImperfectRitualDay extends ImperfectRitual
 {
     public ImperfectRitualDay()
     {
-        super("day", new BlockStack(Blocks.GOLD_BLOCK), 5000, true, "ritual." + Constants.Mod.MODID + ".imperfect.day");
+        super("day", new BlockStack(Blocks.GOLD_BLOCK), 5000, true, "ritual." + BloodMagic.MODID + ".imperfect.day");
     }
 
     @Override
diff --git a/src/main/java/WayofTime/bloodmagic/ritual/imperfect/ImperfectRitualNight.java b/src/main/java/WayofTime/bloodmagic/ritual/imperfect/ImperfectRitualNight.java
index f09168d1..6c06d69f 100644
--- a/src/main/java/WayofTime/bloodmagic/ritual/imperfect/ImperfectRitualNight.java
+++ b/src/main/java/WayofTime/bloodmagic/ritual/imperfect/ImperfectRitualNight.java
@@ -1,7 +1,7 @@
 package WayofTime.bloodmagic.ritual.imperfect;
 
+import WayofTime.bloodmagic.BloodMagic;
 import WayofTime.bloodmagic.api.BlockStack;
-import WayofTime.bloodmagic.api.Constants;
 import WayofTime.bloodmagic.api.ritual.imperfect.IImperfectRitualStone;
 import WayofTime.bloodmagic.api.ritual.imperfect.ImperfectRitual;
 import net.minecraft.entity.player.EntityPlayer;
@@ -11,7 +11,7 @@ public class ImperfectRitualNight extends ImperfectRitual
 {
     public ImperfectRitualNight()
     {
-        super("night", new BlockStack(Blocks.LAPIS_BLOCK), 100, true, "ritual." + Constants.Mod.MODID + ".imperfect.night");
+        super("night", new BlockStack(Blocks.LAPIS_BLOCK), 100, true, "ritual." + BloodMagic.MODID + ".imperfect.night");
     }
 
     @Override
diff --git a/src/main/java/WayofTime/bloodmagic/ritual/imperfect/ImperfectRitualRain.java b/src/main/java/WayofTime/bloodmagic/ritual/imperfect/ImperfectRitualRain.java
index 2ff4f07c..92a858bc 100644
--- a/src/main/java/WayofTime/bloodmagic/ritual/imperfect/ImperfectRitualRain.java
+++ b/src/main/java/WayofTime/bloodmagic/ritual/imperfect/ImperfectRitualRain.java
@@ -1,7 +1,7 @@
 package WayofTime.bloodmagic.ritual.imperfect;
 
+import WayofTime.bloodmagic.BloodMagic;
 import WayofTime.bloodmagic.api.BlockStack;
-import WayofTime.bloodmagic.api.Constants;
 import WayofTime.bloodmagic.api.ritual.imperfect.IImperfectRitualStone;
 import WayofTime.bloodmagic.api.ritual.imperfect.ImperfectRitual;
 import net.minecraft.entity.player.EntityPlayer;
@@ -11,7 +11,7 @@ public class ImperfectRitualRain extends ImperfectRitual
 {
     public ImperfectRitualRain()
     {
-        super("rain", new BlockStack(Blocks.WATER), 5000, true, "ritual." + Constants.Mod.MODID + ".imperfect.rain");
+        super("rain", new BlockStack(Blocks.WATER), 5000, true, "ritual." + BloodMagic.MODID + ".imperfect.rain");
     }
 
     @Override
diff --git a/src/main/java/WayofTime/bloodmagic/ritual/imperfect/ImperfectRitualResistance.java b/src/main/java/WayofTime/bloodmagic/ritual/imperfect/ImperfectRitualResistance.java
index 9e897e8e..521cf385 100644
--- a/src/main/java/WayofTime/bloodmagic/ritual/imperfect/ImperfectRitualResistance.java
+++ b/src/main/java/WayofTime/bloodmagic/ritual/imperfect/ImperfectRitualResistance.java
@@ -1,20 +1,19 @@
 package WayofTime.bloodmagic.ritual.imperfect;
 
+import WayofTime.bloodmagic.BloodMagic;
 import WayofTime.bloodmagic.api.BlockStack;
-import WayofTime.bloodmagic.api.Constants;
 import WayofTime.bloodmagic.api.ritual.imperfect.IImperfectRitualStone;
 import WayofTime.bloodmagic.api.ritual.imperfect.ImperfectRitual;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.init.Blocks;
 import net.minecraft.init.MobEffects;
-import net.minecraft.potion.Potion;
 import net.minecraft.potion.PotionEffect;
 
 public class ImperfectRitualResistance extends ImperfectRitual
 {
     public ImperfectRitualResistance()
     {
-        super("resistance", new BlockStack(Blocks.BEDROCK), 5000, "ritual." + Constants.Mod.MODID + ".imperfect.resistance");
+        super("resistance", new BlockStack(Blocks.BEDROCK), 5000, "ritual." + BloodMagic.MODID + ".imperfect.resistance");
     }
 
     @Override
diff --git a/src/main/java/WayofTime/bloodmagic/ritual/imperfect/ImperfectRitualZombie.java b/src/main/java/WayofTime/bloodmagic/ritual/imperfect/ImperfectRitualZombie.java
index 75dfaf5d..c18a5f17 100644
--- a/src/main/java/WayofTime/bloodmagic/ritual/imperfect/ImperfectRitualZombie.java
+++ b/src/main/java/WayofTime/bloodmagic/ritual/imperfect/ImperfectRitualZombie.java
@@ -1,21 +1,20 @@
 package WayofTime.bloodmagic.ritual.imperfect;
 
+import WayofTime.bloodmagic.BloodMagic;
 import WayofTime.bloodmagic.api.BlockStack;
-import WayofTime.bloodmagic.api.Constants;
 import WayofTime.bloodmagic.api.ritual.imperfect.IImperfectRitualStone;
 import WayofTime.bloodmagic.api.ritual.imperfect.ImperfectRitual;
 import net.minecraft.entity.monster.EntityZombie;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.init.Blocks;
 import net.minecraft.init.MobEffects;
-import net.minecraft.potion.Potion;
 import net.minecraft.potion.PotionEffect;
 
 public class ImperfectRitualZombie extends ImperfectRitual
 {
     public ImperfectRitualZombie()
     {
-        super("zombie", new BlockStack(Blocks.COAL_BLOCK), 5000, "ritual." + Constants.Mod.MODID + ".imperfect.zombie");
+        super("zombie", new BlockStack(Blocks.COAL_BLOCK), 5000, "ritual." + BloodMagic.MODID + ".imperfect.zombie");
     }
 
     @Override
diff --git a/src/main/java/WayofTime/bloodmagic/ritual/portal/LocationsHandler.java b/src/main/java/WayofTime/bloodmagic/ritual/portal/LocationsHandler.java
index 18ee3ad0..7001a118 100644
--- a/src/main/java/WayofTime/bloodmagic/ritual/portal/LocationsHandler.java
+++ b/src/main/java/WayofTime/bloodmagic/ritual/portal/LocationsHandler.java
@@ -1,7 +1,7 @@
 package WayofTime.bloodmagic.ritual.portal;
 
+import WayofTime.bloodmagic.BloodMagic;
 import WayofTime.bloodmagic.api.BloodMagicAPI;
-import WayofTime.bloodmagic.api.Constants;
 import WayofTime.bloodmagic.api.teleport.PortalLocation;
 import net.minecraftforge.common.DimensionManager;
 
@@ -13,7 +13,7 @@ public class LocationsHandler implements Serializable
 {
 
     public static final long serialVersionUID = 10102001;
-    private static final String fileName = String.valueOf(DimensionManager.getCurrentSaveRootDirectory()) + "/" + Constants.Mod.MODID + "/PortalLocations.dat";
+    private static final String fileName = String.valueOf(DimensionManager.getCurrentSaveRootDirectory()) + "/" + BloodMagic.MODID + "/PortalLocations.dat";
     private static HashMap<String, ArrayList<PortalLocation>> portals;
     private static LocationsHandler locationsHandler;
 
@@ -47,11 +47,11 @@ public class LocationsHandler implements Serializable
                 {
                     if (file.createNewFile())
                     {
-                        BloodMagicAPI.getLogger().info("Creating " + fileName + " in " + String.valueOf(DimensionManager.getCurrentSaveRootDirectory()));
+                        BloodMagicAPI.logger.info("Creating " + fileName + " in " + String.valueOf(DimensionManager.getCurrentSaveRootDirectory()));
                     }
                 } else if (file.createNewFile())
                 {
-                    BloodMagicAPI.getLogger().info("Creating " + fileName + " in " + String.valueOf(DimensionManager.getCurrentSaveRootDirectory()));
+                    BloodMagicAPI.logger.info("Creating " + fileName + " in " + String.valueOf(DimensionManager.getCurrentSaveRootDirectory()));
                 }
             }
             FileInputStream fileIn = new FileInputStream(file);
@@ -65,7 +65,7 @@ public class LocationsHandler implements Serializable
             return null;
         } catch (ClassNotFoundException e)
         {
-            BloodMagicAPI.getLogger().error(String.valueOf(file) + " was not found in " + String.valueOf(DimensionManager.getCurrentSaveRootDirectory()));
+            BloodMagicAPI.logger.error(String.valueOf(file) + " was not found in " + String.valueOf(DimensionManager.getCurrentSaveRootDirectory()));
             return null;
         }
     }
@@ -94,13 +94,13 @@ public class LocationsHandler implements Serializable
         }
         if (!portals.get(name).isEmpty() && portals.get(name).size() >= 2)
         {
-            BloodMagicAPI.getLogger().info("Location " + name + " already exists.");
+            BloodMagicAPI.logger.info("Location " + name + " already exists.");
             updateFile(fileName, portals);
             return false;
         } else
         {
             portals.get(name).add(location);
-            BloodMagicAPI.getLogger().info("Adding " + name);
+            BloodMagicAPI.logger.info("Adding " + name);
             updateFile(fileName, portals);
             return true;
         }
@@ -113,12 +113,12 @@ public class LocationsHandler implements Serializable
             if (portals.get(name).contains(location))
             {
                 portals.get(name).remove(location);
-                BloodMagicAPI.getLogger().info("Removing " + name);
+                BloodMagicAPI.logger.info("Removing " + name);
                 updateFile(fileName, portals);
                 return true;
             } else
             {
-                BloodMagicAPI.getLogger().info("No location matching " + name);
+                BloodMagicAPI.logger.info("No location matching " + name);
                 updateFile(fileName, portals);
                 return false;
             }
diff --git a/src/main/java/WayofTime/bloodmagic/ritual/portal/Teleports.java b/src/main/java/WayofTime/bloodmagic/ritual/portal/Teleports.java
index f15568ad..8d7ecfe3 100644
--- a/src/main/java/WayofTime/bloodmagic/ritual/portal/Teleports.java
+++ b/src/main/java/WayofTime/bloodmagic/ritual/portal/Teleports.java
@@ -4,7 +4,6 @@ import WayofTime.bloodmagic.api.event.TeleposeEvent;
 import WayofTime.bloodmagic.api.saving.SoulNetwork;
 import WayofTime.bloodmagic.api.teleport.Teleport;
 import WayofTime.bloodmagic.api.util.helper.NetworkHelper;
-import lombok.Getter;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityList;
 import net.minecraft.entity.EntityLiving;
@@ -18,7 +17,6 @@ import net.minecraft.util.SoundCategory;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
 import net.minecraft.world.WorldServer;
-import net.minecraftforge.common.DimensionManager;
 import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.fml.common.FMLCommonHandler;
 
@@ -102,7 +100,6 @@ public class Teleports
         }
     }
 
-    @Getter
     public static class TeleportToDim extends Teleport
     {
         private World oldWorld;
@@ -130,8 +127,8 @@ public class Teleports
                 if (entity.timeUntilPortal <= 0)
                 {
                     MinecraftServer server = FMLCommonHandler.instance().getMinecraftServerInstance();
-                    WorldServer oldWorldServer = server.worldServerForDimension(entity.dimension);
-                    WorldServer newWorldServer = server.worldServerForDimension(newWorldID);
+                    WorldServer oldWorldServer = server.getWorld(entity.dimension);
+                    WorldServer newWorldServer = server.getWorld(newWorldID);
 
                     if (entity instanceof EntityPlayer)
                     {
@@ -202,5 +199,17 @@ public class Teleports
         {
             return 10000;
         }
+
+        public World getOldWorld() {
+            return oldWorld;
+        }
+
+        public int getNewWorldID() {
+            return newWorldID;
+        }
+
+        public boolean isTeleposer() {
+            return teleposer;
+        }
     }
 }
diff --git a/src/main/java/WayofTime/bloodmagic/routing/ModIdItemFilter.java b/src/main/java/WayofTime/bloodmagic/routing/ModIdItemFilter.java
index 8b0afb1b..56eb3644 100644
--- a/src/main/java/WayofTime/bloodmagic/routing/ModIdItemFilter.java
+++ b/src/main/java/WayofTime/bloodmagic/routing/ModIdItemFilter.java
@@ -4,7 +4,6 @@ import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.ResourceLocation;
 import net.minecraftforge.fml.common.registry.ForgeRegistries;
-import net.minecraftforge.fml.common.registry.GameData;
 
 public class ModIdItemFilter extends TestItemFilter
 {
diff --git a/src/main/java/WayofTime/bloodmagic/structures/BuildTestStructure.java b/src/main/java/WayofTime/bloodmagic/structures/BuildTestStructure.java
index 1957af31..2b18479e 100644
--- a/src/main/java/WayofTime/bloodmagic/structures/BuildTestStructure.java
+++ b/src/main/java/WayofTime/bloodmagic/structures/BuildTestStructure.java
@@ -2,14 +2,12 @@ package WayofTime.bloodmagic.structures;
 
 import java.util.Random;
 
-import WayofTime.bloodmagic.api.Constants;
-import net.minecraft.block.Block;
+import WayofTime.bloodmagic.BloodMagic;
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.util.Mirror;
 import net.minecraft.util.ResourceLocation;
 import net.minecraft.util.Rotation;
 import net.minecraft.util.math.BlockPos;
-import net.minecraft.util.math.ChunkPos;
 import net.minecraft.world.WorldServer;
 import net.minecraft.world.gen.structure.template.PlacementSettings;
 import net.minecraft.world.gen.structure.template.Template;
@@ -25,7 +23,7 @@ public class BuildTestStructure
         MinecraftServer minecraftserver = world.getMinecraftServer();
         TemplateManager templatemanager = world.getStructureTemplateManager();
 
-        ResourceLocation resource = new ResourceLocation(Constants.Mod.MODID, "Corridor1");
+        ResourceLocation resource = new ResourceLocation(BloodMagic.MODID, "Corridor1");
         Template template = templatemanager.getTemplate(minecraftserver, resource);
 
         if (template == null)
diff --git a/src/main/java/WayofTime/bloodmagic/structures/DungeonRoomLoader.java b/src/main/java/WayofTime/bloodmagic/structures/DungeonRoomLoader.java
index 05b3f415..05ee3546 100644
--- a/src/main/java/WayofTime/bloodmagic/structures/DungeonRoomLoader.java
+++ b/src/main/java/WayofTime/bloodmagic/structures/DungeonRoomLoader.java
@@ -9,20 +9,16 @@ import java.net.URL;
 import java.util.List;
 import java.util.Random;
 
+import WayofTime.bloodmagic.BloodMagic;
 import com.google.common.base.Charsets;
 import com.google.common.io.Resources;
 import com.google.common.reflect.TypeToken;
-import net.minecraft.util.EnumFacing;
 import net.minecraft.util.ResourceLocation;
 
 import org.apache.commons.io.IOUtils;
 
-import WayofTime.bloodmagic.api.Constants;
 import WayofTime.bloodmagic.gson.Serializers;
 
-import com.google.gson.Gson;
-import com.google.gson.GsonBuilder;
-
 public class DungeonRoomLoader
 {
     public static void saveDungeons()
@@ -73,7 +69,7 @@ public class DungeonRoomLoader
 
     public static void test()
     {
-        ResourceLocation id = new ResourceLocation(Constants.Mod.MODID, "testGson");
+        ResourceLocation id = new ResourceLocation(BloodMagic.MODID, "testGson");
         String s = id.getResourceDomain();
         String s1 = id.getResourcePath();
         InputStream inputstream = null;
diff --git a/src/main/java/WayofTime/bloodmagic/tile/TileAlchemyArray.java b/src/main/java/WayofTime/bloodmagic/tile/TileAlchemyArray.java
index a1ebd2cf..70f11cc8 100644
--- a/src/main/java/WayofTime/bloodmagic/tile/TileAlchemyArray.java
+++ b/src/main/java/WayofTime/bloodmagic/tile/TileAlchemyArray.java
@@ -1,12 +1,8 @@
 package WayofTime.bloodmagic.tile;
 
-import lombok.Getter;
-import lombok.Setter;
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.entity.Entity;
 import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.network.NetworkManager;
-import net.minecraft.network.play.server.SPacketUpdateTileEntity;
 import net.minecraft.util.EnumFacing;
 import net.minecraft.util.ITickable;
 import WayofTime.bloodmagic.api.Constants;
@@ -18,9 +14,6 @@ public class TileAlchemyArray extends TileInventory implements ITickable, IAlche
 {
     public boolean isActive = false;
     public int activeCounter = 0;
-
-    @Getter
-    @Setter
     public EnumFacing rotation = EnumFacing.HORIZONTALS[0];;
 
     private String key = "empty";
@@ -153,4 +146,13 @@ public class TileAlchemyArray extends TileInventory implements ITickable, IAlche
 
         return false;
     }
+
+    @Override
+    public EnumFacing getRotation() {
+        return rotation;
+    }
+
+    public void setRotation(EnumFacing rotation) {
+        this.rotation = rotation;
+    }
 }
diff --git a/src/main/java/WayofTime/bloodmagic/tile/TileAlchemyTable.java b/src/main/java/WayofTime/bloodmagic/tile/TileAlchemyTable.java
index 0003f75e..e5849e20 100644
--- a/src/main/java/WayofTime/bloodmagic/tile/TileAlchemyTable.java
+++ b/src/main/java/WayofTime/bloodmagic/tile/TileAlchemyTable.java
@@ -3,7 +3,6 @@ package WayofTime.bloodmagic.tile;
 import java.util.ArrayList;
 import java.util.List;
 
-import lombok.Getter;
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.inventory.ISidedInventory;
 import net.minecraft.item.ItemStack;
@@ -25,7 +24,6 @@ import WayofTime.bloodmagic.api.util.helper.NetworkHelper;
 
 import com.google.common.base.Strings;
 
-@Getter
 public class TileAlchemyTable extends TileInventory implements ISidedInventory, ITickable
 {
     public static final int orbSlot = 6;
@@ -398,4 +396,40 @@ public class TileAlchemyTable extends TileInventory implements ISidedInventory,
             setInventorySlotContents(i, result[i]);
         }
     }
+
+    public static int getOrbSlot() {
+        return orbSlot;
+    }
+
+    public static int getToolSlot() {
+        return toolSlot;
+    }
+
+    public static int getOutputSlot() {
+        return outputSlot;
+    }
+
+    public EnumFacing getDirection() {
+        return direction;
+    }
+
+    public boolean isSlave() {
+        return isSlave;
+    }
+
+    public int getBurnTime() {
+        return burnTime;
+    }
+
+    public int getTicksRequired() {
+        return ticksRequired;
+    }
+
+    public BlockPos getConnectedPos() {
+        return connectedPos;
+    }
+
+    public boolean[] getBlockedSlots() {
+        return blockedSlots;
+    }
 }
diff --git a/src/main/java/WayofTime/bloodmagic/tile/TileDemonCrystal.java b/src/main/java/WayofTime/bloodmagic/tile/TileDemonCrystal.java
index b1083df8..d442fa49 100644
--- a/src/main/java/WayofTime/bloodmagic/tile/TileDemonCrystal.java
+++ b/src/main/java/WayofTime/bloodmagic/tile/TileDemonCrystal.java
@@ -1,8 +1,6 @@
 package WayofTime.bloodmagic.tile;
 
 import WayofTime.bloodmagic.tile.base.TileTicking;
-import lombok.Getter;
-import lombok.Setter;
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.entity.item.EntityItem;
 import net.minecraft.item.ItemStack;
@@ -25,12 +23,7 @@ public class TileDemonCrystal extends TileTicking
 
     public double progressToNextCrystal = 0;
     public int internalCounter = 0;
-
-    @Getter
-    @Setter
     public int crystalCount = 1;
-    @Getter
-    @Setter
     public EnumFacing placement = EnumFacing.UP; //Side that this crystal is placed on.
 
     public TileDemonCrystal()
@@ -188,4 +181,20 @@ public class TileDemonCrystal extends TileTicking
         tag.setDouble("progress", progressToNextCrystal);
         return tag;
     }
+
+    public int getCrystalCount() {
+        return crystalCount;
+    }
+
+    public void setCrystalCount(int crystalCount) {
+        this.crystalCount = crystalCount;
+    }
+
+    public EnumFacing getPlacement() {
+        return placement;
+    }
+
+    public void setPlacement(EnumFacing placement) {
+        this.placement = placement;
+    }
 }
\ No newline at end of file
diff --git a/src/main/java/WayofTime/bloodmagic/tile/TileDemonCrystallizer.java b/src/main/java/WayofTime/bloodmagic/tile/TileDemonCrystallizer.java
index a0acb3ee..b560f6d6 100644
--- a/src/main/java/WayofTime/bloodmagic/tile/TileDemonCrystallizer.java
+++ b/src/main/java/WayofTime/bloodmagic/tile/TileDemonCrystallizer.java
@@ -4,7 +4,7 @@ import WayofTime.bloodmagic.api.soul.DemonWillHolder;
 import WayofTime.bloodmagic.api.soul.EnumDemonWillType;
 import WayofTime.bloodmagic.api.soul.IDemonWillConduit;
 import WayofTime.bloodmagic.demonAura.WorldDemonWillHandler;
-import WayofTime.bloodmagic.registry.ModBlocks;
+import WayofTime.bloodmagic.registry.RegistrarBloodMagicBlocks;
 import WayofTime.bloodmagic.tile.base.TileTicking;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.tileentity.TileEntity;
@@ -60,7 +60,7 @@ public class TileDemonCrystallizer extends TileTicking implements IDemonWillCond
 
     public boolean formCrystal(EnumDemonWillType type, BlockPos position)
     {
-        getWorld().setBlockState(position, ModBlocks.DEMON_CRYSTAL.getStateFromMeta(type.ordinal()));
+        getWorld().setBlockState(position, RegistrarBloodMagicBlocks.DEMON_CRYSTAL.getStateFromMeta(type.ordinal()));
         TileEntity tile = getWorld().getTileEntity(position);
         if (tile instanceof TileDemonCrystal)
         {
diff --git a/src/main/java/WayofTime/bloodmagic/tile/TileDimensionalPortal.java b/src/main/java/WayofTime/bloodmagic/tile/TileDimensionalPortal.java
index f65977a2..83db6385 100644
--- a/src/main/java/WayofTime/bloodmagic/tile/TileDimensionalPortal.java
+++ b/src/main/java/WayofTime/bloodmagic/tile/TileDimensionalPortal.java
@@ -13,11 +13,6 @@ public class TileDimensionalPortal extends TileBase
     public int masterStoneY;
     public int masterStoneZ;
 
-    public TileDimensionalPortal()
-    {
-        ;
-    }
-
     public void deserialize(NBTTagCompound tagCompound)
     {
         portalID = tagCompound.getString(RitualPortal.PORTAL_ID_TAG);
diff --git a/src/main/java/WayofTime/bloodmagic/tile/TileImperfectRitualStone.java b/src/main/java/WayofTime/bloodmagic/tile/TileImperfectRitualStone.java
index 1bf00be6..4d6784cd 100644
--- a/src/main/java/WayofTime/bloodmagic/tile/TileImperfectRitualStone.java
+++ b/src/main/java/WayofTime/bloodmagic/tile/TileImperfectRitualStone.java
@@ -6,13 +6,11 @@ import WayofTime.bloodmagic.api.ritual.imperfect.ImperfectRitual;
 import WayofTime.bloodmagic.api.util.helper.NetworkHelper;
 import WayofTime.bloodmagic.api.util.helper.PlayerHelper;
 import WayofTime.bloodmagic.tile.base.TileBase;
-import lombok.NoArgsConstructor;
 import net.minecraft.entity.effect.EntityLightningBolt;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
 
-@NoArgsConstructor
 public class TileImperfectRitualStone extends TileBase implements IImperfectRitualStone
 {
     // IImperfectRitualStone
diff --git a/src/main/java/WayofTime/bloodmagic/tile/TileInversionPillar.java b/src/main/java/WayofTime/bloodmagic/tile/TileInversionPillar.java
index a2a5f56a..22e8f743 100644
--- a/src/main/java/WayofTime/bloodmagic/tile/TileInversionPillar.java
+++ b/src/main/java/WayofTime/bloodmagic/tile/TileInversionPillar.java
@@ -4,8 +4,6 @@ import java.util.Collections;
 import java.util.List;
 import java.util.Locale;
 
-import lombok.Getter;
-import lombok.Setter;
 import net.minecraft.block.Block;
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.init.Blocks;
@@ -26,13 +24,11 @@ import WayofTime.bloodmagic.api.Constants;
 import WayofTime.bloodmagic.api.soul.EnumDemonWillType;
 import WayofTime.bloodmagic.demonAura.WorldDemonWillHandler;
 import WayofTime.bloodmagic.inversion.InversionPillarHandler;
-import WayofTime.bloodmagic.registry.ModBlocks;
+import WayofTime.bloodmagic.registry.RegistrarBloodMagicBlocks;
 import WayofTime.bloodmagic.tile.base.TileTicking;
 
 import com.google.common.collect.ImmutableMap;
 
-@Getter
-@Setter
 public class TileInversionPillar extends TileTicking
 {
     public static double willPerOperation = 0.5;
@@ -73,7 +69,7 @@ public class TileInversionPillar extends TileTicking
     public TileInversionPillar(EnumDemonWillType type)
     {
         this.type = type;
-        asm = BloodMagic.proxy.load(new ResourceLocation(Constants.Mod.MODID.toLowerCase(), "asms/block/inversion_pillar.json"), ImmutableMap.<String, ITimeValue>of("offset", animationOffset, "cycle_length", cycleLength));
+        asm = BloodMagic.proxy.load(new ResourceLocation(BloodMagic.MODID.toLowerCase(), "asms/block/inversion_pillar.json"), ImmutableMap.<String, ITimeValue>of("offset", animationOffset, "cycle_length", cycleLength));
         animationOffsetValue = -1;
     }
 
@@ -156,9 +152,9 @@ public class TileInversionPillar extends TileTicking
                 if (!candidatePos.equals(BlockPos.ORIGIN))
                 {
                     currentInversion = 0;
-                    IBlockState pillarState = ModBlocks.INVERSION_PILLAR.getStateFromMeta(type.ordinal());
-                    IBlockState bottomState = ModBlocks.INVERSION_PILLAR_END.getStateFromMeta(type.ordinal() * 2);
-                    IBlockState topState = ModBlocks.INVERSION_PILLAR_END.getStateFromMeta(type.ordinal() * 2 + 1);
+                    IBlockState pillarState = RegistrarBloodMagicBlocks.INVERSION_PILLAR.getStateFromMeta(type.ordinal());
+                    IBlockState bottomState = RegistrarBloodMagicBlocks.INVERSION_PILLAR_END.getStateFromMeta(type.ordinal() * 2);
+                    IBlockState topState = RegistrarBloodMagicBlocks.INVERSION_PILLAR_END.getStateFromMeta(type.ordinal() * 2 + 1);
                     getWorld().setBlockState(candidatePos, pillarState);
                     getWorld().setBlockState(candidatePos.down(), bottomState);
                     getWorld().setBlockState(candidatePos.up(), topState);
@@ -178,9 +174,9 @@ public class TileInversionPillar extends TileTicking
         {
             Vec3d vec = new Vec3d(getWorld().rand.nextDouble() * 2 - 1, getWorld().rand.nextDouble() * 2 - 1, getWorld().rand.nextDouble() * 2 - 1).normalize().scale(2 * currentInfectionRadius);
 
-            BlockPos centralPos = pos.add(vec.xCoord, vec.yCoord, vec.zCoord);
+            BlockPos centralPos = pos.add(vec.x, vec.y, vec.z);
 
-            getWorld().setBlockState(centralPos, ModBlocks.DEMON_EXTRAS.getStateFromMeta(0));
+            getWorld().setBlockState(centralPos, RegistrarBloodMagicBlocks.DEMON_EXTRAS.getStateFromMeta(0));
             currentInversion -= 1000;
         }
     }
@@ -197,7 +193,7 @@ public class TileInversionPillar extends TileTicking
 
             Vec3d vec = new Vec3d(world.rand.nextDouble() * 2 - 1, world.rand.nextDouble() * 2 - 1, world.rand.nextDouble() * 2 - 1).normalize().scale(wantedAverageDistance);
 
-            BlockPos centralPos = pillarPos.add(vec.xCoord, vec.yCoord, vec.zCoord);
+            BlockPos centralPos = pillarPos.add(vec.x, vec.y, vec.z);
             BlockPos testPos = null;
             candidateTest: for (int h = 0; h <= heightCheckRange; h++)
             {
@@ -385,7 +381,7 @@ public class TileInversionPillar extends TileTicking
                 Block block = state.getBlock();
                 if (block == Blocks.DIRT || block == Blocks.STONE || block == Blocks.GRASS)
                 {
-                    if (getWorld().setBlockState(offsetPos, ModBlocks.DEMON_EXTRAS.getStateFromMeta(0)))
+                    if (getWorld().setBlockState(offsetPos, RegistrarBloodMagicBlocks.DEMON_EXTRAS.getStateFromMeta(0)))
                     {
                         WorldDemonWillHandler.drainWill(getWorld(), pos, type, willPerOperation, true);
                         currentInversion -= inversionPerOperation;
@@ -434,4 +430,164 @@ public class TileInversionPillar extends TileTicking
         }
         return super.getCapability(capability, side);
     }
+
+    public static double getWillPerOperation() {
+        return willPerOperation;
+    }
+
+    public static void setWillPerOperation(double willPerOperation) {
+        TileInversionPillar.willPerOperation = willPerOperation;
+    }
+
+    public static double getInversionPerOperation() {
+        return inversionPerOperation;
+    }
+
+    public static void setInversionPerOperation(double inversionPerOperation) {
+        TileInversionPillar.inversionPerOperation = inversionPerOperation;
+    }
+
+    public static double getAddedInversionPerFailedCheck() {
+        return addedInversionPerFailedCheck;
+    }
+
+    public static void setAddedInversionPerFailedCheck(double addedInversionPerFailedCheck) {
+        TileInversionPillar.addedInversionPerFailedCheck = addedInversionPerFailedCheck;
+    }
+
+    public static double getInversionToIncreaseRadius() {
+        return inversionToIncreaseRadius;
+    }
+
+    public static void setInversionToIncreaseRadius(double inversionToIncreaseRadius) {
+        TileInversionPillar.inversionToIncreaseRadius = inversionToIncreaseRadius;
+    }
+
+    public static double getInversionToAddPillar() {
+        return inversionToAddPillar;
+    }
+
+    public static void setInversionToAddPillar(double inversionToAddPillar) {
+        TileInversionPillar.inversionToAddPillar = inversionToAddPillar;
+    }
+
+    public static double getOperationThreshold() {
+        return operationThreshold;
+    }
+
+    public static void setOperationThreshold(double operationThreshold) {
+        TileInversionPillar.operationThreshold = operationThreshold;
+    }
+
+    public static double getInversionToSpreadWill() {
+        return inversionToSpreadWill;
+    }
+
+    public static void setInversionToSpreadWill(double inversionToSpreadWill) {
+        TileInversionPillar.inversionToSpreadWill = inversionToSpreadWill;
+    }
+
+    public static double getWillPushRate() {
+        return willPushRate;
+    }
+
+    public static void setWillPushRate(double willPushRate) {
+        TileInversionPillar.willPushRate = willPushRate;
+    }
+
+    public static double getInversionCostPerWillSpread() {
+        return inversionCostPerWillSpread;
+    }
+
+    public static void setInversionCostPerWillSpread(double inversionCostPerWillSpread) {
+        TileInversionPillar.inversionCostPerWillSpread = inversionCostPerWillSpread;
+    }
+
+    public static double getMinimumWillForChunkWhenSpreading() {
+        return minimumWillForChunkWhenSpreading;
+    }
+
+    public static void setMinimumWillForChunkWhenSpreading(double minimumWillForChunkWhenSpreading) {
+        TileInversionPillar.minimumWillForChunkWhenSpreading = minimumWillForChunkWhenSpreading;
+    }
+
+    public IAnimationStateMachine getAsm() {
+        return asm;
+    }
+
+    public float getAnimationOffsetValue() {
+        return animationOffsetValue;
+    }
+
+    public void setAnimationOffsetValue(float animationOffsetValue) {
+        this.animationOffsetValue = animationOffsetValue;
+    }
+
+    public VariableValue getAnimationOffset() {
+        return animationOffset;
+    }
+
+    public VariableValue getCycleLength() {
+        return cycleLength;
+    }
+
+    public EnumDemonWillType getType() {
+        return type;
+    }
+
+    public void setType(EnumDemonWillType type) {
+        this.type = type;
+    }
+
+    public double getCurrentInversion() {
+        return currentInversion;
+    }
+
+    public void setCurrentInversion(double currentInversion) {
+        this.currentInversion = currentInversion;
+    }
+
+    public int getConsecutiveFailedChecks() {
+        return consecutiveFailedChecks;
+    }
+
+    public void setConsecutiveFailedChecks(int consecutiveFailedChecks) {
+        this.consecutiveFailedChecks = consecutiveFailedChecks;
+    }
+
+    public int getConsecutiveFailedAirChecks() {
+        return consecutiveFailedAirChecks;
+    }
+
+    public void setConsecutiveFailedAirChecks(int consecutiveFailedAirChecks) {
+        this.consecutiveFailedAirChecks = consecutiveFailedAirChecks;
+    }
+
+    public int getCurrentInfectionRadius() {
+        return currentInfectionRadius;
+    }
+
+    public void setCurrentInfectionRadius(int currentInfectionRadius) {
+        this.currentInfectionRadius = currentInfectionRadius;
+    }
+
+    public int getCounter() {
+        return counter;
+    }
+
+    public void setCounter(int counter) {
+        this.counter = counter;
+    }
+
+    public boolean isRegistered() {
+        return isRegistered;
+    }
+
+    public void setRegistered(boolean registered) {
+        isRegistered = registered;
+    }
+
+    public static double getMaxWillForChunk() {
+        return maxWillForChunk;
+    }
 }
diff --git a/src/main/java/WayofTime/bloodmagic/tile/TileMasterRitualStone.java b/src/main/java/WayofTime/bloodmagic/tile/TileMasterRitualStone.java
index 1b21dbe7..7dd3f9f2 100644
--- a/src/main/java/WayofTime/bloodmagic/tile/TileMasterRitualStone.java
+++ b/src/main/java/WayofTime/bloodmagic/tile/TileMasterRitualStone.java
@@ -4,9 +4,6 @@ import java.util.ArrayList;
 import java.util.List;
 
 import WayofTime.bloodmagic.tile.base.TileTicking;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-import lombok.Setter;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
@@ -28,15 +25,13 @@ import WayofTime.bloodmagic.api.util.helper.NetworkHelper;
 import WayofTime.bloodmagic.api.util.helper.PlayerHelper;
 import WayofTime.bloodmagic.api.util.helper.RitualHelper;
 import WayofTime.bloodmagic.item.ItemActivationCrystal;
-import WayofTime.bloodmagic.registry.ModItems;
+import WayofTime.bloodmagic.registry.RegistrarBloodMagicItems;
 import WayofTime.bloodmagic.util.ChatUtil;
 
 import com.google.common.base.Strings;
 
 import javax.annotation.Nullable;
 
-@Getter
-@NoArgsConstructor
 public class TileMasterRitualStone extends TileTicking implements IMasterRitualStone
 {
     private String owner;
@@ -46,11 +41,8 @@ public class TileMasterRitualStone extends TileTicking implements IMasterRitualS
     private int activeTime;
     private int cooldown;
     private Ritual currentRitual;
-    @Setter
     private EnumFacing direction = EnumFacing.NORTH;
-    @Setter
     private boolean inverted;
-
     private List<EnumDemonWillType> currentActiveWillConfig = new ArrayList<EnumDemonWillType>();
 
     @Override
@@ -70,7 +62,7 @@ public class TileMasterRitualStone extends TileTicking implements IMasterRitualS
         if (!isActive() && !isPowered() && isRedstoned() && getCurrentRitual() != null)
         {
             active = true;
-            ItemStack crystalStack = NBTHelper.checkNBT(new ItemStack(ModItems.ACTIVATION_CRYSTAL, 1, getCurrentRitual().getCrystalLevel()));
+            ItemStack crystalStack = NBTHelper.checkNBT(new ItemStack(RegistrarBloodMagicItems.ACTIVATION_CRYSTAL, 1, getCurrentRitual().getCrystalLevel()));
             crystalStack.getTagCompound().setString(Constants.NBT.OWNER_UUID, getOwner());
             activateRitual(crystalStack, null, getCurrentRitual());
             redstoned = false;
@@ -420,4 +412,64 @@ public class TileMasterRitualStone extends TileTicking implements IMasterRitualS
 
         return getWorld().isBlockPowered(getPos());
     }
+
+    public void setOwner(String owner) {
+        this.owner = owner;
+    }
+
+    public SoulNetwork getCachedNetwork() {
+        return cachedNetwork;
+    }
+
+    public void setCachedNetwork(SoulNetwork cachedNetwork) {
+        this.cachedNetwork = cachedNetwork;
+    }
+
+    public boolean isActive() {
+        return active;
+    }
+
+    public boolean isRedstoned() {
+        return redstoned;
+    }
+
+    public void setRedstoned(boolean redstoned) {
+        this.redstoned = redstoned;
+    }
+
+    public int getActiveTime() {
+        return activeTime;
+    }
+
+    public void setActiveTime(int activeTime) {
+        this.activeTime = activeTime;
+    }
+
+    public Ritual getCurrentRitual() {
+        return currentRitual;
+    }
+
+    public void setCurrentRitual(Ritual currentRitual) {
+        this.currentRitual = currentRitual;
+    }
+
+    public void setDirection(EnumFacing direction) {
+        this.direction = direction;
+    }
+
+    public boolean isInverted() {
+        return inverted;
+    }
+
+    public void setInverted(boolean inverted) {
+        this.inverted = inverted;
+    }
+
+    public List<EnumDemonWillType> getCurrentActiveWillConfig() {
+        return currentActiveWillConfig;
+    }
+
+    public void setCurrentActiveWillConfig(List<EnumDemonWillType> currentActiveWillConfig) {
+        this.currentActiveWillConfig = currentActiveWillConfig;
+    }
 }
diff --git a/src/main/java/WayofTime/bloodmagic/tile/TileMimic.java b/src/main/java/WayofTime/bloodmagic/tile/TileMimic.java
index afc7b0ea..5e0c6a3d 100644
--- a/src/main/java/WayofTime/bloodmagic/tile/TileMimic.java
+++ b/src/main/java/WayofTime/bloodmagic/tile/TileMimic.java
@@ -27,8 +27,8 @@ import net.minecraft.world.World;
 import net.minecraftforge.fml.relauncher.ReflectionHelper;
 import WayofTime.bloodmagic.block.BlockMimic;
 import WayofTime.bloodmagic.entity.mob.EntityMimic;
-import WayofTime.bloodmagic.registry.ModBlocks;
-import WayofTime.bloodmagic.registry.ModItems;
+import WayofTime.bloodmagic.registry.RegistrarBloodMagicBlocks;
+import WayofTime.bloodmagic.registry.RegistrarBloodMagicItems;
 import WayofTime.bloodmagic.util.ChatUtil;
 import WayofTime.bloodmagic.util.Utils;
 
@@ -79,7 +79,7 @@ public class TileMimic extends TileInventory implements ITickable
                         double posY = this.pos.getY() + 0.5 + (2 * getWorld().rand.nextDouble() - 1) * potionSpawnRadius;
                         double posZ = this.pos.getZ() + 0.5 + (2 * getWorld().rand.nextDouble() - 1) * potionSpawnRadius;
 
-                        ItemStack newStack = new ItemStack(potionStack.getItem() == ModItems.POTION_FLASK ? Items.SPLASH_POTION : potionStack.getItem());
+                        ItemStack newStack = new ItemStack(potionStack.getItem() == RegistrarBloodMagicItems.POTION_FLASK ? Items.SPLASH_POTION : potionStack.getItem());
                         newStack.setTagCompound(potionStack.getTagCompound());
 
                         EntityPotion potionEntity = new EntityPotion(getWorld(), posX, posY, posZ, newStack);
@@ -122,7 +122,7 @@ public class TileMimic extends TileInventory implements ITickable
                     ChatUtil.sendNoSpam(player, new TextComponentTranslation("chat.bloodmagic.mimic.potionSet"));
                 }
                 return true;
-            } else if (heldItem.getItem() == ModItems.POTION_FLASK)
+            } else if (heldItem.getItem() == RegistrarBloodMagicItems.POTION_FLASK)
             {
                 //The potion flask is empty, therefore we have to reset the stored potion.
                 if (!world.isRemote)
@@ -143,7 +143,7 @@ public class TileMimic extends TileInventory implements ITickable
         if (player.isSneaking())
             return false;
 
-        if (!player.getHeldItem(hand).isEmpty() && player.getHeldItem(hand).getItem() == new ItemStack(ModBlocks.MIMIC).getItem())
+        if (!player.getHeldItem(hand).isEmpty() && player.getHeldItem(hand).getItem() == new ItemStack(RegistrarBloodMagicBlocks.MIMIC).getItem())
             return false;
 
         if (!getStackInSlot(0).isEmpty() && !player.getHeldItem(hand).isEmpty())
diff --git a/src/main/java/WayofTime/bloodmagic/tile/TilePhantomBlock.java b/src/main/java/WayofTime/bloodmagic/tile/TilePhantomBlock.java
index d495095b..0b8435e0 100644
--- a/src/main/java/WayofTime/bloodmagic/tile/TilePhantomBlock.java
+++ b/src/main/java/WayofTime/bloodmagic/tile/TilePhantomBlock.java
@@ -2,14 +2,15 @@ package WayofTime.bloodmagic.tile;
 
 import WayofTime.bloodmagic.api.Constants;
 import WayofTime.bloodmagic.tile.base.TileTicking;
-import lombok.NoArgsConstructor;
 import net.minecraft.nbt.NBTTagCompound;
 
-@NoArgsConstructor
 public class TilePhantomBlock extends TileTicking
 {
     private int ticksRemaining = 10;
 
+    public TilePhantomBlock() {
+    }
+
     public TilePhantomBlock(int ticksRemaining)
     {
         this.ticksRemaining = ticksRemaining;
diff --git a/src/main/java/WayofTime/bloodmagic/tile/TilePlinth.java b/src/main/java/WayofTime/bloodmagic/tile/TilePlinth.java
deleted file mode 100644
index bb824969..00000000
--- a/src/main/java/WayofTime/bloodmagic/tile/TilePlinth.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package WayofTime.bloodmagic.tile;
-
-public class TilePlinth extends TileInventory
-{
-    public TilePlinth()
-    {
-        super(1, "plinth");
-    }
-}
diff --git a/src/main/java/WayofTime/bloodmagic/tile/TileSpectralBlock.java b/src/main/java/WayofTime/bloodmagic/tile/TileSpectralBlock.java
index 22c48fef..17a69a18 100644
--- a/src/main/java/WayofTime/bloodmagic/tile/TileSpectralBlock.java
+++ b/src/main/java/WayofTime/bloodmagic/tile/TileSpectralBlock.java
@@ -1,7 +1,7 @@
 package WayofTime.bloodmagic.tile;
 
 import WayofTime.bloodmagic.api.Constants;
-import WayofTime.bloodmagic.registry.ModBlocks;
+import WayofTime.bloodmagic.registry.RegistrarBloodMagicBlocks;
 import WayofTime.bloodmagic.tile.base.TileTicking;
 import com.google.common.base.Strings;
 import net.minecraft.block.Block;
@@ -88,7 +88,7 @@ public class TileSpectralBlock extends TileTicking
         if (world.isAirBlock(blockPos))
             return;
         IBlockState cachedState = world.getBlockState(blockPos);
-        world.setBlockState(blockPos, ModBlocks.SPECTRAL_BLOCK.getDefaultState());
+        world.setBlockState(blockPos, RegistrarBloodMagicBlocks.SPECTRAL.getDefaultState());
         TileSpectralBlock tile = (TileSpectralBlock) world.getTileEntity(blockPos);
         tile.setContainedBlockInfo(cachedState);
         tile.setDuration(duration);
diff --git a/src/main/java/WayofTime/bloodmagic/util/Utils.java b/src/main/java/WayofTime/bloodmagic/util/Utils.java
index 91f1833f..129d0714 100644
--- a/src/main/java/WayofTime/bloodmagic/util/Utils.java
+++ b/src/main/java/WayofTime/bloodmagic/util/Utils.java
@@ -25,7 +25,6 @@ import net.minecraft.inventory.IInventory;
 import net.minecraft.inventory.ISidedInventory;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemArmor;
-import net.minecraft.item.ItemBlock;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.potion.Potion;
@@ -33,7 +32,6 @@ import net.minecraft.potion.PotionEffect;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.DamageSource;
 import net.minecraft.util.EnumFacing;
-import net.minecraft.util.ResourceLocation;
 import net.minecraft.util.SoundCategory;
 import net.minecraft.util.math.AxisAlignedBB;
 import net.minecraft.util.math.BlockPos;
@@ -46,12 +44,10 @@ import net.minecraftforge.common.ISpecialArmor.ArmorProperties;
 import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.fluids.IFluidBlock;
 import net.minecraftforge.fml.common.discovery.ASMDataTable;
-import net.minecraftforge.fml.common.registry.ForgeRegistries;
 import net.minecraftforge.items.CapabilityItemHandler;
 import net.minecraftforge.items.IItemHandler;
 import net.minecraftforge.items.ItemHandlerHelper;
 import net.minecraftforge.items.wrapper.InvWrapper;
-import net.minecraftforge.items.wrapper.PlayerInvWrapper;
 import net.minecraftforge.items.wrapper.PlayerMainInvWrapper;
 import net.minecraftforge.items.wrapper.SidedInvWrapper;
 import WayofTime.bloodmagic.BloodMagic;
@@ -62,7 +58,7 @@ import WayofTime.bloodmagic.api.iface.IDemonWillViewer;
 import WayofTime.bloodmagic.api.util.helper.NBTHelper;
 import WayofTime.bloodmagic.network.BloodMagicPacketHandler;
 import WayofTime.bloodmagic.network.PlayerVelocityPacketProcessor;
-import WayofTime.bloodmagic.registry.ModBlocks;
+import WayofTime.bloodmagic.registry.RegistrarBloodMagicBlocks;
 import WayofTime.bloodmagic.tile.TileInventory;
 
 import com.google.common.collect.Iterables;
@@ -142,7 +138,7 @@ public class Utils
     public static boolean canEntitySeeBlock(World world, Entity entity, BlockPos pos)
     {
         Vec3d relativePosition = new Vec3d(entity.posX - pos.getX() - 0.5, entity.posY + (double) entity.getEyeHeight() - pos.getY() - 0.5, entity.posZ - pos.getZ() - 0.5);
-        EnumFacing dir = EnumFacing.getFacingFromVector((float) relativePosition.xCoord, (float) relativePosition.yCoord, (float) relativePosition.zCoord);
+        EnumFacing dir = EnumFacing.getFacingFromVector((float) relativePosition.x, (float) relativePosition.y, (float) relativePosition.z);
         RayTraceResult result = world.rayTraceBlocks(new Vec3d(entity.posX, entity.posY + (double) entity.getEyeHeight(), entity.posZ), new Vec3d(pos.getX() + 0.5 + dir.getFrontOffsetX() * 0.4, pos.getY() + 0.5 + dir.getFrontOffsetY() * 0.4, pos.getZ() + 0.5 + dir.getFrontOffsetZ() * 0.4), false, true, true);
         return result == null || pos.equals(result.getBlockPos());
     }
@@ -226,7 +222,7 @@ public class Utils
 
         World world = itemEntity.getEntityWorld();
         BlockPos pos = itemEntity.getPosition();
-        ItemStack stack = itemEntity.getEntityItem();
+        ItemStack stack = itemEntity.getItem();
 
         int planted = plantItemStack(world, pos, stack, horizontalRadius, verticalRadius);
 
@@ -408,13 +404,13 @@ public class Utils
         case GLOWSTONE:
             return Blocks.GLOWSTONE;
         case BLOODSTONE:
-            return ModBlocks.BLOOD_STONE;
+            return RegistrarBloodMagicBlocks.DECORATIVE_BRICK;
         case BEACON:
             return Blocks.BEACON;
         case BLOODRUNE:
-            return ModBlocks.BLOOD_RUNE;
+            return RegistrarBloodMagicBlocks.BLOOD_RUNE;
         case CRYSTAL:
-            return ModBlocks.CRYSTAL;
+            return RegistrarBloodMagicBlocks.CRYSTAL;
         case NOTAIR:
             return Blocks.STONEBRICK;
         default:
@@ -1016,7 +1012,7 @@ public class Utils
             }
         }
 
-        entityItem.setEntityItemStack(stack);
+        entityItem.setItem(stack);
         return world.spawnEntity(entityItem);
     }
 
@@ -1120,7 +1116,7 @@ public class Utils
                 Class<?> handlerClass = Class.forName(data.getClassName());
                 Object handlerImpl = handlerClass.newInstance();
                 MinecraftForge.EVENT_BUS.register(handlerImpl);
-                BloodMagic.instance.getLogger().debug("Registering event handler for class {}", data.getClassName());
+                BloodMagic.instance.logger.debug("Registering event handler for class {}", data.getClassName());
             } catch (Exception e)
             {
                 // No-op
diff --git a/src/main/java/WayofTime/bloodmagic/util/handler/event/ClientHandler.java b/src/main/java/WayofTime/bloodmagic/util/handler/event/ClientHandler.java
index 1b782631..348fbbd8 100644
--- a/src/main/java/WayofTime/bloodmagic/util/handler/event/ClientHandler.java
+++ b/src/main/java/WayofTime/bloodmagic/util/handler/event/ClientHandler.java
@@ -218,7 +218,7 @@ public class ClientHandler
     @SubscribeEvent
     public void onModelBake(ModelBakeEvent event)
     {
-        if (BloodMagic.isDev() && SUPPRESS_ASSET_ERRORS)
+        if (BloodMagic.IS_DEV && SUPPRESS_ASSET_ERRORS)
             return;
 
         Stopwatch stopwatch = Stopwatch.createStarted();
@@ -228,13 +228,13 @@ public class ClientHandler
         // Collect all Blood Magic model errors
         List<ResourceLocation> errored = new ArrayList<ResourceLocation>();
         for (ResourceLocation modelError : modelErrors.keySet())
-            if (modelError.getResourceDomain().equalsIgnoreCase(Constants.Mod.MODID))
+            if (modelError.getResourceDomain().equalsIgnoreCase(BloodMagic.MODID))
                 errored.add(modelError);
 
         // Collect all Blood Magic variant errors
         List<ModelResourceLocation> missing = new ArrayList<ModelResourceLocation>();
         for (ModelResourceLocation missingVariant : missingVariants)
-            if (missingVariant.getResourceDomain().equalsIgnoreCase(Constants.Mod.MODID))
+            if (missingVariant.getResourceDomain().equalsIgnoreCase(BloodMagic.MODID))
                 missing.add(missingVariant);
 
         // Remove discovered model errors
@@ -245,17 +245,17 @@ public class ClientHandler
         missingVariants.removeAll(missing);
 
         if (errored.size() > 0)
-            BloodMagic.instance.getLogger().info("Suppressed {} model errors from Blood Magic.", errored.size());
+            BloodMagic.instance.logger.info("Suppressed {} model errors from Blood Magic.", errored.size());
         if (missing.size() > 0)
-            BloodMagic.instance.getLogger().info("Suppressed {} variant errors from Blood Magic.", missing.size());
-        BloodMagic.instance.getLogger().debug("Suppressed discovered model/variant errors in {}", stopwatch.stop());
+            BloodMagic.instance.logger.info("Suppressed {} variant errors from Blood Magic.", missing.size());
+        BloodMagic.instance.logger.debug("Suppressed discovered model/variant errors in {}", stopwatch.stop());
     }
 
     // For some reason, we need some bad textures to be listed in the Crystal and Node models. This will hide that from the end user.
     @SubscribeEvent
     public void onTextureStitch(TextureStitchEvent.Post event)
     {
-        if (BloodMagic.isDev() && SUPPRESS_ASSET_ERRORS)
+        if (BloodMagic.IS_DEV && SUPPRESS_ASSET_ERRORS)
             return;
 
         Stopwatch stopwatch = Stopwatch.createStarted();
@@ -284,7 +284,7 @@ public class ClientHandler
             missingTextures.keySet().remove(mc);
             badTextureDomains.remove(mc);
         }
-        BloodMagic.instance.getLogger().debug("Suppressed required texture errors in {}", stopwatch.stop());
+        BloodMagic.instance.logger.debug("Suppressed required texture errors in {}", stopwatch.stop());
     }
 
     public static void cycleSigil(ItemStack stack, EntityPlayer player, int dWheel)
diff --git a/src/main/java/WayofTime/bloodmagic/util/handler/event/CraftingHandler.java b/src/main/java/WayofTime/bloodmagic/util/handler/event/CraftingHandler.java
index 81fceba7..36e543e5 100644
--- a/src/main/java/WayofTime/bloodmagic/util/handler/event/CraftingHandler.java
+++ b/src/main/java/WayofTime/bloodmagic/util/handler/event/CraftingHandler.java
@@ -3,6 +3,7 @@ package WayofTime.bloodmagic.util.handler.event;
 import java.util.ArrayList;
 import java.util.List;
 
+import WayofTime.bloodmagic.BloodMagic;
 import net.minecraft.init.Items;
 import net.minecraft.item.EnumDyeColor;
 import net.minecraft.item.ItemBanner;
@@ -21,7 +22,7 @@ import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade;
 import WayofTime.bloodmagic.api.util.helper.ItemHelper;
 import WayofTime.bloodmagic.api.util.helper.NBTHelper;
 import WayofTime.bloodmagic.item.ItemInscriptionTool;
-import WayofTime.bloodmagic.registry.ModItems;
+import WayofTime.bloodmagic.registry.RegistrarBloodMagicItems;
 
 @Handler
 public class CraftingHandler
@@ -55,11 +56,11 @@ public class CraftingHandler
     {
         if (ConfigHandler.thaumcraftGogglesUpgrade)
         {
-            if (event.getLeft().getItem() == ModItems.LIVING_ARMOUR_HELMET && event.getRight().getItem() == Constants.Compat.THAUMCRAFT_GOGGLES && !event.getRight().isItemDamaged())
+            if (event.getLeft().getItem() == RegistrarBloodMagicItems.LIVING_ARMOUR_HELMET && event.getRight().getItem() == Constants.Compat.THAUMCRAFT_GOGGLES && !event.getRight().isItemDamaged())
             {
-                ItemStack output = new ItemStack(ModItems.UPGRADE_TOME);
+                ItemStack output = new ItemStack(RegistrarBloodMagicItems.UPGRADE_TOME);
                 output = NBTHelper.checkNBT(output);
-                ItemHelper.LivingUpgrades.setKey(output, Constants.Mod.MODID + ".upgrade.revealing");
+                ItemHelper.LivingUpgrades.setKey(output, BloodMagic.MODID + ".upgrade.revealing");
                 ItemHelper.LivingUpgrades.setLevel(output, 1);
                 event.setCost(1);
 
@@ -69,7 +70,7 @@ public class CraftingHandler
             }
         }
 
-        if (event.getLeft().getItem() == ModItems.SIGIL_HOLDING)
+        if (event.getLeft().getItem() == RegistrarBloodMagicItems.SIGIL_HOLDING)
         {
             if (event.getRight().getItem() == Items.NAME_TAG)
             {
@@ -90,7 +91,7 @@ public class CraftingHandler
                 ItemStack output = event.getLeft().copy();
                 if (!output.hasTagCompound())
                     output.setTagCompound(new NBTTagCompound());
-                output.getTagCompound().setString(Constants.NBT.COLOR, String.valueOf(dyeColor.getMapColor().colorValue));
+                output.getTagCompound().setString(Constants.NBT.COLOR, String.valueOf(dyeColor.getColorValue()));
                 event.setCost(1);
 
                 event.setOutput(output);
@@ -101,9 +102,9 @@ public class CraftingHandler
 
         if (event.getLeft().getItem() == Items.BOOK && event.getRight().getItem() == Items.ELYTRA && !event.getRight().isItemDamaged())
         {
-            ItemStack output = new ItemStack(ModItems.UPGRADE_TOME);
+            ItemStack output = new ItemStack(RegistrarBloodMagicItems.UPGRADE_TOME);
             output = NBTHelper.checkNBT(output);
-            ItemHelper.LivingUpgrades.setKey(output, Constants.Mod.MODID + ".upgrade.elytra");
+            ItemHelper.LivingUpgrades.setKey(output, BloodMagic.MODID + ".upgrade.elytra");
             ItemHelper.LivingUpgrades.setLevel(output, 1);
             event.setCost(30);
 
@@ -112,7 +113,7 @@ public class CraftingHandler
             return;
         }
 
-        if (event.getLeft().getItem() == ModItems.UPGRADE_TOME && event.getRight().getItem() == ModItems.UPGRADE_TOME)
+        if (event.getLeft().getItem() == RegistrarBloodMagicItems.UPGRADE_TOME && event.getRight().getItem() == RegistrarBloodMagicItems.UPGRADE_TOME)
         {
             LivingArmourUpgrade leftUpgrade = ItemHelper.LivingUpgrades.getUpgrade(event.getLeft());
             if (leftUpgrade != null && !leftUpgrade.isDowngrade() && ItemHelper.LivingUpgrades.getKey(event.getLeft()).equals(ItemHelper.LivingUpgrades.getKey(event.getRight())))
@@ -133,7 +134,7 @@ public class CraftingHandler
             }
         }
 
-        if (event.getLeft().getItem() instanceof IUpgradeTrainer && event.getRight().getItem() == ModItems.UPGRADE_TOME)
+        if (event.getLeft().getItem() instanceof IUpgradeTrainer && event.getRight().getItem() == RegistrarBloodMagicItems.UPGRADE_TOME)
         {
             LivingArmourUpgrade rightUpgrade = ItemHelper.LivingUpgrades.getUpgrade(event.getRight());
             if (rightUpgrade != null)
diff --git a/src/main/java/WayofTime/bloodmagic/util/handler/event/GenericHandler.java b/src/main/java/WayofTime/bloodmagic/util/handler/event/GenericHandler.java
index bd6cc5ac..d0bbccc7 100644
--- a/src/main/java/WayofTime/bloodmagic/util/handler/event/GenericHandler.java
+++ b/src/main/java/WayofTime/bloodmagic/util/handler/event/GenericHandler.java
@@ -5,6 +5,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Random;
 
+import WayofTime.bloodmagic.BloodMagic;
 import net.minecraft.block.Block;
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.enchantment.EnchantmentHelper;
@@ -78,7 +79,7 @@ import WayofTime.bloodmagic.livingArmour.upgrade.LivingArmourUpgradeSelfSacrific
 import WayofTime.bloodmagic.network.BloodMagicPacketHandler;
 import WayofTime.bloodmagic.network.DemonAuraPacketProcessor;
 import WayofTime.bloodmagic.potion.BMPotionUtils;
-import WayofTime.bloodmagic.registry.ModItems;
+import WayofTime.bloodmagic.registry.RegistrarBloodMagicItems;
 import WayofTime.bloodmagic.registry.ModPotions;
 import WayofTime.bloodmagic.util.ChatUtil;
 import WayofTime.bloodmagic.util.Utils;
@@ -160,7 +161,7 @@ public class GenericHandler
         EntityItem itemEntity = event.getEntityItem();
         if (itemEntity != null)
         {
-            ItemStack stack = itemEntity.getEntityItem();
+            ItemStack stack = itemEntity.getItem();
             Item item = stack.getItem();
             if (stack.hasTagCompound() && item instanceof ISentientTool)
             {
@@ -180,7 +181,7 @@ public class GenericHandler
         Vec3d position = exp.getPosition();
         double radius = 3;
 
-        AxisAlignedBB bb = new AxisAlignedBB(position.xCoord - radius, position.yCoord - radius, position.zCoord - radius, position.xCoord + radius, position.yCoord + radius, position.zCoord + radius);
+        AxisAlignedBB bb = new AxisAlignedBB(position.x - radius, position.y - radius, position.z - radius, position.x + radius, position.y + radius, position.z + radius);
         List<EntitySentientSpecter> specterList = world.getEntitiesWithinAABB(EntitySentientSpecter.class, bb);
         if (!specterList.isEmpty())
         {
@@ -201,9 +202,9 @@ public class GenericHandler
         if (event.getEntity().getEntityWorld().isRemote)
             return;
 
-        if (event.getSource().getEntity() instanceof EntityPlayer && !PlayerHelper.isFakePlayer((EntityPlayer) event.getSource().getEntity()))
+        if (event.getSource().getTrueSource() instanceof EntityPlayer && !PlayerHelper.isFakePlayer((EntityPlayer) event.getSource().getTrueSource()))
         {
-            EntityPlayer player = (EntityPlayer) event.getSource().getEntity();
+            EntityPlayer player = (EntityPlayer) event.getSource().getTrueSource();
 
             if (!player.getItemStackFromSlot(EntityEquipmentSlot.CHEST).isEmpty() && player.getItemStackFromSlot(EntityEquipmentSlot.CHEST).getItem() instanceof ItemPackSacrifice)
             {
@@ -224,7 +225,7 @@ public class GenericHandler
                 if (armour != null)
                 {
 
-                    LivingArmourUpgrade upgrade = ItemLivingArmour.getUpgrade(Constants.Mod.MODID + ".upgrade.battleHunger", chestStack);
+                    LivingArmourUpgrade upgrade = ItemLivingArmour.getUpgrade(BloodMagic.MODID + ".upgrade.battleHunger", chestStack);
                     if (upgrade instanceof LivingArmourUpgradeBattleHungry)
                     {
                         ((LivingArmourUpgradeBattleHungry) upgrade).resetTimer();
@@ -368,7 +369,7 @@ public class GenericHandler
         if (ConfigHandler.teleposerBlacklist.contains(event.initialStack) || ConfigHandler.teleposerBlacklist.contains(event.finalStack))
             event.setCanceled(true);
 
-        if (BloodMagicAPI.getTeleposerBlacklist().contains(event.initialStack) || BloodMagicAPI.getTeleposerBlacklist().contains(event.finalStack))
+        if (BloodMagicAPI.teleposerBlacklist.contains(event.initialStack) || BloodMagicAPI.teleposerBlacklist.contains(event.finalStack))
             event.setCanceled(true);
     }
 
@@ -443,7 +444,7 @@ public class GenericHandler
             if (armour != null)
             {
                 StatTrackerSelfSacrifice.incrementCounter(armour, event.healthDrained / 2);
-                LivingArmourUpgrade upgrade = ItemLivingArmour.getUpgrade(Constants.Mod.MODID + ".upgrade.selfSacrifice", chestStack);
+                LivingArmourUpgrade upgrade = ItemLivingArmour.getUpgrade(BloodMagic.MODID + ".upgrade.selfSacrifice", chestStack);
 
                 if (upgrade instanceof LivingArmourUpgradeSelfSacrifice)
                 {
@@ -461,17 +462,17 @@ public class GenericHandler
     {
         EntityLivingBase attackedEntity = event.getEntityLiving();
         DamageSource source = event.getSource();
-        Entity entity = source.getEntity();
+        Entity entity = source.getTrueSource();
 
         if (entity != null && entity instanceof EntityPlayer)
         {
             EntityPlayer player = (EntityPlayer) entity;
             ItemStack heldStack = player.getHeldItemMainhand();
 
-            if (!heldStack.isEmpty() && heldStack.getItem() == ModItems.BOUND_SWORD && !(attackedEntity instanceof EntityAnimal))
+            if (!heldStack.isEmpty() && heldStack.getItem() == RegistrarBloodMagicItems.BOUND_SWORD && !(attackedEntity instanceof EntityAnimal))
                 for (int i = 0; i <= EnchantmentHelper.getLootingModifier(player); i++)
                     if (attackedEntity.getEntityWorld().rand.nextDouble() < 0.2)
-                        event.getDrops().add(new EntityItem(attackedEntity.getEntityWorld(), attackedEntity.posX, attackedEntity.posY, attackedEntity.posZ, new ItemStack(ModItems.BLOOD_SHARD, 1, 0)));
+                        event.getDrops().add(new EntityItem(attackedEntity.getEntityWorld(), attackedEntity.posX, attackedEntity.posY, attackedEntity.posZ, new ItemStack(RegistrarBloodMagicItems.BLOOD_SHARD, 1, 0)));
         }
     }
 
diff --git a/src/main/java/WayofTime/bloodmagic/util/handler/event/LivingArmourHandler.java b/src/main/java/WayofTime/bloodmagic/util/handler/event/LivingArmourHandler.java
index f41e1968..a6f32d17 100644
--- a/src/main/java/WayofTime/bloodmagic/util/handler/event/LivingArmourHandler.java
+++ b/src/main/java/WayofTime/bloodmagic/util/handler/event/LivingArmourHandler.java
@@ -1,5 +1,6 @@
 package WayofTime.bloodmagic.util.handler.event;
 
+import WayofTime.bloodmagic.BloodMagic;
 import net.minecraft.enchantment.EnchantmentHelper;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.player.EntityPlayer;
@@ -58,7 +59,7 @@ public class LivingArmourHandler
                 if (armour != null)
                 {
                     double modifier = 1;
-                    LivingArmourUpgrade upgrade = ItemLivingArmour.getUpgrade(Constants.Mod.MODID + ".upgrade.slowHeal", chestStack);
+                    LivingArmourUpgrade upgrade = ItemLivingArmour.getUpgrade(BloodMagic.MODID + ".upgrade.slowHeal", chestStack);
 
                     if (upgrade instanceof LivingArmourUpgradeSlowHeal)
                     {
@@ -121,7 +122,7 @@ public class LivingArmourHandler
                 LivingArmour armour = ItemLivingArmour.getLivingArmour(chestStack);
                 if (armour != null)
                 {
-                    LivingArmourUpgrade upgrade = ItemLivingArmour.getUpgrade(Constants.Mod.MODID + ".upgrade.stormTrooper", chestStack);
+                    LivingArmourUpgrade upgrade = ItemLivingArmour.getUpgrade(BloodMagic.MODID + ".upgrade.stormTrooper", chestStack);
 
                     if (upgrade instanceof LivingArmourUpgradeStormTrooper)
                     {
@@ -151,7 +152,7 @@ public class LivingArmourHandler
                 {
                     if (event.getHand() == EnumHand.OFF_HAND)
                     {
-                        LivingArmourUpgrade upgrade = ItemLivingArmour.getUpgrade(Constants.Mod.MODID + ".upgrade.crippledArm", chestStack);
+                        LivingArmourUpgrade upgrade = ItemLivingArmour.getUpgrade(BloodMagic.MODID + ".upgrade.crippledArm", chestStack);
 
                         if (upgrade instanceof LivingArmourUpgradeCrippledArm)
                         {
@@ -164,7 +165,7 @@ public class LivingArmourHandler
                         ItemStack drinkStack = event.getItemStack();
 
                         //TODO: See if the item is a splash potion? Those should be usable.
-                        LivingArmourUpgrade upgrade = ItemLivingArmour.getUpgrade(Constants.Mod.MODID + ".upgrade.quenched", chestStack);
+                        LivingArmourUpgrade upgrade = ItemLivingArmour.getUpgrade(BloodMagic.MODID + ".upgrade.quenched", chestStack);
 
                         if (upgrade instanceof LivingArmourUpgradeQuenched)
                         {
@@ -192,7 +193,7 @@ public class LivingArmourHandler
                 {
                     StatTrackerGrimReaperSprint.incrementCounter(armour);
 
-                    LivingArmourUpgrade upgrade = ItemLivingArmour.getUpgrade(Constants.Mod.MODID + ".upgrade.grimReaper", chestStack);
+                    LivingArmourUpgrade upgrade = ItemLivingArmour.getUpgrade(BloodMagic.MODID + ".upgrade.grimReaper", chestStack);
 
                     if (upgrade instanceof LivingArmourUpgradeGrimReaperSprint && ((LivingArmourUpgradeGrimReaperSprint) upgrade).canSavePlayer(player))
                     {
@@ -225,7 +226,7 @@ public class LivingArmourHandler
 
                     if (!player.isSneaking())
                     {
-                        LivingArmourUpgrade upgrade = ItemLivingArmour.getUpgradeFromNBT(Constants.Mod.MODID + ".upgrade.jump", chestStack);
+                        LivingArmourUpgrade upgrade = ItemLivingArmour.getUpgradeFromNBT(BloodMagic.MODID + ".upgrade.jump", chestStack);
 
                         if (upgrade instanceof LivingArmourUpgradeJump)
                         {
@@ -257,7 +258,7 @@ public class LivingArmourHandler
                     LivingArmour armour = ItemLivingArmour.getLivingArmourFromStack(chestStack);
                     if (armour != null)
                     {
-                        LivingArmourUpgrade upgrade = ItemLivingArmour.getUpgrade(Constants.Mod.MODID + ".upgrade.stepAssist", chestStack);
+                        LivingArmourUpgrade upgrade = ItemLivingArmour.getUpgrade(BloodMagic.MODID + ".upgrade.stepAssist", chestStack);
 
                         if (upgrade instanceof LivingArmourUpgradeStepAssist)
                         {
@@ -279,7 +280,7 @@ public class LivingArmourHandler
                 LivingArmour armour = ItemLivingArmour.getLivingArmourFromStack(chestStack);
                 if (armour != null)
                 {
-                    LivingArmourUpgrade upgrade = ItemLivingArmour.getUpgradeFromNBT(Constants.Mod.MODID + ".upgrade.movement", chestStack);
+                    LivingArmourUpgrade upgrade = ItemLivingArmour.getUpgradeFromNBT(BloodMagic.MODID + ".upgrade.movement", chestStack);
 
                     if (upgrade instanceof LivingArmourUpgradeSpeed)
                     {
@@ -298,7 +299,7 @@ public class LivingArmourHandler
 
             if (percentIncrease > 0 && (player.onGround || player.capabilities.isFlying) && (Math.abs(player.moveForward) > 0 || Math.abs(player.moveStrafing) > 0))
             {
-                player.moveRelative(player.moveStrafing, player.moveForward, player.capabilities.isFlying ? (percentIncrease / 2.0f) : percentIncrease);
+                player.moveRelative(player.moveStrafing, player.moveForward, player.capabilities.isFlying ? (percentIncrease / 2.0f) : percentIncrease, 0.02F);
             }
         }
     }
@@ -323,7 +324,7 @@ public class LivingArmourHandler
             {
                 StatTrackerArrowShot.incrementCounter(armour);
 
-                LivingArmourUpgrade upgrade = ItemLivingArmour.getUpgrade(Constants.Mod.MODID + ".upgrade.arrowShot", chestStack);
+                LivingArmourUpgrade upgrade = ItemLivingArmour.getUpgrade(BloodMagic.MODID + ".upgrade.arrowShot", chestStack);
                 if (upgrade instanceof LivingArmourUpgradeArrowShot)
                 {
                     int charge = event.getCharge();
diff --git a/src/main/java/WayofTime/bloodmagic/util/handler/event/StatTrackerHandler.java b/src/main/java/WayofTime/bloodmagic/util/handler/event/StatTrackerHandler.java
index 4c320e72..e4d8ff82 100644
--- a/src/main/java/WayofTime/bloodmagic/util/handler/event/StatTrackerHandler.java
+++ b/src/main/java/WayofTime/bloodmagic/util/handler/event/StatTrackerHandler.java
@@ -1,5 +1,6 @@
 package WayofTime.bloodmagic.util.handler.event;
 
+import WayofTime.bloodmagic.BloodMagic;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.entity.player.EntityPlayer;
@@ -17,7 +18,6 @@ import net.minecraftforge.event.world.BlockEvent;
 import net.minecraftforge.fml.common.eventhandler.EventPriority;
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
 import WayofTime.bloodmagic.annot.Handler;
-import WayofTime.bloodmagic.api.Constants;
 import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade;
 import WayofTime.bloodmagic.item.armour.ItemLivingArmour;
 import WayofTime.bloodmagic.item.armour.ItemSentientArmour;
@@ -106,7 +106,7 @@ public class StatTrackerHandler
     public void entityHurt(LivingHurtEvent event)
     {
         DamageSource source = event.getSource();
-        Entity sourceEntity = event.getSource().getEntity();
+        Entity sourceEntity = event.getSource().getTrueSource();
         EntityLivingBase attackedEntity = event.getEntityLiving();
 
         if (attackedEntity instanceof EntityPlayer)
@@ -196,7 +196,7 @@ public class StatTrackerHandler
             LivingArmour armour = ItemLivingArmour.getLivingArmour(chestStack);
             if (armour != null)
             {
-                LivingArmourUpgrade upgrade = ItemLivingArmour.getUpgrade(Constants.Mod.MODID + ".upgrade.experienced", chestStack);
+                LivingArmourUpgrade upgrade = ItemLivingArmour.getUpgrade(BloodMagic.MODID + ".upgrade.experienced", chestStack);
                 if (upgrade instanceof LivingArmourUpgradeExperience)
                 {
                     double modifier = ((LivingArmourUpgradeExperience) upgrade).getExperienceModifier();
diff --git a/src/main/java/WayofTime/bloodmagic/util/handler/event/WillHandler.java b/src/main/java/WayofTime/bloodmagic/util/handler/event/WillHandler.java
index 9dd3d359..cc107dd4 100644
--- a/src/main/java/WayofTime/bloodmagic/util/handler/event/WillHandler.java
+++ b/src/main/java/WayofTime/bloodmagic/util/handler/event/WillHandler.java
@@ -34,7 +34,7 @@ import WayofTime.bloodmagic.demonAura.PosXY;
 import WayofTime.bloodmagic.demonAura.WillChunk;
 import WayofTime.bloodmagic.demonAura.WorldDemonWillHandler;
 import WayofTime.bloodmagic.entity.projectile.EntitySentientArrow;
-import WayofTime.bloodmagic.registry.ModItems;
+import WayofTime.bloodmagic.registry.RegistrarBloodMagicItems;
 import WayofTime.bloodmagic.registry.ModPotions;
 
 @Handler
@@ -47,7 +47,7 @@ public class WillHandler
     @SubscribeEvent
     public void onItemPickup(EntityItemPickupEvent event)
     {
-        ItemStack stack = event.getItem().getEntityItem();
+        ItemStack stack = event.getItem().getItem();
         if (stack.getItem() instanceof IDemonWill)
         {
             EntityPlayer player = event.getEntityPlayer();
@@ -67,7 +67,7 @@ public class WillHandler
     {
         if (event.getSource() instanceof EntityDamageSourceIndirect)
         {
-            Entity sourceEntity = event.getSource().getSourceOfDamage();
+            Entity sourceEntity = event.getSource().getImmediateSource();
 
             if (sourceEntity instanceof EntitySentientArrow)
             {
@@ -82,7 +82,7 @@ public class WillHandler
     {
         EntityLivingBase attackedEntity = event.getEntityLiving();
         DamageSource source = event.getSource();
-        Entity entity = source.getEntity();
+        Entity entity = source.getTrueSource();
 
         if (attackedEntity.isPotionActive(ModPotions.soulSnare) && (attackedEntity instanceof EntityMob || attackedEntity.getEntityWorld().getDifficulty() == EnumDifficulty.PEACEFUL))
         {
@@ -90,7 +90,7 @@ public class WillHandler
             int lvl = eff.getAmplifier();
 
             double amountOfSouls = attackedEntity.getEntityWorld().rand.nextDouble() * (lvl + 1) * (lvl + 1) * 5;
-            ItemStack soulStack = ((IDemonWill) ModItems.MONSTER_SOUL).createWill(0, amountOfSouls);
+            ItemStack soulStack = ((IDemonWill) RegistrarBloodMagicItems.MONSTER_SOUL).createWill(0, amountOfSouls);
             event.getDrops().add(new EntityItem(attackedEntity.getEntityWorld(), attackedEntity.posX, attackedEntity.posY, attackedEntity.posZ, soulStack));
         }
 
@@ -159,18 +159,18 @@ public class WillHandler
     public void chunkSave(ChunkDataEvent.Save event)
     {
         int dim = event.getWorld().provider.getDimension();
-        ChunkPos loc = event.getChunk().getChunkCoordIntPair();
+        ChunkPos loc = event.getChunk().getPos();
 
         NBTTagCompound nbt = new NBTTagCompound();
         event.getData().setTag("BloodMagic", nbt);
 
-        WillChunk ac = WorldDemonWillHandler.getWillChunk(dim, loc.chunkXPos, loc.chunkZPos);
+        WillChunk ac = WorldDemonWillHandler.getWillChunk(dim, loc.x, loc.z);
         if (ac != null)
         {
             nbt.setShort("base", ac.getBase());
             ac.getCurrentWill().writeToNBT(nbt, "current");
             if (!event.getChunk().isLoaded())
-                WorldDemonWillHandler.removeWillChunk(dim, loc.chunkXPos, loc.chunkZPos);
+                WorldDemonWillHandler.removeWillChunk(dim, loc.x, loc.z);
         }
     }
 
diff --git a/src/main/java/WayofTime/bloodmagic/util/helper/RecipeHelper.java b/src/main/java/WayofTime/bloodmagic/util/helper/RecipeHelper.java
index acebf301..73d27fd3 100644
--- a/src/main/java/WayofTime/bloodmagic/util/helper/RecipeHelper.java
+++ b/src/main/java/WayofTime/bloodmagic/util/helper/RecipeHelper.java
@@ -1,17 +1,17 @@
 package WayofTime.bloodmagic.util.helper;
 
 import net.minecraft.item.ItemStack;
-import net.minecraft.item.crafting.CraftingManager;
 import net.minecraft.item.crafting.IRecipe;
 import WayofTime.bloodmagic.api.recipe.TartaricForgeRecipe;
 import WayofTime.bloodmagic.api.registry.AltarRecipeRegistry;
 import WayofTime.bloodmagic.api.registry.TartaricForgeRecipeRegistry;
+import net.minecraftforge.fml.common.registry.ForgeRegistries;
 
 public class RecipeHelper
 {
     public static IRecipe getRecipeForOutput(ItemStack stack)
     {
-        for (IRecipe recipe : CraftingManager.getInstance().getRecipeList())
+        for (IRecipe recipe : ForgeRegistries.RECIPES.getValues())
         {
             if (recipe != null)
             {