From fdfcb5c5b7d0a1fc0b13c02eb6898657f3d6d147 Mon Sep 17 00:00:00 2001 From: Nick Date: Mon, 18 Jan 2016 22:34:12 -0800 Subject: [PATCH] Change how blocks/items are registered (desc) tterrag is a meany face and yelled at me for using class.getSimpleName(). So here's an API-friendly re-work of the registration system. This allows all our Items/Blocks to be obtained via the API. Just add a new enum. --- .../bloodmagic/api/BloodMagicAPI.java | 42 ++++++- .../WayofTime/bloodmagic/api/Constants.java | 104 ++++++++++++++++++ .../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/BlockCrystal.java | 1 + .../block/BlockInputRoutingNode.java | 1 + .../block/BlockItemRoutingNode.java | 1 + .../bloodmagic/block/BlockLifeEssence.java | 2 +- .../block/BlockMasterRoutingNode.java | 1 + .../block/BlockOutputRoutingNode.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 + .../bloodmagic/block/BlockTestSpellBlock.java | 1 + .../item/ItemActivationCrystal.java | 1 + .../bloodmagic/item/ItemAltarMaker.java | 1 + .../bloodmagic/item/ItemArcaneAshes.java | 1 + .../bloodmagic/item/ItemBloodOrb.java | 2 +- .../bloodmagic/item/ItemBloodShard.java | 1 + .../bloodmagic/item/ItemBoundAxe.java | 2 + .../bloodmagic/item/ItemBoundPickaxe.java | 2 + .../bloodmagic/item/ItemBoundShovel.java | 2 + .../bloodmagic/item/ItemBoundSword.java | 1 + .../bloodmagic/item/ItemBucketEssence.java | 1 + .../bloodmagic/item/ItemComponent.java | 1 + .../item/ItemDaggerOfSacrifice.java | 1 + .../bloodmagic/item/ItemInscriptionTool.java | 3 +- .../bloodmagic/item/ItemLavaCrystal.java | 1 + .../bloodmagic/item/ItemRitualDiviner.java | 1 + .../item/ItemSacrificialDagger.java | 1 + .../WayofTime/bloodmagic/item/ItemSlate.java | 1 + .../item/ItemTelepositionFocus.java | 2 +- .../bloodmagic/item/ItemUpgradeTome.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 | 2 + .../item/sigil/ItemSigilBloodLight.java | 2 + .../item/sigil/ItemSigilCompression.java | 2 + .../item/sigil/ItemSigilDivination.java | 3 +- .../sigil/ItemSigilElementalAffinity.java | 2 + .../item/sigil/ItemSigilEnderSeverance.java | 2 + .../item/sigil/ItemSigilFastMiner.java | 2 + .../item/sigil/ItemSigilGreenGrove.java | 2 + .../bloodmagic/item/sigil/ItemSigilHaste.java | 2 + .../bloodmagic/item/sigil/ItemSigilLava.java | 2 + .../item/sigil/ItemSigilMagnetism.java | 2 + .../item/sigil/ItemSigilPhantomBridge.java | 2 + .../bloodmagic/item/sigil/ItemSigilSeer.java | 3 +- .../item/sigil/ItemSigilSuppression.java | 2 + .../bloodmagic/item/sigil/ItemSigilVoid.java | 2 + .../bloodmagic/item/sigil/ItemSigilWater.java | 2 + .../item/sigil/ItemSigilWhirlwind.java | 2 + .../bloodmagic/item/soul/ItemMonsterSoul.java | 1 + .../item/soul/ItemSentientArmourGem.java | 5 +- .../bloodmagic/item/soul/ItemSentientBow.java | 3 +- .../item/soul/ItemSentientSword.java | 2 +- .../bloodmagic/item/soul/ItemSoulGem.java | 1 + .../bloodmagic/item/soul/ItemSoulSnare.java | 1 + .../bloodmagic/registry/ModBlocks.java | 20 +++- .../bloodmagic/registry/ModItems.java | 10 +- 69 files changed, 260 insertions(+), 15 deletions(-) diff --git a/src/main/java/WayofTime/bloodmagic/api/BloodMagicAPI.java b/src/main/java/WayofTime/bloodmagic/api/BloodMagicAPI.java index ac7a4492..6f985eb9 100644 --- a/src/main/java/WayofTime/bloodmagic/api/BloodMagicAPI.java +++ b/src/main/java/WayofTime/bloodmagic/api/BloodMagicAPI.java @@ -35,8 +35,9 @@ public class BloodMagicAPI private static Fluid lifeEssence; /** - * Used to obtain Items from BloodMagic. Use the constants above for common - * items in case internal names change. + * Used to obtain Items from BloodMagic. Use + * {@link WayofTime.bloodmagic.api.Constants.BloodMagicItem} to get + * the registered name. * * @param name * - The registered name of the item. Usually the same as the class @@ -48,6 +49,43 @@ public class BloodMagicAPI return GameRegistry.findItem(Constants.Mod.MODID, name); } + /** + * @see #getItem(String) + * + * @param bloodMagicItem + * - The {@link WayofTime.bloodmagic.api.Constants.BloodMagicItem} to get. + * @return - The requested Item + */ + public static Item getItem(Constants.BloodMagicItem bloodMagicItem) { + return getItem(bloodMagicItem.getRegName()); + } + + /** + * Used to obtain Blocks from BloodMagic. Use + * {@link WayofTime.bloodmagic.api.Constants.BloodMagicBlock} to get + * the registered name. + * + * @param name + * - The registered name of the block. Usually the same as the class + * name. + * @return - The requested Block + */ + public static Block getBlock(String name) + { + return GameRegistry.findBlock(Constants.Mod.MODID, name); + } + + /** + * @see #getBlock(String) + * + * @param bloodMagicBlock + * - The {@link WayofTime.bloodmagic.api.Constants.BloodMagicBlock} to get. + * @return - The requested Block + */ + public static Block getBlock(Constants.BloodMagicBlock bloodMagicBlock) { + return getBlock(bloodMagicBlock.getRegName()); + } + /** * Used to add a {@link BlockStack} to the Teleposer blacklist that cannot * be changed via Configuration files. diff --git a/src/main/java/WayofTime/bloodmagic/api/Constants.java b/src/main/java/WayofTime/bloodmagic/api/Constants.java index 7ad04e0a..fe4ece7e 100644 --- a/src/main/java/WayofTime/bloodmagic/api/Constants.java +++ b/src/main/java/WayofTime/bloodmagic/api/Constants.java @@ -1,5 +1,8 @@ package WayofTime.bloodmagic.api; +import lombok.Getter; +import net.minecraft.block.Block; +import net.minecraft.item.Item; import net.minecraft.potion.Potion; import java.util.Locale; @@ -131,4 +134,105 @@ public class Constants { public static final int POTION_ARRAY_SIZE = Potion.potionTypes.length; } + + public enum BloodMagicItem + { + ACTIVATION_CRYSTAL("ItemActivationCrystal"), + ALTAR_MAKER("ItemAltarMaker"), + ARCANE_ASHES("ItemArcaneAshes"), + BLOOD_ORB("ItemBloodOrb"), + BOUND_AXE("ItemBoundAxe"), + BLOOD_SHARD("ItemBloodShard"), + BOUND_PICKAXE("ItemBoundPickaxe"), + BOUND_SHOVEL("ItemBoundShovel"), + BOUND_SWORD("ItemBoundSword"), + BUCKET_ESSENCE("ItemBucketEssence"), + COMPONENT("ItemComponent"), + DAGGER_OF_SACRIFICE("ItemDaggerOfSacrifice"), + INSCRIPTION_TOOL("ItemInscriptionTool"), + LAVA_CRYSTAL("ItemLavaCrystal"), + LIVING_ARMOR_HELMET("ItemLivingArmourHelmet"), + LIVING_ARMOR_CHEST("ItemLivingArmourChest"), + LIVING_ARMOR_LEGS("ItemLivingArmourLegs"), + LIVING_ARMOR_BOOTS("ItemLivingArmourBoots"), + MONSTER_SOUL("ItemMonsterSoul"), + NODE_ROUTER("ItemNodeRouter"), + RITUAL_DIVINER("ItemRitualDiviner"), + ROUTER_FILTER("ItemRouterFilter"), + SACRIFICIAL_DAGGER("ItemSacrificialDagger"), + SACRIFICE_PACK("ItemPackSacrifice"), + SELF_SACRIFICE_PACK("ItemPackSelfSacrifice"), + SENTIENT_ARMOR_HELMET("ItemSentientArmourHelmet"), + SENTIENT_ARMOR_CHEST("ItemSentientArmourChest"), + SENTIENT_ARMOR_LEGS("ItemSentientArmourLegs"), + SENTIENT_ARMOR_BOOTS("ItemSentientArmourBoots"), + SENTIENT_ARMOR_GEM("ItemSentientArmourGem"), + SENTIENT_BOW("ItemSentientBow"), + SENTIENT_SWORD("ItemSentientSword"), + SOUL_GEM("ItemSoulGem"), + SOUL_SNARE("ItemSoulSnare"), + SIGIL_AIR("ItemSigilAir"), + SIGIL_BLOOD_LIGHT("ItemSigilBloodLight"), + SIGIL_COMPRESSION("ItemSigilCompression"), + SIGIL_DIVINATION("ItemSigilDivination"), + SIGIL_ELEMENTAL_AFFINITY("ItemSigilElementalAffinity"), + SIGIL_ENDER_SEVERANCE("ItemSigilEnderSeverance"), + SIGIL_FAST_MINER("ItemSigilFastMiner"), + SIGIL_GREEN_GROVE("ItemSigilGreenGrove"), + SIGIL_HASTE("ItemSigilHaste"), + SIGIL_LAVA("ItemSigilLava"), + SIGIL_MAGNETISM("ItemSigilMagnetism"), + SIGIL_PHANTOM_BRIDGE("ItemSigilPhantomBridge"), + SIGIL_SEER("ItemSigilSeer"), + SIGIL_SUPPRESION("ItemSigilSuppression"), + SIGIL_VOID("ItemSigilVoid"), + SIGIL_WATER("ItemSigilWater"), + SIGIL_WHIRLWIND("ItemSigilWhirlwind"), + SLATE("ItemSlate"), + TELEPOSITION_FOCUS("ItemTelepositionFocus"), + UPGRADE_TOME("ItemUpgradeTome"); + + @Getter + private final String regName; + + BloodMagicItem(String regName) { + this.regName = regName; + } + + public Item getItem() { + return BloodMagicAPI.getItem(getRegName()); + } + } + + public enum BloodMagicBlock { + ALCHEMY_ARRAY("BlockAlchemyArray"), + ALTAR("BlockAltar"), + BLOOD_LIGHT("BlockBloodLight"), + BLOOD_RUNE("BlockBloodRune"), + BLOOD_STONE("BlockBloodStoneBrick"), + CRYSTAL("BlockCrystal"), + INPUT_ROUTING_NODE("BlockInputRoutingNode"), + ITEM_ROUTING_NODE("BlockItemRoutingNode"), + LIFE_ESSENCE("BlockLifeEssence"), + MASTER_ROUTING_NODE("BlockMasterRoutingNode"), + OUTPUT_ROUTING_NODE("BlockOutputRoutingNode"), + PEDESTAL("BlockPedestal"), + PHANTOM("BlockPhantom"), + RITUAL_CONTROLLER("BlockRitualController"), + RITUAL_STONE("BlockRitualStone"), + SOUL_FORGE("BlockSoulForge"), + SPECTRAL("BlockSpectral"), + TELEPOSER("BlockTeleposer"); + + @Getter + private final String regName; + + BloodMagicBlock(String regName) { + this.regName = regName; + } + + public Block getBlock() { + return BloodMagicAPI.getBlock(getRegName()); + } + } } diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockAlchemyArray.java b/src/main/java/WayofTime/bloodmagic/block/BlockAlchemyArray.java index 6a03ab1e..d0a5bd36 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockAlchemyArray.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockAlchemyArray.java @@ -27,6 +27,7 @@ public class BlockAlchemyArray extends BlockContainer super(Material.cloth); setUnlocalizedName(Constants.Mod.MODID + ".alchemyArray"); + setRegistryName(Constants.BloodMagicBlock.ALCHEMY_ARRAY.getRegName()); setCreativeTab(BloodMagic.tabBloodMagic); this.setHardness(0.1f); this.setBlockBounds(0, 0, 0, 1, 0.1f, 1); diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockAltar.java b/src/main/java/WayofTime/bloodmagic/block/BlockAltar.java index 938dcb5c..f49f4675 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockAltar.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockAltar.java @@ -23,6 +23,7 @@ public class BlockAltar extends BlockContainer 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 013462a2..24fac66e 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockBloodLight.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockBloodLight.java @@ -23,6 +23,7 @@ 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 8549a368..21354984 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockBloodRune.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockBloodRune.java @@ -14,6 +14,7 @@ public class BlockBloodRune extends BlockString super(Material.rock, names); setUnlocalizedName(Constants.Mod.MODID + ".rune."); + setRegistryName(Constants.BloodMagicBlock.BLOOD_RUNE.getRegName()); setCreativeTab(BloodMagic.tabBloodMagic); setStepSound(soundTypeStone); setHardness(2.0F); diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockBloodStoneBrick.java b/src/main/java/WayofTime/bloodmagic/block/BlockBloodStoneBrick.java index 9d647b25..ce25f459 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockBloodStoneBrick.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockBloodStoneBrick.java @@ -14,6 +14,7 @@ public class BlockBloodStoneBrick extends BlockString 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/BlockCrystal.java b/src/main/java/WayofTime/bloodmagic/block/BlockCrystal.java index 1cae8638..76189263 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockCrystal.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockCrystal.java @@ -14,6 +14,7 @@ public class BlockCrystal extends BlockString super(Material.rock, names); setUnlocalizedName(Constants.Mod.MODID + ".crystal."); + setRegistryName(Constants.BloodMagicBlock.CRYSTAL.getRegName()); setCreativeTab(BloodMagic.tabBloodMagic); setStepSound(soundTypeStone); setHardness(2.0F); diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockInputRoutingNode.java b/src/main/java/WayofTime/bloodmagic/block/BlockInputRoutingNode.java index d5897608..b8684134 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockInputRoutingNode.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockInputRoutingNode.java @@ -17,6 +17,7 @@ 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 63e5c808..23698ef1 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockItemRoutingNode.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockItemRoutingNode.java @@ -15,6 +15,7 @@ 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 fb763e33..da5802ea 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockLifeEssence.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockLifeEssence.java @@ -26,7 +26,7 @@ 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 3d707444..22dec9bd 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockMasterRoutingNode.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockMasterRoutingNode.java @@ -19,6 +19,7 @@ public class BlockMasterRoutingNode extends BlockContainer super(Material.rock); 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 89baa139..ae9e60fa 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockOutputRoutingNode.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockOutputRoutingNode.java @@ -17,6 +17,7 @@ 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/BlockPedestal.java b/src/main/java/WayofTime/bloodmagic/block/BlockPedestal.java index 04544b7e..4aceda06 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockPedestal.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockPedestal.java @@ -23,6 +23,7 @@ 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 b30a6d66..de316a0c 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockPhantom.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockPhantom.java @@ -25,6 +25,7 @@ public class BlockPhantom extends BlockContainer 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 d271632d..451c3ec4 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockRitualController.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockRitualController.java @@ -30,6 +30,7 @@ public class BlockRitualController extends BlockStringContainer super(Material.rock, names); setUnlocalizedName(Constants.Mod.MODID + ".stone.ritual."); + setRegistryName(Constants.BloodMagicBlock.RITUAL_CONTROLLER.getRegName()); setCreativeTab(BloodMagic.tabBloodMagic); setStepSound(soundTypeStone); setHardness(2.0F); diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockRitualStone.java b/src/main/java/WayofTime/bloodmagic/block/BlockRitualStone.java index 3c96ab80..e498ffaa 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockRitualStone.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockRitualStone.java @@ -18,6 +18,7 @@ public class BlockRitualStone extends BlockString implements IRitualStone super(Material.iron, names); setUnlocalizedName(Constants.Mod.MODID + ".ritualStone."); + setRegistryName(Constants.BloodMagicBlock.RITUAL_STONE.getRegName()); setCreativeTab(BloodMagic.tabBloodMagic); setStepSound(soundTypeStone); setHardness(2.0F); diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockSoulForge.java b/src/main/java/WayofTime/bloodmagic/block/BlockSoulForge.java index 454061f8..e25563b6 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockSoulForge.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockSoulForge.java @@ -22,6 +22,7 @@ public class BlockSoulForge extends BlockContainer super(Material.iron); setUnlocalizedName(Constants.Mod.MODID + ".soulForge"); + setRegistryName(Constants.BloodMagicBlock.SOUL_FORGE.getRegName()); setHardness(2.0F); setResistance(5.0F); setStepSound(soundTypeMetal); diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockSpectral.java b/src/main/java/WayofTime/bloodmagic/block/BlockSpectral.java index e7c78180..3c9073f3 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockSpectral.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockSpectral.java @@ -25,6 +25,7 @@ public class BlockSpectral extends BlockContainer super(Material.cloth); setUnlocalizedName(Constants.Mod.MODID + ".spectral"); + setRegistryName(Constants.BloodMagicBlock.SPECTRAL.getRegName()); setBlockBounds(0, 0, 0, 0, 0, 0); } diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockTeleposer.java b/src/main/java/WayofTime/bloodmagic/block/BlockTeleposer.java index c33f3c31..a6565b13 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockTeleposer.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockTeleposer.java @@ -24,6 +24,7 @@ public class BlockTeleposer extends BlockContainer 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/block/BlockTestSpellBlock.java b/src/main/java/WayofTime/bloodmagic/block/BlockTestSpellBlock.java index 5be4c8c1..a1d068c9 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockTestSpellBlock.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockTestSpellBlock.java @@ -24,6 +24,7 @@ public class BlockTestSpellBlock extends Block setResistance(5.0F); setUnlocalizedName(Constants.Mod.MODID + ".testSpellBlock"); + setRegistryName("BlockTestSpellBlock"); setCreativeTab(BloodMagic.tabBloodMagic); this.setDefaultState(this.blockState.getBaseState().withProperty(INPUT, EnumFacing.DOWN).withProperty(OUTPUT, EnumFacing.UP)); } diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemActivationCrystal.java b/src/main/java/WayofTime/bloodmagic/item/ItemActivationCrystal.java index 90c3a454..0c3b77f1 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemActivationCrystal.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemActivationCrystal.java @@ -20,6 +20,7 @@ public class ItemActivationCrystal extends ItemBindable super(); setUnlocalizedName(Constants.Mod.MODID + ".activationCrystal."); + setRegistryName(Constants.BloodMagicItem.ACTIVATION_CRYSTAL.getRegName()); setHasSubtypes(true); setLPUsed(100); } diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemAltarMaker.java b/src/main/java/WayofTime/bloodmagic/item/ItemAltarMaker.java index 99348d1d..7c4e80ba 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemAltarMaker.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemAltarMaker.java @@ -32,6 +32,7 @@ public class ItemAltarMaker extends Item implements IAltarManipulator { 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 8bbb660b..28317262 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemArcaneAshes.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemArcaneAshes.java @@ -20,6 +20,7 @@ public class ItemArcaneAshes extends Item 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 8d6ca20f..6ebe4fa2 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemBloodOrb.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemBloodOrb.java @@ -13,7 +13,6 @@ import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.util.StatCollector; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -25,6 +24,7 @@ public class ItemBloodOrb extends ItemBindable implements IBloodOrb, IBindable public ItemBloodOrb() { setUnlocalizedName(Constants.Mod.MODID + ".orb."); + setRegistryName(Constants.BloodMagicItem.BLOOD_ORB.getRegName()); setHasSubtypes(true); } diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemBloodShard.java b/src/main/java/WayofTime/bloodmagic/item/ItemBloodShard.java index 72770965..edb6fc44 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemBloodShard.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemBloodShard.java @@ -20,6 +20,7 @@ public class ItemBloodShard extends Item 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 dfb3b5c5..c118f546 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemBoundAxe.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemBoundAxe.java @@ -1,6 +1,7 @@ package WayofTime.bloodmagic.item; import WayofTime.bloodmagic.api.BlockStack; +import WayofTime.bloodmagic.api.Constants; import WayofTime.bloodmagic.api.ItemStackWrapper; import com.google.common.collect.HashMultiset; import com.google.common.collect.Multimap; @@ -27,6 +28,7 @@ public class ItemBoundAxe extends ItemBoundTool public ItemBoundAxe() { super("axe", 5, 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 d2abd3aa..df118afe 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemBoundPickaxe.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemBoundPickaxe.java @@ -4,6 +4,7 @@ import java.util.List; import java.util.Set; import WayofTime.bloodmagic.api.BlockStack; +import WayofTime.bloodmagic.api.Constants; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.enchantment.EnchantmentHelper; @@ -27,6 +28,7 @@ public class ItemBoundPickaxe extends ItemBoundTool 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 00e2c430..cd68d48f 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemBoundShovel.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemBoundShovel.java @@ -1,6 +1,7 @@ package WayofTime.bloodmagic.item; import WayofTime.bloodmagic.api.BlockStack; +import WayofTime.bloodmagic.api.Constants; import WayofTime.bloodmagic.api.ItemStackWrapper; import com.google.common.collect.HashMultiset; @@ -27,6 +28,7 @@ public class ItemBoundShovel extends ItemBoundTool public ItemBoundShovel() { super("shovel", 5, 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 92b82651..7c33ad14 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemBoundSword.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemBoundSword.java @@ -37,6 +37,7 @@ public class ItemBoundSword extends ItemSword super(ModItems.boundToolMaterial); setUnlocalizedName(Constants.Mod.MODID + ".bound.sword"); + setRegistryName(Constants.BloodMagicItem.BOUND_SWORD.getRegName()); setHasSubtypes(true); setNoRepair(); setCreativeTab(BloodMagic.tabBloodMagic); diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemBucketEssence.java b/src/main/java/WayofTime/bloodmagic/item/ItemBucketEssence.java index 53585ff2..b9928454 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemBucketEssence.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemBucketEssence.java @@ -13,6 +13,7 @@ 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 d2bfb4e2..b8fc8ea8 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemComponent.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemComponent.java @@ -34,6 +34,7 @@ public class ItemComponent extends Item 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/ItemDaggerOfSacrifice.java b/src/main/java/WayofTime/bloodmagic/item/ItemDaggerOfSacrifice.java index 9f496ca8..30ccd141 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemDaggerOfSacrifice.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemDaggerOfSacrifice.java @@ -24,6 +24,7 @@ public class ItemDaggerOfSacrifice extends Item { super(); setUnlocalizedName(Constants.Mod.MODID + ".daggerOfSacrifice"); + setRegistryName(Constants.BloodMagicItem.DAGGER_OF_SACRIFICE.getRegName()); setCreativeTab(BloodMagic.tabBloodMagic); setMaxStackSize(1); setFull3D(); diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemInscriptionTool.java b/src/main/java/WayofTime/bloodmagic/item/ItemInscriptionTool.java index 1e505ca4..c462d957 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemInscriptionTool.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemInscriptionTool.java @@ -25,9 +25,10 @@ public class ItemInscriptionTool extends ItemBindable { super(); - setLPUsed(100); setUnlocalizedName(Constants.Mod.MODID + ".scribe."); + setRegistryName(Constants.BloodMagicItem.INSCRIPTION_TOOL.getRegName()); setHasSubtypes(true); + setLPUsed(100); } @Override diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemLavaCrystal.java b/src/main/java/WayofTime/bloodmagic/item/ItemLavaCrystal.java index 0054896a..003f6cf3 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemLavaCrystal.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemLavaCrystal.java @@ -19,6 +19,7 @@ public class ItemLavaCrystal extends ItemBindable implements IFuelHandler { super(); setUnlocalizedName(Constants.Mod.MODID + ".lavaCrystal"); + setRegistryName(Constants.BloodMagicItem.LAVA_CRYSTAL.getRegName()); setLPUsed(25); } diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemRitualDiviner.java b/src/main/java/WayofTime/bloodmagic/item/ItemRitualDiviner.java index 9226b89a..b4bfa3e2 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemRitualDiviner.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemRitualDiviner.java @@ -43,6 +43,7 @@ public class ItemRitualDiviner extends Item 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 caac80de..9996f8da 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemSacrificialDagger.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemSacrificialDagger.java @@ -35,6 +35,7 @@ public class ItemSacrificialDagger extends Item 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 0e1c49cb..4b45db68 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemSlate.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemSlate.java @@ -23,6 +23,7 @@ public class ItemSlate extends Item 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 89d91c5a..4c697203 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemTelepositionFocus.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemTelepositionFocus.java @@ -12,7 +12,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.BlockPos; import net.minecraft.util.MovingObjectPosition; -import net.minecraft.util.StatCollector; import net.minecraft.world.World; import net.minecraftforge.common.DimensionManager; import net.minecraftforge.fml.relauncher.Side; @@ -30,6 +29,7 @@ public class ItemTelepositionFocus extends ItemBindable 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 4d4a2329..27b14ba3 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemUpgradeTome.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemUpgradeTome.java @@ -28,6 +28,7 @@ public class ItemUpgradeTome extends Item 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/gear/ItemPackSacrifice.java b/src/main/java/WayofTime/bloodmagic/item/gear/ItemPackSacrifice.java index 2b312b46..703e7251 100644 --- a/src/main/java/WayofTime/bloodmagic/item/gear/ItemPackSacrifice.java +++ b/src/main/java/WayofTime/bloodmagic/item/gear/ItemPackSacrifice.java @@ -26,6 +26,7 @@ public class ItemPackSacrifice extends ItemArmor implements IAltarManipulator super(ArmorMaterial.CHAIN, 0, 1); 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 0df02bef..a2be9884 100644 --- a/src/main/java/WayofTime/bloodmagic/item/gear/ItemPackSelfSacrifice.java +++ b/src/main/java/WayofTime/bloodmagic/item/gear/ItemPackSelfSacrifice.java @@ -33,6 +33,7 @@ public class ItemPackSelfSacrifice extends ItemArmor implements IAltarManipulato super(ArmorMaterial.CHAIN, 0, 1); 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 a4d476de..d4da40d9 100644 --- a/src/main/java/WayofTime/bloodmagic/item/routing/ItemNodeRouter.java +++ b/src/main/java/WayofTime/bloodmagic/item/routing/ItemNodeRouter.java @@ -26,6 +26,7 @@ public class ItemNodeRouter extends Item 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 d14e96e6..e21d49b8 100644 --- a/src/main/java/WayofTime/bloodmagic/item/routing/ItemRouterFilter.java +++ b/src/main/java/WayofTime/bloodmagic/item/routing/ItemRouterFilter.java @@ -28,6 +28,7 @@ public class ItemRouterFilter extends Item implements IItemFilterProvider 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 0324343a..0350fd84 100644 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilAir.java +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilAir.java @@ -1,5 +1,6 @@ package WayofTime.bloodmagic.item.sigil; +import WayofTime.bloodmagic.api.Constants; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.Vec3; @@ -10,6 +11,7 @@ public class ItemSigilAir extends ItemSigilBase 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 64790c9f..33f7fe6f 100644 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilBloodLight.java +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilBloodLight.java @@ -1,5 +1,6 @@ package WayofTime.bloodmagic.item.sigil; +import WayofTime.bloodmagic.api.Constants; import WayofTime.bloodmagic.api.util.helper.BindableHelper; import WayofTime.bloodmagic.entity.projectile.EntityBloodLight; import WayofTime.bloodmagic.item.ItemBindable; @@ -15,6 +16,7 @@ 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 2664a553..d74cb249 100644 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilCompression.java +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilCompression.java @@ -1,5 +1,6 @@ package WayofTime.bloodmagic.item.sigil; +import WayofTime.bloodmagic.api.Constants; import WayofTime.bloodmagic.api.compress.CompressionRegistry; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; @@ -11,6 +12,7 @@ public class ItemSigilCompression extends ItemSigilToggleable 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 2b258fe7..ca8fd20c 100644 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilDivination.java +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilDivination.java @@ -1,5 +1,6 @@ package WayofTime.bloodmagic.item.sigil; +import WayofTime.bloodmagic.api.Constants; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; @@ -10,7 +11,6 @@ import WayofTime.bloodmagic.api.altar.IBloodAltar; import WayofTime.bloodmagic.api.iface.IAltarReader; import WayofTime.bloodmagic.api.util.helper.BindableHelper; import WayofTime.bloodmagic.api.util.helper.NetworkHelper; -import WayofTime.bloodmagic.api.util.helper.PlayerHelper; import WayofTime.bloodmagic.util.ChatUtil; import WayofTime.bloodmagic.util.helper.TextHelper; @@ -19,6 +19,7 @@ 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 51321e57..5545519a 100644 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilElementalAffinity.java +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilElementalAffinity.java @@ -1,5 +1,6 @@ package WayofTime.bloodmagic.item.sigil; +import WayofTime.bloodmagic.api.Constants; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.potion.Potion; @@ -11,6 +12,7 @@ public class ItemSigilElementalAffinity extends ItemSigilToggleable 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 867fe797..e424e29c 100644 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilEnderSeverance.java +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilEnderSeverance.java @@ -1,5 +1,6 @@ package WayofTime.bloodmagic.item.sigil; +import WayofTime.bloodmagic.api.Constants; import WayofTime.bloodmagic.registry.ModPotions; import net.minecraft.entity.Entity; import net.minecraft.entity.monster.EntityEnderman; @@ -16,6 +17,7 @@ public class ItemSigilEnderSeverance extends ItemSigilToggleable 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 4cb7ae50..9142e565 100644 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilFastMiner.java +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilFastMiner.java @@ -1,5 +1,6 @@ package WayofTime.bloodmagic.item.sigil; +import WayofTime.bloodmagic.api.Constants; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.potion.Potion; @@ -11,6 +12,7 @@ public class ItemSigilFastMiner extends ItemSigilToggleable 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 5f714bb7..791beb7e 100644 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilGreenGrove.java +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilGreenGrove.java @@ -1,5 +1,6 @@ package WayofTime.bloodmagic.item.sigil; +import WayofTime.bloodmagic.api.Constants; import net.minecraft.block.Block; import net.minecraft.block.IGrowable; import net.minecraft.block.state.IBlockState; @@ -15,6 +16,7 @@ public class ItemSigilGreenGrove extends ItemSigilToggleable 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 81f303c5..695aeb9f 100644 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilHaste.java +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilHaste.java @@ -1,5 +1,6 @@ package WayofTime.bloodmagic.item.sigil; +import WayofTime.bloodmagic.api.Constants; import WayofTime.bloodmagic.registry.ModPotions; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -11,6 +12,7 @@ public class ItemSigilHaste extends ItemSigilToggleable 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 b1aa697b..6ac50f04 100644 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilLava.java +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilLava.java @@ -1,5 +1,6 @@ package WayofTime.bloodmagic.item.sigil; +import WayofTime.bloodmagic.api.Constants; import WayofTime.bloodmagic.api.util.helper.BindableHelper; import net.minecraft.block.material.Material; import net.minecraft.entity.player.EntityPlayer; @@ -20,6 +21,7 @@ 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 e274eeec..2a200a43 100644 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilMagnetism.java +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilMagnetism.java @@ -1,5 +1,6 @@ package WayofTime.bloodmagic.item.sigil; +import WayofTime.bloodmagic.api.Constants; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.item.EntityXPOrb; import net.minecraft.entity.player.EntityPlayer; @@ -14,6 +15,7 @@ public class ItemSigilMagnetism extends ItemSigilToggleable 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 8bbcb8bb..947f2bd6 100644 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilPhantomBridge.java +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilPhantomBridge.java @@ -1,5 +1,6 @@ package WayofTime.bloodmagic.item.sigil; +import WayofTime.bloodmagic.api.Constants; import WayofTime.bloodmagic.registry.ModBlocks; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -11,6 +12,7 @@ public class ItemSigilPhantomBridge extends ItemSigilToggleable 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 023f8b7b..0732fb74 100644 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilSeer.java +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilSeer.java @@ -1,5 +1,6 @@ package WayofTime.bloodmagic.item.sigil; +import WayofTime.bloodmagic.api.Constants; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; @@ -11,7 +12,6 @@ import WayofTime.bloodmagic.api.altar.IBloodAltar; import WayofTime.bloodmagic.api.iface.IAltarReader; import WayofTime.bloodmagic.api.util.helper.BindableHelper; import WayofTime.bloodmagic.api.util.helper.NetworkHelper; -import WayofTime.bloodmagic.api.util.helper.PlayerHelper; import WayofTime.bloodmagic.util.ChatUtil; import WayofTime.bloodmagic.util.helper.TextHelper; @@ -20,6 +20,7 @@ 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 ea2b50d9..2a9cbe81 100644 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilSuppression.java +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilSuppression.java @@ -1,5 +1,6 @@ package WayofTime.bloodmagic.item.sigil; +import WayofTime.bloodmagic.api.Constants; import WayofTime.bloodmagic.tile.TileSpectralBlock; import WayofTime.bloodmagic.util.Utils; import net.minecraft.block.Block; @@ -14,6 +15,7 @@ public class ItemSigilSuppression extends ItemSigilToggleable public ItemSigilSuppression() { super("suppression", 400); + setRegistryName(Constants.BloodMagicItem.SIGIL_SUPPRESION.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 f031bc17..c1583ba5 100644 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilVoid.java +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilVoid.java @@ -1,5 +1,6 @@ package WayofTime.bloodmagic.item.sigil; +import WayofTime.bloodmagic.api.Constants; import WayofTime.bloodmagic.api.util.helper.BindableHelper; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -17,6 +18,7 @@ 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 7cffd5bd..550d11d8 100644 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilWater.java +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilWater.java @@ -1,5 +1,6 @@ package WayofTime.bloodmagic.item.sigil; +import WayofTime.bloodmagic.api.Constants; import WayofTime.bloodmagic.api.util.helper.BindableHelper; import net.minecraft.block.material.Material; import net.minecraft.entity.player.EntityPlayer; @@ -20,6 +21,7 @@ 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 4ce008fa..a2cefbdc 100644 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilWhirlwind.java +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilWhirlwind.java @@ -1,5 +1,6 @@ package WayofTime.bloodmagic.item.sigil; +import WayofTime.bloodmagic.api.Constants; import WayofTime.bloodmagic.registry.ModPotions; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -11,6 +12,7 @@ public class ItemSigilWhirlwind extends ItemSigilToggleable 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 5bf81a5c..71ca9c87 100644 --- a/src/main/java/WayofTime/bloodmagic/item/soul/ItemMonsterSoul.java +++ b/src/main/java/WayofTime/bloodmagic/item/soul/ItemMonsterSoul.java @@ -24,6 +24,7 @@ public class ItemMonsterSoul extends Item implements IDemonWill 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 dff4be0d..2b51e7a6 100644 --- a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientArmourGem.java +++ b/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientArmourGem.java @@ -22,9 +22,10 @@ public class ItemSentientArmourGem extends Item { super(); - this.setCreativeTab(BloodMagic.tabBloodMagic); + setCreativeTab(BloodMagic.tabBloodMagic); setUnlocalizedName(Constants.Mod.MODID + ".sentientArmourGem"); - this.setMaxStackSize(1); + setRegistryName(Constants.BloodMagicItem.SENTIENT_ARMOR_GEM.getRegName()); + setMaxStackSize(1); } @Override diff --git a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientBow.java b/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientBow.java index ea5d9029..21b97305 100644 --- a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientBow.java +++ b/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientBow.java @@ -23,7 +23,8 @@ public class ItemSentientBow extends ItemBow { super(); setUnlocalizedName(Constants.Mod.MODID + ".sentientBow"); - this.setCreativeTab(BloodMagic.tabBloodMagic); + setRegistryName(Constants.BloodMagicItem.SENTIENT_BOW.getRegName()); + setCreativeTab(BloodMagic.tabBloodMagic); } @Override diff --git a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientSword.java b/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientSword.java index b716cb75..dd35125b 100644 --- a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientSword.java +++ b/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientSword.java @@ -40,7 +40,7 @@ public class ItemSentientSword extends ItemSword implements IDemonWillWeapon 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 9cb13572..7526a4b9 100644 --- a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSoulGem.java +++ b/src/main/java/WayofTime/bloodmagic/item/soul/ItemSoulGem.java @@ -25,6 +25,7 @@ public class ItemSoulGem extends Item implements IDemonWillGem 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 924380f1..0b30db71 100644 --- a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSoulSnare.java +++ b/src/main/java/WayofTime/bloodmagic/item/soul/ItemSoulSnare.java @@ -24,6 +24,7 @@ public class ItemSoulSnare extends Item 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 45a904cc..ee2fc467 100644 --- a/src/main/java/WayofTime/bloodmagic/registry/ModBlocks.java +++ b/src/main/java/WayofTime/bloodmagic/registry/ModBlocks.java @@ -163,7 +163,15 @@ public class ModBlocks private static Block registerBlock(Block block, Class itemBlock) { - return registerBlock(block, itemBlock, block.getClass().getSimpleName()); + 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; + } + + if (!ConfigHandler.blockBlacklist.contains(block.getRegistryName().split(":")[1])) + GameRegistry.registerBlock(block, itemBlock); + + return block; } private static Block registerBlock(Block block, String name) @@ -176,6 +184,14 @@ public class ModBlocks private static Block registerBlock(Block block) { - return registerBlock(block, block.getClass().getSimpleName()); + 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; + } + + if (!ConfigHandler.blockBlacklist.contains(block.getRegistryName().split(":")[1])) + GameRegistry.registerBlock(block); + + return block; } } diff --git a/src/main/java/WayofTime/bloodmagic/registry/ModItems.java b/src/main/java/WayofTime/bloodmagic/registry/ModItems.java index cfe3a50a..893cf7fd 100644 --- a/src/main/java/WayofTime/bloodmagic/registry/ModItems.java +++ b/src/main/java/WayofTime/bloodmagic/registry/ModItems.java @@ -360,6 +360,14 @@ public class ModItems private static Item registerItem(Item item) { - return registerItem(item, item.getClass().getSimpleName()); + 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; + } + + if (!ConfigHandler.itemBlacklist.contains(item.getRegistryName().split(":")[1])) + GameRegistry.registerItem(item); + + return item; } }