diff --git a/src/main/java/com/cricketcraft/chisel/Features.java b/src/main/java/com/cricketcraft/chisel/Features.java index 3fae4dbf..1a3a47ed 100644 --- a/src/main/java/com/cricketcraft/chisel/Features.java +++ b/src/main/java/com/cricketcraft/chisel/Features.java @@ -41,7 +41,7 @@ import com.cricketcraft.chisel.block.BlockGrimstone; import com.cricketcraft.chisel.block.BlockHolystone; import com.cricketcraft.chisel.block.BlockLavastone; import com.cricketcraft.chisel.block.BlockLeaf; -import com.cricketcraft.chisel.block.BlockMarbleBookshelf; +import com.cricketcraft.chisel.block.BlockCarvableBookshelf; import com.cricketcraft.chisel.block.BlockMarbleCarpet; import com.cricketcraft.chisel.block.BlockMarbleTexturedOre; import com.cricketcraft.chisel.block.BlockPresent; @@ -254,7 +254,7 @@ public enum Features { @Override void addBlocks() { - BlockCarvable bookshelf = (BlockCarvable) new BlockMarbleBookshelf().setHardness(1.5F).setCreativeTab(ChiselTabs.tabWoodChiselBlocks).setStepSound(Block.soundTypeWood); + BlockCarvable bookshelf = (BlockCarvable) new BlockCarvableBookshelf().setHardness(1.5F).setCreativeTab(ChiselTabs.tabWoodChiselBlocks).setStepSound(Block.soundTypeWood); Carving.chisel.addVariation("bookshelf", Blocks.bookshelf, 0, 0); bookshelf.carverHelper.addVariation("tile.bookshelf.1.desc", 1, "bookshelf/rainbow"); bookshelf.carverHelper.addVariation("tile.bookshelf.2.desc", 2, "bookshelf/necromancer-novice"); diff --git a/src/main/java/com/cricketcraft/chisel/block/BlockCarvable.java b/src/main/java/com/cricketcraft/chisel/block/BlockCarvable.java index 2880dc39..55d11ee4 100644 --- a/src/main/java/com/cricketcraft/chisel/block/BlockCarvable.java +++ b/src/main/java/com/cricketcraft/chisel/block/BlockCarvable.java @@ -82,7 +82,7 @@ public class BlockCarvable extends Block implements ICarvable { public CarvableVariation getVariation(IBlockAccess world, int x, int y, int z, int metadata) { return carverHelper.getVariation(metadata); } - + @Override public CarvableVariation getVariation(ItemStack stack) { return carverHelper.getVariation(stack.getItemDamage()); @@ -95,13 +95,10 @@ public class BlockCarvable extends Block implements ICarvable { public final String soundNamePlace; /** - * Creates a SoundType with automatic names for step and break sounds. - * Sound names dig.soundName and step.soundName must be specified in the - * sounds.json + * Creates a SoundType with automatic names for step and break sounds. Sound names dig.soundName and step.soundName must be specified in the sounds.json * * @param soundName - * block of the sound. Will automatically be expanded to - * "mod:dig.soundName" and "mod:step.soundName" respectively) + * block of the sound. Will automatically be expanded to "mod:dig.soundName" and "mod:step.soundName" respectively) * @param volume * default 1.0f * @param frequency @@ -115,8 +112,7 @@ public class BlockCarvable extends Block implements ICarvable { } /** - * Creates a SoundType with manual names for step and break sounds. - * Sound names must be specified in the sounds.json + * Creates a SoundType with manual names for step and break sounds. Sound names must be specified in the sounds.json * * @param soundNameBreak * block break sound @@ -135,8 +131,7 @@ public class BlockCarvable extends Block implements ICarvable { } /** - * Creates a SoundType with manual names for step, break and place - * sounds. Sound names must be specified in the sounds.json + * Creates a SoundType with manual names for step, break and place sounds. Sound names must be specified in the sounds.json * * @param soundNameBreak * block break sound diff --git a/src/main/java/com/cricketcraft/chisel/block/BlockMarbleBookshelf.java b/src/main/java/com/cricketcraft/chisel/block/BlockCarvableBookshelf.java similarity index 84% rename from src/main/java/com/cricketcraft/chisel/block/BlockMarbleBookshelf.java rename to src/main/java/com/cricketcraft/chisel/block/BlockCarvableBookshelf.java index 05e01716..95e3cdce 100644 --- a/src/main/java/com/cricketcraft/chisel/block/BlockMarbleBookshelf.java +++ b/src/main/java/com/cricketcraft/chisel/block/BlockCarvableBookshelf.java @@ -2,6 +2,7 @@ package com.cricketcraft.chisel.block; import java.util.Random; +import net.minecraft.block.material.Material; import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.Item; @@ -11,10 +12,11 @@ import net.minecraft.world.World; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -public class BlockMarbleBookshelf extends BlockCarvable { +public class BlockCarvableBookshelf extends BlockCarvable { - public BlockMarbleBookshelf() { - super(); + public BlockCarvableBookshelf() { + super(Material.wood); + setHarvestLevel("axe", 0); } @Override