From 32bf0bb060af038cb7b005bb66e1b9abd9c05540 Mon Sep 17 00:00:00 2001 From: Arona Jones Date: Mon, 15 Dec 2014 01:19:33 +0000 Subject: [PATCH] Add the voidstone skulls variant back, shift the meta around, and make raw the first variant you craft --- .../cricketcraft/chisel/init/ModBlocks.java | 21 ++++++----- .../resources/assets/chisel/lang/en_GB.lang | 35 +++++++++--------- .../resources/assets/chisel/lang/en_US.lang | 28 +++++++------- .../blocks/voidstone/animated/skulls.png | Bin 0 -> 3517 bytes 4 files changed, 44 insertions(+), 40 deletions(-) create mode 100644 src/main/resources/assets/chisel/textures/blocks/voidstone/animated/skulls.png diff --git a/src/main/java/com/cricketcraft/chisel/init/ModBlocks.java b/src/main/java/com/cricketcraft/chisel/init/ModBlocks.java index 0162f79a..1deffcb3 100644 --- a/src/main/java/com/cricketcraft/chisel/init/ModBlocks.java +++ b/src/main/java/com/cricketcraft/chisel/init/ModBlocks.java @@ -1323,26 +1323,27 @@ public class ModBlocks { if(Configurations.featureEnabled("voidstone")){ voidstone = (BlockVoidstone) new BlockVoidstone(null).setStepSound(Block.soundTypeStone).setCreativeTab(ModTabs.tabChiselBlocks); - voidstone.carverHelper.addVariation(StatCollector.translateToLocal("tile.voidstone.0.desc"), 0, "voidstone/metalborder"); + voidstone.carverHelper.addVariation(StatCollector.translateToLocal("tile.voidstone.0.desc"), 0, "voidstone/raw"); voidstone.carverHelper.addVariation(StatCollector.translateToLocal("tile.voidstone.1.desc"), 1, "voidstone/quarters"); voidstone.carverHelper.addVariation(StatCollector.translateToLocal("tile.voidstone.2.desc"), 2, "voidstone/smooth"); voidstone.carverHelper.addVariation(StatCollector.translateToLocal("tile.voidstone.3.desc"), 3, "voidstone/skulls"); - voidstone.carverHelper.addVariation(StatCollector.translateToLocal("tile.voidstone.12.desc"), 12, "voidstone/rune"); - voidstone.carverHelper.addVariation(StatCollector.translateToLocal("tile.voidstone.13.desc"), 13, "voidstone/raw"); - voidstone.carverHelper.addVariation(StatCollector.translateToLocal("tile.voidstone.14.desc"), 14, "voidstone/eye"); - voidstone.carverHelper.addVariation(StatCollector.translateToLocal("tile.voidstone.15.desc"), 15, "voidstone/bevel"); + voidstone.carverHelper.addVariation(StatCollector.translateToLocal("tile.voidstone.4.desc"), 4, "voidstone/rune"); + voidstone.carverHelper.addVariation(StatCollector.translateToLocal("tile.voidstone.5.desc"), 5, "voidstone/metalborder"); + voidstone.carverHelper.addVariation(StatCollector.translateToLocal("tile.voidstone.6.desc"), 6, "voidstone/eye"); + voidstone.carverHelper.addVariation(StatCollector.translateToLocal("tile.voidstone.7.desc"), 7, "voidstone/bevel"); voidstone.carverHelper.register(voidstone, "voidstone"); Carving.chisel.registerOre("voidstone", "voidstone"); voidstone2 = (BlockVoidstone) new BlockVoidstone(Chisel.MOD_ID + ":voidstone/animated/void").setStepSound(Block.soundTypeStone).setCreativeTab(ModTabs.tabChiselBlocks); - voidstone2.carverHelper.addVariation(StatCollector.translateToLocal("tile.voidstone.0.desc"), 0, "voidstone/animated/metalborder"); + voidstone2.carverHelper.addVariation(StatCollector.translateToLocal("tile.voidstone.0.desc"), 0, "voidstone/animated/raw"); voidstone2.carverHelper.addVariation(StatCollector.translateToLocal("tile.voidstone.1.desc"), 1, "voidstone/animated/quarters"); voidstone2.carverHelper.addVariation(StatCollector.translateToLocal("tile.voidstone.2.desc"), 2, "voidstone/animated/smooth"); - voidstone2.carverHelper.addVariation(StatCollector.translateToLocal("tile.voidstone.12.desc"), 12, "voidstone/animated/rune"); - voidstone2.carverHelper.addVariation(StatCollector.translateToLocal("tile.voidstone.13.desc"), 13, "voidstone/animated/raw"); - voidstone2.carverHelper.addVariation(StatCollector.translateToLocal("tile.voidstone.14.desc"), 14, "voidstone/animated/eye"); - voidstone2.carverHelper.addVariation(StatCollector.translateToLocal("tile.voidstone.15.desc"), 15, "voidstone/animated/bevel"); + voidstone2.carverHelper.addVariation(StatCollector.translateToLocal("tile.voidstone.3.desc"), 3, "voidstone/animated/skulls"); + voidstone2.carverHelper.addVariation(StatCollector.translateToLocal("tile.voidstone.4.desc"), 4, "voidstone/animated/rune"); + voidstone2.carverHelper.addVariation(StatCollector.translateToLocal("tile.voidstone.5.desc"), 5, "voidstone/animated/metalborder"); + voidstone2.carverHelper.addVariation(StatCollector.translateToLocal("tile.voidstone.6.desc"), 6, "voidstone/animated/eye"); + voidstone2.carverHelper.addVariation(StatCollector.translateToLocal("tile.voidstone.7.desc"), 7, "voidstone/animated/bevel"); voidstone2.carverHelper.register(voidstone2, "voidstone2"); Carving.chisel.registerOre("voidstone2", "voidstone2"); diff --git a/src/main/resources/assets/chisel/lang/en_GB.lang b/src/main/resources/assets/chisel/lang/en_GB.lang index a369fc86..56d90cb9 100644 --- a/src/main/resources/assets/chisel/lang/en_GB.lang +++ b/src/main/resources/assets/chisel/lang/en_GB.lang @@ -35,35 +35,36 @@ tile.leaves.8.desc=Pink Petals tile.leaves.9.desc=Red Rose tile.leaves.10.desc=White Rose tile.leaves.11.desc=Christmas Balls -tile.leaves.12.desc=Christmas Lights #Void Stone Blocks tile.voidstone.name=Voidstone -tile.voidstone.0.desc=Metal-Bordered Voidstone -tile.voidstone.1.desc=Large Voidstone tiles +tile.voidstone.0.desc=Raw Voidstone +tile.voidstone.1.desc=Large Voidstone Tiles tile.voidstone.2.desc=Smooth Voidstone -tile.voidstone.12.desc=Runic Voidstone -tile.voidstone.13.desc=Raw Voidstone -tile.voidstone.14.desc=Eye Voidstone -tile.voidstone.15.desc=Beveled Voidstone +tile.voidstone.3.desc=Skull Voidstone +tile.voidstone.4.desc=Runic Voidstone +tile.voidstone.5.desc=Metal-Bordered Voidstone +tile.voidstone.6.desc=Eye Voidstone +tile.voidstone.7.desc=Beveled Voidstone #Void Stone Pillars -tile.voidstonePillar.name=Voidstone Pillar -tile.voidstonePillar.0.desc=Striped Voidstone Pillar +tile.voidstonePillar.name=Void Stone Pillar +tile.voidstonePillar.0.desc=Striped Void Stone Pillar #Animated Void Stone Blocks -tile.voidstone2.name=Animated Voidstone -tile.voidstone2.0.desc=Metal-Bordered Animated Voidstone -tile.voidstone2.1.desc=Large Animated Voidstone tiles +tile.voidstone2.name=Voidstone +tile.voidstone2.0.desc=Raw Animated Voidstone +tile.voidstone2.1.desc=Large Animated Voidstone Tiles tile.voidstone2.2.desc=Smooth Animated Voidstone -tile.voidstone2.12.desc=Runic Animated Voidstone -tile.voidstone2.13.desc=Raw Animated Voidstone -tile.voidstone2.14.desc=Eye Animated Voidstone -tile.voidstone2.15.desc=Beveled Animated Voidstone +tile.voidstone2.3.desc=Skull Animated Voidstone +tile.voidstone2.4.desc=Runic Animated Voidstone +tile.voidstone2.5.desc=Metal-Bordered Animated Voidstone +tile.voidstone2.6.desc=Eye Animated Voidstone +tile.voidstone2.7.desc=Beveled Voidstone #Void Stone Pillars tile.voidstonePillar2.name=Animated Voidstone Pillar -tile.voidstonePillar2.0.desc=Striped Voidstone Pillar +tile.voidstonePillar2.0.desc=Striped Animated Voidstone Pillar #Waterstone tile.waterstone.name=Waterstone diff --git a/src/main/resources/assets/chisel/lang/en_US.lang b/src/main/resources/assets/chisel/lang/en_US.lang index b4ae9520..fb49c0de 100644 --- a/src/main/resources/assets/chisel/lang/en_US.lang +++ b/src/main/resources/assets/chisel/lang/en_US.lang @@ -39,27 +39,29 @@ tile.leaves.12.desc=Christmas Lights #Void Stone Blocks tile.voidstone.name=Voidstone -tile.voidstone.0.desc=Metal-Bordered Voidstone -tile.voidstone.1.desc=Large Voidstone tiles +tile.voidstone.0.desc=Raw Voidstone +tile.voidstone.1.desc=Large Voidstone Tiles tile.voidstone.2.desc=Smooth Voidstone -tile.voidstone.12.desc=Runic Voidstone -tile.voidstone.13.desc=Raw Voidstone -tile.voidstone.14.desc=Eye Voidstone -tile.voidstone.15.desc=Beveled Voidstone +tile.voidstone.3.desc=Skull Voidstone +tile.voidstone.4.desc=Runic Voidstone +tile.voidstone.5.desc=Metal-Bordered Voidstone +tile.voidstone.6.desc=Eye Voidstone +tile.voidstone.7.desc=Beveled Voidstone #Void Stone Pillars tile.voidstonePillar.name=Void Stone Pillar tile.voidstonePillar.0.desc=Striped Void Stone Pillar #Animated Void Stone Blocks -tile.voidstone2.name=Animated Voidstone -tile.voidstone2.0.desc=Metal-Bordered Animated Voidstone -tile.voidstone2.1.desc=Large Animated Voidstone tiles +tile.voidstone2.name=Voidstone +tile.voidstone2.0.desc=Raw Animated Voidstone +tile.voidstone2.1.desc=Large Animated Voidstone Tiles tile.voidstone2.2.desc=Smooth Animated Voidstone -tile.voidstone2.12.desc=Runic Animated Voidstone -tile.voidstone2.13.desc=Raw Animated Voidstone -tile.voidstone2.14.desc=Eye Animated Voidstone -tile.voidstone2.15.desc=Beveled Animated Voidstone +tile.voidstone2.3.desc=Skull Animated Voidstone +tile.voidstone2.4.desc=Runic Animated Voidstone +tile.voidstone2.5.desc=Metal-Bordered Animated Voidstone +tile.voidstone2.6.desc=Eye Animated Voidstone +tile.voidstone2.7.desc=Beveled Voidstone #Void Stone Pillars tile.voidstonePillar2.name=Animated Voidstone Pillar diff --git a/src/main/resources/assets/chisel/textures/blocks/voidstone/animated/skulls.png b/src/main/resources/assets/chisel/textures/blocks/voidstone/animated/skulls.png new file mode 100644 index 0000000000000000000000000000000000000000..deadc0c086c656d00fec1a30fda838d7dcf75dc2 GIT binary patch literal 3517 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 literal 0 HcmV?d00001