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 00000000..deadc0c0 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/voidstone/animated/skulls.png differ