From e73d4df31422c7296e60442b95156d0c50b9502e Mon Sep 17 00:00:00 2001 From: warlordjones Date: Mon, 6 Apr 2015 17:50:48 +0100 Subject: [PATCH] Implement the 'chrono' texture as a glass variant --- src/main/java/com/cricketcraft/chisel/Features.java | 5 +++++ src/main/resources/assets/chisel/lang/en_US.lang | 3 +++ .../{unused/wireframe => glass}/chrono-ctm.png | Bin .../blocks/{unused/wireframe => glass}/chrono.png | Bin 4 files changed, 8 insertions(+) rename src/main/resources/assets/chisel/textures/blocks/{unused/wireframe => glass}/chrono-ctm.png (100%) rename src/main/resources/assets/chisel/textures/blocks/{unused/wireframe => glass}/chrono.png (100%) diff --git a/src/main/java/com/cricketcraft/chisel/Features.java b/src/main/java/com/cricketcraft/chisel/Features.java index 4c6810b1..0cf215e9 100644 --- a/src/main/java/com/cricketcraft/chisel/Features.java +++ b/src/main/java/com/cricketcraft/chisel/Features.java @@ -794,6 +794,11 @@ public enum Features { glass.carverHelper.addVariation("tile.glass.15.desc", 15, "glass/a1-glasswindow-ironfencemodern"); glass.carverHelper.registerAll(glass, "glass"); Carving.chisel.registerOre("glass", "glass"); + + BlockCarvableGlass glass2 = (BlockCarvableGlass) new BlockCarvableGlass().setCreativeTab(ChiselTabs.tabOtherChiselBlocks).setHardness(0.3F).setStepSound(Block.soundTypeGlass); + glass2.carverHelper.addVariation("tile.glass2.0.desc", 0, "glass/chrono"); + glass2.carverHelper.registerBlock(glass2, "glass2"); + glass2.carverHelper.registerVariations("glass", glass2); } }, diff --git a/src/main/resources/assets/chisel/lang/en_US.lang b/src/main/resources/assets/chisel/lang/en_US.lang index 4f2d66b3..a0abc2f6 100644 --- a/src/main/resources/assets/chisel/lang/en_US.lang +++ b/src/main/resources/assets/chisel/lang/en_US.lang @@ -619,6 +619,9 @@ tile.glass.13.desc=Thick Grid Glass tile.glass.14.desc=Thin Grid Glass tile.glass.15.desc=Modern Iron Fence +tile.chisel.glass2.name=Glass +tile.glass2.0.desc=Asymmetrical Leaded Glass + #Sandstone tile.chisel.sandstone.name=Sandstone tile.sandstone.3.desc=Faded Sandstone diff --git a/src/main/resources/assets/chisel/textures/blocks/unused/wireframe/chrono-ctm.png b/src/main/resources/assets/chisel/textures/blocks/glass/chrono-ctm.png similarity index 100% rename from src/main/resources/assets/chisel/textures/blocks/unused/wireframe/chrono-ctm.png rename to src/main/resources/assets/chisel/textures/blocks/glass/chrono-ctm.png diff --git a/src/main/resources/assets/chisel/textures/blocks/unused/wireframe/chrono.png b/src/main/resources/assets/chisel/textures/blocks/glass/chrono.png similarity index 100% rename from src/main/resources/assets/chisel/textures/blocks/unused/wireframe/chrono.png rename to src/main/resources/assets/chisel/textures/blocks/glass/chrono.png