upstream/Chisel
1
0 Fork 0
mirror of https://github.com/GTNewHorizons/Chisel.git synced 2026-11-12 00:07:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed a few derps, localization coming along.

Browse Source
This commit is contained in:
zombiepig333 committed 2014-06-27 18:07:23 -07:00
1 parent 9cce5018c5
commit a6fbd50231
4 files changed
+166 -86
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/main/java/info/jbcs/minecraft/chisel/ChiselBlocks.java
+67 -67
View File
@@ -540,16 +540,16 @@ public class ChiselBlocks
blockEmerald = (BlockBeaconBase) new BlockBeaconBase().setHardness(5.0F).setResistance(10.0F).setStepSound(Block.soundTypeMetal);
Carving.chisel.addVariation("emerald", Blocks.emerald_block, 0, 0);
blockEmerald.carverHelper.addVariation(I18n.format("chisel.tile.emerald.1.desc"), 1, "emerald/a1-blockemerald-emeraldpanel");
blockEmerald.carverHelper.addVariation(I18n.format("chisel.tile.emerald.1.desc"), 2, "emerald/a1-blockemerald-emeraldpanelclassic");
blockEmerald.carverHelper.addVariation(I18n.format("chisel.tile.emerald.1.desc"), 3, "emerald/a1-blockemerald-emeraldsmooth");
blockEmerald.carverHelper.addVariation(I18n.format("chisel.tile.emerald.1.desc"), 4, "emerald/a1-blockemerald-emeraldchunk");
blockEmerald.carverHelper.addVariation(I18n.format("chisel.tile.emerald.1.desc"), 5, "emerald/a1-blockemerald-emeraldornatelayer");
blockEmerald.carverHelper.addVariation(I18n.format("chisel.tile.emerald.1.desc"), 6, "emerald/a1-blockemerald-emeraldzelda");
blockEmerald.carverHelper.addVariation(I18n.format("chisel.tile.emerald.1.desc"), 7, "emerald/a1-blockquartz-cell");
blockEmerald.carverHelper.addVariation(I18n.format("chisel.tile.emerald.1.desc"), 8, "emerald/a1-blockquartz-cellbismuth");
blockEmerald.carverHelper.addVariation(I18n.format("chisel.tile.emerald.1.desc"), 9, "emerald/a1-blockquartz-four");
blockEmerald.carverHelper.addVariation(I18n.format("chisel.tile.emerald.1.desc"), 10, "emerald/a1-blockquartz-fourornate");
blockEmerald.carverHelper.addVariation(I18n.format("chisel.tile.emerald.1.desc"), 11, "emerald/a1-blockquartz-ornate");
blockEmerald.carverHelper.addVariation(I18n.format("chisel.tile.emerald.2.desc"), 2, "emerald/a1-blockemerald-emeraldpanelclassic");
blockEmerald.carverHelper.addVariation(I18n.format("chisel.tile.emerald.3.desc"), 3, "emerald/a1-blockemerald-emeraldsmooth");
blockEmerald.carverHelper.addVariation(I18n.format("chisel.tile.emerald.4.desc"), 4, "emerald/a1-blockemerald-emeraldchunk");
blockEmerald.carverHelper.addVariation(I18n.format("chisel.tile.emerald.5.desc"), 5, "emerald/a1-blockemerald-emeraldornatelayer");
blockEmerald.carverHelper.addVariation(I18n.format("chisel.tile.emerald.6.desc"), 6, "emerald/a1-blockemerald-emeraldzelda");
blockEmerald.carverHelper.addVariation(I18n.format("chisel.tile.emerald.7.desc"), 7, "emerald/a1-blockquartz-cell");
blockEmerald.carverHelper.addVariation(I18n.format("chisel.tile.emerald.8.desc"), 8, "emerald/a1-blockquartz-cellbismuth");
blockEmerald.carverHelper.addVariation(I18n.format("chisel.tile.emerald.9.desc"), 9, "emerald/a1-blockquartz-four");
blockEmerald.carverHelper.addVariation(I18n.format("chisel.tile.emerald.10.desc"), 10, "emerald/a1-blockquartz-fourornate");
blockEmerald.carverHelper.addVariation(I18n.format("chisel.tile.emerald.11.desc"), 11, "emerald/a1-blockquartz-ornate");
blockEmerald.carverHelper.register(blockEmerald, "emerald");
Carving.chisel.registerOre("emerald", "blockEmerald");
}
@@ -559,21 +559,21 @@ public class ChiselBlocks
blockNetherBrick = (BlockCarvable) new BlockCarvable().setHardness(2.0F).setResistance(10.0F).setStepSound(Block.soundTypeStone);
Carving.chisel.addVariation("netherBrick", Blocks.nether_brick, 0, 0);
//blockNetherBrick.carverHelper.addVariation("Nether brick", 0, Blocks.nether_brick);
blockNetherBrick.carverHelper.addVariation("Blue nether brick", 1, "netherbrick/a1-netherbrick-brinstar");
blockNetherBrick.carverHelper.addVariation("Spattered nether brick", 2, "netherbrick/a1-netherbrick-classicspatter");
blockNetherBrick.carverHelper.addVariation("Nether brick made of guts", 3, "netherbrick/a1-netherbrick-guts");
blockNetherBrick.carverHelper.addVariation("Dark nether brick made of guts", 4, "netherbrick/a1-netherbrick-gutsdark");
blockNetherBrick.carverHelper.addVariation("Small nether brick made of guts", 5, "netherbrick/a1-netherbrick-gutssmall");
blockNetherBrick.carverHelper.addVariation("Blue nether brick with lava", 6, "netherbrick/a1-netherbrick-lavabrinstar");
blockNetherBrick.carverHelper.addVariation("Brown nether brick", 7, "netherbrick/a1-netherbrick-lavabrown");
blockNetherBrick.carverHelper.addVariation("Obsidian nether brick", 8, "netherbrick/a1-netherbrick-lavaobsidian");
blockNetherBrick.carverHelper.addVariation("Stone nether brick", 9, "netherbrick/a1-netherbrick-lavastonedark");
blockNetherBrick.carverHelper.addVariation("Nether brick made of meat", 10, "netherbrick/a1-netherbrick-meat");
blockNetherBrick.carverHelper.addVariation("Red nether brick made of meat", 11, "netherbrick/a1-netherbrick-meatred");
blockNetherBrick.carverHelper.addVariation("Small nether brick made of meat", 12, "netherbrick/a1-netherbrick-meatredsmall");
blockNetherBrick.carverHelper.addVariation("Small red nether brick made of meat", 13, "netherbrick/a1-netherbrick-meatsmall");
blockNetherBrick.carverHelper.addVariation("Red nether brick", 14, "netherbrick/a1-netherbrick-red");
blockNetherBrick.carverHelper.addVariation("Small red nether brick", 15, "netherbrick/a1-netherbrick-redsmall");
blockNetherBrick.carverHelper.addVariation(I18n.format("chisel.tile.netherBrick.1.desc"), 1, "netherbrick/a1-netherbrick-brinstar");
blockNetherBrick.carverHelper.addVariation(I18n.format("chisel.tile.netherBrick.2.desc"), 2, "netherbrick/a1-netherbrick-classicspatter");
blockNetherBrick.carverHelper.addVariation(I18n.format("chisel.tile.netherBrick.3.desc"), 3, "netherbrick/a1-netherbrick-guts");
blockNetherBrick.carverHelper.addVariation(I18n.format("chisel.tile.netherBrick.4.desc"), 4, "netherbrick/a1-netherbrick-gutsdark");
blockNetherBrick.carverHelper.addVariation(I18n.format("chisel.tile.netherBrick.5.desc"), 5, "netherbrick/a1-netherbrick-gutssmall");
blockNetherBrick.carverHelper.addVariation(I18n.format("chisel.tile.netherBrick.6.desc"), 6, "netherbrick/a1-netherbrick-lavabrinstar");
blockNetherBrick.carverHelper.addVariation(I18n.format("chisel.tile.netherBrick.7.desc"), 7, "netherbrick/a1-netherbrick-lavabrown");
blockNetherBrick.carverHelper.addVariation(I18n.format("chisel.tile.netherBrick.8.desc"), 8, "netherbrick/a1-netherbrick-lavaobsidian");
blockNetherBrick.carverHelper.addVariation(I18n.format("chisel.tile.netherBrick.9.desc"), 9, "netherbrick/a1-netherbrick-lavastonedark");
blockNetherBrick.carverHelper.addVariation(I18n.format("chisel.tile.netherBrick.10.desc"), 10, "netherbrick/a1-netherbrick-meat");
blockNetherBrick.carverHelper.addVariation(I18n.format("chisel.tile.netherBrick.11.desc"), 11, "netherbrick/a1-netherbrick-meatred");
blockNetherBrick.carverHelper.addVariation(I18n.format("chisel.tile.netherBrick.12.desc"), 12, "netherbrick/a1-netherbrick-meatredsmall");
blockNetherBrick.carverHelper.addVariation(I18n.format("chisel.tile.netherBrick.13.desc"), 13, "netherbrick/a1-netherbrick-meatsmall");
blockNetherBrick.carverHelper.addVariation(I18n.format("chisel.tile.netherBrick.14.desc"), 14, "netherbrick/a1-netherbrick-red");
blockNetherBrick.carverHelper.addVariation(I18n.format("chisel.tile.netherBrick.15.desc"), 15, "netherbrick/a1-netherbrick-redsmall");
blockNetherBrick.carverHelper.register(blockNetherBrick, "netherBrick");
Carving.chisel.registerOre("netherBrick", "netherBrick");
}
@@ -582,20 +582,20 @@ public class ChiselBlocks
{
blockNetherrack = (BlockCarvable) new BlockCarvable().setHardness(0.4F).setStepSound(Block.soundTypeStone);
Carving.chisel.addVariation("hellrock", Blocks.netherrack, 0, 0);
blockNetherrack.carverHelper.addVariation("Nethegravel with blood", 1, "netherrack/a1-netherrack-bloodgravel");
blockNetherrack.carverHelper.addVariation("Netherrack with blood", 2, "netherrack/a1-netherrack-bloodrock");
blockNetherrack.carverHelper.addVariation("Darker netherrack with blood", 3, "netherrack/a1-netherrack-bloodrockgrey");
blockNetherrack.carverHelper.addVariation("Blue netherrack", 4, "netherrack/a1-netherrack-brinstar");
blockNetherrack.carverHelper.addVariation("Shale blue netherrack", 5, "netherrack/a1-netherrack-brinstarshale");
blockNetherrack.carverHelper.addVariation("Classic netherrack", 6, "netherrack/a1-netherrack-classic");
blockNetherrack.carverHelper.addVariation("Spattered netherrack", 7, "netherrack/a1-netherrack-classicspatter");
blockNetherrack.carverHelper.addVariation("Netherrack made of guts", 8, "netherrack/a1-netherrack-guts");
blockNetherrack.carverHelper.addVariation("Dark netherrack made of guts", 9, "netherrack/a1-netherrack-gutsdark");
blockNetherrack.carverHelper.addVariation("Netherrack made of meat", 10, "netherrack/a1-netherrack-meat");
blockNetherrack.carverHelper.addVariation("Red netherrack made of meat", 11, "netherrack/a1-netherrack-meatred");
blockNetherrack.carverHelper.addVariation("Netherrack made of smaller meat chunks", 12, "netherrack/a1-netherrack-meatrock");
blockNetherrack.carverHelper.addVariation("Dark red netherrack", 13, "netherrack/a1-netherrack-red");
blockNetherrack.carverHelper.addVariation("Netherrack with lava flowing", 14, "netherrack/a1-netherrack-wells");
blockNetherrack.carverHelper.addVariation(I18n.format("chisel.tile.hellrock.1.desc"), 1, "netherrack/a1-netherrack-bloodgravel");
blockNetherrack.carverHelper.addVariation(I18n.format("chisel.tile.hellrock.2.desc"), 2, "netherrack/a1-netherrack-bloodrock");
blockNetherrack.carverHelper.addVariation(I18n.format("chisel.tile.hellrock.3.desc"), 3, "netherrack/a1-netherrack-bloodrockgrey");
blockNetherrack.carverHelper.addVariation(I18n.format("chisel.tile.hellrock.4.desc"), 4, "netherrack/a1-netherrack-brinstar");
blockNetherrack.carverHelper.addVariation(I18n.format("chisel.tile.hellrock.5.desc"), 5, "netherrack/a1-netherrack-brinstarshale");
blockNetherrack.carverHelper.addVariation(I18n.format("chisel.tile.hellrock.6.desc"), 6, "netherrack/a1-netherrack-classic");
blockNetherrack.carverHelper.addVariation(I18n.format("chisel.tile.hellrock.7.desc"), 7, "netherrack/a1-netherrack-classicspatter");
blockNetherrack.carverHelper.addVariation(I18n.format("chisel.tile.hellrock.8.desc"), 8, "netherrack/a1-netherrack-guts");
blockNetherrack.carverHelper.addVariation(I18n.format("chisel.tile.hellrock.9.desc"), 9, "netherrack/a1-netherrack-gutsdark");
blockNetherrack.carverHelper.addVariation(I18n.format("chisel.tile.hellrock.10.desc"), 10, "netherrack/a1-netherrack-meat");
blockNetherrack.carverHelper.addVariation(I18n.format("chisel.tile.hellrock.11.desc"), 11, "netherrack/a1-netherrack-meatred");
blockNetherrack.carverHelper.addVariation(I18n.format("chisel.tile.hellrock.12.desc"), 12, "netherrack/a1-netherrack-meatrock");
blockNetherrack.carverHelper.addVariation(I18n.format("chisel.tile.hellrock.13.desc"), 13, "netherrack/a1-netherrack-red");
blockNetherrack.carverHelper.addVariation(I18n.format("chisel.tile.hellrock.14.desc"), 14, "netherrack/a1-netherrack-wells");
blockNetherrack.carverHelper.register(blockNetherrack, "hellrock");
Carving.chisel.registerOre("hellrock", "blockNetherrack");
}
@@ -604,21 +604,21 @@ public class ChiselBlocks
{
blockCobblestoneMossy = (BlockCarvable) new BlockCarvable().setHardness(2.0F).setResistance(10.0F).setStepSound(Block.soundTypeStone);
Carving.chisel.addVariation("stoneMoss", Blocks.mossy_cobblestone, 0, 0);
blockCobblestoneMossy.carverHelper.addVariation("Aligned mossy cobblestone bricks", 1, "cobblestonemossy/terrain-cobb-brickaligned");
blockCobblestoneMossy.carverHelper.addVariation("Detailed mossy cobblestone bricks", 2, "cobblestonemossy/terrain-cob-detailedbrick");
blockCobblestoneMossy.carverHelper.addVariation("Small mossy cobblestone bricks", 3, "cobblestonemossy/terrain-cob-smallbrick");
blockCobblestoneMossy.carverHelper.addVariation("Large mossy cobblestone tiles", 4, "cobblestonemossy/terrain-cobblargetiledark");
blockCobblestoneMossy.carverHelper.addVariation("Small mossy cobblestone tiles", 5, "cobblestonemossy/terrain-cobbsmalltile");
blockCobblestoneMossy.carverHelper.addVariation("French mossy cobblestone tiles", 6, "cobblestonemossy/terrain-cob-french");
blockCobblestoneMossy.carverHelper.addVariation("French mossy cobblestone tiles", 7, "cobblestonemossy/terrain-cob-french2");
blockCobblestoneMossy.carverHelper.addVariation("Creeper mossy cobblestone tiles", 8, "cobblestonemossy/terrain-cobmoss-creepdungeon");
blockCobblestoneMossy.carverHelper.addVariation("Damaged mossy cobblestone tiles", 9, "cobblestonemossy/terrain-mossysmalltiledark");
blockCobblestoneMossy.carverHelper.addVariation("Huge mossy cobblestone tiles", 10, "cobblestonemossy/terrain-pistonback-dungeontile");
blockCobblestoneMossy.carverHelper.addVariation("Mossy cobblestone with creeper panel", 11, "cobblestonemossy/terrain-pistonback-darkcreeper");
blockCobblestoneMossy.carverHelper.addVariation("Mossy cobblestone with dent", 12, "cobblestonemossy/terrain-pistonback-darkdent");
blockCobblestoneMossy.carverHelper.addVariation("Mossy cobblestone with panel", 13, "cobblestonemossy/terrain-pistonback-darkemboss");
blockCobblestoneMossy.carverHelper.addVariation("Mossy cobblestone with light panel", 14, "cobblestonemossy/terrain-pistonback-darkmarker");
blockCobblestoneMossy.carverHelper.addVariation("Mossy cobblestone with dark panel", 15, "cobblestonemossy/terrain-pistonback-darkpanel");
blockCobblestoneMossy.carverHelper.addVariation(I18n.format("chisel.tile.stoneMoss.1.desc"), 1, "cobblestonemossy/terrain-cobb-brickaligned");
blockCobblestoneMossy.carverHelper.addVariation(I18n.format("chisel.tile.stoneMoss.2.desc"), 2, "cobblestonemossy/terrain-cob-detailedbrick");
blockCobblestoneMossy.carverHelper.addVariation(I18n.format("chisel.tile.stoneMoss.3.desc"), 3, "cobblestonemossy/terrain-cob-smallbrick");
blockCobblestoneMossy.carverHelper.addVariation(I18n.format("chisel.tile.stoneMoss.4.desc"), 4, "cobblestonemossy/terrain-cobblargetiledark");
blockCobblestoneMossy.carverHelper.addVariation(I18n.format("chisel.tile.stoneMoss.5.desc"), 5, "cobblestonemossy/terrain-cobbsmalltile");
blockCobblestoneMossy.carverHelper.addVariation(I18n.format("chisel.tile.stoneMoss.6.desc"), 6, "cobblestonemossy/terrain-cob-french");
blockCobblestoneMossy.carverHelper.addVariation(I18n.format("chisel.tile.stoneMoss.7.desc"), 7, "cobblestonemossy/terrain-cob-french2");
blockCobblestoneMossy.carverHelper.addVariation(I18n.format("chisel.tile.stoneMoss.8.desc"), 8, "cobblestonemossy/terrain-cobmoss-creepdungeon");
blockCobblestoneMossy.carverHelper.addVariation(I18n.format("chisel.tile.stoneMoss.9.desc"), 9, "cobblestonemossy/terrain-mossysmalltiledark");
blockCobblestoneMossy.carverHelper.addVariation(I18n.format("chisel.tile.stoneMoss.10.desc"), 10, "cobblestonemossy/terrain-pistonback-dungeontile");
blockCobblestoneMossy.carverHelper.addVariation(I18n.format("chisel.tile.stoneMoss.11.desc"), 11, "cobblestonemossy/terrain-pistonback-darkcreeper");
blockCobblestoneMossy.carverHelper.addVariation(I18n.format("chisel.tile.stoneMoss.12.desc"), 12, "cobblestonemossy/terrain-pistonback-darkdent");
blockCobblestoneMossy.carverHelper.addVariation(I18n.format("chisel.tile.stoneMoss.13.desc"), 13, "cobblestonemossy/terrain-pistonback-darkemboss");
blockCobblestoneMossy.carverHelper.addVariation(I18n.format("chisel.tile.stoneMoss.14.desc"), 14, "cobblestonemossy/terrain-pistonback-darkmarker");
blockCobblestoneMossy.carverHelper.addVariation(I18n.format("chisel.tile.stoneMoss.15.desc"), 15, "cobblestonemossy/terrain-pistonback-darkpanel");
blockCobblestoneMossy.carverHelper.register(blockCobblestoneMossy, "stoneMoss");
Carving.chisel.registerOre("stoneMoss", "blockCobblestoneMossy");
}
@@ -628,25 +628,25 @@ public class ChiselBlocks
stoneBrick = (BlockCarvable) new BlockCarvable().setHardness(1.5F).setResistance(10.0F).setStepSound(Block.soundTypeStone);
for(int i = 0; i < 4; i++)
Carving.chisel.addVariation("stoneBrick", Blocks.stonebrick, i, i);
stoneBrick.carverHelper.addVariation("Small stone bricks", 4, "stonebrick/smallbricks");
stoneBrick.carverHelper.addVariation("Wide stone bricks", 5, "stonebrick/largebricks");
stoneBrick.carverHelper.addVariation("Small disordered stone bricks", 6, "stonebrick/smallchaotic");
stoneBrick.carverHelper.addVariation("Disordered stone bricks", 7, "stonebrick/chaoticbricks");
stoneBrick.carverHelper.addVariation("Disordered stone panels", 8, "stonebrick/chaotic");
stoneBrick.carverHelper.addVariation("Stone bricks in a fancy arrangement", 9, "stonebrick/fancy");
stoneBrick.carverHelper.addVariation("Ornate stone brick tiles", 10, "stonebrick/ornate");
stoneBrick.carverHelper.addVariation("Large ornate stone brick tiles", 11, "stonebrick/largeornate");
stoneBrick.carverHelper.addVariation("Stone panel", 12, "stonebrick/panel-hard");
stoneBrick.carverHelper.addVariation("Sunken stone panel", 13, "stonebrick/sunken");
stoneBrick.carverHelper.addVariation("Ornate stone panel", 14, "stonebrick/ornatepanel");
stoneBrick.carverHelper.addVariation("Poison stone brick", 15, "stonebrick/poison");
stoneBrick.carverHelper.addVariation(I18n.format("chisel.tile.stoneBrick.4.desc"), 4, "stonebrick/smallbricks");
stoneBrick.carverHelper.addVariation(I18n.format("chisel.tile.stoneBrick.5.desc"), 5, "stonebrick/largebricks");
stoneBrick.carverHelper.addVariation(I18n.format("chisel.tile.stoneBrick.6.desc"), 6, "stonebrick/smallchaotic");
stoneBrick.carverHelper.addVariation(I18n.format("chisel.tile.stoneBrick.7.desc"), 7, "stonebrick/chaoticbricks");
stoneBrick.carverHelper.addVariation(I18n.format("chisel.tile.stoneBrick.8.desc"), 8, "stonebrick/chaotic");
stoneBrick.carverHelper.addVariation(I18n.format("chisel.tile.stoneBrick.9.desc"), 9, "stonebrick/fancy");
stoneBrick.carverHelper.addVariation(I18n.format("chisel.tile.stoneBrick.10.desc"), 10, "stonebrick/ornate");
stoneBrick.carverHelper.addVariation(I18n.format("chisel.tile.stoneBrick.11.desc"), 11, "stonebrick/largeornate");
stoneBrick.carverHelper.addVariation(I18n.format("chisel.tile.stoneBrick.12.desc"), 12, "stonebrick/panel-hard");
stoneBrick.carverHelper.addVariation(I18n.format("chisel.tile.stoneBrick.13.desc"), 13, "stonebrick/sunken");
stoneBrick.carverHelper.addVariation(I18n.format("chisel.tile.stoneBrick.14.desc"), 14, "stonebrick/ornatepanel");
stoneBrick.carverHelper.addVariation(I18n.format("chisel.tile.stoneBrick.15.desc"), 15, "stonebrick/poison");
stoneBrick.carverHelper.register(stoneBrick, "stoneBrick");
Carving.chisel.registerOre("stoneBrick", "blockStoneBrick");
}
if(Chisel.featureEnabled("snakestone"))
{
blockSnakestone = (BlockSnakestone) new BlockSnakestone("Chisel:snakestone/snake/").setBlockName("snakestone");
blockSnakestone = (BlockSnakestone) new BlockSnakestone("Chisel:snakestone/snake/").setBlockName("snakestoneStone");
GameRegistry.registerBlock(blockSnakestone, ItemCarvable.class, blockSnakestone.getUnlocalizedName());
//LanguageRegistry.addName(new ItemStack(blockSnakestone, 1, 1), "Stone snake block head");
//LanguageRegistry.addName(new ItemStack(blockSnakestone, 1, 13), "Stone snake block body");