Merge remote-tracking branch 'origin/dev' into dev

src/main/java/com/cricketcraft/chisel/block/BlockRoadLine.java

@@ -16,9 +16,11 @@ public class BlockRoadLine extends Block {
 	public IIcon aloneIcon;
 	public IIcon halfLineIcon;
 	public IIcon fullLineIcon;
+	private String type;
 
-	public BlockRoadLine() {
+	public BlockRoadLine(String type) {
 		super(Material.circuits);
+		this.type = type;
 
 		if (Configurations.useRoadLineTool) {
 			this.setHarvestLevel(Configurations.getRoadLineTool,Configurations.roadLineToolLevel);
@@ -67,9 +69,9 @@ public class BlockRoadLine extends Block {
 
 	@Override
 	public void registerBlockIcons(IIconRegister reg) {
-		blockIcon = aloneIcon = reg.registerIcon("Chisel:line-marking/white-center");
-		halfLineIcon = reg.registerIcon("Chisel:line-marking/white-side");
-		fullLineIcon = reg.registerIcon("Chisel:line-marking/white-long");
+		blockIcon = aloneIcon = reg.registerIcon("Chisel:line-marking/" + type + "-center");
+		halfLineIcon = reg.registerIcon("Chisel:line-marking/" + type + "-side");
+		fullLineIcon = reg.registerIcon("Chisel:line-marking/" + type + "-long");
 	}
 
 }

src/main/java/com/cricketcraft/chisel/init/ChiselBlocks.java

@@ -53,7 +53,7 @@ public final class ChiselBlocks {
 	public static final BlockCarvable sandstone = null;
 	public static final BlockCarvable sandstone_scribbles = null;
 	public static final BlockConcrete concrete = null;
-	public static final BlockRoadLine road_line = null;
+	public static BlockRoadLine road_line = null;
 	public static final BlockCarvable iron_block = null;
 	public static final BlockCarvable gold_block = null;
 	public static final BlockCarvable diamond_block = null;

src/main/java/com/cricketcraft/chisel/init/Features.java

@@ -1875,9 +1875,21 @@ public enum Features {
 
 		@Override
 		void addBlocks() {
-			BlockRoadLine road_line = (BlockRoadLine) new BlockRoadLine().setStepSound(Block.soundTypeStone).setCreativeTab(ChiselTabs.tabOtherChiselBlocks).setHardness(0.01F)
+			BlockRoadLine road_line = (BlockRoadLine) new BlockRoadLine("white").setStepSound(Block.soundTypeStone).setCreativeTab(ChiselTabs.tabOtherChiselBlocks).setHardness(0.01F)
 					.setBlockName("roadLine");
 			GameRegistry.registerBlock(road_line, ItemCarvable.class, "road_line");
+			BlockRoadLine road_line1 = (BlockRoadLine) new BlockRoadLine("yellow").setStepSound(Block.soundTypeStone).setCreativeTab(ChiselTabs.tabOtherChiselBlocks).setHardness(0.01F)
+					.setBlockName("roadLine1");
+			GameRegistry.registerBlock(road_line1, ItemCarvable.class, "road_line1");
+			BlockRoadLine road_line2 = (BlockRoadLine) new BlockRoadLine("double-white").setStepSound(Block.soundTypeStone).setCreativeTab(ChiselTabs.tabOtherChiselBlocks).setHardness(0.01F)
+					.setBlockName("roadLine2");
+			GameRegistry.registerBlock(road_line2, ItemCarvable.class, "road_line2");
+			BlockRoadLine road_line3 = (BlockRoadLine) new BlockRoadLine("double-yellow").setStepSound(Block.soundTypeStone).setCreativeTab(ChiselTabs.tabOtherChiselBlocks).setHardness(0.01F)
+					.setBlockName("roadLine3");
+			GameRegistry.registerBlock(road_line3, ItemCarvable.class, "road_line3");
+			Carving.chisel.addVariation("roadLine", road_line1, 0, 1);
+			Carving.chisel.addVariation("roadLine", road_line2, 0, 2);
+			Carving.chisel.addVariation("roadLine", road_line3, 0, 3);
 			Carving.chisel.registerOre("roadLine", "roadLine");
 		}
 
@@ -2413,9 +2425,9 @@ public enum Features {
 		Carving.chisel.addVariation("torch", Blocks.torch, 0, 0);
 		for(int type = 0; type < 10; type++){
 			if(type == 8 || type == 9)
-				torch[type] = (BlockCarvableTorch) new BlockCarvableTorch().disableParticles();
+				torch[type] = new BlockCarvableTorch().disableParticles();
 			else
-				torch[type] = (BlockCarvableTorch) new BlockCarvableTorch();
+				torch[type] = new BlockCarvableTorch();
 
 			torch[type].setInformation("torch" + (type + 1));
 			GameRegistry.registerBlock(torch[type], "torch" + (type + 1));

src/main/resources/assets/chisel/lang/en_US.lang

@@ -547,7 +547,10 @@ tile.concrete.9.desc=Partly Weathered Concrete Block
 tile.concrete.10.desc=Asphalt
 
 #Road Line
-tile.roadLine.name=Road Lines
+tile.roadLine.name=Road Lines (White)
+tile.roadLine1.name=Road Lines (Double White)
+tile.roadLine2.name=Road Lines (Yellow)
+tile.roadLine3.name=Road Lines (Double Yellow)
 
 #Iron Blocks
 tile.iron_block.name=Iron Block