diff --git a/src/main/java/com/cricketcraft/chisel/init/ModBlocks.java b/src/main/java/com/cricketcraft/chisel/init/ModBlocks.java index 2228ac29..e2a1d65a 100644 --- a/src/main/java/com/cricketcraft/chisel/init/ModBlocks.java +++ b/src/main/java/com/cricketcraft/chisel/init/ModBlocks.java @@ -83,8 +83,7 @@ public class ModBlocks { public static BlockCarvable hexPlating; public static BlockCarvable mechanical; public static BlockCarvable cloudbrick; - - public static BlockSpikes spikeTrap; + public static BlockCarvable bone; // 1.7 public static BlockCarvableGlass[] stainedGlass = new BlockCarvableGlass[4]; @@ -1462,13 +1461,24 @@ public class ModBlocks { Carving.chisel.registerOre("mechanical", "mechanical"); } if(Configurations.featureEnabled("cloudbrick")){ - cloudbrick = (BlockCarvable) new BlockCarvable(Material.rock).setHardness(0.1F).setResistance(0.5F); + cloudbrick = (BlockCarvable) new BlockCarvable(Material.air).setHardness(0.1F).setResistance(0.5F); cloudbrick.carverHelper.addVariation(StatCollector.translateToLocal("tile.cloudbrick.0.desc"), 0, "cloudbrick/larged"); cloudbrick.carverHelper.addVariation(StatCollector.translateToLocal("tile.cloudbrick.1.desc"), 1, "cloudbrick/small"); cloudbrick.carverHelper.addVariation(StatCollector.translateToLocal("tile.cloudbrick.2.desc"), 2, "cloudbrick/vertical"); cloudbrick.carverHelper.addVariation(StatCollector.translateToLocal("tile.cloudbrick.3.desc"), 3, "cloudbrick/grid"); - mechanical.carverHelper.register(cloudbrick, "cloudbrick"); + cloudbrick.carverHelper.register(cloudbrick, "cloudbrick"); Carving.chisel.registerOre("cloudbrick", "cloudbrick"); } + if(Configurations.featureEnabled("bone")) + { + bone = (BlockCarvable) new BlockCarvable(Material.rock); + bone.carverHelper.addVariation(StatCollector.translateToLocal("tile.bone.0.desc"), 0, "bone/solid"); + bone.carverHelper.addVariation(StatCollector.translateToLocal("tile.bone.1.desc"), 1, "bone/skullpile"); + bone.carverHelper.addVariation(StatCollector.translateToLocal("tile.bone.2.desc"), 2, "bone/stacked"); + bone.carverHelper.addVariation(StatCollector.translateToLocal("tile.bone.3.desc"), 3, "bone/bevel"); + bone.carverHelper.addVariation(StatCollector.translateToLocal("tile.bone.4.desc"), 3, "bone/bricks"); + bone.carverHelper.register(bone, "bone"); + Carving.chisel.registerOre("bone", "bone"); + } } } diff --git a/src/main/resources/assets/chisel/lang/en_US.lang b/src/main/resources/assets/chisel/lang/en_US.lang index 6edeeda0..7f2dabc4 100644 --- a/src/main/resources/assets/chisel/lang/en_US.lang +++ b/src/main/resources/assets/chisel/lang/en_US.lang @@ -37,6 +37,14 @@ tile.leaves.10.desc=White Rose tile.leaves.11.desc=Christmas Balls tile.leaves.12.desc=Christmas Lights +#Bone +tile.bone.name=Bone Block +tile.bone.0.desc=Compressed Bone +tile.bone.1.desc=Skullpile +tile.bone.2.desc=Pile of Bones +tile.bone.3.desc=Beveled Compressed Bone +tile.bone.4.desc=Brick Compressed Bone + #Void Stone Blocks tile.voidstone.name=Voidstone tile.voidstone.0.desc=Raw Voidstone diff --git a/src/main/resources/assets/chisel/textures/blocks/bone/bevel.png b/src/main/resources/assets/chisel/textures/blocks/bone/bevel.png new file mode 100755 index 00000000..2f3333e6 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/bone/bevel.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/bone/bricks.png b/src/main/resources/assets/chisel/textures/blocks/bone/bricks.png new file mode 100755 index 00000000..8b3805c4 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/bone/bricks.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/bone/skullpile.png b/src/main/resources/assets/chisel/textures/blocks/bone/skullpile.png new file mode 100755 index 00000000..98a2eaf6 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/bone/skullpile.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/bone/solid.png b/src/main/resources/assets/chisel/textures/blocks/bone/solid.png new file mode 100755 index 00000000..63bf81ff Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/bone/solid.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/bone/stacked.png b/src/main/resources/assets/chisel/textures/blocks/bone/stacked.png new file mode 100755 index 00000000..a8f9c363 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/bone/stacked.png differ