Localization disaster pt1

This commit is contained in:
zombiepig333 committed 2014-06-23 21:42:23 -07:00
1 parent 1157c3cf4a
commit dfaf4ed0f9
4 files changed
+214 -103

No files matched your search

@@ -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("Raw marble", 0, "marble");
blockMarble.carverHelper.addVariation("Marble brick", 1, "marble/a1-stoneornamental-marblebrick");
blockMarble.carverHelper.addVariation("Classic marble panel", 2, "marble/a1-stoneornamental-marbleclassicpanel");
blockMarble.carverHelper.addVariation("Ornate marble panel", 3, "marble/a1-stoneornamental-marbleornate");
blockMarble.carverHelper.addVariation("Marble panel", 4, "marble/panel");
blockMarble.carverHelper.addVariation("Marble block", 5, "marble/block");
blockMarble.carverHelper.addVariation("Dark creeper marble", 6, "marble/terrain-pistonback-marblecreeperdark");
blockMarble.carverHelper.addVariation("Light creeper marble", 7, "marble/terrain-pistonback-marblecreeperlight");
blockMarble.carverHelper.addVariation("Carved marble", 8, "marble/a1-stoneornamental-marblecarved");
blockMarble.carverHelper.addVariation("Radial carved marble", 9, "marble/a1-stoneornamental-marblecarvedradial");
blockMarble.carverHelper.addVariation("Marble with dent", 10, "marble/terrain-pistonback-marbledent");
blockMarble.carverHelper.addVariation("Marble with large dent", 11, "marble/terrain-pistonback-marbledent-small");
blockMarble.carverHelper.addVariation("Marble tiles", 12, "marble/marble-bricks");
blockMarble.carverHelper.addVariation("Arranged marble tiles", 13, "marble/marble-arranged-bricks");
blockMarble.carverHelper.addVariation("Fancy marble tiles", 14, "marble/marble-fancy-bricks");
blockMarble.carverHelper.addVariation("Marble blocks", 15, "marble/marble-blocks");
blockMarble.carverHelper.register(blockMarble, "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");
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("Raw marble slab", 0, "marble");
blockMarbleSlab.carverHelper.addVariation("Marble brick slab", 1, "marbleslab/a1-stoneornamental-marblebrick");
blockMarbleSlab.carverHelper.addVariation("Classic marble panel slab", 2, "marbleslab/a1-stoneornamental-marbleclassicpanel");
blockMarbleSlab.carverHelper.addVariation("Ornate marble panel slab", 3, "marbleslab/a1-stoneornamental-marbleornate");
blockMarbleSlab.carverHelper.addVariation("Marble panel slab", 4, "marbleslab/a1-stoneornamental-marblepanel");
blockMarbleSlab.carverHelper.addVariation("Marble block slab", 5, "marbleslab/terrain-pistonback-marble");
blockMarbleSlab.carverHelper.addVariation("Dark creeper marble slab", 6, "marbleslab/terrain-pistonback-marblecreeperdark");
blockMarbleSlab.carverHelper.addVariation("Light creeper marble slab", 7, "marbleslab/terrain-pistonback-marblecreeperlight");
blockMarbleSlab.carverHelper.addVariation("Carved marble slab", 8, "marbleslab/a1-stoneornamental-marblecarved");
blockMarbleSlab.carverHelper.addVariation("Radial carved marble slab", 9, "marbleslab/a1-stoneornamental-marblecarvedradial");
blockMarbleSlab.carverHelper.addVariation("Marble slab with dent", 10, "marbleslab/terrain-pistonback-marbledent");
blockMarbleSlab.carverHelper.addVariation("Marble slab with large dent ", 11, "marbleslab/terrain-pistonback-marbledent-small");
blockMarbleSlab.carverHelper.addVariation("Marble tiles slab", 12, "marbleslab/marble-bricks");
blockMarbleSlab.carverHelper.addVariation("Arranged marble tiles slab", 13, "marbleslab/marble-arranged-bricks");
blockMarbleSlab.carverHelper.addVariation("Fancy marble tiles slab", 14, "marbleslab/marble-fancy-bricks");
blockMarbleSlab.carverHelper.addVariation("Marble blocks slab", 15, "marbleslab/marble-blocks");
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.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("Marble pillar", 0, "marblepillarold/column");
blockMarblePillar.carverHelper.addVariation("Marble pillar capstone", 1, "marblepillarold/capstone");
blockMarblePillar.carverHelper.addVariation("Marble pillar base", 2, "marblepillarold/base");
blockMarblePillar.carverHelper.addVariation("Small marble pillar", 3, "marblepillarold/small");
blockMarblePillar.carverHelper.addVariation("Carved marble pillar", 4, "marblepillarold/pillar-carved");
blockMarblePillar.carverHelper.addVariation("Ornamental marble pillar", 5, "marblepillarold/a1-stoneornamental-marblegreek");
blockMarblePillar.carverHelper.addVariation("Greek marble pillar", 6, "marblepillarold/a1-stonepillar-greek");
blockMarblePillar.carverHelper.addVariation("Plain marble pillar", 7, "marblepillarold/a1-stonepillar-plain");
blockMarblePillar.carverHelper.addVariation("Greek marble pillar capstone", 8, "marblepillarold/a1-stonepillar-greektopplain");
blockMarblePillar.carverHelper.addVariation("Plain marble pillar capstone", 9, "marblepillarold/a1-stonepillar-plaintopplain");
blockMarblePillar.carverHelper.addVariation("Greek marble pillar base", 10, "marblepillarold/a1-stonepillar-greekbottomplain");
blockMarblePillar.carverHelper.addVariation("Plain marble pillar base", 11, "marblepillarold/a1-stonepillar-plainbottomplain");
blockMarblePillar.carverHelper.addVariation("Greek marble pillar ornate capstone", 12, "marblepillarold/a1-stonepillar-greektopgreek");
blockMarblePillar.carverHelper.addVariation("Plain marble pillar ornate capstone", 13, "marblepillarold/a1-stonepillar-plaintopgreek");
blockMarblePillar.carverHelper.addVariation("Greek marble pillar ornate base", 14, "marblepillarold/a1-stonepillar-greekbottomgreek");
blockMarblePillar.carverHelper.addVariation("Plain marble pillar ornate base", 15, "marblepillarold/a1-stonepillar-plainbottomgreek");
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");
} else
{
blockMarblePillar = (BlockCarvable) new BlockMarblePillar(Material.rock).setHardness(2.0F).setResistance(10F).setStepSound(Block.soundTypeStone);
blockMarblePillar.carverHelper.setChiselBlockName("Marble Pillar");
blockMarblePillar.carverHelper.addVariation("Marble pillar", 0, "marblepillar/pillar");
blockMarblePillar.carverHelper.addVariation("Original marble pillar", 1, "marblepillar/default");
blockMarblePillar.carverHelper.addVariation("Simplistic marble pillar", 2, "marblepillar/simple");
blockMarblePillar.carverHelper.addVariation("Convex marble pillar", 3, "marblepillar/convex");
blockMarblePillar.carverHelper.addVariation("Rough marble pillar", 4, "marblepillar/rough");
blockMarblePillar.carverHelper.addVariation("Greek marble pillar with ornate capstone", 5, "marblepillar/greekdecor");
blockMarblePillar.carverHelper.addVariation("Greek marble pillar", 6, "marblepillar/greekgreek");
blockMarblePillar.carverHelper.addVariation("Greek marble pillar with plain capstone", 7, "marblepillar/greekplain");
blockMarblePillar.carverHelper.addVariation("Plain marble pillar with ornate capstone", 8, "marblepillar/plaindecor");
blockMarblePillar.carverHelper.addVariation("Plain marble pillar with Greek capstone", 9, "marblepillar/plaingreek");
blockMarblePillar.carverHelper.addVariation("Plain marble pillar", 10, "marblepillar/plainplain");
blockMarblePillar.carverHelper.addVariation("Wide marble pillar with ornate capstone", 11, "marblepillar/widedecor");
blockMarblePillar.carverHelper.addVariation("Wide marble pillar with Greek capstone", 12, "marblepillar/widegreek");
blockMarblePillar.carverHelper.addVariation("Wide marble pillar with plain capstone", 13, "marblepillar/wideplain");
blockMarblePillar.carverHelper.addVariation("Carved pillar capstone", 14, "marblepillar/carved");
blockMarblePillar.carverHelper.addVariation("Ornamental pillar capstone", 15, "marblepillar/ornamental");
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.register(blockMarblePillar, "marblePillar");
Carving.chisel.setGroupClass("marblePillar", "marble");
@@ -177,40 +177,40 @@ public class ChiselBlocks
blockMarblePillarSlab.carverHelper.setChiselBlockName("Marble Pillar Slab");
if(Chisel.oldPillars)
{
blockMarblePillarSlab.carverHelper.addVariation("Marble pillar slab", 0, "marblepillarslabold/column");
blockMarblePillarSlab.carverHelper.addVariation("Marble pillar capstone slab", 1, "marblepillarslabold/capstone");
blockMarblePillarSlab.carverHelper.addVariation("Marble pillar base slab", 2, "marblepillarslabold/base");
blockMarblePillarSlab.carverHelper.addVariation("Small marble pillar slab", 3, "marblepillarslabold/small");
blockMarblePillarSlab.carverHelper.addVariation("Carved marble pillar slab", 4, "marblepillarslabold/pillar-carved");
blockMarblePillarSlab.carverHelper.addVariation("Ornamental marble pillar slab", 5, "marblepillarslabold/a1-stoneornamental-marblegreek");
blockMarblePillarSlab.carverHelper.addVariation("Greek marble pillar slab", 6, "marblepillarslabold/a1-stonepillar-greek");
blockMarblePillarSlab.carverHelper.addVariation("Plain marble pillar slab", 7, "marblepillarslabold/a1-stonepillar-plain");
blockMarblePillarSlab.carverHelper.addVariation("Greek marble pillar capstone slab", 8, "marblepillarslabold/a1-stonepillar-greektopplain");
blockMarblePillarSlab.carverHelper.addVariation("Plain marble pillar capstone slab", 9, "marblepillarslabold/a1-stonepillar-plaintopplain");
blockMarblePillarSlab.carverHelper.addVariation("Greek marble pillar base slab", 10, "marblepillarslabold/a1-stonepillar-greekbottomplain");
blockMarblePillarSlab.carverHelper.addVariation("Plain marble pillar base slab", 11, "marblepillarslabold/a1-stonepillar-plainbottomplain");
blockMarblePillarSlab.carverHelper.addVariation("Greek marble pillar ornate capstone slab", 12, "marblepillarslabold/a1-stonepillar-greektopgreek");
blockMarblePillarSlab.carverHelper.addVariation("Plain marble pillar ornate capstone slab", 13, "marblepillarslabold/a1-stonepillar-plaintopgreek");
blockMarblePillarSlab.carverHelper.addVariation("Greek marble pillar ornate base slab", 14, "marblepillarslabold/a1-stonepillar-greekbottomgreek");
blockMarblePillarSlab.carverHelper.addVariation("Plain marble pillar ornate base slab", 15, "marblepillarslabold/a1-stonepillar-plainbottomgreek");
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");
} else
{
blockMarblePillarSlab.carverHelper.addVariation("Marble pillar slab", 0, "marblepillarslab/pillar");
blockMarblePillarSlab.carverHelper.addVariation("Original marble pillar slab", 1, "marblepillarslab/default");
blockMarblePillarSlab.carverHelper.addVariation("Simplistic marble pillar slab", 2, "marblepillarslab/simple");
blockMarblePillarSlab.carverHelper.addVariation("Convex marble pillar slab", 3, "marblepillarslab/convex");
blockMarblePillarSlab.carverHelper.addVariation("Rough marble pillar slab", 4, "marblepillarslab/rough");
blockMarblePillarSlab.carverHelper.addVariation("Greek marble pillar slab with ornate capstone", 5, "marblepillarslab/greekdecor");
blockMarblePillarSlab.carverHelper.addVariation("Greek marble pillar slab", 6, "marblepillarslab/greekgreek");
blockMarblePillarSlab.carverHelper.addVariation("Greek marble pillar slab with plain capstone", 7, "marblepillarslab/greekplain");
blockMarblePillarSlab.carverHelper.addVariation("Plain marble pillar slab with ornate capstone", 8, "marblepillarslab/plaindecor");
blockMarblePillarSlab.carverHelper.addVariation("Plain marble pillar slab with Greek capstone", 9, "marblepillarslab/plaingreek");
blockMarblePillarSlab.carverHelper.addVariation("Plain marble pillar slab", 10, "marblepillarslab/plainplain");
blockMarblePillarSlab.carverHelper.addVariation("Wide marble pillar slab with ornate capstone", 11, "marblepillarslab/widedecor");
blockMarblePillarSlab.carverHelper.addVariation("Wide marble pillar slab with Greek capstone", 12, "marblepillarslab/widegreek");
blockMarblePillarSlab.carverHelper.addVariation("Wide marble pillar slab with plain capstone", 13, "marblepillarslab/wideplain");
blockMarblePillarSlab.carverHelper.addVariation("Carved pillar capstone slab", 14, "marblepillarslab/carved");
blockMarblePillarSlab.carverHelper.addVariation("Ornamental pillar capstone slab", 15, "marblepillarslab/ornamental");
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.register(blockMarblePillarSlab, "marblePillarSlab", ItemMarbleSlab.class);
}
@@ -1104,7 +1104,7 @@ public class ChiselBlocks
if(Chisel.featureEnabled("factory"))
{
blockFactory = (BlockCarvable) new BlockCarvable().setHardness(2.0F).setResistance(10F).setStepSound(Chisel.soundMetalFootstep);
//blockFactory.carverHelper.setChiselBlockName("blockFactory");
blockFactory.carverHelper.setChiselBlockName("blockFactory");
blockFactory.carverHelper.addVariation(I18n.format("tile.blockFactory.0.desc"), 0, "factory/dots");
blockFactory.carverHelper.addVariation(I18n.format("tile.blockFactory.1.desc"), 1, "factory/rust2");
blockFactory.carverHelper.addVariation(I18n.format("tile.blockFactory.2.desc"), 2, "factory/rust");
@@ -325,8 +325,6 @@ public class CarvableHelper
public void registerVariation(String name, CarvableVariation variation, Block block, int blockMeta)
{
//TODO- this goes bye-bye!
//LanguageRegistry.addName(new ItemStack(block, 1, blockMeta), Chisel.blockDescriptions ? variation.blockName : variation.description);
//TODO Multipart registry goes here
if(forbidChiseling)
@@ -31,11 +31,11 @@ public class ItemCarvable extends ItemBlock
}
//TODO- to fix some, one must break some
/*@Override
@Override
public String getUnlocalizedName(ItemStack itemstack)
{
return "item." + Block.getBlockFromItem(this).getUnlocalizedName() + "." + itemstack.getItemDamage();
}*/
return Block.getBlockFromItem(this).getUnlocalizedName();
}
@Override
public IIcon getIconFromDamage(int damage)