From 3bd4a62e72e8f93fd693cdd003c02986b5ec91a2 Mon Sep 17 00:00:00 2001 From: warlordjones Date: Sun, 25 Jan 2015 20:23:14 +0000 Subject: [PATCH] Implement new Yellow bricktype --- .../java/com/cricketcraft/chisel/Features.java | 5 ++--- src/main/resources/assets/chisel/lang/en_US.lang | 1 + .../textures/blocks/brickCustom/yellow.png | Bin 0 -> 3346 bytes 3 files changed, 3 insertions(+), 3 deletions(-) create mode 100644 src/main/resources/assets/chisel/textures/blocks/brickCustom/yellow.png diff --git a/src/main/java/com/cricketcraft/chisel/Features.java b/src/main/java/com/cricketcraft/chisel/Features.java index 7d67c240..4384e0f3 100644 --- a/src/main/java/com/cricketcraft/chisel/Features.java +++ b/src/main/java/com/cricketcraft/chisel/Features.java @@ -291,8 +291,7 @@ public enum Features { // brickCustom.carverHelper.addVariation("tile.brickCustom.4.desc", // 4, "brickCustom/cracked"); brickCustom.carverHelper.addVariation("tile.brickCustom.5.desc", 5, "brickCustom/aged"); - // brickCustom.carverHelper.addVariation("tile.brickCustom.6.desc", - // 6, "brickCustom/mossy"); + brickCustom.carverHelper.addVariation("tile.brickCustom.6.desc", 6, "brickCustom/yellow"); brickCustom.carverHelper.registerAll(brickCustom, "brickCustom"); Carving.chisel.registerOre("brickCustom", "brickCustom"); } @@ -1211,7 +1210,7 @@ public enum Features { void addBlocks() { BlockLeaf leaves = (BlockLeaf) new BlockLeaf(Material.leaves).setCreativeTab(ChiselTabs.tabOtherChiselBlocks).setHardness(0.2F).setStepSound(Block.soundTypeGrass); Carving.chisel.addGroup(new CarvingGroup("leaves") { - + public List getVariations() { if (Configurations.chiselBackToVanillaLeaves) { return super.getVariations(); diff --git a/src/main/resources/assets/chisel/lang/en_US.lang b/src/main/resources/assets/chisel/lang/en_US.lang index a0ea9dee..a5c6a5d2 100644 --- a/src/main/resources/assets/chisel/lang/en_US.lang +++ b/src/main/resources/assets/chisel/lang/en_US.lang @@ -248,6 +248,7 @@ tile.brickCustom.1.desc=Large Bricks tile.brickCustom.2.desc=Mortarless Bricks tile.brickCustom.3.desc=Varied Bricks tile.brickCustom.5.desc=Aged Bricks +tile.brickCustom.6.desc=Yellow Bricks #Chisel 1 diff --git a/src/main/resources/assets/chisel/textures/blocks/brickCustom/yellow.png b/src/main/resources/assets/chisel/textures/blocks/brickCustom/yellow.png new file mode 100644 index 0000000000000000000000000000000000000000..217f263e0e37ee0ae18596866612ea6c33a41c28 GIT binary patch literal 3346 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 literal 0 HcmV?d00001