From 8cce40242040b145ba8475760b8095301c40d1c3 Mon Sep 17 00:00:00 2001 From: warlordjones Date: Sun, 11 Jan 2015 21:18:41 +0000 Subject: [PATCH] Implement more road lines - Double White, Yellow and Double Yellow --- .../chisel/block/BlockRoadLine.java | 10 ++++++---- .../chisel/init/ChiselBlocks.java | 2 +- .../cricketcraft/chisel/init/Features.java | 18 +++++++++++++++--- .../resources/assets/chisel/lang/en_US.lang | 5 ++++- .../line-marking/double-yellow-center.png | Bin 717 -> 3342 bytes 5 files changed, 26 insertions(+), 9 deletions(-) diff --git a/src/main/java/com/cricketcraft/chisel/block/BlockRoadLine.java b/src/main/java/com/cricketcraft/chisel/block/BlockRoadLine.java index fb656454..e405217a 100644 --- a/src/main/java/com/cricketcraft/chisel/block/BlockRoadLine.java +++ b/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"); } } diff --git a/src/main/java/com/cricketcraft/chisel/init/ChiselBlocks.java b/src/main/java/com/cricketcraft/chisel/init/ChiselBlocks.java index 4b5c3e02..1031dc18 100644 --- a/src/main/java/com/cricketcraft/chisel/init/ChiselBlocks.java +++ b/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; diff --git a/src/main/java/com/cricketcraft/chisel/init/Features.java b/src/main/java/com/cricketcraft/chisel/init/Features.java index 3ff6e15d..670e6b86 100644 --- a/src/main/java/com/cricketcraft/chisel/init/Features.java +++ b/src/main/java/com/cricketcraft/chisel/init/Features.java @@ -1874,9 +1874,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"); } @@ -2412,9 +2424,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)); diff --git a/src/main/resources/assets/chisel/lang/en_US.lang b/src/main/resources/assets/chisel/lang/en_US.lang index 72b8751e..8e6bf07b 100644 --- a/src/main/resources/assets/chisel/lang/en_US.lang +++ b/src/main/resources/assets/chisel/lang/en_US.lang @@ -546,7 +546,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 diff --git a/src/main/resources/assets/chisel/textures/blocks/line-marking/double-yellow-center.png b/src/main/resources/assets/chisel/textures/blocks/line-marking/double-yellow-center.png index f4249e53b179b7559a73923e31b0997e93854b1b..3cf03cde985af4faae15ee65df9da2cfc6ca26b0 100644 GIT binary patch delta 2969 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 P00000NkvXXu0mjfGi8lV delta 325 zcmV-L0lNN<8qEceBM$+6P)t-s|NsA=jXr{OGqY+6bOC?-S%HQC000?uQchC<%w568 z{kzA%!?n20{<+A<&Hnz${@LZaV$lzB0002yNkl$QG*xfWmDb?}Tf5~B9wf5;a0?Z`O=AiJurAnf- ziGV;dk~x2h9Q&*ycSFr0V9o<=*g3I>Q{30K5dkLQ%+g?jtZR7%$N>Zlg5Q#mLt&p% zEx`~1h6&kr%ilqqe|%R*5inL{qUn|$TwQT!va0pWfm@Zd3rE{Ww zad~y!@giV`hD6rQaPIr;gEEhRC-M2^)x&CvAA~8lC;}EfGM~-G@1I|1@sC^Tb#=ck X>f