From b9ca797621e116f65aff916f5d4d485a93be1abf Mon Sep 17 00:00:00 2001 From: OnyxDarkKnight Date: Wed, 29 Apr 2015 13:57:06 +0100 Subject: - Removed the Jewel Altar - Improved Ritual --- .../jewelrycraft/block/BlockJewelAltar.java | 164 --------------------- .../darkknight/jewelrycraft/block/BlockList.java | 7 +- 2 files changed, 1 insertion(+), 170 deletions(-) delete mode 100644 src/main/java/darkknight/jewelrycraft/block/BlockJewelAltar.java (limited to 'src/main/java/darkknight/jewelrycraft/block') diff --git a/src/main/java/darkknight/jewelrycraft/block/BlockJewelAltar.java b/src/main/java/darkknight/jewelrycraft/block/BlockJewelAltar.java deleted file mode 100644 index e0a43bc..0000000 --- a/src/main/java/darkknight/jewelrycraft/block/BlockJewelAltar.java +++ /dev/null @@ -1,164 +0,0 @@ -package darkknight.jewelrycraft.block; - -import net.minecraft.block.Block; -import net.minecraft.block.BlockContainer; -import net.minecraft.block.material.Material; -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.entity.item.EntityItem; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.IIcon; -import net.minecraft.world.World; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import darkknight.jewelrycraft.item.ItemList; -import darkknight.jewelrycraft.tileentity.TileEntityAltar; - -public class BlockJewelAltar extends BlockContainer -{ - @SideOnly (Side.CLIENT) - private IIcon altarSide; - @SideOnly (Side.CLIENT) - private IIcon altarBottom; - @SideOnly (Side.CLIENT) - private IIcon altarTop; - - /** - * - */ - public BlockJewelAltar() - { - super(Material.iron); - } - - /** - * @param par0 - * @return - */ - public static boolean isNormalCube(int par0) - { - return true; - } - - /** - * @param par1IconRegister - */ - @Override - public void registerBlockIcons(IIconRegister par1IconRegister) - { - altarSide = par1IconRegister.registerIcon(getTextureName() + "_" + "side"); - altarBottom = par1IconRegister.registerIcon(getTextureName() + "_" + "bottom"); - altarTop = par1IconRegister.registerIcon(getTextureName() + "_" + "top"); - } - - /** - * @param par1 - * @param par2 - * @return - */ - @Override - public IIcon getIcon(int par1, int par2) - { - return par1 == 1 ? altarTop : par1 == 0 ? altarBottom : altarSide; - } - - /** - * @param world - * @param i - * @param j - * @param k - * @param entityPlayer - * @param par6 - * @param par7 - * @param par8 - * @param par9 - * @return - */ - @Override - public boolean onBlockActivated(World world, int i, int j, int k, EntityPlayer entityPlayer, int par6, float par7, float par8, float par9) - { - TileEntityAltar te = (TileEntityAltar)world.getTileEntity(i, j, k); - ItemStack item = entityPlayer.inventory.getCurrentItem(); - if (te != null && !world.isRemote){ - if (item != null && item != new ItemStack(Item.getItemById(0), 0, 0) && (item.getItem() == ItemList.ring || item.getItem() == ItemList.necklace) && !te.hasObject){ - te.object = item.copy(); - item.stackSize = 0; - te.playerName = entityPlayer.getDisplayName(); - te.isDirty = true; - te.markDirty(); - te.hasObject = true; - } - if (te.object != null && te.object != new ItemStack(Item.getItemById(0), 0, 0) && te.hasObject && entityPlayer.isSneaking()){ - entityPlayer.inventory.addItemStackToInventory(te.object); - te.object = new ItemStack(Item.getItemById(0), 0, 0); - te.playerName = ""; - te.isDirty = true; - te.markDirty(); - te.hasObject = false; - } - } - return true; - } - - /** - * @param world - * @param i - * @param j - * @param k - * @param player - */ - @Override - public void onBlockClicked(World world, int i, int j, int k, EntityPlayer player) - { - TileEntityAltar te = (TileEntityAltar)world.getTileEntity(i, j, k); - if (te != null && !world.isRemote) if (te.object != null && te.object != new ItemStack(Item.getItemById(0), 0, 0)){} - } - - /** - * @param world - * @param x - * @param y - * @param z - * @param stack - */ - public void dropItem(World world, double x, double y, double z, ItemStack stack) - { - EntityItem entityitem = new EntityItem(world, x + 0.5D, y + 1.5D, z + 0.5D, stack); - entityitem.motionX = 0; - entityitem.motionZ = 0; - entityitem.motionY = 0.11000000298023224D; - world.spawnEntityInWorld(entityitem); - } - - /** - * @param world - * @param i - * @param j - * @param k - * @param block - * @param par6 - */ - @Override - public void breakBlock(World world, int i, int j, int k, Block block, int par6) - { - TileEntityAltar te = (TileEntityAltar)world.getTileEntity(i, j, k); - if (te != null && te.object != null && te.object != new ItemStack(Item.getItemById(0), 0, 0)){ - dropItem(te.getWorldObj(), te.xCoord, te.yCoord, te.zCoord, te.object); - world.removeTileEntity(i, j, k); - } - super.breakBlock(world, i, j, k, block, par6); - } - - /** - * @param world - * @param var2 - * @return - */ - @Override - public TileEntity createNewTileEntity(World world, int var2) - { - return new TileEntityAltar(); - } -} diff --git a/src/main/java/darkknight/jewelrycraft/block/BlockList.java b/src/main/java/darkknight/jewelrycraft/block/BlockList.java index 5051074..a02b264 100644 --- a/src/main/java/darkknight/jewelrycraft/block/BlockList.java +++ b/src/main/java/darkknight/jewelrycraft/block/BlockList.java @@ -9,8 +9,6 @@ import net.minecraftforge.oredict.OreDictionary; import cpw.mods.fml.common.event.FMLPreInitializationEvent; import cpw.mods.fml.common.registry.GameRegistry; import darkknight.jewelrycraft.JewelrycraftMod; -import darkknight.jewelrycraft.item.ItemList; -import darkknight.jewelrycraft.tileentity.TileEntityAltar; import darkknight.jewelrycraft.tileentity.TileEntityBlockShadow; import darkknight.jewelrycraft.tileentity.TileEntityDisplayer; import darkknight.jewelrycraft.tileentity.TileEntityHandPedestal; @@ -24,7 +22,7 @@ import darkknight.jewelrycraft.util.Variables; public class BlockList { - public static Block shadowOre, smelter, molder, displayer, jewelCraftingTable, shadowBlock, shadowEye, jewelAltar, handPedestal, shadowHand, midasTouchBlock; + public static Block shadowOre, smelter, molder, displayer, jewelCraftingTable, shadowBlock, shadowEye, handPedestal, shadowHand, midasTouchBlock; public static BlockMoltenMetal moltenMetal; public static Fluid moltenMetalFluid; private static boolean isInitialized = false; @@ -37,7 +35,6 @@ public class BlockList displayer = new BlockDisplayer(Material.iron).setHardness(5.0F).setResistance(6.0F).setStepSound(Block.soundTypeMetal).setBlockName(Variables.MODID + ".displayer").setCreativeTab(JewelrycraftMod.jewelrycraft); jewelCraftingTable = new BlockJewelrsCraftingTable(Material.rock).setHardness(3.0F).setResistance(5.0F).setStepSound(Block.soundTypePiston).setBlockName(Variables.MODID + ".jewelCraftingTable").setCreativeTab(JewelrycraftMod.jewelrycraft); shadowBlock = new BlockShadow().setHardness(5.0F).setResistance(7.0F).setStepSound(Block.soundTypeMetal).setBlockTextureName(Variables.MODID + ":blockShadow").setBlockName(Variables.MODID + ".blockShadow").setCreativeTab(JewelrycraftMod.jewelrycraft); - jewelAltar = new BlockJewelAltar().setHardness(5.0F).setResistance(2.0F).setStepSound(Block.soundTypeMetal).setBlockTextureName(Variables.MODID + ":altar").setBlockName(Variables.MODID + ".altar").setCreativeTab(JewelrycraftMod.jewelrycraft); shadowEye = new BlockShadowEye().setHardness(5.0F).setResistance(6.0F).setStepSound(Block.soundTypePiston).setBlockName(Variables.MODID + ".shadowEye").setCreativeTab(JewelrycraftMod.jewelrycraft); handPedestal = new BlockHandPedestal(Material.rock).setHardness(5.0F).setResistance(6.0F).setStepSound(Block.soundTypePiston).setBlockName(Variables.MODID + ".handPedestal").setCreativeTab(JewelrycraftMod.jewelrycraft); shadowHand = new BlockShadowHand(Material.rock).setStepSound(Block.soundTypePiston).setBlockName(Variables.MODID + ".shadowHand").setCreativeTab(JewelrycraftMod.jewelrycraft).setBlockUnbreakable(); @@ -52,7 +49,6 @@ public class BlockList GameRegistry.registerBlock(molder, "Molder"); GameRegistry.registerBlock(jewelCraftingTable, "jewelCraftingTable"); GameRegistry.registerBlock(displayer, "Displayer"); - GameRegistry.registerBlock(jewelAltar, "Altar"); GameRegistry.registerBlock(shadowEye, "Shadow Eye"); GameRegistry.registerBlock(handPedestal, "Stone Bricks Pedestal"); GameRegistry.registerBlock(shadowHand, "Shadow Hand"); @@ -64,7 +60,6 @@ public class BlockList GameRegistry.registerTileEntity(TileEntityJewelrsCraftingTable.class, Variables.MODID + ":table"); GameRegistry.registerTileEntity(TileEntityDisplayer.class, Variables.MODID + ":displayer"); GameRegistry.registerTileEntity(TileEntityBlockShadow.class, Variables.MODID + ":blockShadow"); - GameRegistry.registerTileEntity(TileEntityAltar.class, Variables.MODID + ":altar"); GameRegistry.registerTileEntity(TileEntityShadowEye.class, Variables.MODID + ":shadowEye"); GameRegistry.registerTileEntity(TileEntityHandPedestal.class, Variables.MODID + ":handPedestal"); GameRegistry.registerTileEntity(TileEntityShadowHand.class, Variables.MODID + ":shadowHand"); -- cgit v1.2.3