diff --git a/src/main/java/com/cricketcraft/chisel/block/BlockCarvableTorch.java b/src/main/java/com/cricketcraft/chisel/block/BlockCarvableTorch.java new file mode 100644 index 00000000..04756a40 --- /dev/null +++ b/src/main/java/com/cricketcraft/chisel/block/BlockCarvableTorch.java @@ -0,0 +1,23 @@ +package com.cricketcraft.chisel.block; + +import com.cricketcraft.chisel.carving.CarvableHelper; +import com.cricketcraft.chisel.init.ModTabs; + +public class BlockCarvableTorch extends BlockCarvable +{ + public CarvableHelper carverHelper; + + public BlockCarvableTorch() + { + super(); + + carverHelper = new CarvableHelper(); + + setCreativeTab(ModTabs.tabChiselBlocks); + } + @Override + public int getRenderType() + { + return 2; + } +} diff --git a/src/main/java/com/cricketcraft/chisel/init/ModBlocks.java b/src/main/java/com/cricketcraft/chisel/init/ModBlocks.java index a1e28ff9..c987a637 100644 --- a/src/main/java/com/cricketcraft/chisel/init/ModBlocks.java +++ b/src/main/java/com/cricketcraft/chisel/init/ModBlocks.java @@ -85,7 +85,8 @@ public class ModBlocks { public static BlockCarvable technical; public static BlockCarvable bone; public static BlockCarvable scorching; - public static BlockCarvable brick; + public static BlockCarvable brickCustom; + public static BlockCarvableTorch torch; // 1.7 public static BlockCarvableGlass[] stainedGlass = new BlockCarvableGlass[4]; @@ -1525,18 +1526,31 @@ public class ModBlocks { scorching.carverHelper.register(scorching, "scorching"); Carving.chisel.registerOre("scorching", "scorching"); } - if(Configurations.featureEnabled("brick")) + if(Configurations.featureEnabled("brickCustom")) { - brick = (BlockCarvable) new BlockCarvable(Material.rock).setHardness(50.0F).setResistance(2000.0F).setStepSound(Block.soundTypeStone); - Carving.chisel.addVariation("brick", Blocks.brick_block, 0, 0); - brick.carverHelper.addVariation(StatCollector.translateToLocal("tile.brick.1.desc"), 1, "brick/large"); - brick.carverHelper.addVariation(StatCollector.translateToLocal("tile.brick.2.desc"), 2, "brick/mortarless"); - brick.carverHelper.addVariation(StatCollector.translateToLocal("tile.brick.3.desc"), 3, "brick/varied"); - //brick.carverHelper.addVariation(StatCollector.translateToLocal("tile.brick.4.desc"), 4, "brick/cracked"); - brick.carverHelper.addVariation(StatCollector.translateToLocal("tile.brick.5.desc"), 5, "brick/aged"); - //brick.carverHelper.addVariation(StatCollector.translateToLocal("tile.brick.6.desc"), 6, "brick/mossy"); - brick.carverHelper.register(brick, "brick"); - Carving.chisel.registerOre("brick", "brick"); + brickCustom = (BlockCarvable) new BlockCarvable(Material.rock).setStepSound(Block.soundTypeStone); + Carving.chisel.addVariation("brickCustom", Blocks.brick_block, 0, 0); + brickCustom.carverHelper.addVariation(StatCollector.translateToLocal("tile.brickCustom.1.desc"), 1, "brickCustom/large"); + brickCustom.carverHelper.addVariation(StatCollector.translateToLocal("tile.brickCustom.2.desc"), 2, "brickCustom/mortarless"); + brickCustom.carverHelper.addVariation(StatCollector.translateToLocal("tile.brickCustom.3.desc"), 3, "brickCustom/varied"); + //brickCustom.carverHelper.addVariation(StatCollector.translateToLocal("tile.brickCustom.4.desc"), 4, "brickCustom/cracked"); + brickCustom.carverHelper.addVariation(StatCollector.translateToLocal("tile.brickCustom.5.desc"), 5, "brickCustom/aged"); + //brickCustom.carverHelper.addVariation(StatCollector.translateToLocal("tile.brickCustom.6.desc"), 6, "brickCustom/mossy"); + brickCustom.carverHelper.register(brickCustom, "brickCustom"); + Carving.chisel.registerOre("brickCustom", "brickCustom"); } + /*if(Configurations.featureEnabled("torch")) + { + torch = (BlockCarvableTorch) new BlockCarvableTorch().setLightLevel(0.8F); + Carving.chisel.addVariation("torch", Blocks.torch, 0, 0); + torch.carverHelper.addVariation(StatCollector.translateToLocal("tile.torch.1.desc"), 1, "torch/candle"); + torch.carverHelper.addVariation(StatCollector.translateToLocal("tile.torch.2.desc"), 2, "torch/candle-holder"); + torch.carverHelper.addVariation(StatCollector.translateToLocal("tile.torch.3.desc"), 3, "torch/lantern"); + torch.carverHelper.addVariation(StatCollector.translateToLocal("tile.torch.4.desc"), 4, "torch/lantern-letters"); + torch.carverHelper.addVariation(StatCollector.translateToLocal("tile.torch.5.desc"), 5, "torch/lamp"); + torch.carverHelper.addVariation(StatCollector.translateToLocal("tile.torch.6.desc"), 6, "torch/lamp-tall"); + torch.carverHelper.register(torch, "torch"); + Carving.chisel.registerOre("torch", "torch"); + }*/ } } diff --git a/src/main/resources/assets/chisel/lang/en_US.lang b/src/main/resources/assets/chisel/lang/en_US.lang index 1e8ee66a..a71c00f6 100644 --- a/src/main/resources/assets/chisel/lang/en_US.lang +++ b/src/main/resources/assets/chisel/lang/en_US.lang @@ -134,6 +134,7 @@ tile.technical.6.desc=Fan (Off) tile.technical.7.desc=Vents tile.technical.8.desc=Glowing Vents +#Scorching tile.scorching.name=Scorching Block tile.scorching.0.desc=Solidified Fire tile.scorching.1.desc=Edged Solidified Fire @@ -141,12 +142,12 @@ tile.scorching.2.desc=Beveled Solidified Fire tile.scorching.3.desc=Burn Stone Encased Solidified Fire tile.scorching.4.desc=Deep Core Block -#Cloudbrick -tile.cloudbrick.name=Cloudbrick -tile.cloudbrick.0.name=Large Cloudbricks -tile.cloudbrick.1.name=Small Cloudbricks -tile.cloudbrick.2.name=Vertical Small Cloudbricks -tile.cloudbrick.3.name=Gridded Cloudbricks +#Brick +tile.brickCustom.name=Brick Block +tile.brickCustom.1.desc=Large Bricks +tile.brickCustom.2.desc=Mortarless Bricks +tile.brickCustom.3.desc=Varied Bricks +tile.brickCustom.5.desc=Aged Bricks #Chisel 1 diff --git a/src/main/resources/assets/chisel/textures/blocks/brick/aged.png b/src/main/resources/assets/chisel/textures/blocks/brickCustom/aged.png similarity index 100% rename from src/main/resources/assets/chisel/textures/blocks/brick/aged.png rename to src/main/resources/assets/chisel/textures/blocks/brickCustom/aged.png diff --git a/src/main/resources/assets/chisel/textures/blocks/brick/large.png b/src/main/resources/assets/chisel/textures/blocks/brickCustom/large.png similarity index 100% rename from src/main/resources/assets/chisel/textures/blocks/brick/large.png rename to src/main/resources/assets/chisel/textures/blocks/brickCustom/large.png diff --git a/src/main/resources/assets/chisel/textures/blocks/brick/mortarless.png b/src/main/resources/assets/chisel/textures/blocks/brickCustom/mortarless.png similarity index 100% rename from src/main/resources/assets/chisel/textures/blocks/brick/mortarless.png rename to src/main/resources/assets/chisel/textures/blocks/brickCustom/mortarless.png diff --git a/src/main/resources/assets/chisel/textures/blocks/brick/varied.png b/src/main/resources/assets/chisel/textures/blocks/brickCustom/varied.png similarity index 100% rename from src/main/resources/assets/chisel/textures/blocks/brick/varied.png rename to src/main/resources/assets/chisel/textures/blocks/brickCustom/varied.png diff --git a/src/main/resources/assets/chisel/textures/blocks/torch/candle-holder.png b/src/main/resources/assets/chisel/textures/blocks/torch/candle-holder.png new file mode 100755 index 00000000..94357515 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/torch/candle-holder.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/torch/candle.png b/src/main/resources/assets/chisel/textures/blocks/torch/candle.png new file mode 100755 index 00000000..fe5c5e6f Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/torch/candle.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/torch/lamp-tall.png b/src/main/resources/assets/chisel/textures/blocks/torch/lamp-tall.png new file mode 100755 index 00000000..5eb4208c Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/torch/lamp-tall.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/torch/lamp.png b/src/main/resources/assets/chisel/textures/blocks/torch/lamp.png new file mode 100755 index 00000000..0bd566c0 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/torch/lamp.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/torch/lantern-letters.png b/src/main/resources/assets/chisel/textures/blocks/torch/lantern-letters.png new file mode 100755 index 00000000..fd771961 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/torch/lantern-letters.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/torch/lantern.png b/src/main/resources/assets/chisel/textures/blocks/torch/lantern.png new file mode 100755 index 00000000..9e573f60 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/torch/lantern.png differ