diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/block/BlockEnchantmentGlyph.java b/src/main/java/WayofTime/alchemicalWizardry/common/block/BlockEnchantmentGlyph.java
index bc61a6a8..2eee791d 100644
--- a/src/main/java/WayofTime/alchemicalWizardry/common/block/BlockEnchantmentGlyph.java
+++ b/src/main/java/WayofTime/alchemicalWizardry/common/block/BlockEnchantmentGlyph.java
@@ -8,10 +8,11 @@ import net.minecraft.block.state.IBlockState;
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
+import net.minecraft.util.BlockPos;
 import net.minecraft.world.World;
-import WayofTime.alchemicalWizardry.common.omega.IEnchantmentGlyph;
 import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;
+import WayofTime.alchemicalWizardry.common.omega.IEnchantmentGlyph;
 
 public class BlockEnchantmentGlyph extends Block implements IEnchantmentGlyph
 {
@@ -23,7 +24,7 @@ public class BlockEnchantmentGlyph extends Block implements IEnchantmentGlyph
     }
 
 	@Override
-	public int getAdditionalStabilityForFaceCount(World world, int x, int y, int z, int meta, int faceCount) 
+	public int getAdditionalStabilityForFaceCount(World world, BlockPos pos, int meta, int faceCount) 
 	{
 		switch(meta)
 		{
@@ -37,7 +38,7 @@ public class BlockEnchantmentGlyph extends Block implements IEnchantmentGlyph
 	}
 
 	@Override
-	public int getEnchantability(World world, int x, int y, int z, int meta) 
+	public int getEnchantability(World world, BlockPos pos, int meta) 
 	{
 		switch(meta)
 		{
@@ -49,7 +50,7 @@ public class BlockEnchantmentGlyph extends Block implements IEnchantmentGlyph
 	}
 
 	@Override
-	public int getEnchantmentLevel(World world, int x, int y, int z, int meta) 
+	public int getEnchantmentLevel(World world, BlockPos pos, int meta) 
 	{
 		switch(meta)
 		{
diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/block/BlockStabilityGlyph.java b/src/main/java/WayofTime/alchemicalWizardry/common/block/BlockStabilityGlyph.java
index 5884f4a8..55be5fde 100644
--- a/src/main/java/WayofTime/alchemicalWizardry/common/block/BlockStabilityGlyph.java
+++ b/src/main/java/WayofTime/alchemicalWizardry/common/block/BlockStabilityGlyph.java
@@ -7,10 +7,11 @@ import net.minecraft.block.material.Material;
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
+import net.minecraft.util.BlockPos;
 import net.minecraft.world.World;
-import WayofTime.alchemicalWizardry.common.omega.IStabilityGlyph;
 import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;
+import WayofTime.alchemicalWizardry.common.omega.IStabilityGlyph;
 
 public class BlockStabilityGlyph extends Block implements IStabilityGlyph
 {
@@ -22,7 +23,7 @@ public class BlockStabilityGlyph extends Block implements IStabilityGlyph
     }
 
 	@Override
-	public int getAdditionalStabilityForFaceCount(World world, int x, int y, int z, int meta, int faceCount) 
+	public int getAdditionalStabilityForFaceCount(World world, BlockPos pos, int meta, int faceCount) 
 	{
 		switch(meta)
 		{
diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/thaumcraft/ItemSanguineArmour.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/thaumcraft/ItemSanguineArmour.java
index 997740d9..f044912d 100644
--- a/src/main/java/WayofTime/alchemicalWizardry/common/items/thaumcraft/ItemSanguineArmour.java
+++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/thaumcraft/ItemSanguineArmour.java
@@ -1,192 +1,192 @@
-package WayofTime.alchemicalWizardry.common.items.thaumcraft;
-
-import WayofTime.alchemicalWizardry.AlchemicalWizardry;
-import WayofTime.alchemicalWizardry.ModItems;
-import WayofTime.alchemicalWizardry.api.items.interfaces.ArmourUpgrade;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-import net.minecraft.client.renderer.texture.IIconRegister;
-import net.minecraft.entity.Entity;
-import net.minecraft.entity.EntityLivingBase;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.ItemArmor;
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.IIcon;
-import net.minecraft.util.StatCollector;
-import net.minecraft.world.World;
-import thaumcraft.api.IGoggles;
-import thaumcraft.api.IRepairable;
-import thaumcraft.api.IRunicArmor;
-import thaumcraft.api.IVisDiscountGear;
-import thaumcraft.api.aspects.Aspect;
-import thaumcraft.api.nodes.IRevealer;
-
-import java.util.List;
-
-public class ItemSanguineArmour extends ItemArmor implements ArmourUpgrade, IGoggles, IVisDiscountGear, IRevealer, IRunicArmor, IRepairable
-{
-    @SideOnly(Side.CLIENT)
-    private IIcon helmetIcon;
-    @SideOnly(Side.CLIENT)
-    private IIcon plateIcon;
-    @SideOnly(Side.CLIENT)
-    private IIcon leggingsIcon;
-    @SideOnly(Side.CLIENT)
-    private IIcon bootsIcon;
-
-    public ItemSanguineArmour(int armorType)
-    {
-        super(AlchemicalWizardry.sanguineArmourArmourMaterial, 0, armorType);
-        setMaxDamage(1000);
-        setCreativeTab(AlchemicalWizardry.tabBloodMagic);
-    }
-
-    @Override
-    @SideOnly(Side.CLIENT)
-    public void registerIcons(IIconRegister iconRegister)
-    {
-        this.itemIcon = iconRegister.registerIcon("AlchemicalWizardry:SheathedItem");
-        this.helmetIcon = iconRegister.registerIcon("AlchemicalWizardry:SanguineHelmet");
-        this.plateIcon = iconRegister.registerIcon("AlchemicalWizardry:SanguinePlate");
-        this.leggingsIcon = iconRegister.registerIcon("AlchemicalWizardry:SanguineLeggings");
-        this.bootsIcon = iconRegister.registerIcon("AlchemicalWizardry:SanguineBoots");
-    }
-
-    @SideOnly(Side.CLIENT)
-    public IIcon getIconFromDamage(int par1)
-    {
-        if (this.equals(ModItems.sanguineHelmet))
-        {
-            return this.helmetIcon;
-        }
-
-        if (this.equals(ModItems.sanguineRobe))
-        {
-            return this.plateIcon;
-        }
-
-        if (this.equals(ModItems.sanguinePants))
-        {
-            return this.leggingsIcon;
-        }
-
-        if (this.equals(ModItems.sanguineBoots))
-        {
-            return this.bootsIcon;
-        }
-
-        return this.itemIcon;
-    }
-
-    @Override
-    public String getArmorTexture(ItemStack stack, Entity entity, int slot, String type)
-    {
-        if (this == ModItems.sanguineHelmet)
-        {
-            return "alchemicalwizardry:models/armor/sanguineArmour_layer_1.png";
-        }
-
-        if (this == ModItems.sanguineRobe || this == ModItems.sanguineBoots)
-        {
-            return "alchemicalwizardry:models/armor/sanguineArmour_layer_1.png";
-        }
-
-        if (this == ModItems.sanguinePants)
-        {
-            return "alchemicalwizardry:models/armor/sanguineArmour_layer_2.png";
-        } else
-        {
-            return null;
-        }
-    }
-
-    @Override
-    public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4)
-    {
-        int discount = 0;
-
-        switch (this.armorType)
-        {
-            case 0:
-                discount = 6;
-                break;
-            case 1:
-                discount = 3;
-                break;
-            case 2:
-                discount = 3;
-                break;
-            case 3:
-                discount = 2;
-                break;
-        }
-
-        switch (this.armorType)
-        {
-            case 0:
-                par3List.add(StatCollector.translateToLocal("tooltip.sanguinearmor.desc1"));
-                break;
-            case 1:
-
-            case 2:
-
-            case 3:
-                par3List.add(StatCollector.translateToLocal("tooltip.sanguinearmor.desc2"));
-        }
-
-        par3List.add(StatCollector.translateToLocal("tooltip.sanguinearmor.visdisc") + " " + discount + "%");
-    }
-
-    @Override
-    public void onArmourUpdate(World world, EntityPlayer player, ItemStack thisItemStack)
-    {
-        return;
-    }
-
-    @Override
-    public boolean isUpgrade()
-    {
-        return true;
-    }
-
-    @Override
-    public int getEnergyForTenSeconds()
-    {
-        return 0;
-    }
-
-    @Override
-    public boolean showNodes(ItemStack itemstack, EntityLivingBase player)
-    {
-        return true;
-    }
-
-    @Override
-    public int getVisDiscount(ItemStack stack, EntityPlayer player, Aspect aspect)
-    {
-        switch (this.armorType)
-        {
-            case 0:
-                return 7;
-            case 1:
-                return 3;
-            case 2:
-                return 2;
-            case 3:
-                return 2;
-        }
-        return 0;
-    }
-
-    @Override
-    public boolean showIngamePopups(ItemStack itemstack, EntityLivingBase player)
-    {
-        return true;
-    }
-
-    @Override
-    public int getRunicCharge(ItemStack itemstack)
-    {
-        return 0;
-    }
-}
\ No newline at end of file
+//package WayofTime.alchemicalWizardry.common.items.thaumcraft;
+//
+//import WayofTime.alchemicalWizardry.AlchemicalWizardry;
+//import WayofTime.alchemicalWizardry.ModItems;
+//import WayofTime.alchemicalWizardry.api.items.interfaces.ArmourUpgrade;
+//import cpw.mods.fml.relauncher.Side;
+//import cpw.mods.fml.relauncher.SideOnly;
+//import net.minecraft.client.renderer.texture.IIconRegister;
+//import net.minecraft.entity.Entity;
+//import net.minecraft.entity.EntityLivingBase;
+//import net.minecraft.entity.player.EntityPlayer;
+//import net.minecraft.item.ItemArmor;
+//import net.minecraft.item.ItemStack;
+//import net.minecraft.util.IIcon;
+//import net.minecraft.util.StatCollector;
+//import net.minecraft.world.World;
+//import thaumcraft.api.IGoggles;
+//import thaumcraft.api.IRepairable;
+//import thaumcraft.api.IRunicArmor;
+//import thaumcraft.api.IVisDiscountGear;
+//import thaumcraft.api.aspects.Aspect;
+//import thaumcraft.api.nodes.IRevealer;
+//
+//import java.util.List;
+//
+//public class ItemSanguineArmour extends ItemArmor implements ArmourUpgrade, IGoggles, IVisDiscountGear, IRevealer, IRunicArmor, IRepairable
+//{
+//    @SideOnly(Side.CLIENT)
+//    private IIcon helmetIcon;
+//    @SideOnly(Side.CLIENT)
+//    private IIcon plateIcon;
+//    @SideOnly(Side.CLIENT)
+//    private IIcon leggingsIcon;
+//    @SideOnly(Side.CLIENT)
+//    private IIcon bootsIcon;
+//
+//    public ItemSanguineArmour(int armorType)
+//    {
+//        super(AlchemicalWizardry.sanguineArmourArmourMaterial, 0, armorType);
+//        setMaxDamage(1000);
+//        setCreativeTab(AlchemicalWizardry.tabBloodMagic);
+//    }
+//
+//    @Override
+//    @SideOnly(Side.CLIENT)
+//    public void registerIcons(IIconRegister iconRegister)
+//    {
+//        this.itemIcon = iconRegister.registerIcon("AlchemicalWizardry:SheathedItem");
+//        this.helmetIcon = iconRegister.registerIcon("AlchemicalWizardry:SanguineHelmet");
+//        this.plateIcon = iconRegister.registerIcon("AlchemicalWizardry:SanguinePlate");
+//        this.leggingsIcon = iconRegister.registerIcon("AlchemicalWizardry:SanguineLeggings");
+//        this.bootsIcon = iconRegister.registerIcon("AlchemicalWizardry:SanguineBoots");
+//    }
+//
+//    @SideOnly(Side.CLIENT)
+//    public IIcon getIconFromDamage(int par1)
+//    {
+//        if (this.equals(ModItems.sanguineHelmet))
+//        {
+//            return this.helmetIcon;
+//        }
+//
+//        if (this.equals(ModItems.sanguineRobe))
+//        {
+//            return this.plateIcon;
+//        }
+//
+//        if (this.equals(ModItems.sanguinePants))
+//        {
+//            return this.leggingsIcon;
+//        }
+//
+//        if (this.equals(ModItems.sanguineBoots))
+//        {
+//            return this.bootsIcon;
+//        }
+//
+//        return this.itemIcon;
+//    }
+//
+//    @Override
+//    public String getArmorTexture(ItemStack stack, Entity entity, int slot, String type)
+//    {
+//        if (this == ModItems.sanguineHelmet)
+//        {
+//            return "alchemicalwizardry:models/armor/sanguineArmour_layer_1.png";
+//        }
+//
+//        if (this == ModItems.sanguineRobe || this == ModItems.sanguineBoots)
+//        {
+//            return "alchemicalwizardry:models/armor/sanguineArmour_layer_1.png";
+//        }
+//
+//        if (this == ModItems.sanguinePants)
+//        {
+//            return "alchemicalwizardry:models/armor/sanguineArmour_layer_2.png";
+//        } else
+//        {
+//            return null;
+//        }
+//    }
+//
+//    @Override
+//    public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4)
+//    {
+//        int discount = 0;
+//
+//        switch (this.armorType)
+//        {
+//            case 0:
+//                discount = 6;
+//                break;
+//            case 1:
+//                discount = 3;
+//                break;
+//            case 2:
+//                discount = 3;
+//                break;
+//            case 3:
+//                discount = 2;
+//                break;
+//        }
+//
+//        switch (this.armorType)
+//        {
+//            case 0:
+//                par3List.add(StatCollector.translateToLocal("tooltip.sanguinearmor.desc1"));
+//                break;
+//            case 1:
+//
+//            case 2:
+//
+//            case 3:
+//                par3List.add(StatCollector.translateToLocal("tooltip.sanguinearmor.desc2"));
+//        }
+//
+//        par3List.add(StatCollector.translateToLocal("tooltip.sanguinearmor.visdisc") + " " + discount + "%");
+//    }
+//
+//    @Override
+//    public void onArmourUpdate(World world, EntityPlayer player, ItemStack thisItemStack)
+//    {
+//        return;
+//    }
+//
+//    @Override
+//    public boolean isUpgrade()
+//    {
+//        return true;
+//    }
+//
+//    @Override
+//    public int getEnergyForTenSeconds()
+//    {
+//        return 0;
+//    }
+//
+//    @Override
+//    public boolean showNodes(ItemStack itemstack, EntityLivingBase player)
+//    {
+//        return true;
+//    }
+//
+//    @Override
+//    public int getVisDiscount(ItemStack stack, EntityPlayer player, Aspect aspect)
+//    {
+//        switch (this.armorType)
+//        {
+//            case 0:
+//                return 7;
+//            case 1:
+//                return 3;
+//            case 2:
+//                return 2;
+//            case 3:
+//                return 2;
+//        }
+//        return 0;
+//    }
+//
+//    @Override
+//    public boolean showIngamePopups(ItemStack itemstack, EntityLivingBase player)
+//    {
+//        return true;
+//    }
+//
+//    @Override
+//    public int getRunicCharge(ItemStack itemstack)
+//    {
+//        return 0;
+//    }
+//}
\ No newline at end of file