Teleposers and refractoring

2016-01-01 12:08:17 -05:00 · 2016-01-01 12:08:17 -05:00 · a8a0ae6e8b
commit a8a0ae6e8b
parent 1b9f72b494
145 changed files with 594 additions and 162 deletions
--- a/src/main/java/WayofTime/bloodmagic/item/ItemActivationCrystal.java
+++ b/src/main/java/WayofTime/bloodmagic/item/ItemActivationCrystal.java
@ -13,7 +13,6 @@ import java.util.List;

 public class ItemActivationCrystal extends ItemBindable
 {
-
    public static String[] names = { "weak", "awakened", "creative" };

    public ItemActivationCrystal()
--- a/src/main/java/WayofTime/bloodmagic/item/ItemBloodOrb.java
+++ b/src/main/java/WayofTime/bloodmagic/item/ItemBloodOrb.java
@ -21,7 +21,6 @@ import java.util.List;

 public class ItemBloodOrb extends ItemBindable implements IBloodOrb, IBindable
 {
-
    public ItemBloodOrb()
    {
        setUnlocalizedName(Constants.Mod.MODID + ".orb.");
--- a/src/main/java/WayofTime/bloodmagic/item/ItemBloodShard.java
+++ b/src/main/java/WayofTime/bloodmagic/item/ItemBloodShard.java
@ -12,7 +12,6 @@ import java.util.List;

 public class ItemBloodShard extends Item
 {
-
    public String[] names = { "weak", "demon" };

    public ItemBloodShard()
--- a/src/main/java/WayofTime/bloodmagic/item/ItemBoundAxe.java
+++ b/src/main/java/WayofTime/bloodmagic/item/ItemBoundAxe.java
@ -21,7 +21,6 @@ import java.util.Set;

 public class ItemBoundAxe extends ItemBoundTool
 {
-
    private static final Set<Block> EFFECTIVE_ON = Sets.newHashSet(Blocks.planks, Blocks.bookshelf, Blocks.log, Blocks.log2, Blocks.chest, Blocks.pumpkin, Blocks.lit_pumpkin, Blocks.melon_block, Blocks.ladder);

    public ItemBoundAxe()
--- a/src/main/java/WayofTime/bloodmagic/item/ItemBoundPickaxe.java
+++ b/src/main/java/WayofTime/bloodmagic/item/ItemBoundPickaxe.java
@ -22,7 +22,6 @@ import java.util.Set;

 public class ItemBoundPickaxe extends ItemBoundTool
 {
-
    private static final Set<Block> EFFECTIVE_ON = Sets.newHashSet(Blocks.activator_rail, Blocks.coal_ore, Blocks.cobblestone, Blocks.detector_rail, Blocks.diamond_block, Blocks.diamond_ore, Blocks.double_stone_slab, Blocks.golden_rail, Blocks.gold_block, Blocks.gold_ore, Blocks.ice, Blocks.iron_block, Blocks.iron_ore, Blocks.lapis_block, Blocks.lapis_ore, Blocks.lit_redstone_ore, Blocks.mossy_cobblestone, Blocks.netherrack, Blocks.packed_ice, Blocks.rail, Blocks.redstone_ore, Blocks.sandstone, Blocks.red_sandstone, Blocks.stone, Blocks.stone_slab);

    public ItemBoundPickaxe()
--- a/src/main/java/WayofTime/bloodmagic/item/ItemBoundShovel.java
+++ b/src/main/java/WayofTime/bloodmagic/item/ItemBoundShovel.java
@ -19,7 +19,6 @@ import java.util.Set;

 public class ItemBoundShovel extends ItemBoundTool
 {
-
    private static final Set<Block> EFFECTIVE_ON = Sets.newHashSet(Blocks.clay, Blocks.dirt, Blocks.farmland, Blocks.grass, Blocks.gravel, Blocks.mycelium, Blocks.sand, Blocks.snow, Blocks.snow_layer, Blocks.soul_sand);

    public ItemBoundShovel()
--- a/src/main/java/WayofTime/bloodmagic/item/ItemBucketEssence.java
+++ b/src/main/java/WayofTime/bloodmagic/item/ItemBucketEssence.java
@ -8,7 +8,6 @@ import net.minecraft.item.ItemBucket;

 public class ItemBucketEssence extends ItemBucket
 {
-
    public ItemBucketEssence()
    {
        super(ModBlocks.lifeEssence);
--- a/src/main/java/WayofTime/bloodmagic/item/ItemComponent.java
+++ b/src/main/java/WayofTime/bloodmagic/item/ItemComponent.java
@ -15,7 +15,6 @@ import WayofTime.bloodmagic.api.Constants;

 public class ItemComponent extends Item
 {
-
    @Getter
    private static ArrayList<String> names = new ArrayList<String>();

--- a/src/main/java/WayofTime/bloodmagic/item/ItemDaggerOfSacrifice.java
+++ b/src/main/java/WayofTime/bloodmagic/item/ItemDaggerOfSacrifice.java
@ -20,7 +20,6 @@ import net.minecraft.world.World;

 public class ItemDaggerOfSacrifice extends Item
 {
-
    public ItemDaggerOfSacrifice()
    {
        super();
--- a/src/main/java/WayofTime/bloodmagic/item/ItemInscriptionTool.java
+++ b/src/main/java/WayofTime/bloodmagic/item/ItemInscriptionTool.java
@ -21,7 +21,6 @@ import java.util.List;
 // TODO - NBT based damage
 public class ItemInscriptionTool extends ItemBindable
 {
-
    public ItemInscriptionTool()
    {
        super();
--- a/src/main/java/WayofTime/bloodmagic/item/ItemSlate.java
+++ b/src/main/java/WayofTime/bloodmagic/item/ItemSlate.java
@ -15,7 +15,6 @@ import java.util.List;

 public class ItemSlate extends Item
 {
-
    public String[] names = { "blank", "reinforced", "imbued", "demonic", "ethereal" };

    public ItemSlate()
--- a/src/main/java/WayofTime/bloodmagic/item/armour/ItemLivingArmour.java
+++ b/src/main/java/WayofTime/bloodmagic/item/armour/ItemLivingArmour.java
@ -9,7 +9,6 @@ import net.minecraft.item.ItemStack;

 public class ItemLivingArmour extends ItemArmor
 {
-
    public static String[] names = { "helmet", "chest", "legs", "boots" };

    public ItemLivingArmour(int armorType)
--- a/src/main/java/WayofTime/bloodmagic/item/block/ItemBlockBloodRune.java
+++ b/src/main/java/WayofTime/bloodmagic/item/block/ItemBlockBloodRune.java
@ -7,7 +7,6 @@ import net.minecraft.item.ItemStack;

 public class ItemBlockBloodRune extends ItemBlock
 {
-
    public ItemBlockBloodRune(Block block)
    {
        super(block);
--- a/src/main/java/WayofTime/bloodmagic/item/block/ItemBlockBloodStoneBrick.java
+++ b/src/main/java/WayofTime/bloodmagic/item/block/ItemBlockBloodStoneBrick.java
@ -7,7 +7,6 @@ import net.minecraft.item.ItemStack;

 public class ItemBlockBloodStoneBrick extends ItemBlock
 {
-
    public ItemBlockBloodStoneBrick(Block block)
    {
        super(block);
--- a/src/main/java/WayofTime/bloodmagic/item/block/ItemBlockCrystal.java
+++ b/src/main/java/WayofTime/bloodmagic/item/block/ItemBlockCrystal.java
@ -7,7 +7,6 @@ import net.minecraft.item.ItemStack;

 public class ItemBlockCrystal extends ItemBlock
 {
-
    public ItemBlockCrystal(Block block)
    {
        super(block);
--- a/src/main/java/WayofTime/bloodmagic/item/block/ItemBlockPedestal.java
+++ b/src/main/java/WayofTime/bloodmagic/item/block/ItemBlockPedestal.java
@ -7,7 +7,6 @@ import net.minecraft.item.ItemStack;

 public class ItemBlockPedestal extends ItemBlock
 {
-
    public ItemBlockPedestal(Block block)
    {
        super(block);
--- a/src/main/java/WayofTime/bloodmagic/item/block/ItemBlockRitualController.java
+++ b/src/main/java/WayofTime/bloodmagic/item/block/ItemBlockRitualController.java
@ -7,7 +7,6 @@ import net.minecraft.item.ItemStack;

 public class ItemBlockRitualController extends ItemBlock
 {
-
    public ItemBlockRitualController(Block block)
    {
        super(block);
--- a/src/main/java/WayofTime/bloodmagic/item/block/ItemBlockRitualStone.java
+++ b/src/main/java/WayofTime/bloodmagic/item/block/ItemBlockRitualStone.java
@ -7,7 +7,6 @@ import net.minecraft.item.ItemStack;

 public class ItemBlockRitualStone extends ItemBlock
 {
-
    public ItemBlockRitualStone(Block block)
    {
        super(block);
--- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilAir.java
+++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilAir.java
@ -7,7 +7,6 @@ import net.minecraft.world.World;

 public class ItemSigilAir extends ItemSigilBase
 {
-
    public ItemSigilAir()
    {
        super("air", 50);
--- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilBase.java
+++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilBase.java
@ -20,7 +20,6 @@ import java.util.List;
@Getter
 public class ItemSigilBase extends ItemBindable implements ISigil
 {
-
    protected final String tooltipBase;
    private final String name;
    private boolean toggleable;
--- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilBloodLight.java
+++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilBloodLight.java
@ -12,7 +12,6 @@ import net.minecraft.world.World;

 public class ItemSigilBloodLight extends ItemSigilBase
 {
-
    public ItemSigilBloodLight()
    {
        super("bloodLight", 10);
--- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilCompression.java
+++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilCompression.java
@ -8,7 +8,6 @@ import net.minecraft.world.World;

 public class ItemSigilCompression extends ItemSigilToggleable
 {
-
    public ItemSigilCompression()
    {
        super("compression", 200);
--- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilDivination.java
+++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilDivination.java
@ -16,7 +16,6 @@ import WayofTime.bloodmagic.util.helper.TextHelper;

 public class ItemSigilDivination extends ItemSigilBase implements IAltarReader
 {
-
    public ItemSigilDivination()
    {
        super("divination");
--- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilElementalAffinity.java
+++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilElementalAffinity.java
@ -8,7 +8,6 @@ import net.minecraft.world.World;

 public class ItemSigilElementalAffinity extends ItemSigilToggleable
 {
-
    public ItemSigilElementalAffinity()
    {
        super("elementalAffinity", 200);
--- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilEnderSeverance.java
+++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilEnderSeverance.java
@ -13,7 +13,6 @@ import java.util.List;

 public class ItemSigilEnderSeverance extends ItemSigilToggleable
 {
-
    public ItemSigilEnderSeverance()
    {
        super("enderSeverance", 200);
--- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilFastMiner.java
+++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilFastMiner.java
@ -8,7 +8,6 @@ import net.minecraft.world.World;

 public class ItemSigilFastMiner extends ItemSigilToggleable
 {
-
    public ItemSigilFastMiner()
    {
        super("fastMiner", 100);
--- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilGreenGrove.java
+++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilGreenGrove.java
@ -12,7 +12,6 @@ import net.minecraftforge.common.IPlantable;

 public class ItemSigilGreenGrove extends ItemSigilToggleable
 {
-
    public ItemSigilGreenGrove()
    {
        super("greenGrove", 150);
--- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilHaste.java
+++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilHaste.java
@ -8,7 +8,6 @@ import net.minecraft.world.World;

 public class ItemSigilHaste extends ItemSigilToggleable
 {
-
    public ItemSigilHaste()
    {
        super("haste", 250);
--- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilLava.java
+++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilLava.java
@ -16,7 +16,6 @@ import net.minecraftforge.fluids.IFluidHandler;

 public class ItemSigilLava extends ItemSigilBase
 {
-
    public ItemSigilLava()
    {
        super("lava", 1000);
--- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilMagnetism.java
+++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilMagnetism.java
@ -11,7 +11,6 @@ import java.util.List;

 public class ItemSigilMagnetism extends ItemSigilToggleable
 {
-
    public ItemSigilMagnetism()
    {
        super("magnetism", 50);
--- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilPhantomBridge.java
+++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilPhantomBridge.java
@ -11,7 +11,6 @@ import net.minecraft.world.World;

 public class ItemSigilPhantomBridge extends ItemSigilToggleable
 {
-
    public ItemSigilPhantomBridge()
    {
        super("phantomBridge", 100);
--- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilSeer.java
+++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilSeer.java
@ -17,7 +17,6 @@ import WayofTime.bloodmagic.util.helper.TextHelper;

 public class ItemSigilSeer extends ItemSigilBase implements IAltarReader
 {
-
    public ItemSigilSeer()
    {
        super("seer");
--- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilSuppression.java
+++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilSuppression.java
@ -11,7 +11,6 @@ import net.minecraftforge.fluids.IFluidBlock;

 public class ItemSigilSuppression extends ItemSigilToggleable
 {
-
    public ItemSigilSuppression()
    {
        super("suppression", 400);
--- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilToggleable.java
+++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilToggleable.java
@ -17,7 +17,6 @@ import java.util.List;

 public class ItemSigilToggleable extends ItemSigilBase
 {
-
    public ItemSigilToggleable(String name, int lpUsed)
    {
        super(name, lpUsed);
--- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilWhirlwind.java
+++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilWhirlwind.java
@ -8,7 +8,6 @@ import net.minecraft.world.World;

 public class ItemSigilWhirlwind extends ItemSigilToggleable
 {
-
    public ItemSigilWhirlwind()
    {
        super("whirlwind", 250);