From d48e4e5ae81c3eba780ef3f89c89dd053dacb6c2 Mon Sep 17 00:00:00 2001 From: Nick Date: Sat, 9 Apr 2016 16:50:16 -0700 Subject: [PATCH] Move setRegistryName out of item/block constructors --- .../bloodmagic/block/BlockAlchemyArray.java | 1 - .../bloodmagic/block/BlockAltar.java | 1 - .../bloodmagic/block/BlockBloodLight.java | 1 - .../bloodmagic/block/BlockBloodRune.java | 1 - .../block/BlockBloodStoneBrick.java | 1 - .../bloodmagic/block/BlockBloodTank.java | 1 - .../bloodmagic/block/BlockCrystal.java | 1 - .../bloodmagic/block/BlockDemonCrucible.java | 1 - .../bloodmagic/block/BlockDemonCrystal.java | 1 - .../block/BlockDemonCrystallizer.java | 1 - .../bloodmagic/block/BlockDemonPylon.java | 1 - .../block/BlockDimensionalPortal.java | 1 - .../bloodmagic/block/BlockIncenseAltar.java | 1 - .../block/BlockInputRoutingNode.java | 1 - .../block/BlockItemRoutingNode.java | 1 - .../bloodmagic/block/BlockLifeEssence.java | 1 - .../block/BlockMasterRoutingNode.java | 1 - .../block/BlockOutputRoutingNode.java | 1 - .../WayofTime/bloodmagic/block/BlockPath.java | 1 - .../bloodmagic/block/BlockPedestal.java | 1 - .../bloodmagic/block/BlockPhantom.java | 1 - .../block/BlockRitualController.java | 1 - .../bloodmagic/block/BlockRitualStone.java | 1 - .../bloodmagic/block/BlockSoulForge.java | 1 - .../bloodmagic/block/BlockSpectral.java | 1 - .../bloodmagic/block/BlockTeleposer.java | 1 - .../item/ItemActivationCrystal.java | 1 - .../bloodmagic/item/ItemAltarMaker.java | 1 - .../bloodmagic/item/ItemArcaneAshes.java | 1 - .../bloodmagic/item/ItemBloodOrb.java | 1 - .../bloodmagic/item/ItemBloodShard.java | 1 - .../bloodmagic/item/ItemBoundAxe.java | 1 - .../bloodmagic/item/ItemBoundPickaxe.java | 1 - .../bloodmagic/item/ItemBoundShovel.java | 1 - .../bloodmagic/item/ItemBoundSword.java | 1 - .../bloodmagic/item/ItemBucketEssence.java | 1 - .../bloodmagic/item/ItemComponent.java | 1 - .../bloodmagic/item/ItemDemonCrystal.java | 1 - .../bloodmagic/item/ItemExperienceBook.java | 1 - .../bloodmagic/item/ItemInscriptionTool.java | 1 - .../bloodmagic/item/ItemLavaCrystal.java | 1 - .../bloodmagic/item/ItemRitualDiviner.java | 1 - .../item/ItemSacrificialDagger.java | 1 - .../WayofTime/bloodmagic/item/ItemSlate.java | 1 - .../item/ItemTelepositionFocus.java | 1 - .../bloodmagic/item/ItemUpgradeTome.java | 1 - .../bloodmagic/item/ItemUpgradeTrainer.java | 1 - .../item/gear/ItemPackSacrifice.java | 1 - .../item/gear/ItemPackSelfSacrifice.java | 1 - .../item/routing/ItemNodeRouter.java | 1 - .../item/routing/ItemRouterFilter.java | 1 - .../bloodmagic/item/sigil/ItemSigilAir.java | 1 - .../item/sigil/ItemSigilBloodLight.java | 1 - .../item/sigil/ItemSigilCompression.java | 1 - .../item/sigil/ItemSigilDivination.java | 1 - .../sigil/ItemSigilElementalAffinity.java | 1 - .../item/sigil/ItemSigilEnderSeverance.java | 1 - .../item/sigil/ItemSigilFastMiner.java | 1 - .../item/sigil/ItemSigilGreenGrove.java | 1 - .../bloodmagic/item/sigil/ItemSigilHaste.java | 1 - .../bloodmagic/item/sigil/ItemSigilLava.java | 1 - .../item/sigil/ItemSigilMagnetism.java | 1 - .../item/sigil/ItemSigilPhantomBridge.java | 1 - .../bloodmagic/item/sigil/ItemSigilSeer.java | 1 - .../item/sigil/ItemSigilSuppression.java | 1 - .../item/sigil/ItemSigilTeleposition.java | 1 - .../item/sigil/ItemSigilTransposition.java | 1 - .../bloodmagic/item/sigil/ItemSigilVoid.java | 1 - .../bloodmagic/item/sigil/ItemSigilWater.java | 1 - .../item/sigil/ItemSigilWhirlwind.java | 1 - .../bloodmagic/item/soul/ItemMonsterSoul.java | 1 - .../item/soul/ItemSentientArmourGem.java | 1 - .../bloodmagic/item/soul/ItemSentientBow.java | 1 - .../item/soul/ItemSentientSword.java | 1 - .../bloodmagic/item/soul/ItemSoulGem.java | 1 - .../bloodmagic/item/soul/ItemSoulSnare.java | 1 - .../bloodmagic/registry/ModBlocks.java | 98 ++++++-------- .../bloodmagic/registry/ModItems.java | 124 ++++++++---------- 78 files changed, 92 insertions(+), 206 deletions(-) diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockAlchemyArray.java b/src/main/java/WayofTime/bloodmagic/block/BlockAlchemyArray.java index 534c30ac..6964f11d 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockAlchemyArray.java +++ b/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); } diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockAltar.java b/src/main/java/WayofTime/bloodmagic/block/BlockAltar.java index 7801ad4b..d9a1368b 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockAltar.java +++ b/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); diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockBloodLight.java b/src/main/java/WayofTime/bloodmagic/block/BlockBloodLight.java index 97042bc6..bdcd7173 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockBloodLight.java +++ b/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 diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockBloodRune.java b/src/main/java/WayofTime/bloodmagic/block/BlockBloodRune.java index 9e242018..3f7327c4 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockBloodRune.java +++ b/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); diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockBloodStoneBrick.java b/src/main/java/WayofTime/bloodmagic/block/BlockBloodStoneBrick.java index bddc0f21..d69b6a9e 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockBloodStoneBrick.java +++ b/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); diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockBloodTank.java b/src/main/java/WayofTime/bloodmagic/block/BlockBloodTank.java index b7df85c1..76c087c8 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockBloodTank.java +++ b/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); diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockCrystal.java b/src/main/java/WayofTime/bloodmagic/block/BlockCrystal.java index 00159f55..b617d79a 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockCrystal.java +++ b/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); diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockDemonCrucible.java b/src/main/java/WayofTime/bloodmagic/block/BlockDemonCrucible.java index d56379e5..65ea50a0 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockDemonCrucible.java +++ b/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); diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockDemonCrystal.java b/src/main/java/WayofTime/bloodmagic/block/BlockDemonCrystal.java index efa7ed9e..858438a3 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockDemonCrystal.java +++ b/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); diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockDemonCrystallizer.java b/src/main/java/WayofTime/bloodmagic/block/BlockDemonCrystallizer.java index 97a47bf3..40cccbf5 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockDemonCrystallizer.java +++ b/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); diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockDemonPylon.java b/src/main/java/WayofTime/bloodmagic/block/BlockDemonPylon.java index f975a52f..d2380201 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockDemonPylon.java +++ b/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); diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockDimensionalPortal.java b/src/main/java/WayofTime/bloodmagic/block/BlockDimensionalPortal.java index f4d87b0b..bc75c958 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockDimensionalPortal.java +++ b/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); diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockIncenseAltar.java b/src/main/java/WayofTime/bloodmagic/block/BlockIncenseAltar.java index c2a1321c..5b6217fc 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockIncenseAltar.java +++ b/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); diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockInputRoutingNode.java b/src/main/java/WayofTime/bloodmagic/block/BlockInputRoutingNode.java index da69c644..376975be 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockInputRoutingNode.java +++ b/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 diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockItemRoutingNode.java b/src/main/java/WayofTime/bloodmagic/block/BlockItemRoutingNode.java index 06fcc97e..6f15f7b6 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockItemRoutingNode.java +++ b/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 diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockLifeEssence.java b/src/main/java/WayofTime/bloodmagic/block/BlockLifeEssence.java index 54ded779..b6f14b12 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockLifeEssence.java +++ b/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); } diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockMasterRoutingNode.java b/src/main/java/WayofTime/bloodmagic/block/BlockMasterRoutingNode.java index 6fd2887d..12e3fe12 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockMasterRoutingNode.java +++ b/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); diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockOutputRoutingNode.java b/src/main/java/WayofTime/bloodmagic/block/BlockOutputRoutingNode.java index 06952e92..e9122df9 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockOutputRoutingNode.java +++ b/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 diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockPath.java b/src/main/java/WayofTime/bloodmagic/block/BlockPath.java index 604ad4e8..6d8e2e45 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockPath.java +++ b/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); diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockPedestal.java b/src/main/java/WayofTime/bloodmagic/block/BlockPedestal.java index c8a51524..91936597 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockPedestal.java +++ b/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); diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockPhantom.java b/src/main/java/WayofTime/bloodmagic/block/BlockPhantom.java index 5b00b02b..af622ed7 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockPhantom.java +++ b/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); } diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockRitualController.java b/src/main/java/WayofTime/bloodmagic/block/BlockRitualController.java index 95797d4f..22b06950 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockRitualController.java +++ b/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); diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockRitualStone.java b/src/main/java/WayofTime/bloodmagic/block/BlockRitualStone.java index 537b3cde..1ac3b5cd 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockRitualStone.java +++ b/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); diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockSoulForge.java b/src/main/java/WayofTime/bloodmagic/block/BlockSoulForge.java index cc7f5068..7f354d83 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockSoulForge.java +++ b/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); diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockSpectral.java b/src/main/java/WayofTime/bloodmagic/block/BlockSpectral.java index d6675415..d0e2f831 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockSpectral.java +++ b/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 diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockTeleposer.java b/src/main/java/WayofTime/bloodmagic/block/BlockTeleposer.java index 7acf397a..79b7ef8c 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockTeleposer.java +++ b/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); } diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemActivationCrystal.java b/src/main/java/WayofTime/bloodmagic/item/ItemActivationCrystal.java index c41533bb..a723262b 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemActivationCrystal.java +++ b/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); } diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemAltarMaker.java b/src/main/java/WayofTime/bloodmagic/item/ItemAltarMaker.java index 0fc822a2..6add2eaf 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemAltarMaker.java +++ b/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(); diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemArcaneAshes.java b/src/main/java/WayofTime/bloodmagic/item/ItemArcaneAshes.java index 3c92fc76..86d581a5 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemArcaneAshes.java +++ b/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); diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemBloodOrb.java b/src/main/java/WayofTime/bloodmagic/item/ItemBloodOrb.java index 6b126002..3703fb5d 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemBloodOrb.java +++ b/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); } diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemBloodShard.java b/src/main/java/WayofTime/bloodmagic/item/ItemBloodShard.java index 9ca6c43b..7a5665f5 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemBloodShard.java +++ b/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); } diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemBoundAxe.java b/src/main/java/WayofTime/bloodmagic/item/ItemBoundAxe.java index a50a6560..cdcc31fd 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemBoundAxe.java +++ b/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 diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemBoundPickaxe.java b/src/main/java/WayofTime/bloodmagic/item/ItemBoundPickaxe.java index 4e4c2526..b8c0bfb9 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemBoundPickaxe.java +++ b/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 diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemBoundShovel.java b/src/main/java/WayofTime/bloodmagic/item/ItemBoundShovel.java index eb2cf33b..ac40bf6f 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemBoundShovel.java +++ b/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 diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemBoundSword.java b/src/main/java/WayofTime/bloodmagic/item/ItemBoundSword.java index f3f21ed9..4e43864f 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemBoundSword.java +++ b/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); } diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemBucketEssence.java b/src/main/java/WayofTime/bloodmagic/item/ItemBucketEssence.java index b9928454..53585ff2 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemBucketEssence.java +++ b/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); } diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemComponent.java b/src/main/java/WayofTime/bloodmagic/item/ItemComponent.java index 65fda864..2b01457c 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemComponent.java +++ b/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); diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemDemonCrystal.java b/src/main/java/WayofTime/bloodmagic/item/ItemDemonCrystal.java index a80b863c..512fc608 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemDemonCrystal.java +++ b/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); diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemExperienceBook.java b/src/main/java/WayofTime/bloodmagic/item/ItemExperienceBook.java index a86f8bd5..19fb8049 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemExperienceBook.java +++ b/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); } diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemInscriptionTool.java b/src/main/java/WayofTime/bloodmagic/item/ItemInscriptionTool.java index 706d12c9..0594ea68 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemInscriptionTool.java +++ b/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); } diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemLavaCrystal.java b/src/main/java/WayofTime/bloodmagic/item/ItemLavaCrystal.java index 655476d6..bfce205c 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemLavaCrystal.java +++ b/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 diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemRitualDiviner.java b/src/main/java/WayofTime/bloodmagic/item/ItemRitualDiviner.java index 14b330ca..ace57a28 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemRitualDiviner.java +++ b/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); diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemSacrificialDagger.java b/src/main/java/WayofTime/bloodmagic/item/ItemSacrificialDagger.java index 893c46c8..0c01a5ae 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemSacrificialDagger.java +++ b/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); diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemSlate.java b/src/main/java/WayofTime/bloodmagic/item/ItemSlate.java index 25e51c55..f8552ec5 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemSlate.java +++ b/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); } diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemTelepositionFocus.java b/src/main/java/WayofTime/bloodmagic/item/ItemTelepositionFocus.java index 723ea295..a045afd0 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemTelepositionFocus.java +++ b/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); diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemUpgradeTome.java b/src/main/java/WayofTime/bloodmagic/item/ItemUpgradeTome.java index bc6bec23..1adcc237 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemUpgradeTome.java +++ b/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); } diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemUpgradeTrainer.java b/src/main/java/WayofTime/bloodmagic/item/ItemUpgradeTrainer.java index dc7ba1fa..b064a996 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemUpgradeTrainer.java +++ b/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); } diff --git a/src/main/java/WayofTime/bloodmagic/item/gear/ItemPackSacrifice.java b/src/main/java/WayofTime/bloodmagic/item/gear/ItemPackSacrifice.java index db4752d0..acb1f7e3 100644 --- a/src/main/java/WayofTime/bloodmagic/item/gear/ItemPackSacrifice.java +++ b/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); } diff --git a/src/main/java/WayofTime/bloodmagic/item/gear/ItemPackSelfSacrifice.java b/src/main/java/WayofTime/bloodmagic/item/gear/ItemPackSelfSacrifice.java index dba7438a..178ea0b6 100644 --- a/src/main/java/WayofTime/bloodmagic/item/gear/ItemPackSelfSacrifice.java +++ b/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); } diff --git a/src/main/java/WayofTime/bloodmagic/item/routing/ItemNodeRouter.java b/src/main/java/WayofTime/bloodmagic/item/routing/ItemNodeRouter.java index b5e3438a..7a436984 100644 --- a/src/main/java/WayofTime/bloodmagic/item/routing/ItemNodeRouter.java +++ b/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); } diff --git a/src/main/java/WayofTime/bloodmagic/item/routing/ItemRouterFilter.java b/src/main/java/WayofTime/bloodmagic/item/routing/ItemRouterFilter.java index fd4091e7..9a470ec4 100644 --- a/src/main/java/WayofTime/bloodmagic/item/routing/ItemRouterFilter.java +++ b/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); } diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilAir.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilAir.java index 6f01b507..2a0c32cb 100644 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilAir.java +++ b/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 diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilBloodLight.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilBloodLight.java index 66632525..b0140339 100644 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilBloodLight.java +++ b/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 diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilCompression.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilCompression.java index f56dddbb..82b2dcc9 100644 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilCompression.java +++ b/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 diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilDivination.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilDivination.java index 3cacb1eb..9b69f248 100644 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilDivination.java +++ b/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 diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilElementalAffinity.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilElementalAffinity.java index 6cc4c0e7..3a4f0e72 100644 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilElementalAffinity.java +++ b/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 diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilEnderSeverance.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilEnderSeverance.java index de944785..d25503c9 100644 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilEnderSeverance.java +++ b/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 diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilFastMiner.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilFastMiner.java index f2a0739e..a29031d9 100644 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilFastMiner.java +++ b/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 diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilGreenGrove.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilGreenGrove.java index 92c18537..d372c3c4 100644 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilGreenGrove.java +++ b/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 diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilHaste.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilHaste.java index b11023d4..c828002a 100644 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilHaste.java +++ b/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 diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilLava.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilLava.java index dff6853d..ecd3d574 100644 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilLava.java +++ b/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 diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilMagnetism.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilMagnetism.java index 4456ea0d..c3a6b45c 100644 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilMagnetism.java +++ b/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 diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilPhantomBridge.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilPhantomBridge.java index 2a461eeb..2d2f81f1 100644 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilPhantomBridge.java +++ b/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 diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilSeer.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilSeer.java index bf8ba532..7240893d 100644 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilSeer.java +++ b/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 diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilSuppression.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilSuppression.java index 893859e5..6dafeb48 100644 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilSuppression.java +++ b/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 diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilTeleposition.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilTeleposition.java index 5a328511..4c0b73f7 100644 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilTeleposition.java +++ b/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 diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilTransposition.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilTransposition.java index b60bb1c9..a96a48a5 100644 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilTransposition.java +++ b/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 diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilVoid.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilVoid.java index cb0af14d..e61449e1 100644 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilVoid.java +++ b/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 diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilWater.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilWater.java index ca1b5166..7c11a4d8 100644 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilWater.java +++ b/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 diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilWhirlwind.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilWhirlwind.java index d3a25711..beb95bce 100644 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilWhirlwind.java +++ b/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 diff --git a/src/main/java/WayofTime/bloodmagic/item/soul/ItemMonsterSoul.java b/src/main/java/WayofTime/bloodmagic/item/soul/ItemMonsterSoul.java index 8b3ab311..28361a4d 100644 --- a/src/main/java/WayofTime/bloodmagic/item/soul/ItemMonsterSoul.java +++ b/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); diff --git a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientArmourGem.java b/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientArmourGem.java index 0c1a83be..34830ea0 100644 --- a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientArmourGem.java +++ b/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); } diff --git a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientBow.java b/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientBow.java index b7a6550e..fd46d04d 100644 --- a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientBow.java +++ b/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() { diff --git a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientSword.java b/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientSword.java index 4cbc66dc..35623c01 100644 --- a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientSword.java +++ b/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); } diff --git a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSoulGem.java b/src/main/java/WayofTime/bloodmagic/item/soul/ItemSoulGem.java index c028970d..f64a0f43 100644 --- a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSoulGem.java +++ b/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); diff --git a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSoulSnare.java b/src/main/java/WayofTime/bloodmagic/item/soul/ItemSoulSnare.java index 6c28d94e..59b46e04 100644 --- a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSoulSnare.java +++ b/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); diff --git a/src/main/java/WayofTime/bloodmagic/registry/ModBlocks.java b/src/main/java/WayofTime/bloodmagic/registry/ModBlocks.java index cdfd0170..824c995a 100644 --- a/src/main/java/WayofTime/bloodmagic/registry/ModBlocks.java +++ b/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()); - bloodRune = registerBlock(new ItemBlockBloodRune(new BlockBloodRune())); - ritualController = registerBlock(new ItemBlockRitualController(new BlockRitualController())); - ritualStone = registerBlock(new ItemBlockRitualStone(new BlockRitualStone())); - bloodLight = registerBlock(new BlockBloodLight()); - pedestal = registerBlock(new ItemBlockPedestal(new BlockPedestal())); - teleposer = registerBlock(new BlockTeleposer()); - alchemyArray = registerBlock(new BlockAlchemyArray()); - spectralBlock = registerBlock(new BlockSpectral()); - phantomBlock = registerBlock(new BlockPhantom()); - soulForge = registerBlock(new BlockSoulForge()); - crystal = registerBlock(new ItemBlockCrystal(new BlockCrystal())); - bloodStoneBrick = registerBlock(new ItemBlockBloodStoneBrick(new BlockBloodStoneBrick())); - masterRoutingNode = registerBlock(new ItemBlockRoutingNode(new BlockMasterRoutingNode())); - inputRoutingNode = registerBlock(new ItemBlockRoutingNode(new BlockInputRoutingNode())); - outputRoutingNode = registerBlock(new ItemBlockRoutingNode(new BlockOutputRoutingNode())); - itemRoutingNode = registerBlock(new ItemBlockRoutingNode(new BlockItemRoutingNode())); - incenseAltar = registerBlock(new BlockIncenseAltar()); - pathBlock = registerBlock(new ItemBlockPath(new BlockPath())); - demonCrucible = registerBlock(new BlockDemonCrucible()); - demonPylon = registerBlock(new BlockDemonPylon()); - demonCrystallizer = registerBlock(new BlockDemonCrystallizer()); - demonCrystal = registerBlock(new ItemBlockDemonCrystal(new BlockDemonCrystal())); + altar = registerBlock(new BlockAltar(), Constants.BloodMagicBlock.ALTAR.getRegName()); + bloodRune = registerBlock(new ItemBlockBloodRune(new BlockBloodRune()), Constants.BloodMagicBlock.BLOOD_RUNE.getRegName()); + ritualController = registerBlock(new ItemBlockRitualController(new BlockRitualController()), Constants.BloodMagicBlock.RITUAL_CONTROLLER.getRegName()); + ritualStone = registerBlock(new ItemBlockRitualStone(new BlockRitualStone()), Constants.BloodMagicBlock.RITUAL_STONE.getRegName()); + bloodLight = registerBlock(new BlockBloodLight(), Constants.BloodMagicBlock.BLOOD_LIGHT.getRegName()); + pedestal = registerBlock(new ItemBlockPedestal(new BlockPedestal()), Constants.BloodMagicBlock.PEDESTAL.getRegName()); + teleposer = registerBlock(new BlockTeleposer(), Constants.BloodMagicBlock.TELEPOSER.getRegName()); + alchemyArray = registerBlock(new BlockAlchemyArray(), Constants.BloodMagicBlock.ALCHEMY_ARRAY.getRegName()); + spectralBlock = registerBlock(new BlockSpectral(), Constants.BloodMagicBlock.SPECTRAL.getRegName()); + phantomBlock = registerBlock(new BlockPhantom(), Constants.BloodMagicBlock.PHANTOM.getRegName()); + soulForge = registerBlock(new BlockSoulForge(), Constants.BloodMagicBlock.SOUL_FORGE.getRegName()); + crystal = registerBlock(new ItemBlockCrystal(new BlockCrystal()), Constants.BloodMagicBlock.CRYSTAL.getRegName()); + bloodStoneBrick = registerBlock(new ItemBlockBloodStoneBrick(new BlockBloodStoneBrick()), Constants.BloodMagicBlock.BLOOD_STONE.getRegName()); + masterRoutingNode = registerBlock(new ItemBlockRoutingNode(new BlockMasterRoutingNode()), Constants.BloodMagicBlock.MASTER_ROUTING_NODE.getRegName()); + inputRoutingNode = registerBlock(new ItemBlockRoutingNode(new BlockInputRoutingNode()), Constants.BloodMagicBlock.INPUT_ROUTING_NODE.getRegName()); + outputRoutingNode = registerBlock(new ItemBlockRoutingNode(new BlockOutputRoutingNode()), Constants.BloodMagicBlock.OUTPUT_ROUTING_NODE.getRegName()); + itemRoutingNode = registerBlock(new ItemBlockRoutingNode(new BlockItemRoutingNode()), Constants.BloodMagicBlock.ITEM_ROUTING_NODE.getRegName()); + incenseAltar = registerBlock(new BlockIncenseAltar(), Constants.BloodMagicBlock.INCENSE_ALTAR.getRegName()); + pathBlock = registerBlock(new ItemBlockPath(new BlockPath()), Constants.BloodMagicBlock.PATH.getRegName()); + demonCrucible = registerBlock(new BlockDemonCrucible(), Constants.BloodMagicBlock.DEMON_CRUCIBLE.getRegName()); + demonPylon = registerBlock(new BlockDemonPylon(), Constants.BloodMagicBlock.DEMON_PYLON.getRegName()); + demonCrystallizer = registerBlock(new BlockDemonCrystallizer(), Constants.BloodMagicBlock.DEMON_CRYSTALLIZER.getRegName()); + demonCrystal = registerBlock(new ItemBlockDemonCrystal(new BlockDemonCrystal()), Constants.BloodMagicBlock.DEMON_CRYSTAL.getRegName()); - dimensionalPortal = registerBlock(new BlockDimensionalPortal()); - bloodTank = registerBlock(new ItemBlockBloodTank(new BlockBloodTank())); + dimensionalPortal = registerBlock(new BlockDimensionalPortal(), Constants.BloodMagicBlock.DIMENSIONAL_PORTAL.getRegName()); + 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; - 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; - } + Block block = itemBlock.getBlock(); - String blockName = block.getRegistryName().getResourcePath(); - if (!ConfigHandler.blockBlacklist.contains(blockName)) + if (block.getRegistryName() == null) + block.setRegistryName(name); + + if (!ConfigHandler.blockBlacklist.contains(name)) { GameRegistry.register(block); - GameRegistry.register(itemBlock.setRegistryName(block.getRegistryName().getResourcePath())); -// GameRegistry.registerBlock(block, itemBlock); - 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); + GameRegistry.register(itemBlock.setRegistryName(name)); + BloodMagic.proxy.tryHandleBlockModel(block, name); } return block; diff --git a/src/main/java/WayofTime/bloodmagic/registry/ModItems.java b/src/main/java/WayofTime/bloodmagic/registry/ModItems.java index 43164e5c..a395e15d 100644 --- a/src/main/java/WayofTime/bloodmagic/registry/ModItems.java +++ b/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()); - slate = registerItem(new ItemSlate()); - inscriptionTool = registerItem(new ItemInscriptionTool()); + activationCrystal = registerItem(new ItemActivationCrystal(), Constants.BloodMagicItem.ACTIVATION_CRYSTAL.getRegName()); + slate = registerItem(new ItemSlate(), Constants.BloodMagicItem.SLATE.getRegName()); + inscriptionTool = registerItem(new ItemInscriptionTool(), Constants.BloodMagicItem.INSCRIPTION_TOOL.getRegName()); - sacrificialDagger = registerItem(new ItemSacrificialDagger()); - packSacrifice = registerItem(new ItemPackSacrifice()); - packSelfSacrifice = registerItem(new ItemPackSelfSacrifice()); - daggerOfSacrifice = registerItem(new ItemDaggerOfSacrifice()); + sacrificialDagger = registerItem(new ItemSacrificialDagger(), Constants.BloodMagicItem.SACRIFICIAL_DAGGER.getRegName()); + packSacrifice = registerItem(new ItemPackSacrifice(), Constants.BloodMagicItem.SACRIFICE_PACK.getRegName()); + packSelfSacrifice = registerItem(new ItemPackSelfSacrifice(), Constants.BloodMagicItem.SELF_SACRIFICE_PACK.getRegName()); + 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()); - boundPickaxe = registerItem(new ItemBoundPickaxe()); - boundAxe = registerItem(new ItemBoundAxe()); - boundShovel = registerItem(new ItemBoundShovel()); + boundSword = registerItem(new ItemBoundSword(), Constants.BloodMagicItem.BOUND_SWORD.getRegName()); + boundPickaxe = registerItem(new ItemBoundPickaxe(), Constants.BloodMagicItem.BOUND_PICKAXE.getRegName()); + boundAxe = registerItem(new ItemBoundAxe(), Constants.BloodMagicItem.BOUND_AXE.getRegName()); + boundShovel = registerItem(new ItemBoundShovel(), Constants.BloodMagicItem.BOUND_SHOVEL.getRegName()); - sigilDivination = registerItem(new ItemSigilDivination()); - sigilAir = registerItem(new ItemSigilAir()); - sigilWater = registerItem(new ItemSigilWater()); - sigilLava = registerItem(new ItemSigilLava()); - sigilVoid = registerItem(new ItemSigilVoid()); - sigilGreenGrove = registerItem(new ItemSigilGreenGrove()); - sigilBloodLight = registerItem(new ItemSigilBloodLight()); - sigilElementalAffinity = registerItem(new ItemSigilElementalAffinity()); - sigilMagnetism = registerItem(new ItemSigilMagnetism()); - sigilSuppression = registerItem(new ItemSigilSuppression()); - sigilHaste = registerItem(new ItemSigilHaste()); - sigilFastMiner = registerItem(new ItemSigilFastMiner()); - sigilSeer = registerItem(new ItemSigilSeer()); - sigilPhantomBridge = registerItem(new ItemSigilPhantomBridge()); - sigilWhirlwind = registerItem(new ItemSigilWhirlwind()); - sigilCompression = registerItem(new ItemSigilCompression()); - sigilEnderSeverance = registerItem(new ItemSigilEnderSeverance()); + sigilDivination = registerItem(new ItemSigilDivination(), Constants.BloodMagicItem.SIGIL_DIVINATION.getRegName()); + sigilAir = registerItem(new ItemSigilAir(), Constants.BloodMagicItem.SIGIL_AIR.getRegName()); + sigilWater = registerItem(new ItemSigilWater(), Constants.BloodMagicItem.SIGIL_WATER.getRegName()); + sigilLava = registerItem(new ItemSigilLava(), Constants.BloodMagicItem.SIGIL_LAVA.getRegName()); + sigilVoid = registerItem(new ItemSigilVoid(), Constants.BloodMagicItem.SIGIL_VOID.getRegName()); + sigilGreenGrove = registerItem(new ItemSigilGreenGrove(), Constants.BloodMagicItem.SIGIL_GREEN_GROVE.getRegName()); + sigilBloodLight = registerItem(new ItemSigilBloodLight(), Constants.BloodMagicItem.SIGIL_BLOOD_LIGHT.getRegName()); + sigilElementalAffinity = registerItem(new ItemSigilElementalAffinity(), Constants.BloodMagicItem.SIGIL_ELEMENTAL_AFFINITY.getRegName()); + sigilMagnetism = registerItem(new ItemSigilMagnetism(), Constants.BloodMagicItem.SIGIL_MAGNETISM.getRegName()); + sigilSuppression = registerItem(new ItemSigilSuppression(), Constants.BloodMagicItem.SIGIL_SUPPRESION.getRegName()); + sigilHaste = registerItem(new ItemSigilHaste(), Constants.BloodMagicItem.SIGIL_HASTE.getRegName()); + sigilFastMiner = registerItem(new ItemSigilFastMiner(), Constants.BloodMagicItem.SIGIL_FAST_MINER.getRegName()); + sigilSeer = registerItem(new ItemSigilSeer(), Constants.BloodMagicItem.SIGIL_SEER.getRegName()); + sigilPhantomBridge = registerItem(new ItemSigilPhantomBridge(), Constants.BloodMagicItem.SIGIL_PHANTOM_BRIDGE.getRegName()); + sigilWhirlwind = registerItem(new ItemSigilWhirlwind(), Constants.BloodMagicItem.SIGIL_WHIRLWIND.getRegName()); + sigilCompression = registerItem(new ItemSigilCompression(), Constants.BloodMagicItem.SIGIL_COMPRESSION.getRegName()); + sigilEnderSeverance = registerItem(new ItemSigilEnderSeverance(), Constants.BloodMagicItem.SIGIL_ENDER_SEVERANCE.getRegName()); - sigilTeleposition = registerItem(new ItemSigilTeleposition()); - sigilTransposition = registerItem(new ItemSigilTransposition()); + sigilTeleposition = registerItem(new ItemSigilTeleposition(), Constants.BloodMagicItem.TELEPOSITION_FOCUS.getRegName()); + sigilTransposition = registerItem(new ItemSigilTransposition(), Constants.BloodMagicItem.SIGIL_TRANSPOSITION.getRegName()); - itemComponent = registerItem(new ItemComponent()); - itemDemonCrystal = registerItem(new ItemDemonCrystal()); - telepositionFocus = registerItem(new ItemTelepositionFocus()); - experienceTome = registerItem(new ItemExperienceBook()); + itemComponent = registerItem(new ItemComponent(), Constants.BloodMagicItem.COMPONENT.getRegName()); + itemDemonCrystal = registerItem(new ItemDemonCrystal(), Constants.BloodMagicItem.DEMON_CRYSTAL.getRegName()); + telepositionFocus = registerItem(new ItemTelepositionFocus(), Constants.BloodMagicItem.TELEPOSITION_FOCUS.getRegName()); + 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()); - upgradeTome = registerItem(new ItemUpgradeTome()); - upgradeTrainer = registerItem(new ItemUpgradeTrainer()); + altarMaker = registerItem(new ItemAltarMaker(), Constants.BloodMagicItem.ALTAR_MAKER.getRegName()); + upgradeTome = registerItem(new ItemUpgradeTome(), Constants.BloodMagicItem.UPGRADE_TOME.getRegName()); + upgradeTrainer = registerItem(new ItemUpgradeTrainer(), Constants.BloodMagicItem.UPGRADE_TRAINER.getRegName()); - arcaneAshes = registerItem(new ItemArcaneAshes()); - monsterSoul = registerItem(new ItemMonsterSoul()); - soulGem = registerItem(new ItemSoulGem()); - soulSnare = registerItem(new ItemSoulSnare()); + arcaneAshes = registerItem(new ItemArcaneAshes(), Constants.BloodMagicItem.ARCANE_ASHES.getRegName()); + monsterSoul = registerItem(new ItemMonsterSoul(), Constants.BloodMagicItem.MONSTER_SOUL.getRegName()); + soulGem = registerItem(new ItemSoulGem(), Constants.BloodMagicItem.SOUL_GEM.getRegName()); + soulSnare = registerItem(new ItemSoulSnare(), Constants.BloodMagicItem.SOUL_SNARE.getRegName()); - sentientSword = registerItem(new ItemSentientSword()); - sentientBow = registerItem(new ItemSentientBow()); - sentientArmourGem = registerItem(new ItemSentientArmourGem()); + sentientSword = registerItem(new ItemSentientSword(), Constants.BloodMagicItem.SENTIENT_SWORD.getRegName()); + sentientBow = registerItem(new ItemSentientBow(), Constants.BloodMagicItem.SENTIENT_BOW.getRegName()); + sentientArmourGem = registerItem(new ItemSentientArmourGem(), Constants.BloodMagicItem.SENTIENT_ARMOR_GEM.getRegName()); - nodeRouter = registerItem(new ItemNodeRouter()); - baseItemFilter = registerItem(new ItemRouterFilter()); + nodeRouter = registerItem(new ItemNodeRouter(), Constants.BloodMagicItem.NODE_ROUTER.getRegName()); + 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; - } }