From 5977d977a523116f41ec00a9d5822c35ea0db6dd Mon Sep 17 00:00:00 2001 From: zombiepig333 Date: Tue, 24 Jun 2014 16:22:06 -0700 Subject: [PATCH] Took time to port to 1.7.10pre4, more localization work. -The stair descriptions hate me!!! --- build.gradle | 28 +- .../jbcs/minecraft/chisel/ChiselBlocks.java | 326 ++++++++--------- .../chisel/ChiselModCompatibility.java | 4 +- .../minecraft/chisel/block/BlockConcrete.java | 2 +- .../chisel/block/BlockMarbleStairsMaker.java | 4 +- .../chisel/carving/CarvableHelper.java | 6 +- .../minecraft/chisel/item/ItemCarvable.java | 5 +- .../minecraft/chisel/item/ItemMarbleSlab.java | 2 + .../jbcs/minecraft/utilities/General.java | 3 +- .../resources/assets/chisel/lang/en_US.lang | 329 +++++++++++------- 10 files changed, 404 insertions(+), 305 deletions(-) diff --git a/build.gradle b/build.gradle index 48b379d7..f081a8de 100644 --- a/build.gradle +++ b/build.gradle @@ -1,6 +1,5 @@ buildscript { - repositories { mavenCentral() @@ -20,32 +19,31 @@ buildscript { } apply plugin: 'forge' - version = "1.5.4g" group = "info.jbcs.minecraft.chisel" // http://maven.apache.org/guides/mini/guide-naming-conventions.html archivesBaseName = "Chisel" minecraft { - version = "1.7.2-10.12.2.1126" + version = "1.7.10_pre4-10.12.2.1138-prerelease" assetDir = "eclipse/assets" } processResources - { - // replace stuff in mcmod.info, nothing else - from(sourceSets.main.resources.srcDirs) { - include 'mcmod.info' +{ + // replace stuff in mcmod.info, nothing else + from(sourceSets.main.resources.srcDirs) { + include 'mcmod.info' - // replace version and mcversion - expand 'version': project.version, 'mcversion': project.minecraft.version - } + // replace version and mcversion + expand 'version': project.version, 'mcversion': project.minecraft.version + } - // copy everything else, thats not the mcmod.info - from(sourceSets.main.resources.srcDirs) { - exclude 'mcmod.info' - } + // copy everything else, thats not the mcmod.info + from(sourceSets.main.resources.srcDirs) { + exclude 'mcmod.info' + } - } +} // Create deobf dev jars task deobfJar(type: Jar) { diff --git a/src/main/java/info/jbcs/minecraft/chisel/ChiselBlocks.java b/src/main/java/info/jbcs/minecraft/chisel/ChiselBlocks.java index 18745012..84267773 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/ChiselBlocks.java +++ b/src/main/java/info/jbcs/minecraft/chisel/ChiselBlocks.java @@ -81,23 +81,23 @@ public class ChiselBlocks { blockMarble = (BlockCarvable) new BlockCarvable().setHardness(2.0F).setResistance(10F).setStepSound(Block.soundTypeStone); blockMarble.carverHelper.setChiselBlockName("Marble"); - blockMarble.carverHelper.addVariation(I18n.format("tile.marbleChisel.0.desc"), 0, "marble"); - blockMarble.carverHelper.addVariation(I18n.format("tile.marbleChisel.1.desc"), 1, "marble/a1-stoneornamental-marblebrick"); - blockMarble.carverHelper.addVariation(I18n.format("tile.marbleChisel.2.desc"), 2, "marble/a1-stoneornamental-marbleclassicpanel"); - blockMarble.carverHelper.addVariation(I18n.format("tile.marbleChisel.3.desc"), 3, "marble/a1-stoneornamental-marbleornate"); - blockMarble.carverHelper.addVariation(I18n.format("tile.marbleChisel.4.desc"), 4, "marble/panel"); - blockMarble.carverHelper.addVariation(I18n.format("tile.marbleChisel.5.desc"), 5, "marble/block"); - blockMarble.carverHelper.addVariation(I18n.format("tile.marbleChisel.6.desc"), 6, "marble/terrain-pistonback-marblecreeperdark"); - blockMarble.carverHelper.addVariation(I18n.format("tile.marbleChisel.7.desc"), 7, "marble/terrain-pistonback-marblecreeperlight"); - blockMarble.carverHelper.addVariation(I18n.format("tile.marbleChisel.8.desc"), 8, "marble/a1-stoneornamental-marblecarved"); - blockMarble.carverHelper.addVariation(I18n.format("tile.marbleChisel.9.desc"), 9, "marble/a1-stoneornamental-marblecarvedradial"); - blockMarble.carverHelper.addVariation(I18n.format("tile.marbleChisel.10.desc"), 10, "marble/terrain-pistonback-marbledent"); - blockMarble.carverHelper.addVariation(I18n.format("tile.marbleChisel.11.desc"), 11, "marble/terrain-pistonback-marbledent-small"); - blockMarble.carverHelper.addVariation(I18n.format("tile.marbleChisel.12.desc"), 12, "marble/marble-bricks"); - blockMarble.carverHelper.addVariation(I18n.format("tile.marbleChisel.13.desc"), 13, "marble/marble-arranged-bricks"); - blockMarble.carverHelper.addVariation(I18n.format("tile.marbleChisel.14.desc"), 14, "marble/marble-fancy-bricks"); - blockMarble.carverHelper.addVariation(I18n.format("tile.marbleChisel.15.desc"), 15, "marble/marble-blocks"); - blockMarble.carverHelper.register(blockMarble, "marbleChisel"); + blockMarble.carverHelper.addVariation(I18n.format("chisel.tile.marble.0.desc"), 0, "marble"); + blockMarble.carverHelper.addVariation(I18n.format("chisel.tile.marble.1.desc"), 1, "marble/a1-stoneornamental-marblebrick"); + blockMarble.carverHelper.addVariation(I18n.format("chisel.tile.marble.2.desc"), 2, "marble/a1-stoneornamental-marbleclassicpanel"); + blockMarble.carverHelper.addVariation(I18n.format("chisel.tile.marble.3.desc"), 3, "marble/a1-stoneornamental-marbleornate"); + blockMarble.carverHelper.addVariation(I18n.format("chisel.tile.marble.4.desc"), 4, "marble/panel"); + blockMarble.carverHelper.addVariation(I18n.format("chisel.tile.marble.5.desc"), 5, "marble/block"); + blockMarble.carverHelper.addVariation(I18n.format("chisel.tile.marble.6.desc"), 6, "marble/terrain-pistonback-marblecreeperdark"); + blockMarble.carverHelper.addVariation(I18n.format("chisel.tile.marble.7.desc"), 7, "marble/terrain-pistonback-marblecreeperlight"); + blockMarble.carverHelper.addVariation(I18n.format("chisel.tile.marble.8.desc"), 8, "marble/a1-stoneornamental-marblecarved"); + blockMarble.carverHelper.addVariation(I18n.format("chisel.tile.marble.9.desc"), 9, "marble/a1-stoneornamental-marblecarvedradial"); + blockMarble.carverHelper.addVariation(I18n.format("chisel.tile.marble.10.desc"), 10, "marble/terrain-pistonback-marbledent"); + blockMarble.carverHelper.addVariation(I18n.format("chisel.tile.marble.11.desc"), 11, "marble/terrain-pistonback-marbledent-small"); + blockMarble.carverHelper.addVariation(I18n.format("chisel.tile.marble.12.desc"), 12, "marble/marble-bricks"); + blockMarble.carverHelper.addVariation(I18n.format("chisel.tile.marble.13.desc"), 13, "marble/marble-arranged-bricks"); + blockMarble.carverHelper.addVariation(I18n.format("chisel.tile.marble.14.desc"), 14, "marble/marble-fancy-bricks"); + blockMarble.carverHelper.addVariation(I18n.format("chisel.tile.marble.15.desc"), 15, "marble/marble-blocks"); + blockMarble.carverHelper.register(blockMarble, "marble"); OreDictionary.registerOre("blockMarble", blockMarble); Carving.chisel.registerOre("marble", "blockMarble"); @@ -109,22 +109,22 @@ public class ChiselBlocks blockMarbleSlab = (BlockMarbleSlab) new BlockMarbleSlab(blockMarble).setHardness(2.0F).setResistance(10F); blockMarbleSlab.carverHelper.setChiselBlockName("Marble Slab"); - blockMarbleSlab.carverHelper.addVariation(I18n.format("tile.marbleSlab.0.desc"), 0, "marble"); - blockMarbleSlab.carverHelper.addVariation(I18n.format("tile.marbleSlab.1.desc"), 1, "marbleslab/a1-stoneornamental-marblebrick"); - blockMarbleSlab.carverHelper.addVariation(I18n.format("tile.marbleSlab.2.desc"), 2, "marbleslab/a1-stoneornamental-marbleclassicpanel"); - blockMarbleSlab.carverHelper.addVariation(I18n.format("tile.marbleSlab.3.desc"), 3, "marbleslab/a1-stoneornamental-marbleornate"); - blockMarbleSlab.carverHelper.addVariation(I18n.format("tile.marbleSlab.4.desc"), 4, "marbleslab/a1-stoneornamental-marblepanel"); - blockMarbleSlab.carverHelper.addVariation(I18n.format("tile.marbleSlab.5.desc"), 5, "marbleslab/terrain-pistonback-marble"); - blockMarbleSlab.carverHelper.addVariation(I18n.format("tile.marbleSlab.6.desc"), 6, "marbleslab/terrain-pistonback-marblecreeperdark"); - blockMarbleSlab.carverHelper.addVariation(I18n.format("tile.marbleSlab.7.desc"), 7, "marbleslab/terrain-pistonback-marblecreeperlight"); - blockMarbleSlab.carverHelper.addVariation(I18n.format("tile.marbleSlab.8.desc"), 8, "marbleslab/a1-stoneornamental-marblecarved"); - blockMarbleSlab.carverHelper.addVariation(I18n.format("tile.marbleSlab.9.desc"), 9, "marbleslab/a1-stoneornamental-marblecarvedradial"); - blockMarbleSlab.carverHelper.addVariation(I18n.format("tile.marbleSlab.10.desc"), 10, "marbleslab/terrain-pistonback-marbledent"); - blockMarbleSlab.carverHelper.addVariation(I18n.format("tile.marbleSlab.11.desc"), 11, "marbleslab/terrain-pistonback-marbledent-small"); - blockMarbleSlab.carverHelper.addVariation(I18n.format("tile.marbleSlab.12.desc"), 12, "marbleslab/marble-bricks"); - blockMarbleSlab.carverHelper.addVariation(I18n.format("tile.marbleSlab.13.desc"), 13, "marbleslab/marble-arranged-bricks"); - blockMarbleSlab.carverHelper.addVariation(I18n.format("tile.marbleSlab.14.desc"), 14, "marbleslab/marble-fancy-bricks"); - blockMarbleSlab.carverHelper.addVariation(I18n.format("tile.marbleSlab.15.desc"), 15, "marbleslab/marble-blocks"); + blockMarbleSlab.carverHelper.addVariation(I18n.format("chisel.tile.marbleSlab.0.desc"), 0, "marble"); + blockMarbleSlab.carverHelper.addVariation(I18n.format("chisel.tile.marbleSlab.1.desc"), 1, "marbleslab/a1-stoneornamental-marblebrick"); + blockMarbleSlab.carverHelper.addVariation(I18n.format("chisel.tile.marbleSlab.2.desc"), 2, "marbleslab/a1-stoneornamental-marbleclassicpanel"); + blockMarbleSlab.carverHelper.addVariation(I18n.format("chisel.tile.marbleSlab.3.desc"), 3, "marbleslab/a1-stoneornamental-marbleornate"); + blockMarbleSlab.carverHelper.addVariation(I18n.format("chisel.tile.marbleSlab.4.desc"), 4, "marbleslab/a1-stoneornamental-marblepanel"); + blockMarbleSlab.carverHelper.addVariation(I18n.format("chisel.tile.marbleSlab.5.desc"), 5, "marbleslab/terrain-pistonback-marble"); + blockMarbleSlab.carverHelper.addVariation(I18n.format("chisel.tile.marbleSlab.6.desc"), 6, "marbleslab/terrain-pistonback-marblecreeperdark"); + blockMarbleSlab.carverHelper.addVariation(I18n.format("chisel.tile.marbleSlab.7.desc"), 7, "marbleslab/terrain-pistonback-marblecreeperlight"); + blockMarbleSlab.carverHelper.addVariation(I18n.format("chisel.tile.marbleSlab.8.desc"), 8, "marbleslab/a1-stoneornamental-marblecarved"); + blockMarbleSlab.carverHelper.addVariation(I18n.format("chisel.tile.marbleSlab.9.desc"), 9, "marbleslab/a1-stoneornamental-marblecarvedradial"); + blockMarbleSlab.carverHelper.addVariation(I18n.format("chisel.tile.marbleSlab.10.desc"), 10, "marbleslab/terrain-pistonback-marbledent"); + blockMarbleSlab.carverHelper.addVariation(I18n.format("chisel.tile.marbleSlab.11.desc"), 11, "marbleslab/terrain-pistonback-marbledent-small"); + blockMarbleSlab.carverHelper.addVariation(I18n.format("chisel.tile.marbleSlab.12.desc"), 12, "marbleslab/marble-bricks"); + blockMarbleSlab.carverHelper.addVariation(I18n.format("chisel.tile.marbleSlab.13.desc"), 13, "marbleslab/marble-arranged-bricks"); + blockMarbleSlab.carverHelper.addVariation(I18n.format("chisel.tile.marbleSlab.14.desc"), 14, "marbleslab/marble-fancy-bricks"); + blockMarbleSlab.carverHelper.addVariation(I18n.format("chisel.tile.marbleSlab.15.desc"), 15, "marbleslab/marble-blocks"); blockMarbleSlab.carverHelper.register(blockMarbleSlab, "marbleSlab", ItemMarbleSlab.class); if(Chisel.featureEnabled("marblePillar")) @@ -133,42 +133,42 @@ public class ChiselBlocks { blockMarblePillar = (BlockCarvable) new BlockCarvable().setHardness(2.0F).setResistance(10F).setStepSound(Block.soundTypeStone); blockMarblePillar.carverHelper.setChiselBlockName("Marble Pillar"); - blockMarblePillar.carverHelper.addVariation(I18n.format("tile.marblePillarOld.0.desc"), 0, "marblepillarold/column"); - blockMarblePillar.carverHelper.addVariation(I18n.format("tile.marblePillarOld.1.desc"), 1, "marblepillarold/capstone"); - blockMarblePillar.carverHelper.addVariation(I18n.format("tile.marblePillarOld.2.desc"), 2, "marblepillarold/base"); - blockMarblePillar.carverHelper.addVariation(I18n.format("tile.marblePillarOld.3.desc"), 3, "marblepillarold/small"); - blockMarblePillar.carverHelper.addVariation(I18n.format("tile.marblePillarOld.4.desc"), 4, "marblepillarold/pillar-carved"); - blockMarblePillar.carverHelper.addVariation(I18n.format("tile.marblePillarOld.5.desc"), 5, "marblepillarold/a1-stoneornamental-marblegreek"); - blockMarblePillar.carverHelper.addVariation(I18n.format("tile.marblePillarOld.6.desc"), 6, "marblepillarold/a1-stonepillar-greek"); - blockMarblePillar.carverHelper.addVariation(I18n.format("tile.marblePillarOld.7.desc"), 7, "marblepillarold/a1-stonepillar-plain"); - blockMarblePillar.carverHelper.addVariation(I18n.format("tile.marblePillarOld.8.desc"), 8, "marblepillarold/a1-stonepillar-greektopplain"); - blockMarblePillar.carverHelper.addVariation(I18n.format("tile.marblePillarOld.9.desc"), 9, "marblepillarold/a1-stonepillar-plaintopplain"); - blockMarblePillar.carverHelper.addVariation(I18n.format("tile.marblePillarOld.10.desc"), 10, "marblepillarold/a1-stonepillar-greekbottomplain"); - blockMarblePillar.carverHelper.addVariation(I18n.format("tile.marblePillarOld.11.desc"), 11, "marblepillarold/a1-stonepillar-plainbottomplain"); - blockMarblePillar.carverHelper.addVariation(I18n.format("tile.marblePillarOld.12.desc"), 12, "marblepillarold/a1-stonepillar-greektopgreek"); - blockMarblePillar.carverHelper.addVariation(I18n.format("tile.marblePillarOld.13.desc"), 13, "marblepillarold/a1-stonepillar-plaintopgreek"); - blockMarblePillar.carverHelper.addVariation(I18n.format("tile.marblePillarOld.14.desc"), 14, "marblepillarold/a1-stonepillar-greekbottomgreek"); - blockMarblePillar.carverHelper.addVariation(I18n.format("tile.marblePillarOld.15.desc"), 15, "marblepillarold/a1-stonepillar-plainbottomgreek"); + blockMarblePillar.carverHelper.addVariation(I18n.format("chisel.tile.marblePillarOld.0.desc"), 0, "marblepillarold/column"); + blockMarblePillar.carverHelper.addVariation(I18n.format("chisel.tile.marblePillarOld.1.desc"), 1, "marblepillarold/capstone"); + blockMarblePillar.carverHelper.addVariation(I18n.format("chisel.tile.marblePillarOld.2.desc"), 2, "marblepillarold/base"); + blockMarblePillar.carverHelper.addVariation(I18n.format("chisel.tile.marblePillarOld.3.desc"), 3, "marblepillarold/small"); + blockMarblePillar.carverHelper.addVariation(I18n.format("chisel.tile.marblePillarOld.4.desc"), 4, "marblepillarold/pillar-carved"); + blockMarblePillar.carverHelper.addVariation(I18n.format("chisel.tile.marblePillarOld.5.desc"), 5, "marblepillarold/a1-stoneornamental-marblegreek"); + blockMarblePillar.carverHelper.addVariation(I18n.format("chisel.tile.marblePillarOld.6.desc"), 6, "marblepillarold/a1-stonepillar-greek"); + blockMarblePillar.carverHelper.addVariation(I18n.format("chisel.tile.marblePillarOld.7.desc"), 7, "marblepillarold/a1-stonepillar-plain"); + blockMarblePillar.carverHelper.addVariation(I18n.format("chisel.tile.marblePillarOld.8.desc"), 8, "marblepillarold/a1-stonepillar-greektopplain"); + blockMarblePillar.carverHelper.addVariation(I18n.format("chisel.tile.marblePillarOld.9.desc"), 9, "marblepillarold/a1-stonepillar-plaintopplain"); + blockMarblePillar.carverHelper.addVariation(I18n.format("chisel.tile.marblePillarOld.10.desc"), 10, "marblepillarold/a1-stonepillar-greekbottomplain"); + blockMarblePillar.carverHelper.addVariation(I18n.format("chisel.tile.marblePillarOld.11.desc"), 11, "marblepillarold/a1-stonepillar-plainbottomplain"); + blockMarblePillar.carverHelper.addVariation(I18n.format("chisel.tile.marblePillarOld.12.desc"), 12, "marblepillarold/a1-stonepillar-greektopgreek"); + blockMarblePillar.carverHelper.addVariation(I18n.format("chisel.tile.marblePillarOld.13.desc"), 13, "marblepillarold/a1-stonepillar-plaintopgreek"); + blockMarblePillar.carverHelper.addVariation(I18n.format("chisel.tile.marblePillarOld.14.desc"), 14, "marblepillarold/a1-stonepillar-greekbottomgreek"); + blockMarblePillar.carverHelper.addVariation(I18n.format("chisel.tile.marblePillarOld.15.desc"), 15, "marblepillarold/a1-stonepillar-plainbottomgreek"); } else { blockMarblePillar = (BlockCarvable) new BlockMarblePillar(Material.rock).setHardness(2.0F).setResistance(10F).setStepSound(Block.soundTypeStone); blockMarblePillar.carverHelper.setChiselBlockName("Marble Pillar"); - blockMarblePillar.carverHelper.addVariation(I18n.format("tile.marblePillar.0.desc"), 0, "marblepillar/pillar"); - blockMarblePillar.carverHelper.addVariation(I18n.format("tile.marblePillar.1.desc"), 1, "marblepillar/default"); - blockMarblePillar.carverHelper.addVariation(I18n.format("tile.marblePillar.2.desc"), 2, "marblepillar/simple"); - blockMarblePillar.carverHelper.addVariation(I18n.format("tile.marblePillar.3.desc"), 3, "marblepillar/convex"); - blockMarblePillar.carverHelper.addVariation(I18n.format("tile.marblePillar.4.desc"), 4, "marblepillar/rough"); - blockMarblePillar.carverHelper.addVariation(I18n.format("tile.marblePillar.5.desc"), 5, "marblepillar/greekdecor"); - blockMarblePillar.carverHelper.addVariation(I18n.format("tile.marblePillar.6.desc"), 6, "marblepillar/greekgreek"); - blockMarblePillar.carverHelper.addVariation(I18n.format("tile.marblePillar.7.desc"), 7, "marblepillar/greekplain"); - blockMarblePillar.carverHelper.addVariation(I18n.format("tile.marblePillar.8.desc"), 8, "marblepillar/plaindecor"); - blockMarblePillar.carverHelper.addVariation(I18n.format("tile.marblePillar.9.desc"), 9, "marblepillar/plaingreek"); - blockMarblePillar.carverHelper.addVariation(I18n.format("tile.marblePillar.10.desc"), 10, "marblepillar/plainplain"); - blockMarblePillar.carverHelper.addVariation(I18n.format("tile.marblePillar.11.desc"), 11, "marblepillar/widedecor"); - blockMarblePillar.carverHelper.addVariation(I18n.format("tile.marblePillar.12.desc"), 12, "marblepillar/widegreek"); - blockMarblePillar.carverHelper.addVariation(I18n.format("tile.marblePillar.13.desc"), 13, "marblepillar/wideplain"); - blockMarblePillar.carverHelper.addVariation(I18n.format("tile.marblePillar.14.desc"), 14, "marblepillar/carved"); - blockMarblePillar.carverHelper.addVariation(I18n.format("tile.marblePillar.15.desc"), 15, "marblepillar/ornamental"); + blockMarblePillar.carverHelper.addVariation(I18n.format("chisel.tile.marblePillar.0.desc"), 0, "marblepillar/pillar"); + blockMarblePillar.carverHelper.addVariation(I18n.format("chisel.tile.marblePillar.1.desc"), 1, "marblepillar/default"); + blockMarblePillar.carverHelper.addVariation(I18n.format("chisel.tile.marblePillar.2.desc"), 2, "marblepillar/simple"); + blockMarblePillar.carverHelper.addVariation(I18n.format("chisel.tile.marblePillar.3.desc"), 3, "marblepillar/convex"); + blockMarblePillar.carverHelper.addVariation(I18n.format("chisel.tile.marblePillar.4.desc"), 4, "marblepillar/rough"); + blockMarblePillar.carverHelper.addVariation(I18n.format("chisel.tile.marblePillar.5.desc"), 5, "marblepillar/greekdecor"); + blockMarblePillar.carverHelper.addVariation(I18n.format("chisel.tile.marblePillar.6.desc"), 6, "marblepillar/greekgreek"); + blockMarblePillar.carverHelper.addVariation(I18n.format("chisel.tile.marblePillar.7.desc"), 7, "marblepillar/greekplain"); + blockMarblePillar.carverHelper.addVariation(I18n.format("chisel.tile.marblePillar.8.desc"), 8, "marblepillar/plaindecor"); + blockMarblePillar.carverHelper.addVariation(I18n.format("chisel.tile.marblePillar.9.desc"), 9, "marblepillar/plaingreek"); + blockMarblePillar.carverHelper.addVariation(I18n.format("chisel.tile.marblePillar.10.desc"), 10, "marblepillar/plainplain"); + blockMarblePillar.carverHelper.addVariation(I18n.format("chisel.tile.marblePillar.11.desc"), 11, "marblepillar/widedecor"); + blockMarblePillar.carverHelper.addVariation(I18n.format("chisel.tile.marblePillar.12.desc"), 12, "marblepillar/widegreek"); + blockMarblePillar.carverHelper.addVariation(I18n.format("chisel.tile.marblePillar.13.desc"), 13, "marblepillar/wideplain"); + blockMarblePillar.carverHelper.addVariation(I18n.format("chisel.tile.marblePillar.14.desc"), 14, "marblepillar/carved"); + blockMarblePillar.carverHelper.addVariation(I18n.format("chisel.tile.marblePillar.15.desc"), 15, "marblepillar/ornamental"); } blockMarblePillar.carverHelper.register(blockMarblePillar, "marblePillar"); Carving.chisel.setGroupClass("marblePillar", "marble"); @@ -177,128 +177,128 @@ public class ChiselBlocks blockMarblePillarSlab.carverHelper.setChiselBlockName("Marble Pillar Slab"); if(Chisel.oldPillars) { - blockMarblePillarSlab.carverHelper.addVariation(I18n.format("tile.marblePillarSlabOld.0.desc"), 0, "marblepillarslabold/column"); - blockMarblePillarSlab.carverHelper.addVariation(I18n.format("tile.marblePillarSlabOld.1.desc"), 1, "marblepillarslabold/capstone"); - blockMarblePillarSlab.carverHelper.addVariation(I18n.format("tile.marblePillarSlabOld.2.desc"), 2, "marblepillarslabold/base"); - blockMarblePillarSlab.carverHelper.addVariation(I18n.format("tile.marblePillarSlabOld.3.desc"), 3, "marblepillarslabold/small"); - blockMarblePillarSlab.carverHelper.addVariation(I18n.format("tile.marblePillarSlabOld.4.desc"), 4, "marblepillarslabold/pillar-carved"); - blockMarblePillarSlab.carverHelper.addVariation(I18n.format("tile.marblePillarSlabOld.5.desc"), 5, "marblepillarslabold/a1-stoneornamental-marblegreek"); - blockMarblePillarSlab.carverHelper.addVariation(I18n.format("tile.marblePillarSlabOld.6.desc"), 6, "marblepillarslabold/a1-stonepillar-greek"); - blockMarblePillarSlab.carverHelper.addVariation(I18n.format("tile.marblePillarSlabOld.7.desc"), 7, "marblepillarslabold/a1-stonepillar-plain"); - blockMarblePillarSlab.carverHelper.addVariation(I18n.format("tile.marblePillarSlabOld.8.desc"), 8, "marblepillarslabold/a1-stonepillar-greektopplain"); - blockMarblePillarSlab.carverHelper.addVariation(I18n.format("tile.marblePillarSlabOld.9.desc"), 9, "marblepillarslabold/a1-stonepillar-plaintopplain"); - blockMarblePillarSlab.carverHelper.addVariation(I18n.format("tile.marblePillarSlabOld.10.desc"), 10, "marblepillarslabold/a1-stonepillar-greekbottomplain"); - blockMarblePillarSlab.carverHelper.addVariation(I18n.format("tile.marblePillarSlabOld.11.desc"), 11, "marblepillarslabold/a1-stonepillar-plainbottomplain"); - blockMarblePillarSlab.carverHelper.addVariation(I18n.format("tile.marblePillarSlabOld.12.desc"), 12, "marblepillarslabold/a1-stonepillar-greektopgreek"); - blockMarblePillarSlab.carverHelper.addVariation(I18n.format("tile.marblePillarSlabOld.13.desc"), 13, "marblepillarslabold/a1-stonepillar-plaintopgreek"); - blockMarblePillarSlab.carverHelper.addVariation(I18n.format("tile.marblePillarSlabOld.14.desc"), 14, "marblepillarslabold/a1-stonepillar-greekbottomgreek"); - blockMarblePillarSlab.carverHelper.addVariation(I18n.format("tile.marblePillarSlabOld.15.desc"), 15, "marblepillarslabold/a1-stonepillar-plainbottomgreek"); + blockMarblePillarSlab.carverHelper.addVariation(I18n.format("chisel.tile.marblePillarSlabOld.0.desc"), 0, "marblepillarslabold/column"); + blockMarblePillarSlab.carverHelper.addVariation(I18n.format("chisel.tile.marblePillarSlabOld.1.desc"), 1, "marblepillarslabold/capstone"); + blockMarblePillarSlab.carverHelper.addVariation(I18n.format("chisel.tile.marblePillarSlabOld.2.desc"), 2, "marblepillarslabold/base"); + blockMarblePillarSlab.carverHelper.addVariation(I18n.format("chisel.tile.marblePillarSlabOld.3.desc"), 3, "marblepillarslabold/small"); + blockMarblePillarSlab.carverHelper.addVariation(I18n.format("chisel.tile.marblePillarSlabOld.4.desc"), 4, "marblepillarslabold/pillar-carved"); + blockMarblePillarSlab.carverHelper.addVariation(I18n.format("chisel.tile.marblePillarSlabOld.5.desc"), 5, "marblepillarslabold/a1-stoneornamental-marblegreek"); + blockMarblePillarSlab.carverHelper.addVariation(I18n.format("chisel.tile.marblePillarSlabOld.6.desc"), 6, "marblepillarslabold/a1-stonepillar-greek"); + blockMarblePillarSlab.carverHelper.addVariation(I18n.format("chisel.tile.marblePillarSlabOld.7.desc"), 7, "marblepillarslabold/a1-stonepillar-plain"); + blockMarblePillarSlab.carverHelper.addVariation(I18n.format("chisel.tile.marblePillarSlabOld.8.desc"), 8, "marblepillarslabold/a1-stonepillar-greektopplain"); + blockMarblePillarSlab.carverHelper.addVariation(I18n.format("chisel.tile.marblePillarSlabOld.9.desc"), 9, "marblepillarslabold/a1-stonepillar-plaintopplain"); + blockMarblePillarSlab.carverHelper.addVariation(I18n.format("chisel.tile.marblePillarSlabOld.10.desc"), 10, "marblepillarslabold/a1-stonepillar-greekbottomplain"); + blockMarblePillarSlab.carverHelper.addVariation(I18n.format("chisel.tile.marblePillarSlabOld.11.desc"), 11, "marblepillarslabold/a1-stonepillar-plainbottomplain"); + blockMarblePillarSlab.carverHelper.addVariation(I18n.format("chisel.tile.marblePillarSlabOld.12.desc"), 12, "marblepillarslabold/a1-stonepillar-greektopgreek"); + blockMarblePillarSlab.carverHelper.addVariation(I18n.format("chisel.tile.marblePillarSlabOld.13.desc"), 13, "marblepillarslabold/a1-stonepillar-plaintopgreek"); + blockMarblePillarSlab.carverHelper.addVariation(I18n.format("chisel.tile.marblePillarSlabOld.14.desc"), 14, "marblepillarslabold/a1-stonepillar-greekbottomgreek"); + blockMarblePillarSlab.carverHelper.addVariation(I18n.format("chisel.tile.marblePillarSlabOld.15.desc"), 15, "marblepillarslabold/a1-stonepillar-plainbottomgreek"); } else { - blockMarblePillarSlab.carverHelper.addVariation(I18n.format("tile.marblePillarSlab.0.desc"), 0, "marblepillarslab/pillar"); - blockMarblePillarSlab.carverHelper.addVariation(I18n.format("tile.marblePillarSlab.1.desc"), 1, "marblepillarslab/default"); - blockMarblePillarSlab.carverHelper.addVariation(I18n.format("tile.marblePillarSlab.2.desc"), 2, "marblepillarslab/simple"); - blockMarblePillarSlab.carverHelper.addVariation(I18n.format("tile.marblePillarSlab.3.desc"), 3, "marblepillarslab/convex"); - blockMarblePillarSlab.carverHelper.addVariation(I18n.format("tile.marblePillarSlab.4.desc"), 4, "marblepillarslab/rough"); - blockMarblePillarSlab.carverHelper.addVariation(I18n.format("tile.marblePillarSlab.5.desc"), 5, "marblepillarslab/greekdecor"); - blockMarblePillarSlab.carverHelper.addVariation(I18n.format("tile.marblePillarSlab.6.desc"), 6, "marblepillarslab/greekgreek"); - blockMarblePillarSlab.carverHelper.addVariation(I18n.format("tile.marblePillarSlab.7.desc"), 7, "marblepillarslab/greekplain"); - blockMarblePillarSlab.carverHelper.addVariation(I18n.format("tile.marblePillarSlab.8.desc"), 8, "marblepillarslab/plaindecor"); - blockMarblePillarSlab.carverHelper.addVariation(I18n.format("tile.marblePillarSlab.9.desc"), 9, "marblepillarslab/plaingreek"); - blockMarblePillarSlab.carverHelper.addVariation(I18n.format("tile.marblePillarSlab.10.desc"), 10, "marblepillarslab/plainplain"); - blockMarblePillarSlab.carverHelper.addVariation(I18n.format("tile.marblePillarSlab.11.desc"), 11, "marblepillarslab/widedecor"); - blockMarblePillarSlab.carverHelper.addVariation(I18n.format("tile.marblePillarSlab.12.desc"), 12, "marblepillarslab/widegreek"); - blockMarblePillarSlab.carverHelper.addVariation(I18n.format("tile.marblePillarSlab.13.desc"), 13, "marblepillarslab/wideplain"); - blockMarblePillarSlab.carverHelper.addVariation(I18n.format("tile.marblePillarSlab.14.desc"), 14, "marblepillarslab/carved"); - blockMarblePillarSlab.carverHelper.addVariation(I18n.format("tile.marblePillarSlab.15.desc"), 15, "marblepillarslab/ornamental"); + blockMarblePillarSlab.carverHelper.addVariation(I18n.format("chisel.tile.marblePillarSlab.0.desc"), 0, "marblepillarslab/pillar"); + blockMarblePillarSlab.carverHelper.addVariation(I18n.format("chisel.tile.marblePillarSlab.1.desc"), 1, "marblepillarslab/default"); + blockMarblePillarSlab.carverHelper.addVariation(I18n.format("chisel.tile.marblePillarSlab.2.desc"), 2, "marblepillarslab/simple"); + blockMarblePillarSlab.carverHelper.addVariation(I18n.format("chisel.tile.marblePillarSlab.3.desc"), 3, "marblepillarslab/convex"); + blockMarblePillarSlab.carverHelper.addVariation(I18n.format("chisel.tile.marblePillarSlab.4.desc"), 4, "marblepillarslab/rough"); + blockMarblePillarSlab.carverHelper.addVariation(I18n.format("chisel.tile.marblePillarSlab.5.desc"), 5, "marblepillarslab/greekdecor"); + blockMarblePillarSlab.carverHelper.addVariation(I18n.format("chisel.tile.marblePillarSlab.6.desc"), 6, "marblepillarslab/greekgreek"); + blockMarblePillarSlab.carverHelper.addVariation(I18n.format("chisel.tile.marblePillarSlab.7.desc"), 7, "marblepillarslab/greekplain"); + blockMarblePillarSlab.carverHelper.addVariation(I18n.format("chisel.tile.marblePillarSlab.8.desc"), 8, "marblepillarslab/plaindecor"); + blockMarblePillarSlab.carverHelper.addVariation(I18n.format("chisel.tile.marblePillarSlab.9.desc"), 9, "marblepillarslab/plaingreek"); + blockMarblePillarSlab.carverHelper.addVariation(I18n.format("chisel.tile.marblePillarSlab.10.desc"), 10, "marblepillarslab/plainplain"); + blockMarblePillarSlab.carverHelper.addVariation(I18n.format("chisel.tile.marblePillarSlab.11.desc"), 11, "marblepillarslab/widedecor"); + blockMarblePillarSlab.carverHelper.addVariation(I18n.format("chisel.tile.marblePillarSlab.12.desc"), 12, "marblepillarslab/widegreek"); + blockMarblePillarSlab.carverHelper.addVariation(I18n.format("chisel.tile.marblePillarSlab.13.desc"), 13, "marblepillarslab/wideplain"); + blockMarblePillarSlab.carverHelper.addVariation(I18n.format("chisel.tile.marblePillarSlab.14.desc"), 14, "marblepillarslab/carved"); + blockMarblePillarSlab.carverHelper.addVariation(I18n.format("chisel.tile.marblePillarSlab.15.desc"), 15, "marblepillarslab/ornamental"); } blockMarblePillarSlab.carverHelper.register(blockMarblePillarSlab, "marblePillarSlab", ItemMarbleSlab.class); } BlockMarbleStairsMaker makerMarbleStairs = new BlockMarbleStairsMaker(blockMarble); makerMarbleStairs.carverHelper.setChiselBlockName("Marble Stairs"); - makerMarbleStairs.carverHelper.addVariation("Raw marble stairs", 0, "marble"); - makerMarbleStairs.carverHelper.addVariation("Marble brick stairs", 1, "marbleslab/a1-stoneornamental-marblebrick"); - makerMarbleStairs.carverHelper.addVariation("Classic marble panel stairs", 2, "marbleslab/a1-stoneornamental-marbleclassicpanel"); - makerMarbleStairs.carverHelper.addVariation("Ornate marble panel stairs", 3, "marbleslab/a1-stoneornamental-marbleornate"); - makerMarbleStairs.carverHelper.addVariation("Marble panel stairs", 4, "marbleslab/a1-stoneornamental-marblepanel"); - makerMarbleStairs.carverHelper.addVariation("Marble block stairs", 5, "marbleslab/terrain-pistonback-marble"); - makerMarbleStairs.carverHelper.addVariation("Dark creeper marble stairs", 6, "marbleslab/terrain-pistonback-marblecreeperdark"); - makerMarbleStairs.carverHelper.addVariation("Light creeper marble stairs", 7, "marbleslab/terrain-pistonback-marblecreeperlight"); - makerMarbleStairs.carverHelper.addVariation("Carved marble stairs", 8, "marbleslab/a1-stoneornamental-marblecarved"); - makerMarbleStairs.carverHelper.addVariation("Radial carved marble stairs", 9, "marbleslab/a1-stoneornamental-marblecarvedradial"); - makerMarbleStairs.carverHelper.addVariation("Marble stairs with dent", 10, "marbleslab/terrain-pistonback-marbledent"); - makerMarbleStairs.carverHelper.addVariation("Marble stairs with large dent ", 11, "marbleslab/terrain-pistonback-marbledent-small"); - makerMarbleStairs.carverHelper.addVariation("Marble tiles stairs", 12, "marbleslab/marble-bricks"); - makerMarbleStairs.carverHelper.addVariation("Arranged marble tiles stairs", 13, "marbleslab/marble-arranged-bricks"); - makerMarbleStairs.carverHelper.addVariation("Fancy marble tiles stairs", 14, "marbleslab/marble-fancy-bricks"); - makerMarbleStairs.carverHelper.addVariation("Marble blocks stairs", 15, "marbleslab/marble-blocks"); - makerMarbleStairs.create("chisel.marbleStairs"); + makerMarbleStairs.carverHelper.addVariation(I18n.format("chisel.tile.marbleStairs.0.desc"), 0, "marble"); + makerMarbleStairs.carverHelper.addVariation(I18n.format("chisel.tile.marbleStairs.6.desc"), 1, "marbleslab/a1-stoneornamental-marblebrick"); + makerMarbleStairs.carverHelper.addVariation(I18n.format("chisel.tile.marbleStairs.2.desc"), 2, "marbleslab/a1-stoneornamental-marbleclassicpanel"); + makerMarbleStairs.carverHelper.addVariation(I18n.format("chisel.tile.marbleStairs.3.desc"), 3, "marbleslab/a1-stoneornamental-marbleornate"); + makerMarbleStairs.carverHelper.addVariation(I18n.format("chisel.tile.marbleStairs.4.desc"), 4, "marbleslab/a1-stoneornamental-marblepanel"); + makerMarbleStairs.carverHelper.addVariation(I18n.format("chisel.tile.marbleStairs.5.desc"), 5, "marbleslab/terrain-pistonback-marble"); + makerMarbleStairs.carverHelper.addVariation(I18n.format("chisel.tile.marbleStairs.6.desc"), 6, "marbleslab/terrain-pistonback-marblecreeperdark"); + makerMarbleStairs.carverHelper.addVariation(I18n.format("chisel.tile.marbleStairs.7.desc"), 7, "marbleslab/terrain-pistonback-marblecreeperlight"); + makerMarbleStairs.carverHelper.addVariation(I18n.format("chisel.tile.marbleStairs.8.desc"), 8, "marbleslab/a1-stoneornamental-marblecarved"); + makerMarbleStairs.carverHelper.addVariation(I18n.format("chisel.tile.marbleStairs.9.desc"), 9, "marbleslab/a1-stoneornamental-marblecarvedradial"); + makerMarbleStairs.carverHelper.addVariation(I18n.format("chisel.tile.marbleStairs.10.desc"), 10, "marbleslab/terrain-pistonback-marbledent"); + makerMarbleStairs.carverHelper.addVariation(I18n.format("chisel.tile.marbleStairs.11.desc"), 11, "marbleslab/terrain-pistonback-marbledent-small"); + makerMarbleStairs.carverHelper.addVariation(I18n.format("chisel.tile.marbleStairs.12.desc"), 12, "marbleslab/marble-bricks"); + makerMarbleStairs.carverHelper.addVariation(I18n.format("chisel.tile.marbleStairs.13.desc"), 13, "marbleslab/marble-arranged-bricks"); + makerMarbleStairs.carverHelper.addVariation(I18n.format("chisel.tile.marbleStairs.14.desc"), 14, "marbleslab/marble-fancy-bricks"); + makerMarbleStairs.carverHelper.addVariation(I18n.format("chisel.tile.marbleStairs.15.desc"), 15, "marbleslab/marble-blocks"); + makerMarbleStairs.create("marbleStairs"); } if(Chisel.featureEnabled("limestone")) { blockLimestone = (BlockCarvable) new BlockCarvable().setHardness(2.0F).setResistance(10F).setStepSound(Block.soundTypeStone); blockLimestone.carverHelper.setChiselBlockName("Limestone"); - blockLimestone.carverHelper.addVariation("Limestone", 0, "limestone"); - blockLimestone.carverHelper.addVariation("Small limestone tiles", 1, "limestone/terrain-cobbsmalltilelight"); - blockLimestone.carverHelper.addVariation("French limestone tiles", 2, "limestone/terrain-cob-frenchlight"); - blockLimestone.carverHelper.addVariation("French limestone tiles", 3, "limestone/terrain-cob-french2light"); - blockLimestone.carverHelper.addVariation("Creeper limestone tiles", 4, "limestone/terrain-cobmoss-creepdungeonlight"); - blockLimestone.carverHelper.addVariation("Small limestone bricks", 5, "limestone/terrain-cob-smallbricklight"); - blockLimestone.carverHelper.addVariation("Damaged limestone tiles", 6, "limestone/terrain-mossysmalltilelight"); - blockLimestone.carverHelper.addVariation("Smooth limestone", 7, "limestone/terrain-pistonback-dungeon"); - blockLimestone.carverHelper.addVariation("Limestone with ornate panel", 8, "limestone/terrain-pistonback-dungeonornate"); - blockLimestone.carverHelper.addVariation("Limestone with ornate panel", 9, "limestone/terrain-pistonback-dungeonvent"); - blockLimestone.carverHelper.addVariation("Limestone with creeper panel", 10, "limestone/terrain-pistonback-lightcreeper"); - blockLimestone.carverHelper.addVariation("Limestone with dent", 11, "limestone/terrain-pistonback-lightdent"); - blockLimestone.carverHelper.addVariation("Limestone with panel", 12, "limestone/terrain-pistonback-lightemboss"); - blockLimestone.carverHelper.addVariation("Large limestone tiles", 13, "limestone/terrain-pistonback-lightfour"); - blockLimestone.carverHelper.addVariation("Limestone with light panel", 14, "limestone/terrain-pistonback-lightmarker"); - blockLimestone.carverHelper.addVariation("Limestone with dark panel", 15, "limestone/terrain-pistonback-lightpanel"); + blockLimestone.carverHelper.addVariation(I18n.format("chisel.tile.limestone.0.desc"), 0, "limestone"); + blockLimestone.carverHelper.addVariation(I18n.format("chisel.tile.limestone.1.desc"), 1, "limestone/terrain-cobbsmalltilelight"); + blockLimestone.carverHelper.addVariation(I18n.format("chisel.tile.limestone.2.desc"), 2, "limestone/terrain-cob-frenchlight"); + blockLimestone.carverHelper.addVariation(I18n.format("chisel.tile.limestone.3.desc"), 3, "limestone/terrain-cob-french2light"); + blockLimestone.carverHelper.addVariation(I18n.format("chisel.tile.limestone.4.desc"), 4, "limestone/terrain-cobmoss-creepdungeonlight"); + blockLimestone.carverHelper.addVariation(I18n.format("chisel.tile.limestone.5.desc"), 5, "limestone/terrain-cob-smallbricklight"); + blockLimestone.carverHelper.addVariation(I18n.format("chisel.tile.limestone.6.desc"), 6, "limestone/terrain-mossysmalltilelight"); + blockLimestone.carverHelper.addVariation(I18n.format("chisel.tile.limestone.7.desc"), 7, "limestone/terrain-pistonback-dungeon"); + blockLimestone.carverHelper.addVariation(I18n.format("chisel.tile.limestone.8.desc"), 8, "limestone/terrain-pistonback-dungeonornate"); + blockLimestone.carverHelper.addVariation(I18n.format("chisel.tile.limestone.9.desc"), 9, "limestone/terrain-pistonback-dungeonvent"); + blockLimestone.carverHelper.addVariation(I18n.format("chisel.tile.limestone.10.desc"), 10, "limestone/terrain-pistonback-lightcreeper"); + blockLimestone.carverHelper.addVariation(I18n.format("chisel.tile.limestone.11.desc"), 11, "limestone/terrain-pistonback-lightdent"); + blockLimestone.carverHelper.addVariation(I18n.format("chisel.tile.limestone.12.desc"), 12, "limestone/terrain-pistonback-lightemboss"); + blockLimestone.carverHelper.addVariation(I18n.format("chisel.tile.limestone.13.desc"), 13, "limestone/terrain-pistonback-lightfour"); + blockLimestone.carverHelper.addVariation(I18n.format("chisel.tile.limestone.14.desc"), 14, "limestone/terrain-pistonback-lightmarker"); + blockLimestone.carverHelper.addVariation(I18n.format("chisel.tile.limestone.15.desc"), 15, "limestone/terrain-pistonback-lightpanel"); blockLimestone.carverHelper.register(blockLimestone, "limestone"); OreDictionary.registerOre("blockLimestone", blockLimestone); Carving.chisel.registerOre("limestone", "blockLimestone"); blockLimestoneSlab = (BlockMarbleSlab) new BlockMarbleSlab(blockLimestone).setHardness(2.0F).setResistance(10F); blockLimestoneSlab.carverHelper.setChiselBlockName("Limestone Slab"); - blockLimestoneSlab.carverHelper.addVariation("Limestone slab", 0, "limestone"); - blockLimestoneSlab.carverHelper.addVariation("Small limestone tiles slab", 1, "limestone/terrain-cobbsmalltilelight"); - blockLimestoneSlab.carverHelper.addVariation("French limestone tiles slab", 2, "limestone/terrain-cob-frenchlight"); - blockLimestoneSlab.carverHelper.addVariation("French limestone tiles slab", 3, "limestone/terrain-cob-french2light"); - blockLimestoneSlab.carverHelper.addVariation("Creeper limestone tiles slab", 4, "limestone/terrain-cobmoss-creepdungeonlight"); - blockLimestoneSlab.carverHelper.addVariation("Small limestone bricks slab", 5, "limestone/terrain-cob-smallbricklight"); - blockLimestoneSlab.carverHelper.addVariation("Damaged limestone tiles slab", 6, "limestone/terrain-mossysmalltilelight"); - blockLimestoneSlab.carverHelper.addVariation("Smooth limestone slab", 7, "limestone/terrain-pistonback-dungeon"); - blockLimestoneSlab.carverHelper.addVariation("Limestone slab with ornate panel", 8, "limestone/terrain-pistonback-dungeonornate"); - blockLimestoneSlab.carverHelper.addVariation("Limestone slab with ornate panel", 9, "limestone/terrain-pistonback-dungeonvent"); - blockLimestoneSlab.carverHelper.addVariation("Limestone slab with creeper panel", 10, "limestone/terrain-pistonback-lightcreeper"); - blockLimestoneSlab.carverHelper.addVariation("Limestone slab with dent", 11, "limestone/terrain-pistonback-lightdent"); - blockLimestoneSlab.carverHelper.addVariation("Limestone slab with panel", 12, "limestone/terrain-pistonback-lightemboss"); - blockLimestoneSlab.carverHelper.addVariation("Large limestone tiles slab", 13, "limestone/terrain-pistonback-lightfour"); - blockLimestoneSlab.carverHelper.addVariation("Limestone slab with light panel", 14, "limestone/terrain-pistonback-lightmarker"); - blockLimestoneSlab.carverHelper.addVariation("Limestone slab with dark panel", 15, "limestone/terrain-pistonback-lightpanel"); + blockLimestoneSlab.carverHelper.addVariation(I18n.format("chisel.tile.limestoneSlab.0.desc"), 0, "limestone"); + blockLimestoneSlab.carverHelper.addVariation(I18n.format("chisel.tile.limestoneSlab.1.desc"), 1, "limestone/terrain-cobbsmalltilelight"); + blockLimestoneSlab.carverHelper.addVariation(I18n.format("chisel.tile.limestoneSlab.2.desc"), 2, "limestone/terrain-cob-frenchlight"); + blockLimestoneSlab.carverHelper.addVariation(I18n.format("chisel.tile.limestoneSlab.3.desc"), 3, "limestone/terrain-cob-french2light"); + blockLimestoneSlab.carverHelper.addVariation(I18n.format("chisel.tile.limestoneSlab.4.desc"), 4, "limestone/terrain-cobmoss-creepdungeonlight"); + blockLimestoneSlab.carverHelper.addVariation(I18n.format("chisel.tile.limestoneSlab.5.desc"), 5, "limestone/terrain-cob-smallbricklight"); + blockLimestoneSlab.carverHelper.addVariation(I18n.format("chisel.tile.limestoneSlab.6.desc"), 6, "limestone/terrain-mossysmalltilelight"); + blockLimestoneSlab.carverHelper.addVariation(I18n.format("chisel.tile.limestoneSlab.7.desc"), 7, "limestone/terrain-pistonback-dungeon"); + blockLimestoneSlab.carverHelper.addVariation(I18n.format("chisel.tile.limestoneSlab.8.desc"), 8, "limestone/terrain-pistonback-dungeonornate"); + blockLimestoneSlab.carverHelper.addVariation(I18n.format("chisel.tile.limestoneSlab.9.desc"), 9, "limestone/terrain-pistonback-dungeonvent"); + blockLimestoneSlab.carverHelper.addVariation(I18n.format("chisel.tile.limestoneSlab.10.desc"), 10, "limestone/terrain-pistonback-lightcreeper"); + blockLimestoneSlab.carverHelper.addVariation(I18n.format("chisel.tile.limestoneSlab.11.desc"), 11, "limestone/terrain-pistonback-lightdent"); + blockLimestoneSlab.carverHelper.addVariation(I18n.format("chisel.tile.limestoneSlab.12.desc"), 12, "limestone/terrain-pistonback-lightemboss"); + blockLimestoneSlab.carverHelper.addVariation(I18n.format("chisel.tile.limestoneSlab.13.desc"), 13, "limestone/terrain-pistonback-lightfour"); + blockLimestoneSlab.carverHelper.addVariation(I18n.format("chisel.tile.limestoneSlab.14.desc"), 14, "limestone/terrain-pistonback-lightmarker"); + blockLimestoneSlab.carverHelper.addVariation(I18n.format("chisel.tile.limestoneSlab.15.desc"), 15, "limestone/terrain-pistonback-lightpanel"); blockLimestoneSlab.carverHelper.register(blockLimestoneSlab, "limestoneSlab", ItemMarbleSlab.class); BlockMarbleStairsMaker makerLimestoneStairs = new BlockMarbleStairsMaker(blockLimestone); makerLimestoneStairs.carverHelper.setChiselBlockName("Limestone Stairs"); - makerLimestoneStairs.carverHelper.addVariation("Limestone stairs", 0, "limestone"); - makerLimestoneStairs.carverHelper.addVariation("Small limestone tiles stairs", 1, "limestone/terrain-cobbsmalltilelight"); - makerLimestoneStairs.carverHelper.addVariation("French limestone tiles stairs", 2, "limestone/terrain-cob-frenchlight"); - makerLimestoneStairs.carverHelper.addVariation("French limestone tiles stairs", 3, "limestone/terrain-cob-french2light"); - makerLimestoneStairs.carverHelper.addVariation("Creeper limestone tiles stairs", 4, "limestone/terrain-cobmoss-creepdungeonlight"); - makerLimestoneStairs.carverHelper.addVariation("Small limestone bricks stairs", 5, "limestone/terrain-cob-smallbricklight"); - makerLimestoneStairs.carverHelper.addVariation("Damaged limestone tiles stairs", 6, "limestone/terrain-mossysmalltilelight"); - makerLimestoneStairs.carverHelper.addVariation("Smooth limestone stairs", 7, "limestone/terrain-pistonback-dungeon"); - makerLimestoneStairs.carverHelper.addVariation("Limestone stairs with ornate panel", 8, "limestone/terrain-pistonback-dungeonornate"); - makerLimestoneStairs.carverHelper.addVariation("Limestone stairs with ornate panel", 9, "limestone/terrain-pistonback-dungeonvent"); - makerLimestoneStairs.carverHelper.addVariation("Limestone stairs with creeper panel", 10, "limestone/terrain-pistonback-lightcreeper"); - makerLimestoneStairs.carverHelper.addVariation("Limestone stairs with dent", 11, "limestone/terrain-pistonback-lightdent"); - makerLimestoneStairs.carverHelper.addVariation("Limestone stairs with panel", 12, "limestone/terrain-pistonback-lightemboss"); - makerLimestoneStairs.carverHelper.addVariation("Large limestone tiles stairs", 13, "limestone/terrain-pistonback-lightfour"); - makerLimestoneStairs.carverHelper.addVariation("Limestone stairs with light panel", 14, "limestone/terrain-pistonback-lightmarker"); - makerLimestoneStairs.carverHelper.addVariation("Limestone stairs with dark panel", 15, "limestone/terrain-pistonback-lightpanel"); - makerLimestoneStairs.create("chisel.limestoneStairs"); + makerLimestoneStairs.carverHelper.addVariation(I18n.format("chisel.tile.limestoneStairs.0.desc"), 0, "limestone"); + makerLimestoneStairs.carverHelper.addVariation(I18n.format("chisel.tile.limestoneStairs.1.desc"), 1, "limestone/terrain-cobbsmalltilelight"); + makerLimestoneStairs.carverHelper.addVariation(I18n.format("chisel.tile.limestoneStairs.2.desc"), 2, "limestone/terrain-cob-frenchlight"); + makerLimestoneStairs.carverHelper.addVariation(I18n.format("chisel.tile.limestoneStairs.3.desc"), 3, "limestone/terrain-cob-french2light"); + makerLimestoneStairs.carverHelper.addVariation(I18n.format("chisel.tile.limestoneStairs.4.desc"), 4, "limestone/terrain-cobmoss-creepdungeonlight"); + makerLimestoneStairs.carverHelper.addVariation(I18n.format("chisel.tile.limestoneStairs.5.desc"), 5, "limestone/terrain-cob-smallbricklight"); + makerLimestoneStairs.carverHelper.addVariation(I18n.format("chisel.tile.limestoneStairs.6.desc"), 6, "limestone/terrain-mossysmalltilelight"); + makerLimestoneStairs.carverHelper.addVariation(I18n.format("chisel.tile.limestoneStairs.7.desc"), 7, "limestone/terrain-pistonback-dungeon"); + makerLimestoneStairs.carverHelper.addVariation(I18n.format("chisel.tile.limestoneStairs.8.desc"), 8, "limestone/terrain-pistonback-dungeonornate"); + makerLimestoneStairs.carverHelper.addVariation(I18n.format("chisel.tile.limestoneStairs.9.desc"), 9, "limestone/terrain-pistonback-dungeonvent"); + makerLimestoneStairs.carverHelper.addVariation(I18n.format("chisel.tile.limestoneStairs.10.desc"), 10, "limestone/terrain-pistonback-lightcreeper"); + makerLimestoneStairs.carverHelper.addVariation(I18n.format("chisel.tile.limestoneStairs.11.desc"), 11, "limestone/terrain-pistonback-lightdent"); + makerLimestoneStairs.carverHelper.addVariation(I18n.format("chisel.tile.limestoneStairs.12.desc"), 12, "limestone/terrain-pistonback-lightemboss"); + makerLimestoneStairs.carverHelper.addVariation(I18n.format("chisel.tile.limestoneStairs.13.desc"), 13, "limestone/terrain-pistonback-lightfour"); + makerLimestoneStairs.carverHelper.addVariation(I18n.format("chisel.tile.limestoneStairs.14.desc"), 14, "limestone/terrain-pistonback-lightmarker"); + makerLimestoneStairs.carverHelper.addVariation(I18n.format("chisel.tile.limestoneStairs.15.desc"), 15, "limestone/terrain-pistonback-lightpanel"); + makerLimestoneStairs.create("limestoneStairs"); } if(Chisel.featureEnabled("cobblestone")) diff --git a/src/main/java/info/jbcs/minecraft/chisel/ChiselModCompatibility.java b/src/main/java/info/jbcs/minecraft/chisel/ChiselModCompatibility.java index 5ee48397..af9e5af9 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/ChiselModCompatibility.java +++ b/src/main/java/info/jbcs/minecraft/chisel/ChiselModCompatibility.java @@ -16,8 +16,8 @@ public class ChiselModCompatibility { try { - if((cl = Class.forName(name)) != null) - action(); + if((cl = Class.forName(name)) != null) + action(); } catch(ClassNotFoundException e) { e.printStackTrace(); diff --git a/src/main/java/info/jbcs/minecraft/chisel/block/BlockConcrete.java b/src/main/java/info/jbcs/minecraft/chisel/block/BlockConcrete.java index 126385aa..d32beda2 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/block/BlockConcrete.java +++ b/src/main/java/info/jbcs/minecraft/chisel/block/BlockConcrete.java @@ -20,7 +20,7 @@ public class BlockConcrete extends BlockCarvable public AxisAlignedBB getCollisionBoundingBoxFromPool(World par1World, int par2, int par3, int par4) { float f = 0.125F; - return AxisAlignedBB.getAABBPool().getAABB(par2, par3, par4, (par2 + 1), ((par3 + 1) - f), (par4 + 1)); + return AxisAlignedBB.getBoundingBox(par2, par3, par4, (par2 + 1), ((par3 + 1) - f), (par4 + 1)); } @Override diff --git a/src/main/java/info/jbcs/minecraft/chisel/block/BlockMarbleStairsMaker.java b/src/main/java/info/jbcs/minecraft/chisel/block/BlockMarbleStairsMaker.java index dc2c0f35..9a29b102 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/block/BlockMarbleStairsMaker.java +++ b/src/main/java/info/jbcs/minecraft/chisel/block/BlockMarbleStairsMaker.java @@ -13,14 +13,13 @@ public class BlockMarbleStairsMaker public CarvableHelper carverHelper; BlockMarbleStairs blocks[]; - int idStart; + //int idStart; Block blockBase; String blockName; public BlockMarbleStairsMaker(Block base) { carverHelper = new CarvableHelper(); - blockBase = base; } @@ -32,7 +31,6 @@ public class BlockMarbleStairsMaker public void create(BlockMarbleStairsMakerCreator creator, String name) { blocks = new BlockMarbleStairs[carverHelper.variations.size() / 2]; - for(int i = 0; i < blocks.length; i++) { String n = name + "." + i; diff --git a/src/main/java/info/jbcs/minecraft/chisel/carving/CarvableHelper.java b/src/main/java/info/jbcs/minecraft/chisel/carving/CarvableHelper.java index 184d6993..eea82847 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/carving/CarvableHelper.java +++ b/src/main/java/info/jbcs/minecraft/chisel/carving/CarvableHelper.java @@ -1,5 +1,7 @@ package info.jbcs.minecraft.chisel.carving; +import info.jbcs.minecraft.chisel.ChiselBlocks; +import info.jbcs.minecraft.chisel.block.BlockMarbleStairs; import info.jbcs.minecraft.chisel.carving.CarvableVariation.CarvableVariationCTM; import info.jbcs.minecraft.chisel.Chisel; import info.jbcs.minecraft.chisel.block.BlockMarbleSlab; @@ -326,7 +328,6 @@ public class CarvableHelper public void registerVariation(String name, CarvableVariation variation, Block block, int blockMeta) { //TODO Multipart registry goes here - if(forbidChiseling) return; @@ -423,6 +424,9 @@ public class CarvableHelper { for(CarvableVariation variation : variations) { + if(variation.metadata == 1){ + System.out.println(variation.description); + } list.add(new ItemStack(block, 1, variation.metadata)); } } diff --git a/src/main/java/info/jbcs/minecraft/chisel/item/ItemCarvable.java b/src/main/java/info/jbcs/minecraft/chisel/item/ItemCarvable.java index 6104220b..eb609d4b 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/item/ItemCarvable.java +++ b/src/main/java/info/jbcs/minecraft/chisel/item/ItemCarvable.java @@ -34,7 +34,7 @@ public class ItemCarvable extends ItemBlock @Override public String getUnlocalizedName(ItemStack itemstack) { - return Block.getBlockFromItem(this).getUnlocalizedName(); + return "chisel." + Block.getBlockFromItem(this).getUnlocalizedName(); } @Override @@ -56,7 +56,8 @@ public class ItemCarvable extends ItemBlock ICarvable carvable = (ICarvable) block; CarvableVariation var = carvable.getVariation(stack.getItemDamage()); - if(var == null) return; + if(var == null) + return; lines.add(var.description); } diff --git a/src/main/java/info/jbcs/minecraft/chisel/item/ItemMarbleSlab.java b/src/main/java/info/jbcs/minecraft/chisel/item/ItemMarbleSlab.java index 4097b4a3..5b7724a6 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/item/ItemMarbleSlab.java +++ b/src/main/java/info/jbcs/minecraft/chisel/item/ItemMarbleSlab.java @@ -62,10 +62,12 @@ public class ItemMarbleSlab extends ItemCarvable if(metaMatches && side == 0 && targetBlock.equals(block.top)) { world.setBlock(x, y, z, block.master, meta, 2); + stack.stackSize -= 1; return true; } else if(metaMatches && side == 1 && targetBlock.equals(block.bottom)) { world.setBlock(x, y, z, block.master, meta, 2); + stack.stackSize -= 1; return true; } diff --git a/src/main/java/info/jbcs/minecraft/utilities/General.java b/src/main/java/info/jbcs/minecraft/utilities/General.java index 866b1be1..acf99046 100644 --- a/src/main/java/info/jbcs/minecraft/utilities/General.java +++ b/src/main/java/info/jbcs/minecraft/utilities/General.java @@ -80,7 +80,8 @@ public class General double var7 = par2EntityPlayer.prevPosX + (par2EntityPlayer.posX - par2EntityPlayer.prevPosX) * var4; double var9 = par2EntityPlayer.prevPosY + (par2EntityPlayer.posY - par2EntityPlayer.prevPosY) * var4 + 1.62D - par2EntityPlayer.yOffset; double var11 = par2EntityPlayer.prevPosZ + (par2EntityPlayer.posZ - par2EntityPlayer.prevPosZ) * var4; - Vec3 var13 = par1World.getWorldVec3Pool().getVecFromPool(var7, var9, var11); + //TODO- 1.7.10 fix? + Vec3 var13 = Vec3.createVectorHelper(var7, var9, var11); float var14 = MathHelper.cos(-var6 * 0.017453292F - (float) Math.PI); float var15 = MathHelper.sin(-var6 * 0.017453292F - (float) Math.PI); float var16 = -MathHelper.cos(-var5 * 0.017453292F); diff --git a/src/main/resources/assets/chisel/lang/en_US.lang b/src/main/resources/assets/chisel/lang/en_US.lang index 2ea28ec1..0ac52d08 100644 --- a/src/main/resources/assets/chisel/lang/en_US.lang +++ b/src/main/resources/assets/chisel/lang/en_US.lang @@ -9,136 +9,231 @@ item.cloudBottle.name=Cloud In A Bottle # Have fun! ~zombiepig333 #Marble Blocks -tile.marbleChisel.name=Marble -tile.marbleChisel.0.desc=Raw Marble -tile.marbleChisel.1.desc=Marble Brick -tile.marbleChisel.2.desc=Classic Marble Panel -tile.marbleChisel.3.desc=Ornate Marble Panel -tile.marbleChisel.4.desc=Marble Panel -tile.marbleChisel.5.desc=Marble Block -tile.marbleChisel.6.desc=Dark Creeper Marble -tile.marbleChisel.7.desc=Light Creeper Marble -tile.marbleChisel.8.desc=Carved Marble -tile.marbleChisel.9.desc=Radial Carved Marble -tile.marbleChisel.10.desc=Marble with Dent -tile.marbleChisel.11.desc=Marble with Large Dent -tile.marbleChisel.12.desc=Marble Tiles -tile.marbleChisel.13.desc=Arranged Marble Tiles -tile.marbleChisel.14.desc=Fancy Marble Tiles -tile.marbleChisel.15.desc=Marble Blocks +chisel.tile.marble.name=Marble +chisel.tile.marble.0.desc=Raw Marble +chisel.tile.marble.1.desc=Marble Brick +chisel.tile.marble.2.desc=Classic Marble Panel +chisel.tile.marble.3.desc=Ornate Marble Panel +chisel.tile.marble.4.desc=Marble Panel +chisel.tile.marble.5.desc=Marble Block +chisel.tile.marble.6.desc=Dark Creeper Marble +chisel.tile.marble.7.desc=Light Creeper Marble +chisel.tile.marble.8.desc=Carved Marble +chisel.tile.marble.9.desc=Radial Carved Marble +chisel.tile.marble.10.desc=Marble with Dent +chisel.tile.marble.11.desc=Marble with Large Dent +chisel.tile.marble.12.desc=Marble Tiles +chisel.tile.marble.13.desc=Arranged Marble Tiles +chisel.tile.marble.14.desc=Fancy Marble Tiles +chisel.tile.marble.15.desc=Marble Blocks #Marble Slabs -tile.marbleSlab.name=Marble Slab -tile.marbleSlab.0.desc=Raw Marble Slab -tile.marbleSlab.1.desc=Marble Brick Slab -tile.marbleSlab.2.desc=Classic Marble Panel Slab -tile.marbleSlab.3.desc=Ornate Marble Panel Slab -tile.marbleSlab.4.desc=Marble Panel Slab -tile.marbleSlab.5.desc=Marble Block Slab -tile.marbleSlab.6.desc=Dark Creeper Marble Slab -tile.marbleSlab.7.desc=Light Creeper Marble Slab -tile.marbleSlab.8.desc=Carved Marble Slab -tile.marbleSlab.9.desc=Radial Carved Marble Slab -tile.marbleSlab.10.desc=Marble Slab with Dent -tile.marbleSlab.11.desc=Marble Slab with Large Dent -tile.marbleSlab.12.desc=Marble Tiles Slab -tile.marbleSlab.13.desc=Arranged Marble Tiles Slab -tile.marbleSlab.14.desc=Fancy Marble Tiles Slab -tile.marbleSlab.15.desc=Marble Blocks Slab +chisel.tile.marbleSlab.name=Marble Slab +chisel.tile.marbleSlab.0.desc=Raw Marble Slab +chisel.tile.marbleSlab.1.desc=Marble Brick Slab +chisel.tile.marbleSlab.2.desc=Classic Marble Panel Slab +chisel.tile.marbleSlab.3.desc=Ornate Marble Panel Slab +chisel.tile.marbleSlab.4.desc=Marble Panel Slab +chisel.tile.marbleSlab.5.desc=Marble Block Slab +chisel.tile.marbleSlab.6.desc=Dark Creeper Marble Slab +chisel.tile.marbleSlab.7.desc=Light Creeper Marble Slab +chisel.tile.marbleSlab.8.desc=Carved Marble Slab +chisel.tile.marbleSlab.9.desc=Radial Carved Marble Slab +chisel.tile.marbleSlab.10.desc=Marble Slab with Dent +chisel.tile.marbleSlab.11.desc=Marble Slab with Large Dent +chisel.tile.marbleSlab.12.desc=Marble Tiled Slab +chisel.tile.marbleSlab.13.desc=Arranged Marble Tiled Slab +chisel.tile.marbleSlab.14.desc=Fancy Marble Tiled Slab +chisel.tile.marbleSlab.15.desc=Marble Blocks Slab #Marble Pillars (old) -tile.marblePillar.name=Marble Pillar -tile.marblePillarOld.0.desc=Marble Pillar -tile.marblePillarOld.1.desc=Marble Pillar Capstone -tile.marblePillarOld.2.desc=Marble Pillar Base -tile.marblePillarOld.3.desc=Small Marble Pillar -tile.marblePillarOld.4.desc=Carved Marble Pillar -tile.marblePillarOld.5.desc=Ornamental Marble Pillar -tile.marblePillarOld.6.desc=Greek Marble Pillar -tile.marblePillarOld.7.desc=Plain Marble Pillar -tile.marblePillarOld.8.desc=Greek Marble Pillar Capstone -tile.marblePillarOld.9.desc=Plain Marble Pillar Capstone -tile.marblePillarOld.10.desc=Greek Marble Pillar Base -tile.marblePillarOld.11.desc=Plain Marble Pillar Base -tile.marblePillarOld.12.desc=Greek Marble Pillar Ornate Capstone -tile.marblePillarOld.13.desc=Plain Marble Pillar Ornate Capstone -tile.marblePillarOld.14.desc=Greek Marble Pillar Ornate Base -tile.marblePillarOld.15.desc=Plain Marble Pillar Ornate Base +chisel.tile.marblePillar.name=Marble Pillar +chisel.tile.marblePillarOld.0.desc=Marble Pillar +chisel.tile.marblePillarOld.1.desc=Marble Pillar Capstone +chisel.tile.marblePillarOld.2.desc=Marble Pillar Base +chisel.tile.marblePillarOld.3.desc=Small Marble Pillar +chisel.tile.marblePillarOld.4.desc=Carved Marble Pillar +chisel.tile.marblePillarOld.5.desc=Ornamental Marble Pillar +chisel.tile.marblePillarOld.6.desc=Greek Marble Pillar +chisel.tile.marblePillarOld.7.desc=Plain Marble Pillar +chisel.tile.marblePillarOld.8.desc=Greek Marble Pillar Capstone +chisel.tile.marblePillarOld.9.desc=Plain Marble Pillar Capstone +chisel.tile.marblePillarOld.10.desc=Greek Marble Pillar Base +chisel.tile.marblePillarOld.11.desc=Plain Marble Pillar Base +chisel.tile.marblePillarOld.12.desc=Greek Marble Pillar Ornate Capstone +chisel.tile.marblePillarOld.13.desc=Plain Marble Pillar Ornate Capstone +chisel.tile.marblePillarOld.14.desc=Greek Marble Pillar Ornate Base +chisel.tile.marblePillarOld.15.desc=Plain Marble Pillar Ornate Base #Marble Pillars (current) -tile.marblePillar.0.desc=Marble Pillar -tile.marblePillar.1.desc=Original Marble Pillar -tile.marblePillar.2.desc=Simplistic Marble Pillar -tile.marblePillar.3.desc=Convex Marble Pillar -tile.marblePillar.4.desc=Rough Marble Pillar -tile.marblePillar.5.desc=Greek Marble Pillar with Ornate Capstone -tile.marblePillar.6.desc=Greek Marble Pillar -tile.marblePillar.7.desc=Greek Marble Pillar with Plain Capstone -tile.marblePillar.8.desc=Plain Marble Pillar with Ornate Capstone -tile.marblePillar.9.desc=Plain Marble Pillar with Greek Capstone -tile.marblePillar.10.desc=Plain Marble Pillar -tile.marblePillar.11.desc=Wide Marble Pillar with Ornate Capstone -tile.marblePillar.12.desc=Wide Marble Pillar with Greek Capstone -tile.marblePillar.13.desc=Wide Marble Pillar with Plain Capstone -tile.marblePillar.14.desc=Carved Pillar Capstone -tile.marblePillar.15.desc=Ornamental Pillar Capstone +chisel.tile.marblePillar.0.desc=Marble Pillar +chisel.tile.marblePillar.1.desc=Original Marble Pillar +chisel.tile.marblePillar.2.desc=Simplistic Marble Pillar +chisel.tile.marblePillar.3.desc=Convex Marble Pillar +chisel.tile.marblePillar.4.desc=Rough Marble Pillar +chisel.tile.marblePillar.5.desc=Greek Marble Pillar with Ornate Capstone +chisel.tile.marblePillar.6.desc=Greek Marble Pillar +chisel.tile.marblePillar.7.desc=Greek Marble Pillar with Plain Capstone +chisel.tile.marblePillar.8.desc=Plain Marble Pillar with Ornate Capstone +chisel.tile.marblePillar.9.desc=Plain Marble Pillar with Greek Capstone +chisel.tile.marblePillar.10.desc=Plain Marble Pillar +chisel.tile.marblePillar.11.desc=Wide Marble Pillar with Ornate Capstone +chisel.tile.marblePillar.12.desc=Wide Marble Pillar with Greek Capstone +chisel.tile.marblePillar.13.desc=Wide Marble Pillar with Plain Capstone +chisel.tile.marblePillar.14.desc=Carved Pillar Capstone +chisel.tile.marblePillar.15.desc=Ornamental Pillar Capstone #Marble Slabs (old) -tile.marblePillarSlab.name=Marble Pillar Slab -tile.marblePillarSlabOld.0.desc=Marble Pillar Slab -tile.marblePillarSlabOld.1.desc=Marble Pllar Capstone Slab -tile.marblePillarSlabOld.2.desc=Marble Pillar Base Slab -tile.marblePillarSlabOld.3.desc=Small Marble Pillar Slab -tile.marblePillarSlabOld.4.desc=Carved Marble Pillar Slab -tile.marblePillarSlabOld.5.desc=Ornamental Marble Pillar Slab -tile.marblePillarSlabOld.6.desc=Greek Marble Pillar Slab -tile.marblePillarSlabOld.7.desc=Plain Marble Pillar Slab -tile.marblePillarSlabOld.8.desc=Greek Marble Pillar capstone Slab -tile.marblePillarSlabOld.9.desc=Plain Marble Pillar capstone Slab -tile.marblePillarSlabOld.10.desc=Greek Marble Pillar Base Slab -tile.marblePillarSlabOld.11.desc=Plain Marble Pillar Base Slab -tile.marblePillarSlabOld.12.desc=Greek Marble Pillar ornate capstone Slab -tile.marblePillarSlabOld.13.desc=Plain Marble Pillar ornate capstone Slab -tile.marblePillarSlabOld.14.desc=Greek Marble Pillar ornate Base Slab -tile.marblePillarSlabOld.15.desc=Plain Marble Pillar ornate Base Slab +chisel.tile.marblePillarSlab.name=Marble Pillar Slab +chisel.tile.marblePillarSlabOld.0.desc=Marble Pillar Slab +chisel.tile.marblePillarSlabOld.1.desc=Marble Pllar Capstone Slab +chisel.tile.marblePillarSlabOld.2.desc=Marble Pillar Base Slab +chisel.tile.marblePillarSlabOld.3.desc=Small Marble Pillar Slab +chisel.tile.marblePillarSlabOld.4.desc=Carved Marble Pillar Slab +chisel.tile.marblePillarSlabOld.5.desc=Ornamental Marble Pillar Slab +chisel.tile.marblePillarSlabOld.6.desc=Greek Marble Pillar Slab +chisel.tile.marblePillarSlabOld.7.desc=Plain Marble Pillar Slab +chisel.tile.marblePillarSlabOld.8.desc=Greek Marble Pillar capstone Slab +chisel.tile.marblePillarSlabOld.9.desc=Plain Marble Pillar capstone Slab +chisel.tile.marblePillarSlabOld.10.desc=Greek Marble Pillar Base Slab +chisel.tile.marblePillarSlabOld.11.desc=Plain Marble Pillar Base Slab +chisel.tile.marblePillarSlabOld.12.desc=Greek Marble Pillar ornate capstone Slab +chisel.tile.marblePillarSlabOld.13.desc=Plain Marble Pillar ornate capstone Slab +chisel.tile.marblePillarSlabOld.14.desc=Greek Marble Pillar ornate Base Slab +chisel.tile.marblePillarSlabOld.15.desc=Plain Marble Pillar ornate Base Slab #Marble Slabs (current) -tile.marblePillarSlab.0.desc=Marble Pillar Slab -tile.marblePillarSlab.1.desc=Original Marble Pillar Slab -tile.marblePillarSlab.2.desc=Simplistic Marble Pillar Slab -tile.marblePillarSlab.3.desc=Convex Marble Pillar Slab -tile.marblePillarSlab.4.desc=Rough Marble Pillar Slab -tile.marblePillarSlab.5.desc=Greek Marble Pillar Slab with Ornate Capstone -tile.marblePillarSlab.6.desc=Greek Marble Pillar Slab -tile.marblePillarSlab.7.desc=Greek Marble Pillar Slab with Plain Capstone -tile.marblePillarSlab.8.desc=Plain Marble Pillar Slab with Ornate Capstone -tile.marblePillarSlab.9.desc=Plain Marble Pillar Slab with Greek Capstone -tile.marblePillarSlab.10.desc=Plain Marble Pillar Slab -tile.marblePillarSlab.11.desc=Wide Marble Pillar Slab with Ornate Capstone -tile.marblePillarSlab.12.desc=Wide Marble Pillar Slab with Greek Capstone -tile.marblePillarSlab.13.desc=Wide Marble Pillar Slab with Plain Capstone -tile.marblePillarSlab.14.desc=Carved Pillar Capstone Slab -tile.marblePillarSlab.15.desc=Ornamental Pillar Capstone Slab +chisel.tile.marblePillarSlab.0.desc=Marble Pillar Slab +chisel.tile.marblePillarSlab.1.desc=Original Marble Pillar Slab +chisel.tile.marblePillarSlab.2.desc=Simplistic Marble Pillar Slab +chisel.tile.marblePillarSlab.3.desc=Convex Marble Pillar Slab +chisel.tile.marblePillarSlab.4.desc=Rough Marble Pillar Slab +chisel.tile.marblePillarSlab.5.desc=Greek Marble Pillar Slab with Ornate Capstone +chisel.tile.marblePillarSlab.6.desc=Greek Marble Pillar Slab +chisel.tile.marblePillarSlab.7.desc=Greek Marble Pillar Slab with Plain Capstone +chisel.tile.marblePillarSlab.8.desc=Plain Marble Pillar Slab with Ornate Capstone +chisel.tile.marblePillarSlab.9.desc=Plain Marble Pillar Slab with Greek Capstone +chisel.tile.marblePillarSlab.10.desc=Plain Marble Pillar Slab +chisel.tile.marblePillarSlab.11.desc=Wide Marble Pillar Slab with Ornate Capstone +chisel.tile.marblePillarSlab.12.desc=Wide Marble Pillar Slab with Greek Capstone +chisel.tile.marblePillarSlab.13.desc=Wide Marble Pillar Slab with Plain Capstone +chisel.tile.marblePillarSlab.14.desc=Carved Pillar Capstone Slab +chisel.tile.marblePillarSlab.15.desc=Ornamental Pillar Capstone Slab +#Marble Stairs +#The same name goes here 8 different times since stairs take up 8 block positions. +#Sorry! It was the only way! +chisel.tile.marbleStairs.0.name=Marble Stairs +chisel.tile.marbleStairs.1.name=Marble Stairs +chisel.tile.marbleStairs.2.name=Marble Stairs +chisel.tile.marbleStairs.3.name=Marble Stairs +chisel.tile.marbleStairs.4.name=Marble Stairs +chisel.tile.marbleStairs.5.name=Marble Stairs +chisel.tile.marbleStairs.6.name=Marble Stairs +chisel.tile.marbleStairs.7.name=Marble Stairs + +chisel.tile.marbleStairs.0.desc=Raw Marble Stairs +chisel.tile.marbleStairs.1.desc=Marble Brick Stairs +chisel.tile.marbleStairs.2.desc=Classic Marble Panel Stairs +chisel.tile.marbleStairs.3.desc=Ornate Marble Panel Stairs +chisel.tile.marbleStairs.4.desc=Marble Panel Stairs +chisel.tile.marbleStairs.5.desc=Marble Block Stairs +chisel.tile.marbleStairs.6.desc=Dark Creeper Marble Stairs +chisel.tile.marbleStairs.7.desc=Light Creeper Marble Stairs +chisel.tile.marbleStairs.8.desc=Carved Marble Stairs +chisel.tile.marbleStairs.9.desc=Radial Carved Marble Stairs +chisel.tile.marbleStairs.10.desc=Marble Stairs with Dent +chisel.tile.marbleStairs.11.desc=Marble Stairs with Large Dent +chisel.tile.marbleStairs.12.desc=Marble Tiled Stairs +chisel.tile.marbleStairs.13.desc=Arranged Marble Tiled Stairs +chisel.tile.marbleStairs.14.desc=Fancy Marble Tiled Stairs +chisel.tile.marbleStairs.15.desc=Marble Block Stairs + +#Limestone +chisel.tile.limestone.name=Limestone +chisel.tile.limestone.0.desc=Limestone +chisel.tile.limestone.1.desc=Small Limestone Tiles +chisel.tile.limestone.2.desc=French Limestone Tiles +chisel.tile.limestone.3.desc=French Limestone Tiles +chisel.tile.limestone.4.desc=Creeper Limestone Tiles +chisel.tile.limestone.5.desc=Small Limestone Bricks +chisel.tile.limestone.6.desc=Damaged Limestone Tiles +chisel.tile.limestone.7.desc=Smooth Limestone +chisel.tile.limestone.8.desc=Limestone with Ornate Panel +chisel.tile.limestone.9.desc=Limestone with Ornate Panel +chisel.tile.limestone.10.desc=Limestone with Creeper Panel +chisel.tile.limestone.11.desc=Limestone with Dent +chisel.tile.limestone.12.desc=Limestone with Panel +chisel.tile.limestone.13.desc=Large Limestone Tiles +chisel.tile.limestone.14.desc=Limestone with Light Panel +chisel.tile.limestone.15.desc=Limestone with Dark Panel + +#Limestone Slabs +chisel.tile.limestoneSlab.name=Limestone Slab +chisel.tile.limestoneSlab.0.desc=Limestone Slab +chisel.tile.limestoneSlab.1.desc=Small Limestone Tiled Slab +chisel.tile.limestoneSlab.2.desc=French Limestone Tiled Slab +chisel.tile.limestoneSlab.3.desc=French Limestone Tiled Slab +chisel.tile.limestoneSlab.4.desc=Creeper Limestone Tiled Slab +chisel.tile.limestoneSlab.5.desc=Small Limestone Bricks Slab +chisel.tile.limestoneSlab.6.desc=Damaged Limestone Tiled Slab +chisel.tile.limestoneSlab.7.desc=Smooth Limestone Slab +chisel.tile.limestoneSlab.8.desc=Limestone Slab with Ornate Panel +chisel.tile.limestoneSlab.9.desc=Limestone Slab with Ornate Panel +chisel.tile.limestoneSlab.10.desc=Limestone Slab with Creeper Panel +chisel.tile.limestoneSlab.11.desc=Limestone Slab with Dent +chisel.tile.limestoneSlab.12.desc=Limestone Slab with Panel +chisel.tile.limestoneSlab.13.desc=Large Limestone Tiles Slab +chisel.tile.limestoneSlab.14.desc=Limestone Slab with Light Panel +chisel.tile.limestoneSlab.15.desc=Limestone Slab with Dark Panel + +#Limestone Stairs +#The same name goes here 8 different times since stairs take up 8 block positions. +#Sorry! It was the only way! +chisel.tile.limestoneStairs.0.name=Limestone Stairs +chisel.tile.limestoneStairs.1.name=Limestone Stairs +chisel.tile.limestoneStairs.2.name=Limestone Stairs +chisel.tile.limestoneStairs.3.name=Limestone Stairs +chisel.tile.limestoneStairs.4.name=Limestone Stairs +chisel.tile.limestoneStairs.5.name=Limestone Stairs +chisel.tile.limestoneStairs.6.name=Limestone Stairs +chisel.tile.limestoneStairs.7.name=Limestone Stairs + +chisel.tile.limestoneStairs.0.desc=Limestone Stairs +chisel.tile.limestoneStairs.1.desc=Small Limestone Tiled Stairs +chisel.tile.limestoneStairs.2.desc=French Limestone Tiled Stairs +chisel.tile.limestoneStairs.3.desc=French Limestone Tiled Stairs +chisel.tile.limestoneStairs.4.desc=Creeper Limestone Tiled Stairs +chisel.tile.limestoneStairs.5.desc=Small Limestone Bricks Stairs +chisel.tile.limestoneStairs.6.desc=Damaged Limestone Tiled Stairs +chisel.tile.limestoneStairs.7.desc=Smooth Limestone Stairs +chisel.tile.limestoneStairs.8.desc=Limestone Stairs with Ornate Panel +chisel.tile.limestoneStairs.9.desc=Limestone Stairs with Ornate Panel +chisel.tile.limestoneStairs.10.desc=Limestone Stairs with Creeper Panel +chisel.tile.limestoneStairs.11.desc=Limestone Stairs with Dent +chisel.tile.limestoneStairs.12.desc=Limestone Stairs with Panel +chisel.tile.limestoneStairs.13.desc=Large Limestone Tiled Stairs +chisel.tile.limestoneStairs.14.desc=Limestone Stairs with Light Panel +chisel.tile.limestoneStairs.15.desc=Limestone Stairs with Dark Panel #Factory Blocks -tile.blockFactory.name=Factory Block -tile.blockFactory.0.desc=Rusty Metal Plate with Dotted Pattern -tile.blockFactory.1.desc=Rusty Metal Plate -tile.blockFactory.2.desc=Very Rusty Metal Plate -tile.blockFactory.3.desc=A Metal Plate with Little Rust -tile.blockFactory.4.desc=Wireframe -tile.blockFactory.5.desc=Wireframe in a Shade of Purple -tile.blockFactory.6.desc=Yellow-Black Hazard Block -tile.blockFactory.7.desc=Orange-White Hazard Block -tile.blockFactory.8.desc=Fancy Circuit Block -tile.blockFactory.9.desc=Fancy Metal Box -tile.blockFactory.10.desc=Fancy Circuit Block with Gold Plating -tile.blockFactory.11.desc=Rusty Purple Block with Gold Plating -tile.blockFactory.12.desc=Shiny Metal Construction Block -tile.blockFactory.13.desc=Weared Metal Wall with Openings for Ventilation -tile.blockFactory.14.desc=Rusty Metal Plates -tile.blockFactory.15.desc=Weared Metal Column +chisel.tile.blockFactory.name=Factory Block +chisel.tile.blockFactory.0.desc=Rusty Metal Plate with Dotted Pattern +chisel.tile.blockFactory.1.desc=Rusty Metal Plate +chisel.tile.blockFactory.2.desc=Very Rusty Metal Plate +chisel.tile.blockFactory.3.desc=A Metal Plate with Little Rust +chisel.tile.blockFactory.4.desc=Wireframe +chisel.tile.blockFactory.5.desc=Wireframe in a Shade of Purple +chisel.tile.blockFactory.6.desc=Yellow-Black Hazard Block +chisel.tile.blockFactory.7.desc=Orange-White Hazard Block +chisel.tile.blockFactory.8.desc=Fancy Circuit Block +chisel.tile.blockFactory.9.desc=Fancy Metal Box +chisel.tile.blockFactory.10.desc=Fancy Circuit Block with Gold Plating +chisel.tile.blockFactory.11.desc=Rusty Purple Block with Gold Plating +chisel.tile.blockFactory.12.desc=Shiny Metal Construction Block +chisel.tile.blockFactory.13.desc=Weared Metal Wall with Openings for Ventilation +chisel.tile.blockFactory.14.desc=Rusty Metal Plates +chisel.tile.blockFactory.15.desc=Weared Metal Column # Creative Tab localizations itemGroup.tabChisel=Chisel Blocks