Remove the Pedestal

It's unused and probably won't ever be used.

src/main/java/WayofTime/bloodmagic/api/Constants.java

@@ -275,7 +275,8 @@ public class Constants
         LIFE_ESSENCE("BlockLifeEssence"),
         MASTER_ROUTING_NODE("BlockMasterRoutingNode"),
         OUTPUT_ROUTING_NODE("BlockOutputRoutingNode"),
-        PEDESTAL("BlockPedestal"),
+        @Deprecated
+        PEDESTAL("BlockPedestal"), /** No longer included in the mod. */
         PHANTOM("BlockPhantom"),
         RITUAL_CONTROLLER("BlockRitualController"),
         RITUAL_STONE("BlockRitualStone"),

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

@@ -1,114 +0,0 @@
-package WayofTime.bloodmagic.block;
-
-import net.minecraft.block.material.Material;
-import net.minecraft.block.state.IBlockState;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.ItemStack;
-import net.minecraft.tileentity.TileEntity;
-import net.minecraft.util.EnumBlockRenderType;
-import net.minecraft.util.EnumFacing;
-import net.minecraft.util.EnumHand;
-import net.minecraft.util.math.BlockPos;
-import net.minecraft.world.IBlockAccess;
-import net.minecraft.world.World;
-import WayofTime.bloodmagic.BloodMagic;
-import WayofTime.bloodmagic.api.Constants;
-import WayofTime.bloodmagic.block.base.BlockStringContainer;
-import WayofTime.bloodmagic.tile.TilePlinth;
-import WayofTime.bloodmagic.util.Utils;
-
-public class BlockPedestal extends BlockStringContainer
-{
-    public static String[] names = { "pedestal", "plinth" };
-
-    public BlockPedestal()
-    {
-        super(Material.ROCK, names);
-
-        setUnlocalizedName(Constants.Mod.MODID + ".");
-        setCreativeTab(BloodMagic.tabBloodMagic);
-        setHardness(2.0F);
-        setResistance(5.0F);
-    }
-
-    @Override
-    public boolean isOpaqueCube(IBlockState state)
-    {
-        return false;
-    }
-
-    @Override
-    public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, ItemStack heldItem, EnumFacing side, float hitX, float hitY, float hitZ)
-    {
-        switch (getMetaFromState(state))
-        {
-        case 0:
-        {
-            // TileEntity plinth = world.getTileEntity(pos);
-            //
-            // if (plinth!= null && plinth instanceof TilePlinth) {
-            // Utils.insertItemToTile((TilePlinth) plinth, player);
-            // }
-        }
-
-        case 1:
-        {
-            TileEntity plinth = world.getTileEntity(pos);
-
-            if (plinth == null || player.isSneaking())
-                return false;
-
-            if (plinth instanceof TilePlinth)
-            {
-                Utils.insertItemToTile((TilePlinth) plinth, player);
-                return true;
-            }
-        }
-        }
-
-        world.notifyBlockUpdate(pos, state, state, 3);
-        return false;
-    }
-
-//    @Override
-//    public void setBlockBoundsBasedOnState(IBlockAccess blockAccess, BlockPos pos)
-//    {
-//        IBlockState state = blockAccess.getBlockState(pos);
-//
-//        if (getMetaFromState(state) == 0)
-//            setBlockBounds(0.5F - 0.3125F, 0.0F, 0.5F - 0.3125F, 0.5F + 0.3125F, 0.6F, 0.5F + 0.3125F);
-//        else if (getMetaFromState(state) == 1)
-//            setBlockBounds(0.1F, 0.0F, 0.1F, 1.0F - 0.1F, 0.8F, 1.0F - 0.1F);
-//
-//    }
-
-    @Override
-    public boolean isNormalCube(IBlockState state, IBlockAccess world, BlockPos pos)
-    {
-        return false;
-    }
-
-    @Override
-    public boolean isFullCube(IBlockState state)
-    {
-        return false;
-    }
-
-    @Override
-    public boolean isVisuallyOpaque()
-    {
-        return false;
-    }
-
-    @Override
-    public EnumBlockRenderType getRenderType(IBlockState state)
-    {
-        return EnumBlockRenderType.MODEL;
-    }
-
-    @Override
-    public TileEntity createNewTileEntity(World world, int meta)
-    {
-        return meta == 0 ? null : new TilePlinth();
-    }
-}

src/main/java/WayofTime/bloodmagic/item/block/ItemBlockPedestal.java

@@ -1,28 +0,0 @@
-package WayofTime.bloodmagic.item.block;
-
-import WayofTime.bloodmagic.block.BlockPedestal;
-import net.minecraft.block.Block;
-import net.minecraft.item.ItemBlock;
-import net.minecraft.item.ItemStack;
-
-public class ItemBlockPedestal extends ItemBlock
-{
-    public ItemBlockPedestal(Block block)
-    {
-        super(block);
-
-        setHasSubtypes(true);
-    }
-
-    @Override
-    public String getUnlocalizedName(ItemStack stack)
-    {
-        return super.getUnlocalizedName(stack) + BlockPedestal.names[stack.getItemDamage()];
-    }
-
-    @Override
-    public int getMetadata(int meta)
-    {
-        return meta;
-    }
-}

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

@@ -39,7 +39,6 @@ import WayofTime.bloodmagic.block.BlockMasterRoutingNode;
 import WayofTime.bloodmagic.block.BlockMimic;
 import WayofTime.bloodmagic.block.BlockOutputRoutingNode;
 import WayofTime.bloodmagic.block.BlockPath;
-import WayofTime.bloodmagic.block.BlockPedestal;
 import WayofTime.bloodmagic.block.BlockPhantom;
 import WayofTime.bloodmagic.block.BlockRitualController;
 import WayofTime.bloodmagic.block.BlockRitualStone;
@@ -59,7 +58,6 @@ import WayofTime.bloodmagic.item.block.ItemBlockDemonPillarCapBase;
 import WayofTime.bloodmagic.item.block.ItemBlockDemonWallBase;
 import WayofTime.bloodmagic.item.block.ItemBlockMimic;
 import WayofTime.bloodmagic.item.block.ItemBlockPath;
-import WayofTime.bloodmagic.item.block.ItemBlockPedestal;
 import WayofTime.bloodmagic.item.block.ItemBlockRitualController;
 import WayofTime.bloodmagic.item.block.ItemBlockRitualStone;
 import WayofTime.bloodmagic.item.block.ItemDemonStairsBase;
@@ -96,8 +94,6 @@ public class ModBlocks
     public static Block ritualController;
     public static Block ritualStone;
     public static Block bloodLight;
-    //    public static Block testSpellBlock;
-    public static Block pedestal;
     public static Block teleposer;
     public static Block alchemyArray;
     public static Block spectralBlock;
@@ -158,7 +154,6 @@ public class ModBlocks
         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());
@@ -193,7 +188,6 @@ public class ModBlocks
         demonPillarCap1 = registerBlock(new ItemBlockDemonPillarCapBase(new BlockDemonPillarCapBase("pillarCap1", Material.ROCK, new String[] { "raw", "corrosive" })), Constants.BloodMagicBlock.DEMON_PILLAR_CAP_1.getRegName());
         demonPillarCap2 = registerBlock(new ItemBlockDemonPillarCapBase(new BlockDemonPillarCapBase("pillarCap2", Material.ROCK, new String[] { "destructive", "vengeful" })), Constants.BloodMagicBlock.DEMON_PILLAR_CAP_2.getRegName());
         demonPillarCap3 = registerBlock(new ItemBlockDemonPillarCapBase(new BlockDemonPillarCapBase("pillarCap3", Material.ROCK, new String[] { "steadfast" })), Constants.BloodMagicBlock.DEMON_PILLAR_CAP_3.getRegName());
-//        testSpellBlock = registerBlock(new BlockTestSpellBlock());
 
         demonLight = registerBlock(new ItemBlockDemonLight(new BlockDemonLight()), Constants.BloodMagicBlock.DEMON_LIGHT.getRegName());
 
@@ -254,8 +248,6 @@ public class ModBlocks
         renderHelper.fluidRender(lifeEssence);
 
         renderHelper.itemRender(InventoryRenderHelper.getItemFromBlock(bloodLight));
-        renderHelper.itemRender(InventoryRenderHelper.getItemFromBlock(pedestal), 0);
-        renderHelper.itemRender(InventoryRenderHelper.getItemFromBlock(pedestal), 1);
         renderHelper.itemRender(InventoryRenderHelper.getItemFromBlock(alchemyArray));
         renderHelper.itemRender(InventoryRenderHelper.getItemFromBlock(outputRoutingNode));
         renderHelper.itemRender(InventoryRenderHelper.getItemFromBlock(inputRoutingNode));

src/main/resources/assets/bloodmagic/blockstates/BlockPedestal.json

@@ -1,24 +0,0 @@
-{
-  "forge_marker": 1,
-  "defaults": {
-    "textures": { },
-    "model": "bloodmagic:BlockPedestal1",
-    "uvlock": true
-  },
-  "variants": {
-    "type": {
-      "pedestal": {
-        "model": "bloodmagic:BlockPedestal0",
-        "textures": {
-          "all": "bloodmagic:models/Plinth"
-        }
-      },
-      "plinth": {
-        "model": "bloodmagic:BlockPedestal1",
-        "textures": {
-          "all": "bloodmagic:models/Plinth"
-        }
-      }
-    }
-  }
-}

src/main/resources/assets/bloodmagic/models/block/BlockPedestal0.json

@@ -1,97 +0,0 @@
-{
-    "textures": {
-    },
-    "elements": [
-        {
-            "name": "Base",
-            "from": [ 3.0, 0.0, 3.0 ], 
-            "to": [ 13.0, 2.0, 13.0 ], 
-            "faces": {
-                "north": { "texture": "#-1", "uv": [ 0.0, 0.0, 10.0, 2.0 ] },
-                "east": { "texture": "#-1", "uv": [ 0.0, 0.0, 10.0, 2.0 ] },
-                "south": { "texture": "#-1", "uv": [ 0.0, 0.0, 10.0, 2.0 ] },
-                "west": { "texture": "#-1", "uv": [ 0.0, 0.0, 10.0, 2.0 ] },
-                "up": { "texture": "#-1", "uv": [ 0.0, 0.0, 10.0, 10.0 ] },
-                "down": { "texture": "#-1", "uv": [ 0.0, 0.0, 10.0, 10.0 ] }
-            }
-        },
-        {
-            "name": "Leg",
-            "from": [ 5.0, 2.0, 5.0 ], 
-            "to": [ 11.0, 11.0, 11.0 ], 
-            "faces": {
-                "north": { "texture": "#-1", "uv": [ 0.0, 0.0, 6.0, 9.0 ] },
-                "east": { "texture": "#-1", "uv": [ 0.0, 0.0, 6.0, 9.0 ] },
-                "south": { "texture": "#-1", "uv": [ 0.0, 0.0, 6.0, 9.0 ] },
-                "west": { "texture": "#-1", "uv": [ 0.0, 0.0, 6.0, 9.0 ] },
-                "up": { "texture": "#-1", "uv": [ 0.0, 0.0, 6.0, 6.0 ] },
-                "down": { "texture": "#-1", "uv": [ 0.0, 0.0, 6.0, 6.0 ] }
-            }
-        },
-        {
-            "name": "Plate",
-            "from": [ 1.0, 11.0, 1.0 ], 
-            "to": [ 15.0, 12.0, 15.0 ], 
-            "faces": {
-                "north": { "texture": "#-1", "uv": [ 0.0, 0.0, 14.0, 1.0 ] },
-                "east": { "texture": "#-1", "uv": [ 0.0, 0.0, 14.0, 1.0 ] },
-                "south": { "texture": "#-1", "uv": [ 0.0, 0.0, 14.0, 1.0 ] },
-                "west": { "texture": "#-1", "uv": [ 0.0, 0.0, 14.0, 1.0 ] },
-                "up": { "texture": "#-1", "uv": [ 0.0, 0.0, 14.0, 14.0 ] },
-                "down": { "texture": "#-1", "uv": [ 0.0, 0.0, 14.0, 14.0 ] }
-            }
-        },
-        {
-            "name": "NWall",
-            "from": [ 0.0, 11.0, 0.0 ], 
-            "to": [ 16.0, 13.0, 1.0 ], 
-            "faces": {
-                "north": { "texture": "#-1", "uv": [ 0.0, 0.0, 16.0, 2.0 ] },
-                "east": { "texture": "#-1", "uv": [ 0.0, 0.0, 1.0, 2.0 ] },
-                "south": { "texture": "#-1", "uv": [ 0.0, 0.0, 16.0, 2.0 ] },
-                "west": { "texture": "#-1", "uv": [ 0.0, 0.0, 1.0, 2.0 ] },
-                "up": { "texture": "#-1", "uv": [ 0.0, 0.0, 16.0, 1.0 ] },
-                "down": { "texture": "#-1", "uv": [ 0.0, 0.0, 16.0, 1.0 ] }
-            }
-        },
-        {
-            "name": "SWall",
-            "from": [ 0.0, 11.0, 15.0 ], 
-            "to": [ 16.0, 13.0, 16.0 ], 
-            "faces": {
-                "north": { "texture": "#-1", "uv": [ 0.0, 0.0, 16.0, 2.0 ] },
-                "east": { "texture": "#-1", "uv": [ 0.0, 0.0, 1.0, 2.0 ] },
-                "south": { "texture": "#-1", "uv": [ 0.0, 0.0, 16.0, 2.0 ] },
-                "west": { "texture": "#-1", "uv": [ 0.0, 0.0, 1.0, 2.0 ] },
-                "up": { "texture": "#-1", "uv": [ 0.0, 0.0, 16.0, 1.0 ] },
-                "down": { "texture": "#-1", "uv": [ 0.0, 0.0, 16.0, 1.0 ] }
-            }
-        },
-        {
-            "name": "WWall",
-            "from": [ 0.0, 11.0, 1.0 ], 
-            "to": [ 1.0, 13.0, 15.0 ], 
-            "faces": {
-                "north": { "texture": "#-1", "uv": [ 0.0, 0.0, 1.0, 2.0 ] },
-                "east": { "texture": "#-1", "uv": [ 0.0, 0.0, 14.0, 2.0 ] },
-                "south": { "texture": "#-1", "uv": [ 0.0, 0.0, 1.0, 2.0 ] },
-                "west": { "texture": "#-1", "uv": [ 0.0, 0.0, 14.0, 2.0 ] },
-                "up": { "texture": "#-1", "uv": [ 0.0, 0.0, 1.0, 14.0 ] },
-                "down": { "texture": "#-1", "uv": [ 0.0, 0.0, 1.0, 14.0 ] }
-            }
-        },
-        {
-            "name": "EWall",
-            "from": [ 15.0, 11.0, 1.0 ], 
-            "to": [ 16.0, 13.0, 15.0 ], 
-            "faces": {
-                "north": { "texture": "#-1", "uv": [ 0.0, 0.0, 1.0, 2.0 ] },
-                "east": { "texture": "#-1", "uv": [ 0.0, 0.0, 14.0, 2.0 ] },
-                "south": { "texture": "#-1", "uv": [ 0.0, 0.0, 1.0, 2.0 ] },
-                "west": { "texture": "#-1", "uv": [ 0.0, 0.0, 14.0, 2.0 ] },
-                "up": { "texture": "#-1", "uv": [ 0.0, 0.0, 1.0, 14.0 ] },
-                "down": { "texture": "#-1", "uv": [ 0.0, 0.0, 1.0, 14.0 ] }
-            }
-        }
-    ]
-}

src/main/resources/assets/bloodmagic/models/block/BlockPedestal1.json

@@ -1,97 +0,0 @@
-{
-    "textures": {
-    },
-    "elements": [
-        {
-            "name": "Base",
-            "from": [ 3.0, 0.0, 3.0 ], 
-            "to": [ 13.0, 2.0, 13.0 ], 
-            "faces": {
-                "north": { "texture": "#-1", "uv": [ 0.0, 0.0, 10.0, 2.0 ] },
-                "east": { "texture": "#-1", "uv": [ 0.0, 0.0, 10.0, 2.0 ] },
-                "south": { "texture": "#-1", "uv": [ 0.0, 0.0, 10.0, 2.0 ] },
-                "west": { "texture": "#-1", "uv": [ 0.0, 0.0, 10.0, 2.0 ] },
-                "up": { "texture": "#-1", "uv": [ 0.0, 0.0, 10.0, 10.0 ] },
-                "down": { "texture": "#-1", "uv": [ 0.0, 0.0, 10.0, 10.0 ] }
-            }
-        },
-        {
-            "name": "Leg",
-            "from": [ 5.0, 2.0, 5.0 ], 
-            "to": [ 11.0, 11.0, 11.0 ], 
-            "faces": {
-                "north": { "texture": "#-1", "uv": [ 0.0, 0.0, 6.0, 9.0 ] },
-                "east": { "texture": "#-1", "uv": [ 0.0, 0.0, 6.0, 9.0 ] },
-                "south": { "texture": "#-1", "uv": [ 0.0, 0.0, 6.0, 9.0 ] },
-                "west": { "texture": "#-1", "uv": [ 0.0, 0.0, 6.0, 9.0 ] },
-                "up": { "texture": "#-1", "uv": [ 0.0, 0.0, 6.0, 6.0 ] },
-                "down": { "texture": "#-1", "uv": [ 0.0, 0.0, 6.0, 6.0 ] }
-            }
-        },
-        {
-            "name": "Plate",
-            "from": [ 1.0, 11.0, 1.0 ], 
-            "to": [ 15.0, 12.0, 15.0 ], 
-            "faces": {
-                "north": { "texture": "#-1", "uv": [ 0.0, 0.0, 14.0, 1.0 ] },
-                "east": { "texture": "#-1", "uv": [ 0.0, 0.0, 14.0, 1.0 ] },
-                "south": { "texture": "#-1", "uv": [ 0.0, 0.0, 14.0, 1.0 ] },
-                "west": { "texture": "#-1", "uv": [ 0.0, 0.0, 14.0, 1.0 ] },
-                "up": { "texture": "#-1", "uv": [ 0.0, 0.0, 14.0, 14.0 ] },
-                "down": { "texture": "#-1", "uv": [ 0.0, 0.0, 14.0, 14.0 ] }
-            }
-        },
-        {
-            "name": "NWall",
-            "from": [ 0.0, 11.0, 0.0 ], 
-            "to": [ 16.0, 13.0, 1.0 ], 
-            "faces": {
-                "north": { "texture": "#-1", "uv": [ 0.0, 0.0, 16.0, 2.0 ] },
-                "east": { "texture": "#-1", "uv": [ 0.0, 0.0, 1.0, 2.0 ] },
-                "south": { "texture": "#-1", "uv": [ 0.0, 0.0, 16.0, 2.0 ] },
-                "west": { "texture": "#-1", "uv": [ 0.0, 0.0, 1.0, 2.0 ] },
-                "up": { "texture": "#-1", "uv": [ 0.0, 0.0, 16.0, 1.0 ] },
-                "down": { "texture": "#-1", "uv": [ 0.0, 0.0, 16.0, 1.0 ] }
-            }
-        },
-        {
-            "name": "SWall",
-            "from": [ 0.0, 11.0, 15.0 ], 
-            "to": [ 16.0, 13.0, 16.0 ], 
-            "faces": {
-                "north": { "texture": "#-1", "uv": [ 0.0, 0.0, 16.0, 2.0 ] },
-                "east": { "texture": "#-1", "uv": [ 0.0, 0.0, 1.0, 2.0 ] },
-                "south": { "texture": "#-1", "uv": [ 0.0, 0.0, 16.0, 2.0 ] },
-                "west": { "texture": "#-1", "uv": [ 0.0, 0.0, 1.0, 2.0 ] },
-                "up": { "texture": "#-1", "uv": [ 0.0, 0.0, 16.0, 1.0 ] },
-                "down": { "texture": "#-1", "uv": [ 0.0, 0.0, 16.0, 1.0 ] }
-            }
-        },
-        {
-            "name": "WWall",
-            "from": [ 0.0, 11.0, 1.0 ], 
-            "to": [ 1.0, 13.0, 15.0 ], 
-            "faces": {
-                "north": { "texture": "#-1", "uv": [ 0.0, 0.0, 1.0, 2.0 ] },
-                "east": { "texture": "#-1", "uv": [ 0.0, 0.0, 14.0, 2.0 ] },
-                "south": { "texture": "#-1", "uv": [ 0.0, 0.0, 1.0, 2.0 ] },
-                "west": { "texture": "#-1", "uv": [ 0.0, 0.0, 14.0, 2.0 ] },
-                "up": { "texture": "#-1", "uv": [ 0.0, 0.0, 1.0, 14.0 ] },
-                "down": { "texture": "#-1", "uv": [ 0.0, 0.0, 1.0, 14.0 ] }
-            }
-        },
-        {
-            "name": "EWall",
-            "from": [ 15.0, 11.0, 1.0 ], 
-            "to": [ 16.0, 13.0, 15.0 ], 
-            "faces": {
-                "north": { "texture": "#-1", "uv": [ 0.0, 0.0, 1.0, 2.0 ] },
-                "east": { "texture": "#-1", "uv": [ 0.0, 0.0, 14.0, 2.0 ] },
-                "south": { "texture": "#-1", "uv": [ 0.0, 0.0, 1.0, 2.0 ] },
-                "west": { "texture": "#-1", "uv": [ 0.0, 0.0, 14.0, 2.0 ] },
-                "up": { "texture": "#-1", "uv": [ 0.0, 0.0, 1.0, 14.0 ] },
-                "down": { "texture": "#-1", "uv": [ 0.0, 0.0, 1.0, 14.0 ] }
-            }
-        }
-    ]
-}