diff --git a/src/main/java/com/cricketcraft/chisel/Features.java b/src/main/java/com/cricketcraft/chisel/Features.java index 066f2ee7..61791b1c 100644 --- a/src/main/java/com/cricketcraft/chisel/Features.java +++ b/src/main/java/com/cricketcraft/chisel/Features.java @@ -83,12 +83,12 @@ public enum Features { void addBlocks() { BlockCarvable aluminum = (BlockCarvable) new BlockBeaconBase(Material.iron).setStepSound(Block.soundTypeMetal).setCreativeTab(ChiselTabs.tabModdedChiselBlocks).setHardness(5F) .setResistance(10F); - aluminum.carverHelper.addVariation("tile.metalOre.0.desc", 0, "metals/aluminum/caution"); - aluminum.carverHelper.addVariation("tile.metalOre.1.desc", 1, "metals/aluminum/crate"); - aluminum.carverHelper.addVariation("tile.metalOre.2.desc", 2, "metals/aluminum/thermal"); - aluminum.carverHelper.addVariation("tile.metalOre.3.desc", 3, "metals/aluminum/adv"); - aluminum.carverHelper.addVariation("tile.metalOre.4.desc", 4, "metals/aluminum/egregious"); - aluminum.carverHelper.addVariation("tile.metalOre.5.desc", 5, "metals/aluminum/bolted"); + aluminum.carverHelper.addVariation("tile.metalOre.0.desc", 0, "metals/aluminum/caution", 20); + aluminum.carverHelper.addVariation("tile.metalOre.1.desc", 1, "metals/aluminum/crate", 21); + aluminum.carverHelper.addVariation("tile.metalOre.2.desc", 2, "metals/aluminum/thermal", 22); + aluminum.carverHelper.addVariation("tile.metalOre.3.desc", 3, "metals/aluminum/adv", 23); + aluminum.carverHelper.addVariation("tile.metalOre.4.desc", 4, "metals/aluminum/egregious", 24); + aluminum.carverHelper.addVariation("tile.metalOre.5.desc", 5, "metals/aluminum/bolted", 25); aluminum.carverHelper.registerAll(aluminum, "aluminumblock"); Carving.chisel.registerOre("aluminumblock", "blockAluminum"); } @@ -111,7 +111,6 @@ public enum Features { @Override void addBlocks() { BlockCarvable andesite = (BlockCarvable) new BlockCarvable(Material.rock).setHardness(2.0F).setResistance(10.0F).setCreativeTab(ChiselTabs.tabStoneChiselBlocks); - andesite.carverHelper.addVariation("tile.andesite.0.desc", 0, "andesite/andesite"); andesite.carverHelper.addVariation("tile.andesite.1.desc", 1, "andesite/andesitePolished"); andesite.carverHelper.addVariation("tile.andesite.2.desc", 2, "andesite/andesitePillar"); @@ -167,8 +166,8 @@ public enum Features { @Override void addBlocks() { BlockCarvable arcane = (BlockCarvable) new BlockCarvable(Material.rock).setCreativeTab(ChiselTabs.tabModdedChiselBlocks).setStepSound(Block.soundTypeStone); - Carving.chisel.addVariation("arcane", GameRegistry.findBlock("Thaumcraft", "blockCosmeticSolid"), 6, 0); - Carving.chisel.addVariation("arcane", GameRegistry.findBlock("Thaumcraft", "blockCosmeticSolid"), 7, 1); + Carving.chisel.addVariation("arcane", GameRegistry.findBlock("Thaumcraft", "blockCosmeticSolid"), 6, -5); + Carving.chisel.addVariation("arcane", GameRegistry.findBlock("Thaumcraft", "blockCosmeticSolid"), 7, -4); arcane.carverHelper.addVariation("tile.arcane.0.desc", 0, "arcane/moonEngrave"); arcane.carverHelper.addVariation("tile.arcane.1.desc", 1, "arcane/moonGlowAnim"); arcane.carverHelper.addVariation("tile.arcane.2.desc", 2, "arcane/arcaneTile"); @@ -308,12 +307,12 @@ public enum Features { void addBlocks() { BlockCarvable bronze = (BlockCarvable) new BlockBeaconBase(Material.iron).setStepSound(Block.soundTypeMetal).setCreativeTab(ChiselTabs.tabModdedChiselBlocks).setHardness(5F) .setResistance(10F); - bronze.carverHelper.addVariation("tile.metalOre.0.desc", 0, "metals/bronze/caution"); - bronze.carverHelper.addVariation("tile.metalOre.1.desc", 1, "metals/bronze/crate"); - bronze.carverHelper.addVariation("tile.metalOre.2.desc", 2, "metals/bronze/thermal"); - bronze.carverHelper.addVariation("tile.metalOre.3.desc", 3, "metals/bronze/adv"); - bronze.carverHelper.addVariation("tile.metalOre.4.desc", 4, "metals/bronze/egregious"); - bronze.carverHelper.addVariation("tile.metalOre.5.desc", 5, "metals/bronze/bolted"); + bronze.carverHelper.addVariation("tile.metalOre.0.desc", 0, "metals/bronze/caution", 20); + bronze.carverHelper.addVariation("tile.metalOre.1.desc", 1, "metals/bronze/crate", 21); + bronze.carverHelper.addVariation("tile.metalOre.2.desc", 2, "metals/bronze/thermal", 22); + bronze.carverHelper.addVariation("tile.metalOre.3.desc", 3, "metals/bronze/adv", 23); + bronze.carverHelper.addVariation("tile.metalOre.4.desc", 4, "metals/bronze/egregious", 24); + bronze.carverHelper.addVariation("tile.metalOre.5.desc", 5, "metals/bronze/bolted", 25); bronze.carverHelper.registerAll(bronze, "bronzeblock"); Carving.chisel.registerOre("bronzeblock", "blockBronze"); } @@ -559,12 +558,12 @@ public enum Features { void addBlocks() { BlockCarvable copper = (BlockCarvable) new BlockBeaconBase(Material.iron).setStepSound(Block.soundTypeMetal).setCreativeTab(ChiselTabs.tabModdedChiselBlocks).setHardness(5F) .setResistance(10F); - copper.carverHelper.addVariation("tile.metalOre.0.desc", 0, "metals/copper/caution"); - copper.carverHelper.addVariation("tile.metalOre.1.desc", 1, "metals/copper/crate"); - copper.carverHelper.addVariation("tile.metalOre.2.desc", 2, "metals/copper/thermal"); - copper.carverHelper.addVariation("tile.metalOre.3.desc", 3, "metals/copper/adv"); - copper.carverHelper.addVariation("tile.metalOre.4.desc", 4, "metals/copper/egregious"); - copper.carverHelper.addVariation("tile.metalOre.5.desc", 5, "metals/copper/bolted"); + copper.carverHelper.addVariation("tile.metalOre.0.desc", 0, "metals/copper/caution", 20); + copper.carverHelper.addVariation("tile.metalOre.1.desc", 1, "metals/copper/crate", 21); + copper.carverHelper.addVariation("tile.metalOre.2.desc", 2, "metals/copper/thermal", 22); + copper.carverHelper.addVariation("tile.metalOre.3.desc", 3, "metals/copper/adv", 23); + copper.carverHelper.addVariation("tile.metalOre.4.desc", 4, "metals/copper/egregious", 24); + copper.carverHelper.addVariation("tile.metalOre.5.desc", 5, "metals/copper/bolted", 25); copper.carverHelper.registerAll(copper, "copperblock"); Carving.chisel.registerOre("copperblock", "blockCopper"); } @@ -623,7 +622,7 @@ public enum Features { void addBlocks() { BlockCarvable dirt = (BlockCarvable) new BlockCarvable(Material.ground).setCreativeTab(ChiselTabs.tabOtherChiselBlocks).setHardness(0.5F).setStepSound(Block.soundTypeGravel) .setBlockName("dirt.default"); - Carving.chisel.addVariation("dirt", Blocks.dirt, 0, 0); + Carving.chisel.addVariation("dirt", Blocks.dirt, 0, -1); // dirt.carverHelper.addVariation("Dirt", 0, Blocks.dirt); dirt.carverHelper.addVariation("tile.dirt.0.desc", 0, "dirt/bricks"); @@ -639,6 +638,9 @@ public enum Features { dirt.carverHelper.addVariation("tile.dirt.10.desc", 10, "dirt/vert"); dirt.carverHelper.addVariation("tile.dirt.11.desc", 11, "dirt/layers"); dirt.carverHelper.addVariation("tile.dirt.12.desc", 12, "dirt/vertical"); + dirt.carverHelper.addVariation("tile.dirt.13.desc", 13, "dirt/chunky"); + dirt.carverHelper.addVariation("tile.dirt.14.desc", 14, "dirt/horizontal"); + dirt.carverHelper.addVariation("tile.dirt.15.desc", 15, "dirt/plate"); dirt.carverHelper.registerAll(dirt, "dirt"); dirt.setHarvestLevel("shovel", 0); OreDictionary.registerOre("dirt", dirt); @@ -708,10 +710,10 @@ public enum Features { BlockCarvable factoryblock2 = (BlockCarvable) new BlockCarvable(Material.iron).setCreativeTab(ChiselTabs.tabMetalChiselBlocks).setHardness(2.0F).setResistance(10F) .setStepSound(Chisel.soundMetalFootstep); - factoryblock2.carverHelper.addVariation("tile.factory2.0.desc", 0, "factory/iceiceice"); - factoryblock2.carverHelper.addVariation("tile.factory2.1.desc", 1, "factory/vent"); - factoryblock2.carverHelper.addVariation("tile.factory2.2.desc", 2, "factory/tilemosaic"); - factoryblock2.carverHelper.addVariation("tile.factory2.3.desc", 3, "factory/wireframeblue"); + factoryblock2.carverHelper.addVariation("tile.factory2.0.desc", 0, "factory/iceiceice", 20); + factoryblock2.carverHelper.addVariation("tile.factory2.1.desc", 1, "factory/vent", 21); + factoryblock2.carverHelper.addVariation("tile.factory2.2.desc", 2, "factory/tilemosaic", 22); + factoryblock2.carverHelper.addVariation("tile.factory2.3.desc", 3, "factory/wireframeblue", 23); factoryblock2.carverHelper.registerAll(factoryblock2, "factoryblock2"); factoryblock2.carverHelper.registerVariations("factoryblock", factoryblock2); } @@ -765,8 +767,9 @@ public enum Features { fantasyblock2.carverHelper.addVariation("tile.fantasyblock2.13.desc", 13, "fantasy2/block"); fantasyblock2.carverHelper.addVariation("tile.fantasyblock2.14.desc", 14, "fantasy2/bricks-chaotic"); fantasyblock2.carverHelper.addVariation("tile.fantasyblock2.15.desc", 15, "fantasy2/bricks-wear"); - fantasyblock2.carverHelper.registerAll(fantasyblock2, "fantasyblock2"); - Carving.chisel.registerOre("fantasyblock2", "fantasy2"); + + fantasyblock2.carverHelper.registerBlock(fantasyblock2, "fantasyblock2"); + fantasyblock2.carverHelper.registerVariations("fantasy", fantasyblock2); } @Override @@ -792,15 +795,9 @@ public enum Features { BlockCarvable circuits = (BlockCarvable) new BlockCarvableGlow("animations/strobe").setCreativeTab(ChiselTabs.tabMetalChiselBlocks).setHardness(2.0F).setResistance(10.0F); for (int i = 0; i < 16; i++) { - circuits.carverHelper.addVariation("tile.futuraCircuit." + ItemDye.field_150921_b[i] + ".desc", i, "futura/circuitPlate"); + circuits.carverHelper.addVariation("tile.futuraCircuit." + ItemDye.field_150921_b[i] + ".desc", i, "futura/circuitPlate", (i+20)); } - // Looks like an AE Controller, feels like one, even lags like one! - /*BlockSnakestone FakeAE = (BlockSnakestone) new BlockSnakestone("Chisel:futura/controllerHack/").setBlockName("chisel.fakeController").setCreativeTab(ChiselTabs.tabMetalChiselBlocks); - GameRegistry.registerBlock(FakeAE, ItemCarvable.class, "FakeAE"); - Carving.chisel.addVariation("futura", FakeAE, 1, 67); - Carving.chisel.addVariation("futura", FakeAE, 13, 68);*/ - circuits.carverHelper.registerBlock(circuits, "futuraCircuit"); circuits.carverHelper.registerVariations("futura", circuits); Carving.chisel.registerOre("futura", "futura"); @@ -837,7 +834,7 @@ public enum Features { Carving.chisel.registerOre("glass", "glass"); BlockCarvableGlass glass2 = (BlockCarvableGlass) new BlockCarvableGlass().setCreativeTab(ChiselTabs.tabOtherChiselBlocks).setHardness(0.3F).setStepSound(Block.soundTypeGlass); - glass2.carverHelper.addVariation("tile.glass2.0.desc", 0, "glass/chrono"); + glass2.carverHelper.addVariation("tile.glass2.0.desc", 0, "glass/chrono", 20); glass2.carverHelper.registerBlock(glass2, "glass2"); glass2.carverHelper.registerVariations("glass", glass2); } @@ -976,12 +973,12 @@ public enum Features { BlockCarvable gold2 = (BlockCarvable) new BlockBeaconBase(Material.iron).setStepSound(Block.soundTypeMetal).setCreativeTab(ChiselTabs.tabModdedChiselBlocks).setHardness(5F) .setResistance(10F); - gold2.carverHelper.addVariation("tile.metalOre.0.desc", 0, "metals/gold/caution"); - gold2.carverHelper.addVariation("tile.metalOre.1.desc", 1, "metals/gold/crate"); - gold2.carverHelper.addVariation("tile.metalOre.2.desc", 2, "metals/gold/thermal"); - gold2.carverHelper.addVariation("tile.metalOre.3.desc", 3, "metals/gold/adv"); - gold2.carverHelper.addVariation("tile.metalOre.4.desc", 4, "metals/gold/egregious"); - gold2.carverHelper.addVariation("tile.metalOre.5.desc", 5, "metals/gold/bolted"); + gold2.carverHelper.addVariation("tile.metalOre.0.desc", 0, "metals/gold/caution", 20); + gold2.carverHelper.addVariation("tile.metalOre.1.desc", 1, "metals/gold/crate", 21); + gold2.carverHelper.addVariation("tile.metalOre.2.desc", 2, "metals/gold/thermal", 22); + gold2.carverHelper.addVariation("tile.metalOre.3.desc", 3, "metals/gold/adv", 23); + gold2.carverHelper.addVariation("tile.metalOre.4.desc", 4, "metals/gold/egregious", 24); + gold2.carverHelper.addVariation("tile.metalOre.5.desc", 5, "metals/gold/bolted", 25); gold2.carverHelper.registerBlock(gold2, "gold2"); gold2.carverHelper.registerVariations("gold_block", gold2); @@ -1056,7 +1053,7 @@ public enum Features { BlockCarvable hexLargePlating = (BlockCarvable) new BlockCarvableGlow("animations/archetype2").setCreativeTab(ChiselTabs.tabMetalChiselBlocks).setHardness(2.0F).setResistance(10.0F); for (int i = 0; i < 16; i++) { - hexLargePlating.carverHelper.addVariation("tile.hexPlating." + ItemDye.field_150921_b[i] + ".desc", i, "hexPlating/hexNew"); + hexLargePlating.carverHelper.addVariation("tile.hexPlating." + ItemDye.field_150921_b[i] + ".desc", i, "hexPlating/hexNew", (i+20)); } hexLargePlating.carverHelper.registerBlock(hexLargePlating, "hexLargePlating"); @@ -1234,12 +1231,12 @@ public enum Features { BlockCarvable iron2 = (BlockCarvable) new BlockBeaconBase(Material.iron).setStepSound(Block.soundTypeMetal).setCreativeTab(ChiselTabs.tabModdedChiselBlocks).setHardness(5F) .setResistance(10F); - iron2.carverHelper.addVariation("tile.metalOre.0.desc", 0, "metals/iron/caution"); - iron2.carverHelper.addVariation("tile.metalOre.1.desc", 1, "metals/iron/crate"); - iron2.carverHelper.addVariation("tile.metalOre.2.desc", 2, "metals/iron/thermal"); - iron2.carverHelper.addVariation("tile.metalOre.3.desc", 3, "metals/iron/adv"); - iron2.carverHelper.addVariation("tile.metalOre.4.desc", 4, "metals/iron/egregious"); - iron2.carverHelper.addVariation("tile.metalOre.5.desc", 5, "metals/iron/bolted"); + iron2.carverHelper.addVariation("tile.metalOre.0.desc", 0, "metals/iron/caution", 20); + iron2.carverHelper.addVariation("tile.metalOre.1.desc", 1, "metals/iron/crate", 21); + iron2.carverHelper.addVariation("tile.metalOre.2.desc", 2, "metals/iron/thermal", 22); + iron2.carverHelper.addVariation("tile.metalOre.3.desc", 3, "metals/iron/adv", 23); + iron2.carverHelper.addVariation("tile.metalOre.4.desc", 4, "metals/iron/egregious", 24); + iron2.carverHelper.addVariation("tile.metalOre.5.desc", 5, "metals/iron/bolted", 25); iron2.carverHelper.registerBlock(iron2, "iron2"); iron2.carverHelper.registerVariations("iron_block", iron2); @@ -1386,7 +1383,7 @@ public enum Features { Carving.chisel.addVariation("leaves", Blocks.leaves, 3, 0); Carving.chisel.addVariation("leaves", Blocks.leaves2, 0, 0); Carving.chisel.addVariation("leaves", Blocks.leaves2, 1, 0); - if (Configurations.fancy) { + if (Configurations.fancy) { //TODO: This looks problematic -Drullkus leaves.carverHelper.addVariation("tile.leaves.6.desc", 6, "leaves/dead"); leaves.carverHelper.addVariation("tile.leaves.7.desc", 7, "leaves/fancy"); leaves.carverHelper.addVariation("tile.leaves.8.desc", 8, "leaves/pinkpetal"); @@ -1676,11 +1673,11 @@ public enum Features { imperial.carverHelper.registerAll(imperial, "nation"); BlockCarvable rebel = (BlockCarvable) new BlockCarvable(Material.rock).setCreativeTab(ChiselTabs.tabMetalChiselBlocks).setHardness(2.0F).setResistance(10F); - rebel.carverHelper.addVariation("tile.nation.0.desc", 0, "nation/rebelCamo"); - rebel.carverHelper.addVariation("tile.nation.1.desc", 1, "nation/rebelCamoSecluded"); - rebel.carverHelper.addVariation("tile.nation.2.desc", 2, "nation/rebelPlate"); - rebel.carverHelper.addVariation("tile.nation.3.desc", 3, "nation/rebelCautionWhite"); - rebel.carverHelper.addVariation("tile.nation.4.desc", 4, "nation/rebelCautionRed"); + rebel.carverHelper.addVariation("tile.nation.0.desc", 0, "nation/rebelCamo", 20); + rebel.carverHelper.addVariation("tile.nation.1.desc", 1, "nation/rebelCamoSecluded", 21); + rebel.carverHelper.addVariation("tile.nation.2.desc", 2, "nation/rebelPlate", 22); + rebel.carverHelper.addVariation("tile.nation.3.desc", 3, "nation/rebelCautionWhite", 23); + rebel.carverHelper.addVariation("tile.nation.4.desc", 4, "nation/rebelCautionRed", 24); rebel.carverHelper.registerBlock(rebel, "rebel"); rebel.carverHelper.registerVariations("nation", rebel); @@ -2162,9 +2159,9 @@ public enum Features { Carving.chisel.addVariation("sandstone", Blocks.sandstone, 0, -5); Carving.chisel.addVariation("sandstone", Blocks.sandstone, 1, -4); Carving.chisel.addVariation("sandstone", Blocks.sandstone, 2, -3); - sandstone.carverHelper.addVariation("tile.sandstone.0.desc", 0, "sandstone/terrain-sandstone-smoothglyph"); - sandstone.carverHelper.addVariation("tile.sandstone.1.desc", 1, "sandstone/terrain-sandstone-solidcobble"); - sandstone.carverHelper.addVariation("tile.sandstone.2.desc", 2, "sandstone/a0-sandstonepreview-boxcreeper"); + sandstone.carverHelper.addVariation("tile.sandstone.0.desc", 0, "sandstone/terrain-sandstone-smoothglyph", 16); + sandstone.carverHelper.addVariation("tile.sandstone.1.desc", 1, "sandstone/terrain-sandstone-solidcobble", 17); + sandstone.carverHelper.addVariation("tile.sandstone.2.desc", 2, "sandstone/a0-sandstonepreview-boxcreeper", 18); sandstone.carverHelper.addVariation("tile.sandstone.3.desc", 3, "sandstone/faded"); sandstone.carverHelper.addVariation("tile.sandstone.4.desc", 4, "sandstone/column"); sandstone.carverHelper.addVariation("tile.sandstone.5.desc", 5, "sandstone/capstone"); @@ -2180,23 +2177,29 @@ public enum Features { sandstone.carverHelper.addVariation("tile.sandstone.15.desc", 15, "sandstone/horizontal-tiles"); sandstone.carverHelper.registerAll(sandstone, "sandstone"); + BlockCarvable sandstone2 = (BlockCarvable) new BlockCarvable(Material.rock).setCreativeTab(ChiselTabs.tabStoneChiselBlocks).setStepSound(Block.soundTypeStone).setHardness(0.8F); + sandstone2.carverHelper.addVariation("tile.sandstone.16.desc", 0, "sandstone2/terrain-sandstone-brickflat", 19); + sandstone2.carverHelper.addVariation("tile.sandstone.17.desc", 1, "sandstone2/a0-sandstonepreview-smoothflat", 20); + sandstone2.carverHelper.registerBlock(sandstone2, "sandstone2"); + sandstone2.carverHelper.registerVariations("sandstone", sandstone2); + BlockCarvable sandstone_scribbles = (BlockCarvable) new BlockCarvable(Material.rock).setCreativeTab(ChiselTabs.tabStoneChiselBlocks).setStepSound(Block.soundTypeStone).setHardness(0.8F); - sandstone_scribbles.carverHelper.addVariation("tile.sandstoneScribbles.desc", 0, "sandstone-scribbles/scribbles-0", 16); - sandstone_scribbles.carverHelper.addVariation("tile.sandstoneScribbles.desc", 1, "sandstone-scribbles/scribbles-1", 17); - sandstone_scribbles.carverHelper.addVariation("tile.sandstoneScribbles.desc", 2, "sandstone-scribbles/scribbles-2", 18); - sandstone_scribbles.carverHelper.addVariation("tile.sandstoneScribbles.desc", 3, "sandstone-scribbles/scribbles-3", 19); - sandstone_scribbles.carverHelper.addVariation("tile.sandstoneScribbles.desc", 4, "sandstone-scribbles/scribbles-4", 20); - sandstone_scribbles.carverHelper.addVariation("tile.sandstoneScribbles.desc", 5, "sandstone-scribbles/scribbles-5", 21); - sandstone_scribbles.carverHelper.addVariation("tile.sandstoneScribbles.desc", 6, "sandstone-scribbles/scribbles-6", 22); - sandstone_scribbles.carverHelper.addVariation("tile.sandstoneScribbles.desc", 7, "sandstone-scribbles/scribbles-7", 23); - sandstone_scribbles.carverHelper.addVariation("tile.sandstoneScribbles.desc", 8, "sandstone-scribbles/scribbles-8", 24); - sandstone_scribbles.carverHelper.addVariation("tile.sandstoneScribbles.desc", 9, "sandstone-scribbles/scribbles-9", 25); - sandstone_scribbles.carverHelper.addVariation("tile.sandstoneScribbles.desc", 10, "sandstone-scribbles/scribbles-10", 26); - sandstone_scribbles.carverHelper.addVariation("tile.sandstoneScribbles.desc", 11, "sandstone-scribbles/scribbles-11", 27); - sandstone_scribbles.carverHelper.addVariation("tile.sandstoneScribbles.desc", 12, "sandstone-scribbles/scribbles-12", 28); - sandstone_scribbles.carverHelper.addVariation("tile.sandstoneScribbles.desc", 13, "sandstone-scribbles/scribbles-13", 29); - sandstone_scribbles.carverHelper.addVariation("tile.sandstoneScribbles.desc", 14, "sandstone-scribbles/scribbles-14", 30); - sandstone_scribbles.carverHelper.addVariation("tile.sandstoneScribbles.desc", 15, "sandstone-scribbles/scribbles-15", 31); + sandstone_scribbles.carverHelper.addVariation("tile.sandstoneScribbles.desc", 0, "sandstone-scribbles/scribbles-0", 36); + sandstone_scribbles.carverHelper.addVariation("tile.sandstoneScribbles.desc", 1, "sandstone-scribbles/scribbles-1", 37); + sandstone_scribbles.carverHelper.addVariation("tile.sandstoneScribbles.desc", 2, "sandstone-scribbles/scribbles-2", 38); + sandstone_scribbles.carverHelper.addVariation("tile.sandstoneScribbles.desc", 3, "sandstone-scribbles/scribbles-3", 39); + sandstone_scribbles.carverHelper.addVariation("tile.sandstoneScribbles.desc", 4, "sandstone-scribbles/scribbles-4", 40); + sandstone_scribbles.carverHelper.addVariation("tile.sandstoneScribbles.desc", 5, "sandstone-scribbles/scribbles-5", 41); + sandstone_scribbles.carverHelper.addVariation("tile.sandstoneScribbles.desc", 6, "sandstone-scribbles/scribbles-6", 42); + sandstone_scribbles.carverHelper.addVariation("tile.sandstoneScribbles.desc", 7, "sandstone-scribbles/scribbles-7", 43); + sandstone_scribbles.carverHelper.addVariation("tile.sandstoneScribbles.desc", 8, "sandstone-scribbles/scribbles-8", 44); + sandstone_scribbles.carverHelper.addVariation("tile.sandstoneScribbles.desc", 9, "sandstone-scribbles/scribbles-9", 45); + sandstone_scribbles.carverHelper.addVariation("tile.sandstoneScribbles.desc", 10, "sandstone-scribbles/scribbles-10", 46); + sandstone_scribbles.carverHelper.addVariation("tile.sandstoneScribbles.desc", 11, "sandstone-scribbles/scribbles-11", 47); + sandstone_scribbles.carverHelper.addVariation("tile.sandstoneScribbles.desc", 12, "sandstone-scribbles/scribbles-12", 48); + sandstone_scribbles.carverHelper.addVariation("tile.sandstoneScribbles.desc", 13, "sandstone-scribbles/scribbles-13", 49); + sandstone_scribbles.carverHelper.addVariation("tile.sandstoneScribbles.desc", 14, "sandstone-scribbles/scribbles-14", 50); + sandstone_scribbles.carverHelper.addVariation("tile.sandstoneScribbles.desc", 15, "sandstone-scribbles/scribbles-15", 51); sandstone_scribbles.carverHelper.registerBlock(sandstone_scribbles, "sandstone_scribbles"); sandstone_scribbles.carverHelper.registerVariations("sandstone", sandstone_scribbles); @@ -2222,12 +2225,12 @@ public enum Features { void addBlocks() { BlockCarvable silver = (BlockCarvable) new BlockBeaconBase(Material.iron).setStepSound(Block.soundTypeMetal).setCreativeTab(ChiselTabs.tabModdedChiselBlocks).setHardness(5F) .setResistance(10F); - silver.carverHelper.addVariation("tile.metalOre.0.desc", 0, "metals/silver/caution"); - silver.carverHelper.addVariation("tile.metalOre.1.desc", 1, "metals/silver/crate"); - silver.carverHelper.addVariation("tile.metalOre.2.desc", 2, "metals/silver/thermal"); - silver.carverHelper.addVariation("tile.metalOre.3.desc", 3, "metals/silver/adv"); - silver.carverHelper.addVariation("tile.metalOre.4.desc", 4, "metals/silver/egregious"); - silver.carverHelper.addVariation("tile.metalOre.5.desc", 5, "metals/silver/bolted"); + silver.carverHelper.addVariation("tile.metalOre.0.desc", 0, "metals/silver/caution", 20); + silver.carverHelper.addVariation("tile.metalOre.1.desc", 1, "metals/silver/crate", 21); + silver.carverHelper.addVariation("tile.metalOre.2.desc", 2, "metals/silver/thermal", 22); + silver.carverHelper.addVariation("tile.metalOre.3.desc", 3, "metals/silver/adv", 23); + silver.carverHelper.addVariation("tile.metalOre.4.desc", 4, "metals/silver/egregious", 24); + silver.carverHelper.addVariation("tile.metalOre.5.desc", 5, "metals/silver/bolted", 25); silver.carverHelper.registerAll(silver, "silverblock"); Carving.chisel.registerOre("silverblock", "blockSilver"); } @@ -2277,8 +2280,8 @@ public enum Features { // "Stone snake block head"); // LanguageRegistry.addName(new ItemStack(snakestone, 1, 13), // "Stone snake block body"); - Carving.chisel.addVariation("stonebrick", stone_snakestone, 1, 16); - Carving.chisel.addVariation("stonebrick", stone_snakestone, 13, 17); + Carving.chisel.addVariation("stonebrick", stone_snakestone, 1, 100); + Carving.chisel.addVariation("stonebrick", stone_snakestone, 13, 101); // Carving.chisel.registerOre("snakestoneStone", "snakestoneStone"); } }, @@ -2290,8 +2293,8 @@ public enum Features { BlockSnakestoneObsidian obsidian_snakestone = (BlockSnakestoneObsidian) new BlockSnakestoneObsidian("Chisel:snakestone/obsidian/").setBlockName("chisel.obsidianSnakestone") .setHardness(50.0F).setResistance(2000.0F); GameRegistry.registerBlock(obsidian_snakestone, ItemCarvable.class, "obsidian_snakestone"); - Carving.chisel.addVariation("obsidian", obsidian_snakestone, 1, 16); - Carving.chisel.addVariation("obsidian", obsidian_snakestone, 13, 17); + Carving.chisel.addVariation("obsidian", obsidian_snakestone, 1, 100); + Carving.chisel.addVariation("obsidian", obsidian_snakestone, 13, 101); // Carving.chisel.registerOre("obsidianSnakestone", // "obsidianSnakestone"); } @@ -2303,12 +2306,12 @@ public enum Features { void addBlocks() { BlockCarvable steel = (BlockCarvable) new BlockBeaconBase(Material.iron).setStepSound(Block.soundTypeMetal).setCreativeTab(ChiselTabs.tabModdedChiselBlocks).setHardness(5F) .setResistance(10F); - steel.carverHelper.addVariation("tile.metalOre.0.desc", 0, "metals/steel/caution"); - steel.carverHelper.addVariation("tile.metalOre.1.desc", 1, "metals/steel/crate"); - steel.carverHelper.addVariation("tile.metalOre.2.desc", 2, "metals/steel/thermal"); - steel.carverHelper.addVariation("tile.metalOre.3.desc", 3, "metals/steel/adv"); - steel.carverHelper.addVariation("tile.metalOre.4.desc", 4, "metals/steel/egregious"); - steel.carverHelper.addVariation("tile.metalOre.5.desc", 5, "metals/steel/bolted"); + steel.carverHelper.addVariation("tile.metalOre.0.desc", 0, "metals/steel/caution", 20); + steel.carverHelper.addVariation("tile.metalOre.1.desc", 1, "metals/steel/crate", 21); + steel.carverHelper.addVariation("tile.metalOre.2.desc", 2, "metals/steel/thermal", 22); + steel.carverHelper.addVariation("tile.metalOre.3.desc", 3, "metals/steel/adv", 23); + steel.carverHelper.addVariation("tile.metalOre.4.desc", 4, "metals/steel/egregious", 24); + steel.carverHelper.addVariation("tile.metalOre.5.desc", 5, "metals/steel/bolted", 25); steel.carverHelper.registerAll(steel, "steelblock"); Carving.chisel.registerOre("steelblock", "blockSteel"); } @@ -2331,10 +2334,10 @@ public enum Features { } } - stonebricksmooth.carverHelper.addVariation("tile.stonebricksmooth.0.desc", 0, "stonebrick2/masonBricksPlain"); - stonebricksmooth.carverHelper.addVariation("tile.stonebricksmooth.1.desc", 1, "stonebrick2/masonBricksFelsic"); - stonebricksmooth.carverHelper.addVariation("tile.stonebricksmooth.2.desc", 2, "stonebrick2/masonBricksMafic"); - stonebricksmooth.carverHelper.addVariation("tile.stonebricksmooth.3.desc", 3, "stonebrick2/masonBricksMixed"); + stonebricksmooth.carverHelper.addVariation("tile.stonebricksmooth.0.desc", 0, "stonebrick2/masonBricksPlain", 16); + stonebricksmooth.carverHelper.addVariation("tile.stonebricksmooth.1.desc", 1, "stonebrick2/masonBricksFelsic", 17); + stonebricksmooth.carverHelper.addVariation("tile.stonebricksmooth.2.desc", 2, "stonebrick2/masonBricksMafic", 18); + stonebricksmooth.carverHelper.addVariation("tile.stonebricksmooth.3.desc", 3, "stonebrick2/masonBricksMixed", 19); stonebricksmooth.carverHelper.addVariation("tile.stonebricksmooth.4.desc", 4, "stonebrick/smallbricks"); stonebricksmooth.carverHelper.addVariation("tile.stonebricksmooth.5.desc", 5, "stonebrick/largebricks"); stonebricksmooth.carverHelper.addVariation("tile.stonebricksmooth.6.desc", 6, "stonebrick/smallchaotic"); @@ -2392,16 +2395,16 @@ public enum Features { technical.carverHelper.registerAll(technical, "technical"); BlockCarvableGlass technical2 = (BlockCarvableGlass) new BlockCarvableGlass().setHardness(2.0F).setResistance(10F); - technical2.carverHelper.addVariation("tile.technical.0.desc", 0, "technical/scaffoldTransparent"); - technical2.carverHelper.addVariation("tile.technical.4.desc", 1, "technical/fanFastTransparent"); - technical2.carverHelper.addVariation("tile.technical.6.desc", 2, "technical/fanStillTransparent"); - technical2.carverHelper.addVariation("tile.technical.14.desc", 3, "technical/fanStillTransparent"); + technical2.carverHelper.addVariation("tile.technical.0.desc", 0, "technical/scaffoldTransparent", 20); + technical2.carverHelper.addVariation("tile.technical.4.desc", 1, "technical/fanFastTransparent", 21); + technical2.carverHelper.addVariation("tile.technical.6.desc", 2, "technical/fanStillTransparent", 22); + technical2.carverHelper.addVariation("tile.technical.14.desc", 3, "technical/fanStillTransparent", 23); technical2.carverHelper.registerBlock(technical2, "technical2"); technical2.carverHelper.registerVariations("technical", technical2); BlockCarvable technical3 = (BlockCarvable) new BlockCarvable(Material.rock).setCreativeTab(ChiselTabs.tabMetalChiselBlocks).setHardness(2.0F).setResistance(10F); - technical3.carverHelper.addVariation("tile.technical3.0.desc", 0, "technical/massiveFan"); - technical3.carverHelper.addVariation("tile.technical3.1.desc", 1, "technical/massiveHexPlating"); + technical3.carverHelper.addVariation("tile.technical3.0.desc", 0, "technical/massiveFan", 40); + technical3.carverHelper.addVariation("tile.technical3.1.desc", 1, "technical/massiveHexPlating", 41); technical2.carverHelper.registerBlock(technical3, "technical3"); technical2.carverHelper.registerVariations("technical", technical3); @@ -2486,12 +2489,12 @@ public enum Features { void addBlocks() { BlockCarvable tin = (BlockCarvable) new BlockBeaconBase(Material.iron).setStepSound(Block.soundTypeMetal).setCreativeTab(ChiselTabs.tabModdedChiselBlocks).setHardness(5F) .setResistance(10F); - tin.carverHelper.addVariation("tile.metalOre.0.desc", 0, "metals/tin/caution"); - tin.carverHelper.addVariation("tile.metalOre.1.desc", 1, "metals/tin/crate"); - tin.carverHelper.addVariation("tile.metalOre.2.desc", 2, "metals/tin/thermal"); - tin.carverHelper.addVariation("tile.metalOre.3.desc", 3, "metals/tin/adv"); - tin.carverHelper.addVariation("tile.metalOre.4.desc", 4, "metals/tin/egregious"); - tin.carverHelper.addVariation("tile.metalOre.5.desc", 5, "metals/tin/bolted"); + tin.carverHelper.addVariation("tile.metalOre.0.desc", 0, "metals/tin/caution", 20); + tin.carverHelper.addVariation("tile.metalOre.1.desc", 1, "metals/tin/crate", 21); + tin.carverHelper.addVariation("tile.metalOre.2.desc", 2, "metals/tin/thermal", 22); + tin.carverHelper.addVariation("tile.metalOre.3.desc", 3, "metals/tin/adv", 23); + tin.carverHelper.addVariation("tile.metalOre.4.desc", 4, "metals/tin/egregious", 24); + tin.carverHelper.addVariation("tile.metalOre.5.desc", 5, "metals/tin/bolted", 25); tin.carverHelper.registerAll(tin, "tinblock"); Carving.chisel.registerOre("tinblock", "blockTin"); } @@ -2547,12 +2550,12 @@ public enum Features { void addBlocks() { BlockCarvable thaumium = (BlockCarvable) new BlockCarvable(Material.iron).setCreativeTab(ChiselTabs.tabModdedChiselBlocks).setStepSound(Block.soundTypeMetal); Carving.chisel.addVariation("thaumium", GameRegistry.findBlock("Thaumcraft", "blockCosmeticSolid"), 4, 0); - thaumium.carverHelper.addVariation("tile.thaumium.0.desc", 0, "thaumium/ornate"); - thaumium.carverHelper.addVariation("tile.thaumium.1.desc", 1, "thaumium/totem"); - thaumium.carverHelper.addVariation("tile.thaumium.2.desc", 2, "thaumium/thaumiumBigBricks"); - thaumium.carverHelper.addVariation("tile.thaumium.3.desc", 3, "thaumium/small"); - thaumium.carverHelper.addVariation("tile.thaumium.4.desc", 4, "thaumium/lattice"); - thaumium.carverHelper.addVariation("tile.thaumium.5.desc", 5, "thaumium/planks"); + thaumium.carverHelper.addVariation("tile.thaumium.0.desc", 0, "thaumium/ornate", 20); + thaumium.carverHelper.addVariation("tile.thaumium.1.desc", 1, "thaumium/totem", 21); + thaumium.carverHelper.addVariation("tile.thaumium.2.desc", 2, "thaumium/thaumiumBigBricks", 22); + thaumium.carverHelper.addVariation("tile.thaumium.3.desc", 3, "thaumium/small", 23); + thaumium.carverHelper.addVariation("tile.thaumium.4.desc", 4, "thaumium/lattice", 24); + thaumium.carverHelper.addVariation("tile.thaumium.5.desc", 5, "thaumium/planks", 25); thaumium.carverHelper.registerAll(thaumium, "thaumium"); Carving.chisel.registerOre("thaumium", "thaumium"); } @@ -2621,12 +2624,12 @@ public enum Features { void addBlocks() { BlockCarvable uranium = (BlockCarvable) new BlockBeaconBase(Material.iron).setStepSound(Block.soundTypeMetal).setCreativeTab(ChiselTabs.tabModdedChiselBlocks).setHardness(5F) .setResistance(10F); - uranium.carverHelper.addVariation("tile.metalOre.0.desc", 0, "metals/uranium/caution"); - uranium.carverHelper.addVariation("tile.metalOre.1.desc", 1, "metals/uranium/crate"); - uranium.carverHelper.addVariation("tile.metalOre.2.desc", 2, "metals/uranium/thermal"); - uranium.carverHelper.addVariation("tile.metalOre.3.desc", 3, "metals/uranium/adv"); - uranium.carverHelper.addVariation("tile.metalOre.4.desc", 4, "metals/uranium/egregious"); - uranium.carverHelper.addVariation("tile.metalOre.5.desc", 5, "metals/uranium/bolted"); + uranium.carverHelper.addVariation("tile.metalOre.0.desc", 0, "metals/uranium/caution", 20); + uranium.carverHelper.addVariation("tile.metalOre.1.desc", 1, "metals/uranium/crate", 21); + uranium.carverHelper.addVariation("tile.metalOre.2.desc", 2, "metals/uranium/thermal", 22); + uranium.carverHelper.addVariation("tile.metalOre.3.desc", 3, "metals/uranium/adv", 23); + uranium.carverHelper.addVariation("tile.metalOre.4.desc", 4, "metals/uranium/egregious", 24); + uranium.carverHelper.addVariation("tile.metalOre.5.desc", 5, "metals/uranium/bolted", 25); uranium.carverHelper.registerAll(uranium, "uraniumblock"); Carving.chisel.registerOre("uraniumblock", "blockUranium"); } diff --git a/src/main/resources/assets/chisel/textures/blocks/fantasy/pillar+-ctm.png b/src/main/resources/assets/chisel/textures/blocks/fantasy/pillar+-ctm.png deleted file mode 100644 index e4a2a765..00000000 Binary files a/src/main/resources/assets/chisel/textures/blocks/fantasy/pillar+-ctm.png and /dev/null differ diff --git a/src/main/resources/assets/chisel/textures/blocks/fantasy/pillar+.png b/src/main/resources/assets/chisel/textures/blocks/fantasy/pillar+.png deleted file mode 100644 index 7897b5c3..00000000 Binary files a/src/main/resources/assets/chisel/textures/blocks/fantasy/pillar+.png and /dev/null differ diff --git a/src/main/resources/assets/chisel/textures/blocks/fantasy2/pillar+-ctm.png b/src/main/resources/assets/chisel/textures/blocks/fantasy2/pillar+-ctm.png deleted file mode 100644 index 1b80b671..00000000 Binary files a/src/main/resources/assets/chisel/textures/blocks/fantasy2/pillar+-ctm.png and /dev/null differ diff --git a/src/main/resources/assets/chisel/textures/blocks/fantasy2/pillar+.png b/src/main/resources/assets/chisel/textures/blocks/fantasy2/pillar+.png deleted file mode 100644 index b6f895a2..00000000 Binary files a/src/main/resources/assets/chisel/textures/blocks/fantasy2/pillar+.png and /dev/null differ diff --git a/src/main/resources/assets/chisel/textures/blocks/sandstone/unused/a0-sandstonepreview-smoothflat-bottom.png b/src/main/resources/assets/chisel/textures/blocks/sandstone2/a0-sandstonepreview-smoothflat-bottom.png similarity index 100% rename from src/main/resources/assets/chisel/textures/blocks/sandstone/unused/a0-sandstonepreview-smoothflat-bottom.png rename to src/main/resources/assets/chisel/textures/blocks/sandstone2/a0-sandstonepreview-smoothflat-bottom.png diff --git a/src/main/resources/assets/chisel/textures/blocks/sandstone/unused/a0-sandstonepreview-smoothflat-side.png b/src/main/resources/assets/chisel/textures/blocks/sandstone2/a0-sandstonepreview-smoothflat-side.png similarity index 100% rename from src/main/resources/assets/chisel/textures/blocks/sandstone/unused/a0-sandstonepreview-smoothflat-side.png rename to src/main/resources/assets/chisel/textures/blocks/sandstone2/a0-sandstonepreview-smoothflat-side.png diff --git a/src/main/resources/assets/chisel/textures/blocks/sandstone/unused/a0-sandstonepreview-smoothflat-top.png b/src/main/resources/assets/chisel/textures/blocks/sandstone2/a0-sandstonepreview-smoothflat-top.png similarity index 100% rename from src/main/resources/assets/chisel/textures/blocks/sandstone/unused/a0-sandstonepreview-smoothflat-top.png rename to src/main/resources/assets/chisel/textures/blocks/sandstone2/a0-sandstonepreview-smoothflat-top.png diff --git a/src/main/resources/assets/chisel/textures/blocks/sandstone/unused/terrain-sandstone-brickflat-bottom.png b/src/main/resources/assets/chisel/textures/blocks/sandstone2/terrain-sandstone-brickflat-bottom.png similarity index 100% rename from src/main/resources/assets/chisel/textures/blocks/sandstone/unused/terrain-sandstone-brickflat-bottom.png rename to src/main/resources/assets/chisel/textures/blocks/sandstone2/terrain-sandstone-brickflat-bottom.png diff --git a/src/main/resources/assets/chisel/textures/blocks/sandstone/unused/terrain-sandstone-brickflat-side.png b/src/main/resources/assets/chisel/textures/blocks/sandstone2/terrain-sandstone-brickflat-side.png similarity index 100% rename from src/main/resources/assets/chisel/textures/blocks/sandstone/unused/terrain-sandstone-brickflat-side.png rename to src/main/resources/assets/chisel/textures/blocks/sandstone2/terrain-sandstone-brickflat-side.png diff --git a/src/main/resources/assets/chisel/textures/blocks/sandstone/unused/terrain-sandstone-brickflat-top.png b/src/main/resources/assets/chisel/textures/blocks/sandstone2/terrain-sandstone-brickflat-top.png similarity index 100% rename from src/main/resources/assets/chisel/textures/blocks/sandstone/unused/terrain-sandstone-brickflat-top.png rename to src/main/resources/assets/chisel/textures/blocks/sandstone2/terrain-sandstone-brickflat-top.png