Move setRegistryName out of item/block constructors

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

@@ -35,7 +35,6 @@ public class BlockAlchemyArray extends BlockContainer
         super(Material.cloth);
 
         setUnlocalizedName(Constants.Mod.MODID + ".alchemyArray");
-        setRegistryName(Constants.BloodMagicBlock.ALCHEMY_ARRAY.getRegName());
         setHardness(0.1f);
     }
 

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

@@ -40,7 +40,6 @@ public class BlockAltar extends BlockContainer implements IVariantProvider
         super(Material.rock);
 
         setUnlocalizedName(Constants.Mod.MODID + ".altar");
-        setRegistryName(Constants.BloodMagicBlock.ALTAR.getRegName());
         setCreativeTab(BloodMagic.tabBloodMagic);
         setHardness(2.0F);
         setResistance(5.0F);

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

@@ -29,7 +29,6 @@ public class BlockBloodLight extends Block
         super(Material.cloth);
 
         setUnlocalizedName(Constants.Mod.MODID + ".bloodLight");
-        setRegistryName(Constants.BloodMagicBlock.BLOOD_LIGHT.getRegName());
     }
 
     @Override

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

@@ -22,7 +22,6 @@ public class BlockBloodRune extends BlockString implements IVariantProvider
         super(Material.rock, names);
 
         setUnlocalizedName(Constants.Mod.MODID + ".rune.");
-        setRegistryName(Constants.BloodMagicBlock.BLOOD_RUNE.getRegName());
         setCreativeTab(BloodMagic.tabBloodMagic);
         setSoundType(SoundType.STONE);
         setHardness(2.0F);

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

@@ -22,7 +22,6 @@ public class BlockBloodStoneBrick extends BlockString implements IVariantProvide
         super(Material.rock, names);
 
         setUnlocalizedName(Constants.Mod.MODID + ".bloodstonebrick.");
-        setRegistryName(Constants.BloodMagicBlock.BLOOD_STONE.getRegName());
         setCreativeTab(BloodMagic.tabBloodMagic);
         setHardness(2.0F);
         setResistance(5.0F);

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

@@ -33,7 +33,6 @@ public class BlockBloodTank extends BlockContainer
         super(Material.iron);
 
         setUnlocalizedName(Constants.Mod.MODID + ".bloodTank");
-        setRegistryName(Constants.BloodMagicBlock.BLOOD_TANK.getRegName());
         setHardness(2.0F);
         setResistance(5.0F);
         setSoundType(SoundType.GLASS);

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

@@ -22,7 +22,6 @@ public class BlockCrystal extends BlockString implements IVariantProvider
         super(Material.rock, names);
 
         setUnlocalizedName(Constants.Mod.MODID + ".crystal.");
-        setRegistryName(Constants.BloodMagicBlock.CRYSTAL.getRegName());
         setCreativeTab(BloodMagic.tabBloodMagic);
         setSoundType(SoundType.STONE);
         setHardness(2.0F);

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

@@ -34,7 +34,6 @@ public class BlockDemonCrucible extends BlockContainer implements IVariantProvid
         super(Material.rock);
 
         setUnlocalizedName(Constants.Mod.MODID + ".demonCrucible");
-        setRegistryName(Constants.BloodMagicBlock.DEMON_CRUCIBLE.getRegName());
         setCreativeTab(BloodMagic.tabBloodMagic);
         setHardness(2.0F);
         setResistance(5.0F);

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

@@ -43,7 +43,6 @@ public class BlockDemonCrystal extends BlockContainer
         this.setDefaultState(this.blockState.getBaseState().withProperty(TYPE, EnumDemonWillType.DEFAULT).withProperty(ATTACHED, EnumFacing.UP));
 
         setUnlocalizedName(Constants.Mod.MODID + ".demonCrystal");
-        setRegistryName(Constants.BloodMagicBlock.DEMON_CRYSTAL.getRegName());
         setCreativeTab(BloodMagic.tabBloodMagic);
         setHardness(2.0F);
         setResistance(5.0F);

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

@@ -28,7 +28,6 @@ public class BlockDemonCrystallizer extends BlockContainer implements IVariantPr
         super(Material.rock);
 
         setUnlocalizedName(Constants.Mod.MODID + ".demonCrystallizer");
-        setRegistryName(Constants.BloodMagicBlock.DEMON_CRYSTALLIZER.getRegName());
         setCreativeTab(BloodMagic.tabBloodMagic);
         setHardness(2.0F);
         setResistance(5.0F);

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

@@ -27,7 +27,6 @@ public class BlockDemonPylon extends BlockContainer implements IVariantProvider
         super(Material.rock);
 
         setUnlocalizedName(Constants.Mod.MODID + ".demonPylon");
-        setRegistryName(Constants.BloodMagicBlock.DEMON_PYLON.getRegName());
         setCreativeTab(BloodMagic.tabBloodMagic);
         setHardness(2.0F);
         setResistance(5.0F);

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

@@ -34,7 +34,6 @@ public class BlockDimensionalPortal extends BlockIntegerContainer
     {
         super(Material.portal, 2);
         setUnlocalizedName(Constants.Mod.MODID + ".dimensionalPortal");
-        setRegistryName(Constants.BloodMagicBlock.DIMENSIONAL_PORTAL.getRegName());
         setBlockUnbreakable();
         setResistance(2000);
         setLightOpacity(0);

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

@@ -30,7 +30,6 @@ public class BlockIncenseAltar extends BlockContainer implements IVariantProvide
         super(Material.rock);
 
         setUnlocalizedName(Constants.Mod.MODID + ".incenseAltar");
-        setRegistryName(Constants.BloodMagicBlock.INCENSE_ALTAR.getRegName());
         setCreativeTab(BloodMagic.tabBloodMagic);
         setHardness(2.0F);
         setResistance(5.0F);

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

@@ -19,7 +19,6 @@ public class BlockInputRoutingNode extends BlockRoutingNode
         super();
 
         setUnlocalizedName(Constants.Mod.MODID + ".inputRouting");
-        setRegistryName(Constants.BloodMagicBlock.INPUT_ROUTING_NODE.getRegName());
     }
 
     @Override

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

@@ -15,7 +15,6 @@ public class BlockItemRoutingNode extends BlockRoutingNode
         super();
 
         setUnlocalizedName(Constants.Mod.MODID + ".itemRouting");
-        setRegistryName(Constants.BloodMagicBlock.ITEM_ROUTING_NODE.getRegName());
     }
 
     @Override

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

@@ -25,7 +25,6 @@ public class BlockLifeEssence extends BlockFluidClassic
         super(lifeEssence, Material.water);
 
         setUnlocalizedName(Constants.Mod.MODID + ".fluid.lifeEssence");
-        setRegistryName(Constants.BloodMagicBlock.LIFE_ESSENCE.getRegName());
         lifeEssence.setBlock(this);
         BloodMagicAPI.setLifeEssence(lifeEssence);
     }

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

@@ -19,7 +19,6 @@ public class BlockMasterRoutingNode extends BlockRoutingNode
         super();
 
         setUnlocalizedName(Constants.Mod.MODID + ".masterRouting");
-        setRegistryName(Constants.BloodMagicBlock.MASTER_ROUTING_NODE.getRegName());
         setCreativeTab(BloodMagic.tabBloodMagic);
         setHardness(2.0F);
         setResistance(5.0F);

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

@@ -19,7 +19,6 @@ public class BlockOutputRoutingNode extends BlockRoutingNode
         super();
 
         setUnlocalizedName(Constants.Mod.MODID + ".outputRouting");
-        setRegistryName(Constants.BloodMagicBlock.OUTPUT_ROUTING_NODE.getRegName());
     }
 
     @Override

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

@@ -27,7 +27,6 @@ public class BlockPath extends BlockString implements IIncensePath, IVariantProv
         super(Material.rock, names);
 
         setUnlocalizedName(Constants.Mod.MODID + ".path.");
-        setRegistryName(Constants.BloodMagicBlock.PATH.getRegName());
         setCreativeTab(BloodMagic.tabBloodMagic);
         setHardness(2.0F);
         setResistance(5.0F);

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

@@ -26,7 +26,6 @@ public class BlockPedestal extends BlockStringContainer
         super(Material.rock, names);
 
         setUnlocalizedName(Constants.Mod.MODID + ".");
-        setRegistryName(Constants.BloodMagicBlock.PEDESTAL.getRegName());
         setCreativeTab(BloodMagic.tabBloodMagic);
         setHardness(2.0F);
         setResistance(5.0F);

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

@@ -33,7 +33,6 @@ public class BlockPhantom extends BlockContainer implements IVariantProvider
         super(Material.cloth);
 
         setUnlocalizedName(Constants.Mod.MODID + ".phantom");
-        setRegistryName(Constants.BloodMagicBlock.PHANTOM.getRegName());
         setCreativeTab(BloodMagic.tabBloodMagic);
     }
 

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

@@ -41,7 +41,6 @@ public class BlockRitualController extends BlockStringContainer implements IVari
         super(Material.rock, names);
 
         setUnlocalizedName(Constants.Mod.MODID + ".stone.ritual.");
-        setRegistryName(Constants.BloodMagicBlock.RITUAL_CONTROLLER.getRegName());
         setCreativeTab(BloodMagic.tabBloodMagic);
         setSoundType(SoundType.STONE);
         setHardness(2.0F);

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

@@ -29,7 +29,6 @@ public class BlockRitualStone extends BlockString implements IRitualStone, IVari
         super(Material.iron, names);
 
         setUnlocalizedName(Constants.Mod.MODID + ".ritualStone.");
-        setRegistryName(Constants.BloodMagicBlock.RITUAL_STONE.getRegName());
         setCreativeTab(BloodMagic.tabBloodMagic);
         setSoundType(SoundType.STONE);
         setHardness(2.0F);

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

@@ -35,7 +35,6 @@ public class BlockSoulForge extends BlockContainer implements IVariantProvider
         super(Material.iron);
 
         setUnlocalizedName(Constants.Mod.MODID + ".soulForge");
-        setRegistryName(Constants.BloodMagicBlock.SOUL_FORGE.getRegName());
         setHardness(2.0F);
         setResistance(5.0F);
         setSoundType(SoundType.METAL);

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

@@ -31,7 +31,6 @@ public class BlockSpectral extends BlockContainer implements IVariantProvider
         super(Material.cloth);
 
         setUnlocalizedName(Constants.Mod.MODID + ".spectral");
-        setRegistryName(Constants.BloodMagicBlock.SPECTRAL.getRegName());
     }
 
     @Override

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

@@ -32,7 +32,6 @@ public class BlockTeleposer extends BlockContainer implements IVariantProvider
 
         setCreativeTab(BloodMagic.tabBloodMagic);
         setUnlocalizedName(Constants.Mod.MODID + ".teleposer");
-        setRegistryName(Constants.BloodMagicBlock.TELEPOSER.getRegName());
         setHardness(2.0F);
         setResistance(5.0F);
     }

src/main/java/WayofTime/bloodmagic/item/ItemActivationCrystal.java

@@ -24,7 +24,6 @@ public class ItemActivationCrystal extends ItemBindableBase implements IVariantP
         super();
 
         setUnlocalizedName(Constants.Mod.MODID + ".activationCrystal.");
-        setRegistryName(Constants.BloodMagicItem.ACTIVATION_CRYSTAL.getRegName());
         setHasSubtypes(true);
     }
 

src/main/java/WayofTime/bloodmagic/item/ItemAltarMaker.java

@@ -41,7 +41,6 @@ public class ItemAltarMaker extends Item implements IAltarManipulator, IVariantP
     {
         super();
         setUnlocalizedName(Constants.Mod.MODID + ".altarMaker");
-        setRegistryName(Constants.BloodMagicItem.ALTAR_MAKER.getRegName());
         setCreativeTab(BloodMagic.tabBloodMagic);
         setMaxStackSize(1);
         setFull3D();

src/main/java/WayofTime/bloodmagic/item/ItemArcaneAshes.java

@@ -28,7 +28,6 @@ public class ItemArcaneAshes extends Item implements IVariantProvider
     public ItemArcaneAshes()
     {
         setUnlocalizedName(Constants.Mod.MODID + ".arcaneAshes");
-        setRegistryName(Constants.BloodMagicItem.ARCANE_ASHES.getRegName());
         setMaxStackSize(1);
         setMaxDamage(19); //Allows for 20 uses
         setCreativeTab(BloodMagic.tabBloodMagic);

src/main/java/WayofTime/bloodmagic/item/ItemBloodOrb.java

@@ -29,7 +29,6 @@ public class ItemBloodOrb extends ItemBindableBase implements IBloodOrb, IBindab
     public ItemBloodOrb()
     {
         setUnlocalizedName(Constants.Mod.MODID + ".orb.");
-        setRegistryName(Constants.BloodMagicItem.BLOOD_ORB.getRegName());
         this.setMaxDamage(0);
         setHasSubtypes(true);
     }

src/main/java/WayofTime/bloodmagic/item/ItemBloodShard.java

@@ -24,7 +24,6 @@ public class ItemBloodShard extends Item implements IVariantProvider
 
         setCreativeTab(BloodMagic.tabBloodMagic);
         setUnlocalizedName(Constants.Mod.MODID + ".bloodShard.");
-        setRegistryName(Constants.BloodMagicItem.BLOOD_SHARD.getRegName());
         setHasSubtypes(true);
     }
 

src/main/java/WayofTime/bloodmagic/item/ItemBoundAxe.java

@@ -45,7 +45,6 @@ public class ItemBoundAxe extends ItemBoundTool implements IMeshProvider
     public ItemBoundAxe()
     {
         super("axe", 7, EFFECTIVE_ON);
-        setRegistryName(Constants.BloodMagicItem.BOUND_AXE.getRegName());
     }
 
     @Override

src/main/java/WayofTime/bloodmagic/item/ItemBoundPickaxe.java

@@ -45,7 +45,6 @@ public class ItemBoundPickaxe extends ItemBoundTool implements IMeshProvider
     public ItemBoundPickaxe()
     {
         super("pickaxe", 5, EFFECTIVE_ON);
-        setRegistryName(Constants.BloodMagicItem.BOUND_PICKAXE.getRegName());
     }
 
     @Override

src/main/java/WayofTime/bloodmagic/item/ItemBoundShovel.java

@@ -44,7 +44,6 @@ public class ItemBoundShovel extends ItemBoundTool implements IMeshProvider
     public ItemBoundShovel()
     {
         super("shovel", 1, EFFECTIVE_ON);
-        setRegistryName(Constants.BloodMagicItem.BOUND_SHOVEL.getRegName());
     }
 
     @Override

src/main/java/WayofTime/bloodmagic/item/ItemBoundSword.java

@@ -46,7 +46,6 @@ public class ItemBoundSword extends ItemSword implements IBindable, IActivatable
         super(ModItems.boundToolMaterial);
 
         setUnlocalizedName(Constants.Mod.MODID + ".bound.sword");
-        setRegistryName(Constants.BloodMagicItem.BOUND_SWORD.getRegName());
         setCreativeTab(BloodMagic.tabBloodMagic);
     }
 

src/main/java/WayofTime/bloodmagic/item/ItemBucketEssence.java

@@ -13,7 +13,6 @@ public class ItemBucketEssence extends ItemBucket
         super(ModBlocks.lifeEssence);
 
         setUnlocalizedName(Constants.Mod.MODID + ".bucket.lifeEssence");
-        setRegistryName(Constants.BloodMagicItem.BUCKET_ESSENCE.getRegName());
         setContainerItem(Items.bucket);
         setCreativeTab(BloodMagic.tabBloodMagic);
     }

src/main/java/WayofTime/bloodmagic/item/ItemComponent.java

@@ -46,7 +46,6 @@ public class ItemComponent extends Item implements IVariantProvider
         super();
 
         setUnlocalizedName(Constants.Mod.MODID + ".baseComponent.");
-        setRegistryName(Constants.BloodMagicItem.COMPONENT.getRegName());
         setHasSubtypes(true);
         setCreativeTab(BloodMagic.tabBloodMagic);
 

src/main/java/WayofTime/bloodmagic/item/ItemDemonCrystal.java

@@ -37,7 +37,6 @@ public class ItemDemonCrystal extends Item implements IDiscreteDemonWill, IVaria
         super();
 
         setUnlocalizedName(Constants.Mod.MODID + ".demonCrystal.");
-        setRegistryName(Constants.BloodMagicItem.DEMON_CRYSTAL.getRegName());
         setHasSubtypes(true);
         setCreativeTab(BloodMagic.tabBloodMagic);
 

src/main/java/WayofTime/bloodmagic/item/ItemExperienceBook.java

@@ -29,7 +29,6 @@ public class ItemExperienceBook extends Item implements IVariantProvider
     public ItemExperienceBook()
     {
         setUnlocalizedName(Constants.Mod.MODID + ".experienceTome");
-        setRegistryName(Constants.BloodMagicItem.EXPERIENCE_TOME.getRegName());
         setMaxStackSize(1);
         setCreativeTab(BloodMagic.tabBloodMagic);
     }

src/main/java/WayofTime/bloodmagic/item/ItemInscriptionTool.java

@@ -34,7 +34,6 @@ public class ItemInscriptionTool extends ItemBindableBase implements IVariantPro
         super();
 
         setUnlocalizedName(Constants.Mod.MODID + ".scribe.");
-        setRegistryName(Constants.BloodMagicItem.INSCRIPTION_TOOL.getRegName());
         setHasSubtypes(true);
     }
 

src/main/java/WayofTime/bloodmagic/item/ItemLavaCrystal.java

@@ -26,7 +26,6 @@ public class ItemLavaCrystal extends ItemBindableBase implements IFuelHandler, I
     {
         super();
         setUnlocalizedName(Constants.Mod.MODID + ".lavaCrystal");
-        setRegistryName(Constants.BloodMagicItem.LAVA_CRYSTAL.getRegName());
     }
 
     @Override

src/main/java/WayofTime/bloodmagic/item/ItemRitualDiviner.java

@@ -49,7 +49,6 @@ public class ItemRitualDiviner extends Item implements IVariantProvider
     public ItemRitualDiviner()
     {
         setUnlocalizedName(Constants.Mod.MODID + ".ritualDiviner");
-        setRegistryName(Constants.BloodMagicItem.RITUAL_DIVINER.getRegName());
         setCreativeTab(BloodMagic.tabBloodMagic);
         setHasSubtypes(true);
         setMaxStackSize(1);

src/main/java/WayofTime/bloodmagic/item/ItemSacrificialDagger.java

@@ -49,7 +49,6 @@ public class ItemSacrificialDagger extends Item implements IVariantProvider
         super();
 
         setUnlocalizedName(Constants.Mod.MODID + ".sacrificialDagger.");
-        setRegistryName(Constants.BloodMagicItem.SACRIFICIAL_DAGGER.getRegName());
         setCreativeTab(BloodMagic.tabBloodMagic);
         setHasSubtypes(true);
         setMaxStackSize(1);

src/main/java/WayofTime/bloodmagic/item/ItemSlate.java

@@ -27,7 +27,6 @@ public class ItemSlate extends Item implements IVariantProvider
 
         setCreativeTab(BloodMagic.tabBloodMagic);
         setUnlocalizedName(Constants.Mod.MODID + ".slate.");
-        setRegistryName(Constants.BloodMagicItem.SLATE.getRegName());
         setHasSubtypes(true);
     }
 

src/main/java/WayofTime/bloodmagic/item/ItemTelepositionFocus.java

@@ -34,7 +34,6 @@ public class ItemTelepositionFocus extends ItemBindableBase implements IVariantP
         super();
 
         setUnlocalizedName(Constants.Mod.MODID + ".focus.");
-        setRegistryName(Constants.BloodMagicItem.TELEPOSITION_FOCUS.getRegName());
         setCreativeTab(BloodMagic.tabBloodMagic);
         setMaxStackSize(1);
         setHasSubtypes(true);

src/main/java/WayofTime/bloodmagic/item/ItemUpgradeTome.java

@@ -36,7 +36,6 @@ public class ItemUpgradeTome extends Item implements IVariantProvider
 
         setCreativeTab(BloodMagic.tabUpgradeTome);
         setUnlocalizedName(Constants.Mod.MODID + ".upgradeTome");
-        setRegistryName(Constants.BloodMagicItem.UPGRADE_TOME.getRegName());
         setHasSubtypes(true);
         setMaxStackSize(1);
     }

src/main/java/WayofTime/bloodmagic/item/ItemUpgradeTrainer.java

@@ -30,7 +30,6 @@ public class ItemUpgradeTrainer extends Item implements IUpgradeTrainer, IVarian
 
         setCreativeTab(BloodMagic.tabUpgradeTome);
         setUnlocalizedName(Constants.Mod.MODID + ".upgradeTrainer");
-        setRegistryName(Constants.BloodMagicItem.UPGRADE_TRAINER.getRegName());
         setHasSubtypes(true);
         setMaxStackSize(1);
     }

src/main/java/WayofTime/bloodmagic/item/gear/ItemPackSacrifice.java

@@ -32,7 +32,6 @@ public class ItemPackSacrifice extends ItemArmor implements IAltarManipulator, I
         super(ArmorMaterial.CHAIN, 0, EntityEquipmentSlot.CHEST);
 
         setUnlocalizedName(Constants.Mod.MODID + ".pack.sacrifice");
-        setRegistryName(Constants.BloodMagicItem.SACRIFICE_PACK.getRegName());
         setCreativeTab(BloodMagic.tabBloodMagic);
     }
 

src/main/java/WayofTime/bloodmagic/item/gear/ItemPackSelfSacrifice.java

@@ -40,7 +40,6 @@ public class ItemPackSelfSacrifice extends ItemArmor implements IAltarManipulato
         super(ArmorMaterial.CHAIN, 0, EntityEquipmentSlot.CHEST);
 
         setUnlocalizedName(Constants.Mod.MODID + ".pack.selfSacrifice");
-        setRegistryName(Constants.BloodMagicItem.SELF_SACRIFICE_PACK.getRegName());
         setCreativeTab(BloodMagic.tabBloodMagic);
     }
 

src/main/java/WayofTime/bloodmagic/item/routing/ItemNodeRouter.java

@@ -33,7 +33,6 @@ public class ItemNodeRouter extends Item implements INodeRenderer, IVariantProvi
     public ItemNodeRouter()
     {
         setUnlocalizedName(Constants.Mod.MODID + ".nodeRouter");
-        setRegistryName(Constants.BloodMagicItem.NODE_ROUTER.getRegName());
         setMaxStackSize(1);
         setCreativeTab(BloodMagic.tabBloodMagic);
     }

src/main/java/WayofTime/bloodmagic/item/routing/ItemRouterFilter.java

@@ -30,7 +30,6 @@ public class ItemRouterFilter extends Item implements IItemFilterProvider, IVari
         super();
 
         setUnlocalizedName(Constants.Mod.MODID + ".itemFilter.");
-        setRegistryName(Constants.BloodMagicItem.ROUTER_FILTER.getRegName());
         setHasSubtypes(true);
         setCreativeTab(BloodMagic.tabBloodMagic);
     }

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

@@ -21,7 +21,6 @@ public class ItemSigilAir extends ItemSigilBase implements ISentientSwordEffectP
     public ItemSigilAir()
     {
         super("air", 50);
-        setRegistryName(Constants.BloodMagicItem.SIGIL_AIR.getRegName());
     }
 
     @Override

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

@@ -19,7 +19,6 @@ public class ItemSigilBloodLight extends ItemSigilBase
     public ItemSigilBloodLight()
     {
         super("bloodLight", 10);
-        setRegistryName(Constants.BloodMagicItem.SIGIL_BLOOD_LIGHT.getRegName());
     }
 
     @Override

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

@@ -12,7 +12,6 @@ public class ItemSigilCompression extends ItemSigilToggleableBase
     public ItemSigilCompression()
     {
         super("compression", 200);
-        setRegistryName(Constants.BloodMagicItem.SIGIL_COMPRESSION.getRegName());
     }
 
     // TODO REWRITE all compression stuff if someone has time

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

@@ -25,7 +25,6 @@ public class ItemSigilDivination extends ItemSigilBase implements IAltarReader
     public ItemSigilDivination()
     {
         super("divination");
-        setRegistryName(Constants.BloodMagicItem.SIGIL_DIVINATION.getRegName());
     }
 
     @Override

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

@@ -12,7 +12,6 @@ public class ItemSigilElementalAffinity extends ItemSigilToggleableBase
     public ItemSigilElementalAffinity()
     {
         super("elementalAffinity", 200);
-        setRegistryName(Constants.BloodMagicItem.SIGIL_ELEMENTAL_AFFINITY.getRegName());
     }
 
     @Override

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

@@ -16,7 +16,6 @@ public class ItemSigilEnderSeverance extends ItemSigilToggleableBase
     public ItemSigilEnderSeverance()
     {
         super("enderSeverance", 200);
-        setRegistryName(Constants.BloodMagicItem.SIGIL_ENDER_SEVERANCE.getRegName());
     }
 
     @Override

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

@@ -12,7 +12,6 @@ public class ItemSigilFastMiner extends ItemSigilToggleableBase
     public ItemSigilFastMiner()
     {
         super("fastMiner", 100);
-        setRegistryName(Constants.BloodMagicItem.SIGIL_FAST_MINER.getRegName());
     }
 
     @Override

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

@@ -17,7 +17,6 @@ public class ItemSigilGreenGrove extends ItemSigilToggleableBase
     public ItemSigilGreenGrove()
     {
         super("greenGrove", 150);
-        setRegistryName(Constants.BloodMagicItem.SIGIL_GREEN_GROVE.getRegName());
     }
 
     @Override

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

@@ -12,7 +12,6 @@ public class ItemSigilHaste extends ItemSigilToggleableBase
     public ItemSigilHaste()
     {
         super("haste", 250);
-        setRegistryName(Constants.BloodMagicItem.SIGIL_HASTE.getRegName());
     }
 
     @Override

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

@@ -24,7 +24,6 @@ public class ItemSigilLava extends ItemSigilBase
     public ItemSigilLava()
     {
         super("lava", 1000);
-        setRegistryName(Constants.BloodMagicItem.SIGIL_LAVA.getRegName());
     }
 
     @Override

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

@@ -15,7 +15,6 @@ public class ItemSigilMagnetism extends ItemSigilToggleableBase
     public ItemSigilMagnetism()
     {
         super("magnetism", 50);
-        setRegistryName(Constants.BloodMagicItem.SIGIL_MAGNETISM.getRegName());
     }
 
     @Override

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

@@ -12,7 +12,6 @@ public class ItemSigilPhantomBridge extends ItemSigilToggleableBase
     public ItemSigilPhantomBridge()
     {
         super("phantomBridge", 100);
-        setRegistryName(Constants.BloodMagicItem.SIGIL_PHANTOM_BRIDGE.getRegName());
     }
 
     @Override

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

@@ -26,7 +26,6 @@ public class ItemSigilSeer extends ItemSigilBase implements IAltarReader
     public ItemSigilSeer()
     {
         super("seer");
-        setRegistryName(Constants.BloodMagicItem.SIGIL_SEER.getRegName());
     }
 
     @Override

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

@@ -15,7 +15,6 @@ public class ItemSigilSuppression extends ItemSigilToggleableBase
     public ItemSigilSuppression()
     {
         super("suppression", 400);
-        setRegistryName(Constants.BloodMagicItem.SIGIL_SUPPRESION.getRegName());
     }
 
     @Override

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

@@ -25,7 +25,6 @@ public class ItemSigilTeleposition extends ItemSigilBase
     public ItemSigilTeleposition()
     {
         super("teleposition");
-        setRegistryName(Constants.BloodMagicItem.SIGIL_TELEPOSITION.getRegName());
     }
 
     @Override

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

@@ -27,7 +27,6 @@ public class ItemSigilTransposition extends ItemSigilBase
     public ItemSigilTransposition()
     {
         super("transposition", 1000);
-        setRegistryName(Constants.BloodMagicItem.SIGIL_TRANSPOSITION.getRegName());
     }
 
     @Override

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

@@ -22,7 +22,6 @@ public class ItemSigilVoid extends ItemSigilBase
     public ItemSigilVoid()
     {
         super("void", 50);
-        setRegistryName(Constants.BloodMagicItem.SIGIL_VOID.getRegName());
     }
 
     @Override

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

@@ -27,7 +27,6 @@ public class ItemSigilWater extends ItemSigilBase
     public ItemSigilWater()
     {
         super("water", 100);
-        setRegistryName(Constants.BloodMagicItem.SIGIL_WATER.getRegName());
     }
 
     @Override

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

@@ -12,7 +12,6 @@ public class ItemSigilWhirlwind extends ItemSigilToggleableBase
     public ItemSigilWhirlwind()
     {
         super("whirlwind", 250);
-        setRegistryName(Constants.BloodMagicItem.SIGIL_WHIRLWIND.getRegName());
     }
 
     @Override

src/main/java/WayofTime/bloodmagic/item/soul/ItemMonsterSoul.java

@@ -28,7 +28,6 @@ public class ItemMonsterSoul extends Item implements IDemonWill, IVariantProvide
         super();
 
         setUnlocalizedName(Constants.Mod.MODID + ".monsterSoul.");
-        setRegistryName(Constants.BloodMagicItem.MONSTER_SOUL.getRegName());
         setCreativeTab(BloodMagic.tabBloodMagic);
         setHasSubtypes(true);
         setMaxStackSize(1);

src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientArmourGem.java

@@ -24,7 +24,6 @@ public class ItemSentientArmourGem extends Item
 
         setCreativeTab(BloodMagic.tabBloodMagic);
         setUnlocalizedName(Constants.Mod.MODID + ".sentientArmourGem");
-        setRegistryName(Constants.BloodMagicItem.SENTIENT_ARMOR_GEM.getRegName());
         setMaxStackSize(1);
     }
 

src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientBow.java

@@ -39,7 +39,6 @@ public class ItemSentientBow extends ItemBow implements IMultiWillTool//, IMeshP
     {
         super();
         setUnlocalizedName(Constants.Mod.MODID + ".sentientBow");
-        setRegistryName(Constants.BloodMagicItem.SENTIENT_BOW.getRegName());
         setCreativeTab(BloodMagic.tabBloodMagic);
         this.addPropertyOverride(new ResourceLocation("pull"), new IItemPropertyGetter()
         {

src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientSword.java

@@ -72,7 +72,6 @@ public class ItemSentientSword extends ItemSword implements IDemonWillWeapon, IM
         super(ModItems.soulToolMaterial);
 
         setUnlocalizedName(Constants.Mod.MODID + ".sentientSword");
-        setRegistryName(Constants.BloodMagicItem.SENTIENT_SWORD.getRegName());
         setCreativeTab(BloodMagic.tabBloodMagic);
     }
 

src/main/java/WayofTime/bloodmagic/item/soul/ItemSoulGem.java

@@ -39,7 +39,6 @@ public class ItemSoulGem extends Item implements IDemonWillGem, IMeshProvider, I
         super();
 
         setUnlocalizedName(Constants.Mod.MODID + ".soulGem.");
-        setRegistryName(Constants.BloodMagicItem.SOUL_GEM.getRegName());
         setHasSubtypes(true);
         setMaxStackSize(1);
         setCreativeTab(BloodMagic.tabBloodMagic);

src/main/java/WayofTime/bloodmagic/item/soul/ItemSoulSnare.java

@@ -34,7 +34,6 @@ public class ItemSoulSnare extends Item implements IVariantProvider
         super();
 
         setUnlocalizedName(Constants.Mod.MODID + ".soulSnare.");
-        setRegistryName(Constants.BloodMagicItem.SOUL_SNARE.getRegName());
         setCreativeTab(BloodMagic.tabBloodMagic);
         setHasSubtypes(true);
         setMaxStackSize(16);

src/main/java/WayofTime/bloodmagic/registry/ModBlocks.java

@@ -104,34 +104,34 @@ public class ModBlocks
     public static void init()
     {
         FluidRegistry.registerFluid(BlockLifeEssence.getLifeEssence());
-        lifeEssence = registerBlock(new BlockLifeEssence());
+        lifeEssence = registerBlock(new BlockLifeEssence(), Constants.BloodMagicBlock.LIFE_ESSENCE.getRegName());
 
-        altar = registerBlock(new BlockAltar());
+        altar = registerBlock(new BlockAltar(), Constants.BloodMagicBlock.ALTAR.getRegName());
-        bloodRune = registerBlock(new ItemBlockBloodRune(new BlockBloodRune()));
+        bloodRune = registerBlock(new ItemBlockBloodRune(new BlockBloodRune()), Constants.BloodMagicBlock.BLOOD_RUNE.getRegName());
-        ritualController = registerBlock(new ItemBlockRitualController(new BlockRitualController()));
+        ritualController = registerBlock(new ItemBlockRitualController(new BlockRitualController()), Constants.BloodMagicBlock.RITUAL_CONTROLLER.getRegName());
-        ritualStone = registerBlock(new ItemBlockRitualStone(new BlockRitualStone()));
+        ritualStone = registerBlock(new ItemBlockRitualStone(new BlockRitualStone()), Constants.BloodMagicBlock.RITUAL_STONE.getRegName());
-        bloodLight = registerBlock(new BlockBloodLight());
+        bloodLight = registerBlock(new BlockBloodLight(), Constants.BloodMagicBlock.BLOOD_LIGHT.getRegName());
-        pedestal = registerBlock(new ItemBlockPedestal(new BlockPedestal()));
+        pedestal = registerBlock(new ItemBlockPedestal(new BlockPedestal()), Constants.BloodMagicBlock.PEDESTAL.getRegName());
-        teleposer = registerBlock(new BlockTeleposer());
+        teleposer = registerBlock(new BlockTeleposer(), Constants.BloodMagicBlock.TELEPOSER.getRegName());
-        alchemyArray = registerBlock(new BlockAlchemyArray());
+        alchemyArray = registerBlock(new BlockAlchemyArray(), Constants.BloodMagicBlock.ALCHEMY_ARRAY.getRegName());
-        spectralBlock = registerBlock(new BlockSpectral());
+        spectralBlock = registerBlock(new BlockSpectral(), Constants.BloodMagicBlock.SPECTRAL.getRegName());
-        phantomBlock = registerBlock(new BlockPhantom());
+        phantomBlock = registerBlock(new BlockPhantom(), Constants.BloodMagicBlock.PHANTOM.getRegName());
-        soulForge = registerBlock(new BlockSoulForge());
+        soulForge = registerBlock(new BlockSoulForge(), Constants.BloodMagicBlock.SOUL_FORGE.getRegName());
-        crystal = registerBlock(new ItemBlockCrystal(new BlockCrystal()));
+        crystal = registerBlock(new ItemBlockCrystal(new BlockCrystal()), Constants.BloodMagicBlock.CRYSTAL.getRegName());
-        bloodStoneBrick = registerBlock(new ItemBlockBloodStoneBrick(new BlockBloodStoneBrick()));
+        bloodStoneBrick = registerBlock(new ItemBlockBloodStoneBrick(new BlockBloodStoneBrick()), Constants.BloodMagicBlock.BLOOD_STONE.getRegName());
-        masterRoutingNode = registerBlock(new ItemBlockRoutingNode(new BlockMasterRoutingNode()));
+        masterRoutingNode = registerBlock(new ItemBlockRoutingNode(new BlockMasterRoutingNode()), Constants.BloodMagicBlock.MASTER_ROUTING_NODE.getRegName());
-        inputRoutingNode = registerBlock(new ItemBlockRoutingNode(new BlockInputRoutingNode()));
+        inputRoutingNode = registerBlock(new ItemBlockRoutingNode(new BlockInputRoutingNode()), Constants.BloodMagicBlock.INPUT_ROUTING_NODE.getRegName());
-        outputRoutingNode = registerBlock(new ItemBlockRoutingNode(new BlockOutputRoutingNode()));
+        outputRoutingNode = registerBlock(new ItemBlockRoutingNode(new BlockOutputRoutingNode()), Constants.BloodMagicBlock.OUTPUT_ROUTING_NODE.getRegName());
-        itemRoutingNode = registerBlock(new ItemBlockRoutingNode(new BlockItemRoutingNode()));
+        itemRoutingNode = registerBlock(new ItemBlockRoutingNode(new BlockItemRoutingNode()), Constants.BloodMagicBlock.ITEM_ROUTING_NODE.getRegName());
-        incenseAltar = registerBlock(new BlockIncenseAltar());
+        incenseAltar = registerBlock(new BlockIncenseAltar(), Constants.BloodMagicBlock.INCENSE_ALTAR.getRegName());
-        pathBlock = registerBlock(new ItemBlockPath(new BlockPath()));
+        pathBlock = registerBlock(new ItemBlockPath(new BlockPath()), Constants.BloodMagicBlock.PATH.getRegName());
-        demonCrucible = registerBlock(new BlockDemonCrucible());
+        demonCrucible = registerBlock(new BlockDemonCrucible(), Constants.BloodMagicBlock.DEMON_CRUCIBLE.getRegName());
-        demonPylon = registerBlock(new BlockDemonPylon());
+        demonPylon = registerBlock(new BlockDemonPylon(), Constants.BloodMagicBlock.DEMON_PYLON.getRegName());
-        demonCrystallizer = registerBlock(new BlockDemonCrystallizer());
+        demonCrystallizer = registerBlock(new BlockDemonCrystallizer(), Constants.BloodMagicBlock.DEMON_CRYSTALLIZER.getRegName());
-        demonCrystal = registerBlock(new ItemBlockDemonCrystal(new BlockDemonCrystal()));
+        demonCrystal = registerBlock(new ItemBlockDemonCrystal(new BlockDemonCrystal()), Constants.BloodMagicBlock.DEMON_CRYSTAL.getRegName());
 
-        dimensionalPortal = registerBlock(new BlockDimensionalPortal());
+        dimensionalPortal = registerBlock(new BlockDimensionalPortal(), Constants.BloodMagicBlock.DIMENSIONAL_PORTAL.getRegName());
-        bloodTank = registerBlock(new ItemBlockBloodTank(new BlockBloodTank()));
+        bloodTank = registerBlock(new ItemBlockBloodTank(new BlockBloodTank()), Constants.BloodMagicBlock.BLOOD_TANK.getRegName());
 
 //        testSpellBlock = registerBlock(new BlockTestSpellBlock());
 
@@ -192,54 +192,32 @@ public class ModBlocks
         renderHelper.itemRender(InventoryRenderHelper.getItemFromBlock(dimensionalPortal));
     }
 
-    private static Block registerBlock(ItemBlock itemBlock, String name)
+    private static Block registerBlock(Block block, String name)
     {
-        Block block = itemBlock.block;
         if (!ConfigHandler.blockBlacklist.contains(name))
         {
+            if (block.getRegistryName() == null)
+                block.setRegistryName(name);
             GameRegistry.register(block);
-            GameRegistry.register(itemBlock.setRegistryName(block.getRegistryName()));
+            GameRegistry.register(new ItemBlock(block));
             BloodMagic.proxy.tryHandleBlockModel(block, name);
         }
 
         return block;
     }
 
-    private static Block registerBlock(ItemBlock itemBlock)
+    private static Block registerBlock(ItemBlock itemBlock, String name)
     {
-        Block block = itemBlock.block;
+        Block block = itemBlock.getBlock();
-        if (block.getRegistryName() == null)
-        {
-            BloodMagic.instance.getLogger().error("Attempted to register Block {} without setting a registry name. Block will not be registered. Please report this.", block.getClass().getCanonicalName());
-            return block;
-        }
 
-        String blockName = block.getRegistryName().getResourcePath();
+        if (block.getRegistryName() == null)
-        if (!ConfigHandler.blockBlacklist.contains(blockName))
+            block.setRegistryName(name);
+
+        if (!ConfigHandler.blockBlacklist.contains(name))
         {
             GameRegistry.register(block);
-            GameRegistry.register(itemBlock.setRegistryName(block.getRegistryName().getResourcePath()));
+            GameRegistry.register(itemBlock.setRegistryName(name));
-//            GameRegistry.registerBlock(block, itemBlock);
+            BloodMagic.proxy.tryHandleBlockModel(block, name);
-            BloodMagic.proxy.tryHandleBlockModel(block, blockName);
-        }
-
-        return block;
-    }
-
-    private static Block registerBlock(Block block)
-    {
-        if (block.getRegistryName() == null)
-        {
-            BloodMagic.instance.getLogger().error("Attempted to register Block {} without setting a registry name. Block will not be registered. Please report this.", block.getClass().getCanonicalName());
-            return null;
-        }
-
-        String blockName = block.getRegistryName().getResourcePath();
-        if (!ConfigHandler.blockBlacklist.contains(blockName))
-        {
-            GameRegistry.register(block);
-            GameRegistry.register(new ItemBlock(block).setRegistryName(block.getRegistryName().getResourcePath()));
-            BloodMagic.proxy.tryHandleBlockModel(block, blockName);
         }
 
         return block;

src/main/java/WayofTime/bloodmagic/registry/ModItems.java

@@ -153,7 +153,7 @@ public class ModItems
 
     public static void init()
     {
-        bloodOrb = registerItem(new ItemBloodOrb());
+        bloodOrb = registerItem(new ItemBloodOrb(), Constants.BloodMagicItem.BLOOD_ORB.getRegName());
         orbWeak = new BloodOrb("weak", 1, 5000);
         OrbRegistry.registerOrb(orbWeak);
         orbApprentice = new BloodOrb("apprentice", 2, 25000);
@@ -167,54 +167,54 @@ public class ModItems
         orbTranscendent = new BloodOrb("transcendent", 6, 30000000);
         OrbRegistry.registerOrb(orbTranscendent);
 
-        bucketEssence = registerItem(new ItemBucketEssence());
+        bucketEssence = registerItem(new ItemBucketEssence(), Constants.BloodMagicItem.BUCKET_ESSENCE.getRegName());
 
-        activationCrystal = registerItem(new ItemActivationCrystal());
+        activationCrystal = registerItem(new ItemActivationCrystal(), Constants.BloodMagicItem.ACTIVATION_CRYSTAL.getRegName());
-        slate = registerItem(new ItemSlate());
+        slate = registerItem(new ItemSlate(), Constants.BloodMagicItem.SLATE.getRegName());
-        inscriptionTool = registerItem(new ItemInscriptionTool());
+        inscriptionTool = registerItem(new ItemInscriptionTool(), Constants.BloodMagicItem.INSCRIPTION_TOOL.getRegName());
 
-        sacrificialDagger = registerItem(new ItemSacrificialDagger());
+        sacrificialDagger = registerItem(new ItemSacrificialDagger(), Constants.BloodMagicItem.SACRIFICIAL_DAGGER.getRegName());
-        packSacrifice = registerItem(new ItemPackSacrifice());
+        packSacrifice = registerItem(new ItemPackSacrifice(), Constants.BloodMagicItem.SACRIFICE_PACK.getRegName());
-        packSelfSacrifice = registerItem(new ItemPackSelfSacrifice());
+        packSelfSacrifice = registerItem(new ItemPackSelfSacrifice(), Constants.BloodMagicItem.SELF_SACRIFICE_PACK.getRegName());
-        daggerOfSacrifice = registerItem(new ItemDaggerOfSacrifice());
+        daggerOfSacrifice = registerItem(new ItemDaggerOfSacrifice(), Constants.BloodMagicItem.DAGGER_OF_SACRIFICE.getRegName());
 
-        ritualDiviner = registerItem(new ItemRitualDiviner());
+        ritualDiviner = registerItem(new ItemRitualDiviner(), Constants.BloodMagicItem.RITUAL_DIVINER.getRegName());
 
-        lavaCrystal = registerItem(new ItemLavaCrystal());
+        lavaCrystal = registerItem(new ItemLavaCrystal(), Constants.BloodMagicItem.LAVA_CRYSTAL.getRegName());
         GameRegistry.registerFuelHandler(new ItemLavaCrystal());
 
-        boundSword = registerItem(new ItemBoundSword());
+        boundSword = registerItem(new ItemBoundSword(), Constants.BloodMagicItem.BOUND_SWORD.getRegName());
-        boundPickaxe = registerItem(new ItemBoundPickaxe());
+        boundPickaxe = registerItem(new ItemBoundPickaxe(), Constants.BloodMagicItem.BOUND_PICKAXE.getRegName());
-        boundAxe = registerItem(new ItemBoundAxe());
+        boundAxe = registerItem(new ItemBoundAxe(), Constants.BloodMagicItem.BOUND_AXE.getRegName());
-        boundShovel = registerItem(new ItemBoundShovel());
+        boundShovel = registerItem(new ItemBoundShovel(), Constants.BloodMagicItem.BOUND_SHOVEL.getRegName());
 
-        sigilDivination = registerItem(new ItemSigilDivination());
+        sigilDivination = registerItem(new ItemSigilDivination(), Constants.BloodMagicItem.SIGIL_DIVINATION.getRegName());
-        sigilAir = registerItem(new ItemSigilAir());
+        sigilAir = registerItem(new ItemSigilAir(), Constants.BloodMagicItem.SIGIL_AIR.getRegName());
-        sigilWater = registerItem(new ItemSigilWater());
+        sigilWater = registerItem(new ItemSigilWater(), Constants.BloodMagicItem.SIGIL_WATER.getRegName());
-        sigilLava = registerItem(new ItemSigilLava());
+        sigilLava = registerItem(new ItemSigilLava(), Constants.BloodMagicItem.SIGIL_LAVA.getRegName());
-        sigilVoid = registerItem(new ItemSigilVoid());
+        sigilVoid = registerItem(new ItemSigilVoid(), Constants.BloodMagicItem.SIGIL_VOID.getRegName());
-        sigilGreenGrove = registerItem(new ItemSigilGreenGrove());
+        sigilGreenGrove = registerItem(new ItemSigilGreenGrove(), Constants.BloodMagicItem.SIGIL_GREEN_GROVE.getRegName());
-        sigilBloodLight = registerItem(new ItemSigilBloodLight());
+        sigilBloodLight = registerItem(new ItemSigilBloodLight(), Constants.BloodMagicItem.SIGIL_BLOOD_LIGHT.getRegName());
-        sigilElementalAffinity = registerItem(new ItemSigilElementalAffinity());
+        sigilElementalAffinity = registerItem(new ItemSigilElementalAffinity(), Constants.BloodMagicItem.SIGIL_ELEMENTAL_AFFINITY.getRegName());
-        sigilMagnetism = registerItem(new ItemSigilMagnetism());
+        sigilMagnetism = registerItem(new ItemSigilMagnetism(), Constants.BloodMagicItem.SIGIL_MAGNETISM.getRegName());
-        sigilSuppression = registerItem(new ItemSigilSuppression());
+        sigilSuppression = registerItem(new ItemSigilSuppression(), Constants.BloodMagicItem.SIGIL_SUPPRESION.getRegName());
-        sigilHaste = registerItem(new ItemSigilHaste());
+        sigilHaste = registerItem(new ItemSigilHaste(), Constants.BloodMagicItem.SIGIL_HASTE.getRegName());
-        sigilFastMiner = registerItem(new ItemSigilFastMiner());
+        sigilFastMiner = registerItem(new ItemSigilFastMiner(), Constants.BloodMagicItem.SIGIL_FAST_MINER.getRegName());
-        sigilSeer = registerItem(new ItemSigilSeer());
+        sigilSeer = registerItem(new ItemSigilSeer(), Constants.BloodMagicItem.SIGIL_SEER.getRegName());
-        sigilPhantomBridge = registerItem(new ItemSigilPhantomBridge());
+        sigilPhantomBridge = registerItem(new ItemSigilPhantomBridge(), Constants.BloodMagicItem.SIGIL_PHANTOM_BRIDGE.getRegName());
-        sigilWhirlwind = registerItem(new ItemSigilWhirlwind());
+        sigilWhirlwind = registerItem(new ItemSigilWhirlwind(), Constants.BloodMagicItem.SIGIL_WHIRLWIND.getRegName());
-        sigilCompression = registerItem(new ItemSigilCompression());
+        sigilCompression = registerItem(new ItemSigilCompression(), Constants.BloodMagicItem.SIGIL_COMPRESSION.getRegName());
-        sigilEnderSeverance = registerItem(new ItemSigilEnderSeverance());
+        sigilEnderSeverance = registerItem(new ItemSigilEnderSeverance(), Constants.BloodMagicItem.SIGIL_ENDER_SEVERANCE.getRegName());
 
-        sigilTeleposition = registerItem(new ItemSigilTeleposition());
+        sigilTeleposition = registerItem(new ItemSigilTeleposition(), Constants.BloodMagicItem.TELEPOSITION_FOCUS.getRegName());
-        sigilTransposition = registerItem(new ItemSigilTransposition());
+        sigilTransposition = registerItem(new ItemSigilTransposition(), Constants.BloodMagicItem.SIGIL_TRANSPOSITION.getRegName());
 
-        itemComponent = registerItem(new ItemComponent());
+        itemComponent = registerItem(new ItemComponent(), Constants.BloodMagicItem.COMPONENT.getRegName());
-        itemDemonCrystal = registerItem(new ItemDemonCrystal());
+        itemDemonCrystal = registerItem(new ItemDemonCrystal(), Constants.BloodMagicItem.DEMON_CRYSTAL.getRegName());
-        telepositionFocus = registerItem(new ItemTelepositionFocus());
+        telepositionFocus = registerItem(new ItemTelepositionFocus(), Constants.BloodMagicItem.TELEPOSITION_FOCUS.getRegName());
-        experienceTome = registerItem(new ItemExperienceBook());
+        experienceTome = registerItem(new ItemExperienceBook(), Constants.BloodMagicItem.EXPERIENCE_TOME.getRegName());
 
-        bloodShard = registerItem(new ItemBloodShard());
+        bloodShard = registerItem(new ItemBloodShard(), Constants.BloodMagicItem.BLOOD_SHARD.getRegName());
 
         livingArmourHelmet = registerItem(new ItemLivingArmour(EntityEquipmentSlot.HEAD), "ItemLivingArmourHelmet");
         livingArmourChest = registerItem(new ItemLivingArmour(EntityEquipmentSlot.CHEST), "ItemLivingArmourChest");
@@ -226,21 +226,21 @@ public class ModItems
         sentientArmourLegs = registerItem(new ItemSentientArmour(EntityEquipmentSlot.LEGS), "ItemSentientArmourLegs");
         sentientArmourBoots = registerItem(new ItemSentientArmour(EntityEquipmentSlot.FEET), "ItemSentientArmourBoots");
 
-        altarMaker = registerItem(new ItemAltarMaker());
+        altarMaker = registerItem(new ItemAltarMaker(), Constants.BloodMagicItem.ALTAR_MAKER.getRegName());
-        upgradeTome = registerItem(new ItemUpgradeTome());
+        upgradeTome = registerItem(new ItemUpgradeTome(), Constants.BloodMagicItem.UPGRADE_TOME.getRegName());
-        upgradeTrainer = registerItem(new ItemUpgradeTrainer());
+        upgradeTrainer = registerItem(new ItemUpgradeTrainer(), Constants.BloodMagicItem.UPGRADE_TRAINER.getRegName());
 
-        arcaneAshes = registerItem(new ItemArcaneAshes());
+        arcaneAshes = registerItem(new ItemArcaneAshes(), Constants.BloodMagicItem.ARCANE_ASHES.getRegName());
-        monsterSoul = registerItem(new ItemMonsterSoul());
+        monsterSoul = registerItem(new ItemMonsterSoul(), Constants.BloodMagicItem.MONSTER_SOUL.getRegName());
-        soulGem = registerItem(new ItemSoulGem());
+        soulGem = registerItem(new ItemSoulGem(), Constants.BloodMagicItem.SOUL_GEM.getRegName());
-        soulSnare = registerItem(new ItemSoulSnare());
+        soulSnare = registerItem(new ItemSoulSnare(), Constants.BloodMagicItem.SOUL_SNARE.getRegName());
 
-        sentientSword = registerItem(new ItemSentientSword());
+        sentientSword = registerItem(new ItemSentientSword(), Constants.BloodMagicItem.SENTIENT_SWORD.getRegName());
-        sentientBow = registerItem(new ItemSentientBow());
+        sentientBow = registerItem(new ItemSentientBow(), Constants.BloodMagicItem.SENTIENT_BOW.getRegName());
-        sentientArmourGem = registerItem(new ItemSentientArmourGem());
+        sentientArmourGem = registerItem(new ItemSentientArmourGem(), Constants.BloodMagicItem.SENTIENT_ARMOR_GEM.getRegName());
 
-        nodeRouter = registerItem(new ItemNodeRouter());
+        nodeRouter = registerItem(new ItemNodeRouter(), Constants.BloodMagicItem.NODE_ROUTER.getRegName());
-        baseItemFilter = registerItem(new ItemRouterFilter());
+        baseItemFilter = registerItem(new ItemRouterFilter(), Constants.BloodMagicItem.ROUTER_FILTER.getRegName());
     }
 
     public static void initRenders()
@@ -270,28 +270,12 @@ public class ModItems
     {
         if (!ConfigHandler.itemBlacklist.contains(name))
         {
-            GameRegistry.registerItem(item, name);
+            if (item.getRegistryName() == null)
+                item.setRegistryName(name);
+            GameRegistry.register(item);
             BloodMagic.proxy.tryHandleItemModel(item, name);
         }
 
         return item;
     }
-
-    private static Item registerItem(Item item)
-    {
-        if (item.getRegistryName() == null)
-        {
-            BloodMagic.instance.getLogger().error("Attempted to register Item {} without setting a registry name. Item will not be registered. Please report this.", item.getClass().getCanonicalName());
-            return item;
-        }
-
-        String itemName = item.getRegistryName().getResourcePath();
-        if (!ConfigHandler.itemBlacklist.contains(itemName))
-        {
-            GameRegistry.registerItem(item);
-            BloodMagic.proxy.tryHandleItemModel(item, itemName);
-        }
-
-        return item;
-    }
 }