From 85e58f4f57ec120413f739b971f8a0c3a44db3fe Mon Sep 17 00:00:00 2001 From: tterrag1098 Date: Thu, 8 Jan 2015 05:46:10 -0500 Subject: [PATCH] Begin major feature structor overhaul. Just recipes left to do. --- .../java/com/cricketcraft/chisel/Chisel.java | 26 +- .../com/cricketcraft/chisel/Crafting.java | 110 +- .../chisel/block/BlockCarvable.java | 4 +- .../chisel/block/BlockCarvableGlass.java | 4 +- .../chisel/block/BlockCarvablePane.java | 4 +- .../chisel/block/BlockCarvableSand.java | 4 +- .../cricketcraft/chisel/block/BlockCloud.java | 2 +- .../chisel/block/BlockConcrete.java | 2 +- .../chisel/block/BlockMarbleIceStairs.java | 8 +- .../block/BlockMarblePackedIceStairs.java | 8 +- .../chisel/block/BlockPresent.java | 39 +- .../tileentity/TileEntityAutoChisel.java | 6 +- .../chisel/carving/CarvableHelper.java | 2 +- .../chisel/client/GeneralChiselClient.java | 2 +- .../chisel/client/gui/GuiChiselConfig.java | 2 +- .../chisel/compat/FMPIntegration.java | 122 +- .../chisel/{ => config}/Configurations.java | 29 +- .../chisel/entity/EntityBallOMoss.java | 10 +- .../chisel/entity/EntityCloudInABottle.java | 4 +- .../chisel/entity/fx/EntityBallOMossFX.java | 4 +- .../chisel/init/ChiselBlocks.java | 129 ++ .../cricketcraft/chisel/init/ChiselItems.java | 23 + .../init/{ModTabs.java => ChiselTabs.java} | 16 +- .../cricketcraft/chisel/init/ModBlocks.java | 1785 ----------------- .../cricketcraft/chisel/init/ModItems.java | 52 - .../chisel/inventory/ContainerAutoChisel.java | 6 +- .../chisel/item/ItemCarvable.java | 2 +- .../chisel/proxy/ClientProxy.java | 16 +- .../cricketcraft/chisel/utils/General.java | 1 + .../chisel/models/autoChisel/autoChisel.obj | 114 +- .../textures/blocks/autoChisel/autoChisel.png | Bin 16598 -> 1884 bytes src/main/resources/mcmod.info | 4 +- 32 files changed, 424 insertions(+), 2116 deletions(-) rename src/main/java/com/cricketcraft/chisel/{ => config}/Configurations.java (80%) create mode 100644 src/main/java/com/cricketcraft/chisel/init/ChiselBlocks.java create mode 100644 src/main/java/com/cricketcraft/chisel/init/ChiselItems.java rename src/main/java/com/cricketcraft/chisel/init/{ModTabs.java => ChiselTabs.java} (79%) delete mode 100644 src/main/java/com/cricketcraft/chisel/init/ModBlocks.java delete mode 100644 src/main/java/com/cricketcraft/chisel/init/ModItems.java diff --git a/src/main/java/com/cricketcraft/chisel/Chisel.java b/src/main/java/com/cricketcraft/chisel/Chisel.java index 44e5c94d..27362e74 100644 --- a/src/main/java/com/cricketcraft/chisel/Chisel.java +++ b/src/main/java/com/cricketcraft/chisel/Chisel.java @@ -21,9 +21,11 @@ import com.cricketcraft.chisel.client.gui.GuiPresent; import com.cricketcraft.chisel.compat.Compatibility; import com.cricketcraft.chisel.compat.FMPIntegration; import com.cricketcraft.chisel.compat.ModIntegration; -import com.cricketcraft.chisel.init.ModBlocks; -import com.cricketcraft.chisel.init.ModItems; -import com.cricketcraft.chisel.init.ModTabs; +import com.cricketcraft.chisel.config.Configurations; +import com.cricketcraft.chisel.init.Features; +import com.cricketcraft.chisel.init.ChiselBlocks; +import com.cricketcraft.chisel.init.ChiselItems; +import com.cricketcraft.chisel.init.ChiselTabs; import com.cricketcraft.chisel.inventory.ContainerAutoChisel; import com.cricketcraft.chisel.inventory.ContainerChisel; import com.cricketcraft.chisel.inventory.ContainerPresent; @@ -140,16 +142,15 @@ public class Chisel { Configurations.config.load(); Configurations.refreshConfig(); + Features.preInit(); PacketHandler.init(); - ModTabs.load(); - ModBlocks.load(); - ModItems.load(); + ChiselTabs.load(); proxy.preInit(); } @EventHandler public void init(FMLInitializationEvent event) { - Crafting.init(); + Features.init(); NetworkRegistry.INSTANCE.registerGuiHandler(this, new IGuiHandler() { @@ -190,11 +191,11 @@ public class Chisel { } }); - GameRegistry.registerWorldGenerator(new GeneratorChisel(ModBlocks.marble, 32, Configurations.marbleAmount), 1000); - GameRegistry.registerWorldGenerator(new GeneratorChisel(ModBlocks.limestone, 32, Configurations.limestoneAmount), 1000); - GameRegistry.registerWorldGenerator(new GeneratorChisel(ModBlocks.andesite, 32, Configurations.andesiteAmount), 1000); - GameRegistry.registerWorldGenerator(new GeneratorChisel(ModBlocks.granite, 32, Configurations.graniteAmount), 1000); - GameRegistry.registerWorldGenerator(new GeneratorChisel(ModBlocks.diorite, 32, Configurations.dioriteAmount), 1000); + GameRegistry.registerWorldGenerator(new GeneratorChisel(ChiselBlocks.marble, 32, Configurations.marbleAmount), 1000); + GameRegistry.registerWorldGenerator(new GeneratorChisel(ChiselBlocks.limestone, 32, Configurations.limestoneAmount), 1000); + GameRegistry.registerWorldGenerator(new GeneratorChisel(ChiselBlocks.andesite, 32, Configurations.andesiteAmount), 1000); + GameRegistry.registerWorldGenerator(new GeneratorChisel(ChiselBlocks.granite, 32, Configurations.graniteAmount), 1000); + GameRegistry.registerWorldGenerator(new GeneratorChisel(ChiselBlocks.diorite, 32, Configurations.dioriteAmount), 1000); if (event.getSide() == Side.CLIENT) { initModIntegration(); @@ -209,7 +210,6 @@ public class Chisel { @EventHandler public void postInit(FMLPostInitializationEvent event) { - ModBlocks.postLoad(); ModIntegration.postInit(); Compatibility.init(event); } diff --git a/src/main/java/com/cricketcraft/chisel/Crafting.java b/src/main/java/com/cricketcraft/chisel/Crafting.java index 77b3f4ee..b5411a17 100644 --- a/src/main/java/com/cricketcraft/chisel/Crafting.java +++ b/src/main/java/com/cricketcraft/chisel/Crafting.java @@ -10,159 +10,161 @@ import net.minecraftforge.oredict.OreDictionary; import net.minecraftforge.oredict.ShapedOreRecipe; import net.minecraftforge.oredict.ShapelessOreRecipe; -import com.cricketcraft.chisel.init.ModBlocks; -import com.cricketcraft.chisel.init.ModItems; +import com.cricketcraft.chisel.config.Configurations; +import com.cricketcraft.chisel.init.ChiselBlocks; +import com.cricketcraft.chisel.init.ChiselItems; import cpw.mods.fml.common.registry.GameRegistry; public class Crafting { - public static void init() { + @Deprecated + private static void init() { Block concreteRecipeBlock = Block.getBlockFromName(Configurations.config.get("tweaks", "concrete recipe block", "gravel", "Unlocalized name of the block that, when burned, will produce concrete (examples: lightgem, stone)").getString()); if (concreteRecipeBlock == null) concreteRecipeBlock = Blocks.gravel; if (Configurations.featureEnabled("concrete")) - FurnaceRecipes.smelting().func_151393_a(concreteRecipeBlock, new ItemStack(ModBlocks.concrete), 0.1F); + FurnaceRecipes.smelting().func_151393_a(concreteRecipeBlock, new ItemStack(ChiselBlocks.concrete), 0.1F); if (Configurations.featureEnabled("sandstoneScribbles")) - GameRegistry.addRecipe(new ItemStack(ModBlocks.sandstoneScribbles, 1), new Object[] { "X", 'X', new ItemStack(ModBlocks.sandstone, 1, 8), }); + GameRegistry.addRecipe(new ItemStack(ChiselBlocks.sandstone_scribbles, 1), new Object[] { "X", 'X', new ItemStack(ChiselBlocks.sandstone, 1, 8), }); for (int meta = 0; meta < 16; meta++) { if (Configurations.featureEnabled("marble")) - GameRegistry.addRecipe(new ItemStack(ModBlocks.marbleSlab, 6, 0), new Object[] { "***", '*', new ItemStack(ModBlocks.marble, 1, meta) }); + GameRegistry.addRecipe(new ItemStack(ChiselBlocks.marble_slab, 6, 0), new Object[] { "***", '*', new ItemStack(ChiselBlocks.marble, 1, meta) }); if (Configurations.featureEnabled("limestone")) - GameRegistry.addRecipe(new ItemStack(ModBlocks.limestoneSlab, 6, 0), new Object[] { "***", '*', new ItemStack(ModBlocks.limestone, 1, meta) }); + GameRegistry.addRecipe(new ItemStack(ChiselBlocks.limestone_slab, 6, 0), new Object[] { "***", '*', new ItemStack(ChiselBlocks.limestone, 1, meta) }); if (Configurations.featureEnabled("marblePillar")) - GameRegistry.addRecipe(new ItemStack(ModBlocks.marblePillarSlab, 6, 0), new Object[] { "***", '*', new ItemStack(ModBlocks.marblePillar, 1, meta) }); + GameRegistry.addRecipe(new ItemStack(ChiselBlocks.marble_pillar_slab, 6, 0), new Object[] { "***", '*', new ItemStack(ChiselBlocks.marble_pillar, 1, meta) }); if (Configurations.featureEnabled("marblePillar")) - GameRegistry.addRecipe(new ItemStack(ModBlocks.marblePillar, 6), new Object[] { "XX", "XX", "XX", 'X', new ItemStack(ModBlocks.marble, 1, meta), }); + GameRegistry.addRecipe(new ItemStack(ChiselBlocks.marble_pillar, 6), new Object[] { "XX", "XX", "XX", 'X', new ItemStack(ChiselBlocks.marble, 1, meta), }); if (Configurations.featureEnabled("marble")) - GameRegistry.addRecipe(new ItemStack(ModBlocks.marble, 4), new Object[] { "XX", "XX", 'X', new ItemStack(ModBlocks.marblePillar, 1, meta), }); + GameRegistry.addRecipe(new ItemStack(ChiselBlocks.marble, 4), new Object[] { "XX", "XX", 'X', new ItemStack(ChiselBlocks.marble_pillar, 1, meta), }); if (Configurations.featureEnabled("icePillar")) - GameRegistry.addRecipe(new ItemStack(ModBlocks.icePillar, 6, 1), new Object[] { "XX", "XX", "XX", 'X', new ItemStack(ModBlocks.ice, 1, meta), }); + GameRegistry.addRecipe(new ItemStack(ChiselBlocks.ice_pillar, 6, 1), new Object[] { "XX", "XX", "XX", 'X', new ItemStack(ChiselBlocks.ice, 1, meta), }); if (Configurations.featureEnabled("ice")) - GameRegistry.addRecipe(new ItemStack(ModBlocks.ice, 4, 1), new Object[] { "XX", "XX", 'X', new ItemStack(ModBlocks.icePillar, 1, meta), }); + GameRegistry.addRecipe(new ItemStack(ChiselBlocks.ice, 4, 1), new Object[] { "XX", "XX", 'X', new ItemStack(ChiselBlocks.ice_pillar, 1, meta), }); if (Configurations.featureEnabled("sandstone")) - GameRegistry.addRecipe(new ItemStack(Blocks.sandstone, 1, 1), new Object[] { "X", 'X', new ItemStack(ModBlocks.sandstoneScribbles, 1, meta), }); + GameRegistry.addRecipe(new ItemStack(Blocks.sandstone, 1, 1), new Object[] { "X", 'X', new ItemStack(ChiselBlocks.sandstone_scribbles, 1, meta), }); if (Configurations.featureEnabled("carpet")) - GameRegistry.addRecipe(new ItemStack(ModBlocks.carpet, 8, meta), new Object[] { "YYY", "YXY", "YYY", 'X', new ItemStack(Items.string, 1), 'Y', new ItemStack(Blocks.wool, 1, meta), }); + GameRegistry.addRecipe(new ItemStack(ChiselBlocks.carpet_block, 8, meta), new Object[] { "YYY", "YXY", "YYY", 'X', new ItemStack(Items.string, 1), 'Y', new ItemStack(Blocks.wool, 1, meta), }); if (Configurations.featureEnabled("carpetFloor")) - GameRegistry.addRecipe(new ItemStack(ModBlocks.carpetFloor, 3, meta), new Object[] { "XX", 'X', new ItemStack(ModBlocks.carpet, 1, meta), }); + GameRegistry.addRecipe(new ItemStack(ChiselBlocks.carpet, 3, meta), new Object[] { "XX", 'X', new ItemStack(ChiselBlocks.carpet_block, 1, meta), }); } // The following recipe is due to bugs with Chisel 1.5.1 to 1.5.6a if (Configurations.featureEnabled("sandstone")) - GameRegistry.addRecipe(new ItemStack(Blocks.sandstone, 1, 0), new Object[] { "X", 'X', new ItemStack(ModBlocks.sandstone, 1, 0), }); + GameRegistry.addRecipe(new ItemStack(Blocks.sandstone, 1, 0), new Object[] { "X", 'X', new ItemStack(ChiselBlocks.sandstone, 1, 0), }); // The following recipe is due to bug with Chisel 1.5.6b if (Configurations.featureEnabled("sandstone")) - GameRegistry.addRecipe(new ItemStack(Blocks.sandstone, 1, 1), new Object[] { "X", 'X', new ItemStack(ModBlocks.sandstone, 1, 1), }); + GameRegistry.addRecipe(new ItemStack(Blocks.sandstone, 1, 1), new Object[] { "X", 'X', new ItemStack(ChiselBlocks.sandstone, 1, 1), }); if (Configurations.featureEnabled("holystone")) - GameRegistry.addRecipe(new ItemStack(ModBlocks.holystone, 8, 0), new Object[] { "***", "*X*", "***", '*', new ItemStack(Blocks.stone, 1), 'X', new ItemStack(Items.feather, 1) }); + GameRegistry.addRecipe(new ItemStack(ChiselBlocks.holystone, 8, 0), new Object[] { "***", "*X*", "***", '*', new ItemStack(Blocks.stone, 1), 'X', new ItemStack(Items.feather, 1) }); if (Configurations.featureEnabled("grimstone")) - GameRegistry.addRecipe(new ItemStack(ModBlocks.grimstone, 8, 0), new Object[] { "***", "*X*", "***", '*', new ItemStack(Blocks.stone, 1), 'X', new ItemStack(Items.coal, 1) }); + GameRegistry.addRecipe(new ItemStack(ChiselBlocks.grimstone, 8, 0), new Object[] { "***", "*X*", "***", '*', new ItemStack(Blocks.stone, 1), 'X', new ItemStack(Items.coal, 1) }); if (Configurations.featureEnabled("lavastone")) - GameRegistry.addRecipe(new ItemStack(ModBlocks.lavastone, 8, 0), new Object[] { "***", "*X*", "***", '*', new ItemStack(Blocks.stone, 1), 'X', new ItemStack(Items.lava_bucket, 1) }); + GameRegistry.addRecipe(new ItemStack(ChiselBlocks.lavastone, 8, 0), new Object[] { "***", "*X*", "***", '*', new ItemStack(Blocks.stone, 1), 'X', new ItemStack(Items.lava_bucket, 1) }); if (Configurations.featureEnabled("waterstone")) - GameRegistry.addRecipe(new ItemStack(ModBlocks.waterstone, 8, 0), new Object[] { "***", "*X*", "***", '*', new ItemStack(Blocks.stone, 1), 'X', new ItemStack(Items.water_bucket, 1) }); + GameRegistry.addRecipe(new ItemStack(ChiselBlocks.waterstone, 8, 0), new Object[] { "***", "*X*", "***", '*', new ItemStack(Blocks.stone, 1), 'X', new ItemStack(Items.water_bucket, 1) }); if (Configurations.featureEnabled("fantasy")) { - GameRegistry.addRecipe(new ItemStack(ModBlocks.fantasy, 8, 0), new Object[] { "***", "*X*", "***", '*', new ItemStack(Blocks.stone, 1), 'X', new ItemStack(Items.gold_nugget, 1) }); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.fantasy2, 8, 0), new Object[] { "***", "*X*", "***", '*', new ItemStack(ModBlocks.fantasy, 1), 'X', "dyeWhite" })); + GameRegistry.addRecipe(new ItemStack(ChiselBlocks.fantasy, 8, 0), new Object[] { "***", "*X*", "***", '*', new ItemStack(Blocks.stone, 1), 'X', new ItemStack(Items.gold_nugget, 1) }); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ChiselBlocks.fantasyblock2, 8, 0), new Object[] { "***", "*X*", "***", '*', new ItemStack(ChiselBlocks.fantasy, 1), 'X', "dyeWhite" })); } if (Configurations.featureEnabled("futuristicArmorPlating")) - GameRegistry.addRecipe(new ItemStack(ModBlocks.tyrian, 8, 0), new Object[] { "***", "*X*", "***", '*', new ItemStack(Blocks.stone, 1), 'X', new ItemStack(Items.iron_ingot, 1) }); + GameRegistry.addRecipe(new ItemStack(ChiselBlocks.tyrian, 8, 0), new Object[] { "***", "*X*", "***", '*', new ItemStack(Blocks.stone, 1), 'X', new ItemStack(Items.iron_ingot, 1) }); if (Configurations.featureEnabled("templeBlock")) - GameRegistry.addRecipe(new ItemStack(ModBlocks.temple, 8, 0), new Object[] { "***", "*X*", "***", '*', new ItemStack(Blocks.stone, 1), 'X', new ItemStack(Items.dye, 1, 4) }); + GameRegistry.addRecipe(new ItemStack(ChiselBlocks.templeblock, 8, 0), new Object[] { "***", "*X*", "***", '*', new ItemStack(Blocks.stone, 1), 'X', new ItemStack(Items.dye, 1, 4) }); if (Configurations.featureEnabled("factory")) - GameRegistry.addRecipe(new ItemStack(ModBlocks.factory, Configurations.factoryBlockAmount, 0), new Object[] { "*X*", "X X", "*X*", '*', new ItemStack(Blocks.stone, 1), 'X', + GameRegistry.addRecipe(new ItemStack(ChiselBlocks.factoryblock, Configurations.factoryBlockAmount, 0), new Object[] { "*X*", "X X", "*X*", '*', new ItemStack(Blocks.stone, 1), 'X', new ItemStack(Items.iron_ingot, 1) }); if (Configurations.featureEnabled("voidstone")) { - GameRegistry.addRecipe(new ItemStack(ModBlocks.voidstone, 8, 0), new Object[] { "oxo", "xyx", "oxo", 'x', new ItemStack(Blocks.stone, 1), 'y', new ItemStack(Items.ender_pearl, 1), 'o', + GameRegistry.addRecipe(new ItemStack(ChiselBlocks.voidstone, 8, 0), new Object[] { "oxo", "xyx", "oxo", 'x', new ItemStack(Blocks.stone, 1), 'y', new ItemStack(Items.ender_pearl, 1), 'o', new ItemStack(Blocks.obsidian, 1) }); - GameRegistry.addRecipe(new ItemStack(ModBlocks.voidstone2, 8, 0), new Object[] { "oxo", "xyx", "oxo", 'x', new ItemStack(Blocks.stone, 1), 'y', new ItemStack(Items.ender_eye, 1), 'o', + GameRegistry.addRecipe(new ItemStack(ChiselBlocks.voidstone2, 8, 0), new Object[] { "oxo", "xyx", "oxo", 'x', new ItemStack(Blocks.stone, 1), 'y', new ItemStack(Items.ender_eye, 1), 'o', new ItemStack(Blocks.obsidian, 1) }); } if (Configurations.featureEnabled("voidstonePillars")) { - GameRegistry.addRecipe(new ItemStack(ModBlocks.voidstonePillar, 4, 0), new Object[] { "xx", "xx", 'x', new ItemStack(ModBlocks.voidstone, 1) }); - GameRegistry.addRecipe(new ItemStack(ModBlocks.voidstonePillar2, 4, 0), new Object[] { "xx", "xx", 'x', new ItemStack(ModBlocks.voidstone2, 1) }); + GameRegistry.addRecipe(new ItemStack(ChiselBlocks.voidstonePillar, 4, 0), new Object[] { "xx", "xx", 'x', new ItemStack(ChiselBlocks.voidstone, 1) }); + GameRegistry.addRecipe(new ItemStack(ChiselBlocks.voidstonePillar2, 4, 0), new Object[] { "xx", "xx", 'x', new ItemStack(ChiselBlocks.voidstone2, 1) }); } - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.roadLine, 8, 0), new Object[] { "wrw", "wrw", "wrw", ('w'), "dyeWhite", ('r'), Items.redstone })); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ChiselBlocks.road_line, 8, 0), new Object[] { "wrw", "wrw", "wrw", ('w'), "dyeWhite", ('r'), Items.redstone })); if (Configurations.chiselRecipe) { - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.chisel, 1), new Object[] { " YY", " YY", "X ", 'X', Items.stick, 'Y', Items.iron_ingot })); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.chisel, 1, 1), new Object[] { " YY", " YY", "x ", 'x', "stickWood", 'Y', "ingotIron" })); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ChiselItems.chisel, 1), new Object[] { " YY", " YY", "X ", 'X', Items.stick, 'Y', Items.iron_ingot })); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ChiselItems.chisel, 1, 1), new Object[] { " YY", " YY", "x ", 'x', "stickWood", 'Y', "ingotIron" })); } else { - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.chisel, 1), new Object[] { " Y", "X ", 'X', Items.stick, 'Y', Items.iron_ingot })); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.chisel, 1, 1), new Object[] { " y", "x ", 'x', "stickWood", 'y', "ingotIron" })); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ChiselItems.chisel, 1), new Object[] { " Y", "X ", 'X', Items.stick, 'Y', Items.iron_ingot })); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ChiselItems.chisel, 1, 1), new Object[] { " y", "x ", 'x', "stickWood", 'y', "ingotIron" })); } if (Configurations.featureEnabled("ballOfMoss")) - GameRegistry.addRecipe(new ItemStack(ModItems.itemBallOMoss, 1), new Object[] { "XYX", "YXY", "XYX", 'X', Blocks.vine, 'Y', Items.stick }); + GameRegistry.addRecipe(new ItemStack(ChiselItems.itemBallOMoss, 1), new Object[] { "XYX", "YXY", "XYX", 'X', Blocks.vine, 'Y', Items.stick }); if (Configurations.featureEnabled("cloud")) - GameRegistry.addRecipe(new ItemStack(ModItems.itemCloudInABottle, 1), new Object[] { "X X", "XYX", " X ", 'X', Blocks.glass, 'Y', Items.quartz }); + GameRegistry.addRecipe(new ItemStack(ChiselItems.itemCloudInABottle, 1), new Object[] { "X X", "XYX", " X ", 'X', Blocks.glass, 'Y', Items.quartz }); if (Configurations.featureEnabled("smashingrock")) - GameRegistry.addShapelessRecipe(new ItemStack(ModItems.smashingRock, 16), new Object[] { new ItemStack(Items.stone_pickaxe), new ItemStack(Items.glass_bottle, 1), + GameRegistry.addShapelessRecipe(new ItemStack(ChiselItems.smashingRock, 16), new Object[] { new ItemStack(Items.stone_pickaxe), new ItemStack(Items.glass_bottle, 1), new ItemStack(Items.stone_shovel) }); if (Configurations.featureEnabled("paperWall")) - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.paperWall, 8), new Object[] { "ppp", "psp", "ppp", ('p'), Items.paper, ('s'), "stickWood" })); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ChiselBlocks.paperwall, 8), new Object[] { "ppp", "psp", "ppp", ('p'), Items.paper, ('s'), "stickWood" })); String[] sGNames = new String[] { "White", "Orange", "Magenta", "Light Blue", "Yellow", "Lime", "Pink", "Gray", "Light Gray", "Cyan", "Purple", "Blue", "Brown", "Green", "Red", "Black" }; for (int i = 0; i < 16; i++) { OreDictionary.registerOre("stainedClay" + sGNames[i].replaceAll(" ", ""), new ItemStack(Blocks.stained_hardened_clay, 1, i)); OreDictionary.registerOre("blockWool" + sGNames[i].replaceAll(" ", ""), new ItemStack(Blocks.wool, 1, i)); if (Configurations.featureEnabled("woolenClay")) - GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModBlocks.woolenClay, 2, i), new Object[] { "blockWool" + sGNames[i].replaceAll(" ", ""), + GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ChiselBlocks.woolen_clay, 2, i), new Object[] { "blockWool" + sGNames[i].replaceAll(" ", ""), "stainedClay" + sGNames[i].replaceAll(" ", "") })); } if (Configurations.featureEnabled("laboratory")) - GameRegistry.addRecipe(new ItemStack(ModBlocks.laboratory, 8, 0), new Object[] { "***", "*X*", "***", '*', new ItemStack(Blocks.stone, 1), 'X', new ItemStack(Items.quartz, 1) }); + GameRegistry.addRecipe(new ItemStack(ChiselBlocks.laboratoryblock, 8, 0), new Object[] { "***", "*X*", "***", '*', new ItemStack(Blocks.stone, 1), 'X', new ItemStack(Items.quartz, 1) }); if (Configurations.autoChisel) - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.autoChisel, 1), new Object[] { "XXX", "XYX", "XXX", Character.valueOf('X'), "plankWood", Character.valueOf('Y'), - ModItems.chisel })); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ChiselBlocks.autoChisel, 1), new Object[] { "XXX", "XYX", "XXX", Character.valueOf('X'), "plankWood", Character.valueOf('Y'), + ChiselItems.chisel })); if (Configurations.featureEnabled("hexPlating")) - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.hexPlating, 8, 0), new Object[] { "XXX", "XYX", "XXX", 'X', "stone", 'Y', "blockCoal" })); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ChiselBlocks.hexPlating, 8, 0), new Object[] { "XXX", "XYX", "XXX", 'X', "stone", 'Y', "blockCoal" })); if (Configurations.featureEnabled("bone")) - GameRegistry.addRecipe(new ItemStack(ModBlocks.bone, 4), new Object[] { "XX", "XX", 'X', Items.bone }); + GameRegistry.addRecipe(new ItemStack(ChiselBlocks.bone, 4), new Object[] { "XX", "XX", 'X', Items.bone }); if (Configurations.featureEnabled("pumpkin")) { for (int x = 0; x < 16; x++) { - GameRegistry.addShapelessRecipe(new ItemStack(ModBlocks.jackolantern[x]), - new Object[] { new ItemStack(ModBlocks.pumpkin[x], 1), new ItemStack(Item.getItemFromBlock(Blocks.torch), 1) }); + GameRegistry.addShapelessRecipe(new ItemStack(ChiselBlocks.jackolantern[x]), + new Object[] { new ItemStack(ChiselBlocks.pumpkin[x], 1), new ItemStack(Item.getItemFromBlock(Blocks.torch), 1) }); } } if (Configurations.featureEnabled("technical")) { - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.technical, Configurations.factoryBlockAmount, 0), new Object[] { "xyx", "yxy", "xyx", 'x', "stone", 'y', + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ChiselBlocks.technical, Configurations.factoryBlockAmount, 0), new Object[] { "xyx", "yxy", "xyx", 'x', "stone", 'y', Items.iron_ingot })); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.technical2, Configurations.factoryBlockAmount, 0), new Object[] { "xyx", "yzy", "xyx", 'x', "stone", 'y', "ingotIron", + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ChiselBlocks.technical2, Configurations.factoryBlockAmount, 0), new Object[] { "xyx", "yzy", "xyx", 'x', "stone", 'y', "ingotIron", 'z', Blocks.glass })); } if (Configurations.featureEnabled("chest")) { for (int x = 0; x < 16; x++) { - GameRegistry.addShapelessRecipe(new ItemStack(ModBlocks.present[x]), new Object[] { new ItemStack(Blocks.chest, 1), new ItemStack(Items.dye, 1, x) }); + GameRegistry.addShapelessRecipe(new ItemStack(ChiselBlocks.present[x]), new Object[] { new ItemStack(Blocks.chest, 1), new ItemStack(Items.dye, 1, x) }); } } if (Configurations.featureEnabled("warningSign")) { - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.sign, 4, 0), new Object[] { "xxx", "xyx", "xxx", 'x', "stone", 'y', Items.sign })); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ChiselBlocks.sign, 4, 0), new Object[] { "xxx", "xyx", "xxx", 'x', "stone", 'y', Items.sign })); } if (Configurations.featureEnabled("scorching")) { - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.scorching, 8, 0), new Object[] { "xxx", "xyx", "xxx", 'x', "stone", 'y', Items.blaze_rod })); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ChiselBlocks.scorching, 8, 0), new Object[] { "xxx", "xyx", "xxx", 'x', "stone", 'y', Items.blaze_rod })); } if (Configurations.featureEnabled("coloredSand")) { for (int x = 0; x < 16; x++) { String[] dyes = { "Black", "Red", "Green", "Brown", "Blue", "Purple", "Cyan", "LightGray", "Gray", "Pink", "Lime", "Yellow", "LightBlue", "Magenta", "Orange", "White" }; - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.coloredSand, 1, x), new Object[] { "sss", "sds", "sss", 's', Blocks.sand, 'd', "dye" + dyes[x] })); - GameRegistry.addSmelting(new ItemStack(ModBlocks.coloredSand, 1, x), new ItemStack(Blocks.stained_glass, 1, x), 0.3F); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ChiselBlocks.colored_sand, 1, x), new Object[] { "sss", "sds", "sss", 's', Blocks.sand, 'd', "dye" + dyes[x] })); + GameRegistry.addSmelting(new ItemStack(ChiselBlocks.colored_sand, 1, x), new ItemStack(Blocks.stained_glass, 1, x), 0.3F); } } } diff --git a/src/main/java/com/cricketcraft/chisel/block/BlockCarvable.java b/src/main/java/com/cricketcraft/chisel/block/BlockCarvable.java index 86890065..1e324415 100644 --- a/src/main/java/com/cricketcraft/chisel/block/BlockCarvable.java +++ b/src/main/java/com/cricketcraft/chisel/block/BlockCarvable.java @@ -14,7 +14,7 @@ import com.cricketcraft.chisel.Chisel; import com.cricketcraft.chisel.api.ICarvable; import com.cricketcraft.chisel.carving.CarvableHelper; import com.cricketcraft.chisel.carving.CarvableVariation; -import com.cricketcraft.chisel.init.ModTabs; +import com.cricketcraft.chisel.init.ChiselTabs; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -33,7 +33,7 @@ public class BlockCarvable extends Block implements ICarvable { carverHelper = new CarvableHelper(); setResistance(10.0F); setHardness(2.0F); - setCreativeTab(ModTabs.tabOtherChiselBlocks); + setCreativeTab(ChiselTabs.tabOtherChiselBlocks); } public BlockCarvable setStained(boolean a) { diff --git a/src/main/java/com/cricketcraft/chisel/block/BlockCarvableGlass.java b/src/main/java/com/cricketcraft/chisel/block/BlockCarvableGlass.java index d75c9c28..199cf150 100644 --- a/src/main/java/com/cricketcraft/chisel/block/BlockCarvableGlass.java +++ b/src/main/java/com/cricketcraft/chisel/block/BlockCarvableGlass.java @@ -13,7 +13,7 @@ import com.cricketcraft.chisel.Chisel; import com.cricketcraft.chisel.api.ICarvable; import com.cricketcraft.chisel.carving.CarvableHelper; import com.cricketcraft.chisel.carving.CarvableVariation; -import com.cricketcraft.chisel.init.ModTabs; +import com.cricketcraft.chisel.init.ChiselTabs; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -27,7 +27,7 @@ public class BlockCarvableGlass extends BlockGlass implements ICarvable { super(Material.glass, false); carverHelper = new CarvableHelper(); - setCreativeTab(ModTabs.tabOtherChiselBlocks); + setCreativeTab(ChiselTabs.tabOtherChiselBlocks); } public BlockCarvableGlass setStained(boolean a) { diff --git a/src/main/java/com/cricketcraft/chisel/block/BlockCarvablePane.java b/src/main/java/com/cricketcraft/chisel/block/BlockCarvablePane.java index 945445a1..28e437f8 100644 --- a/src/main/java/com/cricketcraft/chisel/block/BlockCarvablePane.java +++ b/src/main/java/com/cricketcraft/chisel/block/BlockCarvablePane.java @@ -13,7 +13,7 @@ import com.cricketcraft.chisel.api.ICarvable; import com.cricketcraft.chisel.carving.CarvableHelper; import com.cricketcraft.chisel.carving.CarvableVariation; import com.cricketcraft.chisel.client.render.BlockMarblePaneRenderer; -import com.cricketcraft.chisel.init.ModTabs; +import com.cricketcraft.chisel.init.ChiselTabs; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -28,7 +28,7 @@ public class BlockCarvablePane extends BlockPane implements ICarvable { carverHelper = new CarvableHelper(); - setCreativeTab(ModTabs.tabOtherChiselBlocks); + setCreativeTab(ChiselTabs.tabOtherChiselBlocks); } public BlockCarvablePane setStained(boolean a) { diff --git a/src/main/java/com/cricketcraft/chisel/block/BlockCarvableSand.java b/src/main/java/com/cricketcraft/chisel/block/BlockCarvableSand.java index 3a086be2..d00ff11c 100644 --- a/src/main/java/com/cricketcraft/chisel/block/BlockCarvableSand.java +++ b/src/main/java/com/cricketcraft/chisel/block/BlockCarvableSand.java @@ -14,7 +14,7 @@ import com.cricketcraft.chisel.Chisel; import com.cricketcraft.chisel.api.ICarvable; import com.cricketcraft.chisel.carving.CarvableHelper; import com.cricketcraft.chisel.carving.CarvableVariation; -import com.cricketcraft.chisel.init.ModTabs; +import com.cricketcraft.chisel.init.ChiselTabs; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -27,7 +27,7 @@ public class BlockCarvableSand extends BlockSand implements ICarvable { public BlockCarvableSand() { super(); carverHelper = new CarvableHelper(); - setCreativeTab(ModTabs.tabOtherChiselBlocks); + setCreativeTab(ChiselTabs.tabOtherChiselBlocks); } public BlockCarvableSand setStained(boolean a) { diff --git a/src/main/java/com/cricketcraft/chisel/block/BlockCloud.java b/src/main/java/com/cricketcraft/chisel/block/BlockCloud.java index 1649aa68..dcd5506c 100644 --- a/src/main/java/com/cricketcraft/chisel/block/BlockCloud.java +++ b/src/main/java/com/cricketcraft/chisel/block/BlockCloud.java @@ -9,7 +9,7 @@ import net.minecraft.util.AxisAlignedBB; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import com.cricketcraft.chisel.Configurations; +import com.cricketcraft.chisel.config.Configurations; public class BlockCloud extends BlockCarvable { diff --git a/src/main/java/com/cricketcraft/chisel/block/BlockConcrete.java b/src/main/java/com/cricketcraft/chisel/block/BlockConcrete.java index f776d912..f4736c03 100644 --- a/src/main/java/com/cricketcraft/chisel/block/BlockConcrete.java +++ b/src/main/java/com/cricketcraft/chisel/block/BlockConcrete.java @@ -4,8 +4,8 @@ import net.minecraft.entity.Entity; import net.minecraft.util.AxisAlignedBB; import net.minecraft.world.World; -import com.cricketcraft.chisel.Configurations; import com.cricketcraft.chisel.client.GeneralChiselClient; +import com.cricketcraft.chisel.config.Configurations; import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.relauncher.Side; diff --git a/src/main/java/com/cricketcraft/chisel/block/BlockMarbleIceStairs.java b/src/main/java/com/cricketcraft/chisel/block/BlockMarbleIceStairs.java index fde458fb..64fba5c2 100644 --- a/src/main/java/com/cricketcraft/chisel/block/BlockMarbleIceStairs.java +++ b/src/main/java/com/cricketcraft/chisel/block/BlockMarbleIceStairs.java @@ -7,7 +7,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.world.World; import com.cricketcraft.chisel.carving.CarvableHelper; -import com.cricketcraft.chisel.init.ModBlocks; +import com.cricketcraft.chisel.init.ChiselBlocks; public class BlockMarbleIceStairs extends BlockMarbleStairs { @@ -20,12 +20,12 @@ public class BlockMarbleIceStairs extends BlockMarbleStairs { @Override public void harvestBlock(World par1World, EntityPlayer par2EntityPlayer, int par3, int par4, int par5, int par6) { - ModBlocks.ice.harvestBlock(par1World, par2EntityPlayer, par3, par4, par5, par6); + ChiselBlocks.ice.harvestBlock(par1World, par2EntityPlayer, par3, par4, par5, par6); } @Override public int quantityDropped(Random par1Random) { - return ModBlocks.ice.quantityDropped(par1Random); + return ChiselBlocks.ice.quantityDropped(par1Random); } @Override @@ -35,7 +35,7 @@ public class BlockMarbleIceStairs extends BlockMarbleStairs { @Override public void updateTick(World par1World, int par2, int par3, int par4, Random par5Random) { - ModBlocks.ice.updateTick(par1World, par2, par3, par4, par5Random); + ChiselBlocks.ice.updateTick(par1World, par2, par3, par4, par5Random); } @Override diff --git a/src/main/java/com/cricketcraft/chisel/block/BlockMarblePackedIceStairs.java b/src/main/java/com/cricketcraft/chisel/block/BlockMarblePackedIceStairs.java index 8c653ece..5aa9ee10 100644 --- a/src/main/java/com/cricketcraft/chisel/block/BlockMarblePackedIceStairs.java +++ b/src/main/java/com/cricketcraft/chisel/block/BlockMarblePackedIceStairs.java @@ -7,7 +7,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.world.World; import com.cricketcraft.chisel.carving.CarvableHelper; -import com.cricketcraft.chisel.init.ModBlocks; +import com.cricketcraft.chisel.init.ChiselBlocks; public class BlockMarblePackedIceStairs extends BlockMarbleStairs { @@ -20,12 +20,12 @@ public class BlockMarblePackedIceStairs extends BlockMarbleStairs { @Override public void harvestBlock(World par1World, EntityPlayer par2EntityPlayer, int par3, int par4, int par5, int par6) { - ModBlocks.ice.harvestBlock(par1World, par2EntityPlayer, par3, par4, par5, par6); + ChiselBlocks.ice.harvestBlock(par1World, par2EntityPlayer, par3, par4, par5, par6); } @Override public int quantityDropped(Random par1Random) { - return ModBlocks.ice.quantityDropped(par1Random); + return ChiselBlocks.ice.quantityDropped(par1Random); } @Override @@ -35,7 +35,7 @@ public class BlockMarblePackedIceStairs extends BlockMarbleStairs { @Override public void updateTick(World par1World, int par2, int par3, int par4, Random par5Random) { - ModBlocks.ice.updateTick(par1World, par2, par3, par4, par5Random); + ChiselBlocks.ice.updateTick(par1World, par2, par3, par4, par5Random); } @Override diff --git a/src/main/java/com/cricketcraft/chisel/block/BlockPresent.java b/src/main/java/com/cricketcraft/chisel/block/BlockPresent.java index 00509d13..1ee01d29 100644 --- a/src/main/java/com/cricketcraft/chisel/block/BlockPresent.java +++ b/src/main/java/com/cricketcraft/chisel/block/BlockPresent.java @@ -44,42 +44,7 @@ public class BlockPresent extends BlockChest implements ICarvable { } public String getKindOfChest(int type) { - switch (type) { - case 0: - return "textures/blocks/present/presentChest0"; - case 1: - return "textures/blocks/present/presentChest1"; - case 2: - return "textures/blocks/present/presentChest2"; - case 3: - return "textures/blocks/present/presentChest3"; - case 4: - return "textures/blocks/present/presentChest4"; - case 5: - return "textures/blocks/present/presentChest5"; - case 6: - return "textures/blocks/present/presentChest6"; - case 7: - return "textures/blocks/present/presentChest7"; - case 8: - return "textures/blocks/present/presentChest8"; - case 9: - return "textures/blocks/present/presentChest9"; - case 10: - return "textures/blocks/present/presentChest10"; - case 11: - return "textures/blocks/present/presentChest11"; - case 12: - return "textures/blocks/present/presentChest12"; - case 13: - return "textures/blocks/present/presentChest13"; - case 14: - return "textures/blocks/present/presentChest14"; - case 15: - return "textures/blocks/present/presentChest15"; - default: - return null; - } + return "textures/blocks/present/presentChest" + type; } private static boolean isCatSittingOnMe(World world, int x, int y, int z) { @@ -248,7 +213,7 @@ public class BlockPresent extends BlockChest implements ICarvable { } @Override - public int isProvidingWeakPower(IBlockAccess world, int x, int y, int z, int strength) { + public int isProvidingWeakPower(IBlockAccess world, int x, int y, int z, int direction) { if (!canProvidePower()) { return 0; } else { diff --git a/src/main/java/com/cricketcraft/chisel/block/tileentity/TileEntityAutoChisel.java b/src/main/java/com/cricketcraft/chisel/block/tileentity/TileEntityAutoChisel.java index 17b935f1..93d5df74 100644 --- a/src/main/java/com/cricketcraft/chisel/block/tileentity/TileEntityAutoChisel.java +++ b/src/main/java/com/cricketcraft/chisel/block/tileentity/TileEntityAutoChisel.java @@ -15,7 +15,7 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.StatCollector; import com.cricketcraft.chisel.carving.Carving; -import com.cricketcraft.chisel.init.ModItems; +import com.cricketcraft.chisel.init.ChiselItems; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -26,7 +26,7 @@ public class TileEntityAutoChisel extends TileEntity implements ISidedInventory SPEED, AUTOMATION, STACK; public String getUnlocalizedName() { - return ModItems.upgrade.getUnlocalizedName() + "_" + this.name().toLowerCase(); + return ChiselItems.upgrade.getUnlocalizedName() + "_" + this.name().toLowerCase(); } public String getLocalizedName() { @@ -302,7 +302,7 @@ public class TileEntityAutoChisel extends TileEntity implements ISidedInventory public boolean hasUpgrade(Upgrade upgrade) { ItemStack stack = inventory[MIN_UPGRADE + upgrade.ordinal()]; if (stack != null) { - return stack.getItem() == ModItems.upgrade && stack.getItemDamage() == upgrade.ordinal(); + return stack.getItem() == ChiselItems.upgrade && stack.getItemDamage() == upgrade.ordinal(); } return false; } diff --git a/src/main/java/com/cricketcraft/chisel/carving/CarvableHelper.java b/src/main/java/com/cricketcraft/chisel/carving/CarvableHelper.java index ffa38c97..59d3b423 100644 --- a/src/main/java/com/cricketcraft/chisel/carving/CarvableHelper.java +++ b/src/main/java/com/cricketcraft/chisel/carving/CarvableHelper.java @@ -15,11 +15,11 @@ import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import com.cricketcraft.chisel.Chisel; -import com.cricketcraft.chisel.Configurations; import com.cricketcraft.chisel.block.BlockMarbleSlab; import com.cricketcraft.chisel.carving.CarvableVariation.CarvableVariationCTM; import com.cricketcraft.chisel.client.render.CTM; import com.cricketcraft.chisel.client.render.TextureSubmap; +import com.cricketcraft.chisel.config.Configurations; import com.cricketcraft.chisel.item.ItemCarvable; import com.cricketcraft.chisel.utils.GeneralClient; diff --git a/src/main/java/com/cricketcraft/chisel/client/GeneralChiselClient.java b/src/main/java/com/cricketcraft/chisel/client/GeneralChiselClient.java index d3ea9503..b88ef912 100644 --- a/src/main/java/com/cricketcraft/chisel/client/GeneralChiselClient.java +++ b/src/main/java/com/cricketcraft/chisel/client/GeneralChiselClient.java @@ -11,11 +11,11 @@ import net.minecraft.client.particle.EntityLavaFX; import net.minecraft.entity.Entity; import net.minecraft.world.World; -import com.cricketcraft.chisel.Configurations; import com.cricketcraft.chisel.block.BlockGrimstone; import com.cricketcraft.chisel.block.BlockHolystone; import com.cricketcraft.chisel.block.BlockLavastone; import com.cricketcraft.chisel.block.BlockSnakestoneObsidian; +import com.cricketcraft.chisel.config.Configurations; import com.cricketcraft.chisel.entity.fx.EntityBallOMossFX; import com.cricketcraft.chisel.entity.fx.EntityGrimstoneFX; import com.cricketcraft.chisel.entity.fx.EntityHolystoneFX; diff --git a/src/main/java/com/cricketcraft/chisel/client/gui/GuiChiselConfig.java b/src/main/java/com/cricketcraft/chisel/client/gui/GuiChiselConfig.java index a0fefb62..f64ef0b4 100644 --- a/src/main/java/com/cricketcraft/chisel/client/gui/GuiChiselConfig.java +++ b/src/main/java/com/cricketcraft/chisel/client/gui/GuiChiselConfig.java @@ -5,7 +5,7 @@ import net.minecraftforge.common.config.ConfigElement; import net.minecraftforge.common.config.Configuration; import com.cricketcraft.chisel.Chisel; -import com.cricketcraft.chisel.Configurations; +import com.cricketcraft.chisel.config.Configurations; import cpw.mods.fml.client.config.GuiConfig; diff --git a/src/main/java/com/cricketcraft/chisel/compat/FMPIntegration.java b/src/main/java/com/cricketcraft/chisel/compat/FMPIntegration.java index ae39b2a0..74ce027d 100644 --- a/src/main/java/com/cricketcraft/chisel/compat/FMPIntegration.java +++ b/src/main/java/com/cricketcraft/chisel/compat/FMPIntegration.java @@ -4,7 +4,7 @@ import net.minecraft.block.Block; import net.minecraft.item.ItemStack; import com.cricketcraft.chisel.compat.ModIntegration.IModIntegration; -import com.cricketcraft.chisel.init.ModBlocks; +import com.cricketcraft.chisel.init.ChiselBlocks; import cpw.mods.fml.common.event.FMLInterModComms; @@ -17,73 +17,73 @@ public class FMPIntegration implements IModIntegration { @Override public void onInit() { - registerMaterial(ModBlocks.marble); - registerMaterial(ModBlocks.limestone); - registerMaterial(ModBlocks.cobblestone, 1, 15); - registerMaterial(ModBlocks.glass, 1, 15); - registerMaterial(ModBlocks.sandstone, 3, 15); - registerMaterial(ModBlocks.sandSnakestone, 1, 1); - registerMaterial(ModBlocks.sandSnakestone, 13, 13); - registerMaterial(ModBlocks.sandstoneScribbles); - registerMaterial(ModBlocks.concrete, 0, 10); - registerMaterial(ModBlocks.iron, 1, 15); - registerMaterial(ModBlocks.gold, 1, 14); - registerMaterial(ModBlocks.diamond, 1, 12); - registerMaterial(ModBlocks.lightstone, 1, 15); // This is glowstone - registerMaterial(ModBlocks.lapis, 1, 8); - registerMaterial(ModBlocks.emerald, 1, 11); - registerMaterial(ModBlocks.netherBrick, 1, 5); - registerMaterial(ModBlocks.netherrack, 1, 14); - registerMaterial(ModBlocks.cobblestoneMossy, 1, 15); - registerMaterial(ModBlocks.stoneBrick, 4, 15); - registerMaterial(ModBlocks.snakestone, 1, 1); - registerMaterial(ModBlocks.snakestone, 13, 13); - registerMaterial(ModBlocks.dirt, 0, 3); - registerMaterial(ModBlocks.dirt, 6, 7); - registerMaterial(ModBlocks.dirt, 11, 11); - registerMaterial(ModBlocks.ice, 1, 15); - registerMaterial(ModBlocks.icePillar); + registerMaterial(ChiselBlocks.marble); + registerMaterial(ChiselBlocks.limestone); + registerMaterial(ChiselBlocks.cobblestone, 1, 15); + registerMaterial(ChiselBlocks.glass, 1, 15); + registerMaterial(ChiselBlocks.sandstone, 3, 15); + registerMaterial(ChiselBlocks.sand_snakestone, 1, 1); + registerMaterial(ChiselBlocks.sand_snakestone, 13, 13); + registerMaterial(ChiselBlocks.sandstone_scribbles); + registerMaterial(ChiselBlocks.concrete, 0, 10); + registerMaterial(ChiselBlocks.iron_block, 1, 15); + registerMaterial(ChiselBlocks.gold_block, 1, 14); + registerMaterial(ChiselBlocks.diamond_block, 1, 12); + registerMaterial(ChiselBlocks.glowstone, 1, 15); // This is glowstone + registerMaterial(ChiselBlocks.lapis_block, 1, 8); + registerMaterial(ChiselBlocks.emerald_block, 1, 11); + registerMaterial(ChiselBlocks.nether_brick, 1, 5); + registerMaterial(ChiselBlocks.netherrack, 1, 14); + registerMaterial(ChiselBlocks.mossy_cobblestone, 1, 15); + registerMaterial(ChiselBlocks.stonebricksmooth, 4, 15); + registerMaterial(ChiselBlocks.stone_snakestone, 1, 1); + registerMaterial(ChiselBlocks.stone_snakestone, 13, 13); + registerMaterial(ChiselBlocks.dirt, 0, 3); + registerMaterial(ChiselBlocks.dirt, 6, 7); + registerMaterial(ChiselBlocks.dirt, 11, 11); + registerMaterial(ChiselBlocks.ice, 1, 15); + registerMaterial(ChiselBlocks.ice_pillar); for (int x = 0; x < 4; x++) { - registerMaterial(ModBlocks.planks[x], 1, 15); // Oak, Spruce, Birch + registerMaterial(ChiselBlocks.planks[x], 1, 15); // Oak, Spruce, Birch // and Jungle } // Accacia - registerMaterial(ModBlocks.planks[4], 1, 1); - registerMaterial(ModBlocks.planks[4], 2, 2); - registerMaterial(ModBlocks.planks[4], 6, 6); - registerMaterial(ModBlocks.planks[4], 8, 11); - registerMaterial(ModBlocks.planks[4], 13, 13); + registerMaterial(ChiselBlocks.planks[4], 1, 1); + registerMaterial(ChiselBlocks.planks[4], 2, 2); + registerMaterial(ChiselBlocks.planks[4], 6, 6); + registerMaterial(ChiselBlocks.planks[4], 8, 11); + registerMaterial(ChiselBlocks.planks[4], 13, 13); // Dark Oak - registerMaterial(ModBlocks.planks[5], 1, 1); - registerMaterial(ModBlocks.planks[5], 2, 2); - registerMaterial(ModBlocks.planks[5], 6, 6); - registerMaterial(ModBlocks.planks[5], 8, 11); - registerMaterial(ModBlocks.planks[5], 13, 13); + registerMaterial(ChiselBlocks.planks[5], 1, 1); + registerMaterial(ChiselBlocks.planks[5], 2, 2); + registerMaterial(ChiselBlocks.planks[5], 6, 6); + registerMaterial(ChiselBlocks.planks[5], 8, 11); + registerMaterial(ChiselBlocks.planks[5], 13, 13); - registerMaterial(ModBlocks.obsidian, 1, 15); - registerMaterial(ModBlocks.obsidianSnakestone, 1, 1); - registerMaterial(ModBlocks.obsidianSnakestone, 13, 13); - registerMaterial(ModBlocks.redstone, 1, 15); - registerMaterial(ModBlocks.holystone, 0, 13); - registerMaterial(ModBlocks.carpet); - registerMaterial(ModBlocks.lavastone, 0, 6); - registerMaterial(ModBlocks.fantasy, 0, 1); - registerMaterial(ModBlocks.fantasy, 3, 14); - registerMaterial(ModBlocks.tyrian); - registerMaterial(ModBlocks.temple, 1, 2); - registerMaterial(ModBlocks.temple, 4, 15); - registerMaterial(ModBlocks.templeMossy, 1, 2); - registerMaterial(ModBlocks.templeMossy, 4, 15); - registerMaterial(ModBlocks.factory, 0, 12); - registerMaterial(ModBlocks.factory, 14, 14); - registerMaterial(ModBlocks.stainedGlass[0]); // White - registerMaterial(ModBlocks.woolenClay); - registerMaterial(ModBlocks.laboratory, 2, 3); - registerMaterial(ModBlocks.laboratory, 5, 12); - registerMaterial(ModBlocks.voidstone, 0, 3); - registerMaterial(ModBlocks.voidstone, 12, 15); - registerMaterial(ModBlocks.waterstone); + registerMaterial(ChiselBlocks.obsidian, 1, 15); + registerMaterial(ChiselBlocks.obsidian_snakestone, 1, 1); + registerMaterial(ChiselBlocks.obsidian_snakestone, 13, 13); + registerMaterial(ChiselBlocks.redstone_block, 1, 15); + registerMaterial(ChiselBlocks.holystone, 0, 13); + registerMaterial(ChiselBlocks.carpet_block); + registerMaterial(ChiselBlocks.lavastone, 0, 6); + registerMaterial(ChiselBlocks.fantasy, 0, 1); + registerMaterial(ChiselBlocks.fantasy, 3, 14); + registerMaterial(ChiselBlocks.tyrian); + registerMaterial(ChiselBlocks.templeblock, 1, 2); + registerMaterial(ChiselBlocks.templeblock, 4, 15); + registerMaterial(ChiselBlocks.mossy_templeblock, 1, 2); + registerMaterial(ChiselBlocks.mossy_templeblock, 4, 15); + registerMaterial(ChiselBlocks.factoryblock, 0, 12); + registerMaterial(ChiselBlocks.factoryblock, 14, 14); + registerMaterial(ChiselBlocks.stainedGlass[0]); // White + registerMaterial(ChiselBlocks.woolen_clay); + registerMaterial(ChiselBlocks.laboratoryblock, 2, 3); + registerMaterial(ChiselBlocks.laboratoryblock, 5, 12); + registerMaterial(ChiselBlocks.voidstone, 0, 3); + registerMaterial(ChiselBlocks.voidstone, 12, 15); + registerMaterial(ChiselBlocks.waterstone); } @Override diff --git a/src/main/java/com/cricketcraft/chisel/Configurations.java b/src/main/java/com/cricketcraft/chisel/config/Configurations.java similarity index 80% rename from src/main/java/com/cricketcraft/chisel/Configurations.java rename to src/main/java/com/cricketcraft/chisel/config/Configurations.java index 082e5ad3..85b229cd 100644 --- a/src/main/java/com/cricketcraft/chisel/Configurations.java +++ b/src/main/java/com/cricketcraft/chisel/config/Configurations.java @@ -1,4 +1,10 @@ -package com.cricketcraft.chisel; +package com.cricketcraft.chisel.config; + +import java.util.Locale; + +import org.apache.commons.lang3.StringUtils; + +import com.cricketcraft.chisel.init.Features; import net.minecraftforge.common.config.Configuration; @@ -56,7 +62,24 @@ public class Configurations { return true; } - public static boolean featureEnabled(String feature) { - return config.get("features", feature, true).getBoolean(true) && refreshConfig(); + public static boolean featureEnabled(Features feature) { + return config.get("features", featureName(feature), true).getBoolean(true) && refreshConfig(); } + + // this makes the old camelCase names from the new CONSTANT_CASE names + private static String featureName (Features feature) { + String[] words = feature.name().toLowerCase(Locale.ENGLISH).split("_"); + if (words.length == 1) { + return words[0]; + } + + String ret = words[0]; + for (int i = 1; i < words.length; i++) { + ret += StringUtils.capitalize(words[i]); + } + return ret; + } + + @Deprecated + public static boolean featureEnabled(String feature) {return false;} } diff --git a/src/main/java/com/cricketcraft/chisel/entity/EntityBallOMoss.java b/src/main/java/com/cricketcraft/chisel/entity/EntityBallOMoss.java index 5c5780ad..3aa727f4 100644 --- a/src/main/java/com/cricketcraft/chisel/entity/EntityBallOMoss.java +++ b/src/main/java/com/cricketcraft/chisel/entity/EntityBallOMoss.java @@ -9,7 +9,7 @@ import net.minecraft.world.World; import com.cricketcraft.chisel.Chisel; import com.cricketcraft.chisel.client.GeneralChiselClient; -import com.cricketcraft.chisel.init.ModBlocks; +import com.cricketcraft.chisel.init.ChiselBlocks; import com.cricketcraft.chisel.utils.General; public class EntityBallOMoss extends EntityThrowable { @@ -93,10 +93,10 @@ public class EntityBallOMoss extends EntityThrowable { resBlock = Blocks.mossy_cobblestone; } else if (block.equals(Blocks.cobblestone_wall) && meta == 0) { resMeta = 1; - } else if (block.equals(ModBlocks.cobblestone)) { - resBlock = ModBlocks.cobblestoneMossy; - } else if (block.equals(ModBlocks.temple)) { - resBlock = ModBlocks.templeMossy; + } else if (block.equals(ChiselBlocks.cobblestone)) { + resBlock = ChiselBlocks.mossy_cobblestone; + } else if (block.equals(ChiselBlocks.templeblock)) { + resBlock = ChiselBlocks.mossy_templeblock; } else if (block.equals(Blocks.stonebrick)) { resMeta = 1; } diff --git a/src/main/java/com/cricketcraft/chisel/entity/EntityCloudInABottle.java b/src/main/java/com/cricketcraft/chisel/entity/EntityCloudInABottle.java index 7d227457..6dacbf43 100644 --- a/src/main/java/com/cricketcraft/chisel/entity/EntityCloudInABottle.java +++ b/src/main/java/com/cricketcraft/chisel/entity/EntityCloudInABottle.java @@ -7,7 +7,7 @@ import net.minecraft.entity.projectile.EntityThrowable; import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; -import com.cricketcraft.chisel.init.ModBlocks; +import com.cricketcraft.chisel.init.ChiselBlocks; public class EntityCloudInABottle extends EntityThrowable { @@ -95,7 +95,7 @@ public class EntityCloudInABottle extends EntityThrowable { for (int k2 = y; k2 < y + random.nextInt(1) + 2; k2++) { for (int l2 = z; l2 < z + random.nextInt(4) + 1; l2++) { if (world.getBlock(j2, k2, l2).isAir(world, j2, k2, l2) && Math.abs(j2 - x) + Math.abs(k2 - y) + Math.abs(l2 - z) < 4 * 1 + random.nextInt(2)) { - world.setBlock(j2, k2, l2, ModBlocks.cloud); + world.setBlock(j2, k2, l2, ChiselBlocks.cloud); count++; } } diff --git a/src/main/java/com/cricketcraft/chisel/entity/fx/EntityBallOMossFX.java b/src/main/java/com/cricketcraft/chisel/entity/fx/EntityBallOMossFX.java index a2316b9e..01ff12bb 100644 --- a/src/main/java/com/cricketcraft/chisel/entity/fx/EntityBallOMossFX.java +++ b/src/main/java/com/cricketcraft/chisel/entity/fx/EntityBallOMossFX.java @@ -8,7 +8,7 @@ import net.minecraft.world.World; import org.lwjgl.opengl.GL11; import com.cricketcraft.chisel.block.BlockSnakestoneObsidian; -import com.cricketcraft.chisel.init.ModItems; +import com.cricketcraft.chisel.init.ChiselItems; import com.cricketcraft.chisel.utils.General; import cpw.mods.fml.relauncher.Side; @@ -97,7 +97,7 @@ public class EntityBallOMossFX extends EntityFX { // setParticleIcon(block.particles[General.rand.nextInt(block.particles.length)]); - icon = ModItems.itemBallOMoss.getIconFromDamage(0); + icon = ChiselItems.itemBallOMoss.getIconFromDamage(0); float width = 4.0f + General.rand.nextFloat() * 8.0f; float uu = General.rand.nextFloat() * (16.0f - width); float vv = General.rand.nextFloat() * (16.0f - width); diff --git a/src/main/java/com/cricketcraft/chisel/init/ChiselBlocks.java b/src/main/java/com/cricketcraft/chisel/init/ChiselBlocks.java new file mode 100644 index 00000000..7a35a6cc --- /dev/null +++ b/src/main/java/com/cricketcraft/chisel/init/ChiselBlocks.java @@ -0,0 +1,129 @@ +package com.cricketcraft.chisel.init; + +import net.minecraft.block.Block; + +import com.cricketcraft.chisel.Chisel; +import com.cricketcraft.chisel.block.BlockCarvable; +import com.cricketcraft.chisel.block.BlockCarvableGlass; +import com.cricketcraft.chisel.block.BlockCarvablePane; +import com.cricketcraft.chisel.block.BlockCarvablePowered; +import com.cricketcraft.chisel.block.BlockCarvablePumpkin; +import com.cricketcraft.chisel.block.BlockCarvableSand; +import com.cricketcraft.chisel.block.BlockCloud; +import com.cricketcraft.chisel.block.BlockConcrete; +import com.cricketcraft.chisel.block.BlockGrimstone; +import com.cricketcraft.chisel.block.BlockHolystone; +import com.cricketcraft.chisel.block.BlockLavastone; +import com.cricketcraft.chisel.block.BlockLightstoneCarvable; +import com.cricketcraft.chisel.block.BlockMarbleCarpet; +import com.cricketcraft.chisel.block.BlockMarbleIce; +import com.cricketcraft.chisel.block.BlockMarbleIceStairs; +import com.cricketcraft.chisel.block.BlockMarblePackedIce; +import com.cricketcraft.chisel.block.BlockMarblePackedIceStairs; +import com.cricketcraft.chisel.block.BlockMarbleSlab; +import com.cricketcraft.chisel.block.BlockMarbleStairs; +import com.cricketcraft.chisel.block.BlockMarbleTexturedOre; +import com.cricketcraft.chisel.block.BlockMarbleWall; +import com.cricketcraft.chisel.block.BlockPresent; +import com.cricketcraft.chisel.block.BlockRoadLine; +import com.cricketcraft.chisel.block.BlockSnakestone; +import com.cricketcraft.chisel.block.BlockSnakestoneObsidian; +import com.cricketcraft.chisel.block.BlockVoidstonePillar; +import com.cricketcraft.chisel.block.BlockVoidstonePillar2; +import com.cricketcraft.chisel.block.BlockWaterstone; + +import cpw.mods.fml.common.registry.GameRegistry.ObjectHolder; + +@ObjectHolder(Chisel.MOD_ID) +public final class ChiselBlocks { + + public static final Block autoChisel = null; + public static final BlockCarvable marble = null; + public static final BlockCarvable marble_pillar = null; + public static final BlockCarvable limestone = null; + public static final BlockMarbleSlab marble_slab = null; + public static final BlockMarbleSlab limestone_slab = null; + public static final BlockMarbleSlab marble_pillar_slab = null; + public static final BlockCarvable cobblestone = null; + public static final BlockMarbleWall cobblestoneWall = null; + public static final BlockCarvableGlass glass = null; + public static final BlockCarvablePane glass_pane = null; + public static final BlockCarvable sandstone = null; + public static final BlockCarvable sandstone_scribbles = null; + public static final BlockConcrete concrete = null; + public static final BlockRoadLine road_line = null; + public static final BlockCarvable iron_block = null; + public static final BlockCarvable gold_block = null; + public static final BlockCarvable diamond_block = null; + public static final BlockLightstoneCarvable glowstone = null; + public static final BlockCarvable lapis_block = null; + public static final BlockCarvable emerald_block = null; + public static final BlockCarvable nether_brick = null; + public static final BlockCarvable netherrack = null; + public static final BlockCarvable mossy_cobblestone = null; + public static final BlockCarvable stonebricksmooth = null; + public static final BlockMarbleStairs marbleStairs = null; + public static final BlockMarbleStairs limestoneStairs = null; + public static final BlockCarvablePane iron_bars = null; + public static final BlockMarbleIce ice = null; + public static final BlockMarbleIce ice_pillar = null; + public static final BlockMarblePackedIce packedice = null; + public static final BlockMarblePackedIce packedice_pillar = null; + public static final BlockMarbleIceStairs iceStairs = null; + public static final BlockMarblePackedIceStairs packediceStairs = null; + public static final BlockCarvable[] planks = new BlockCarvable[6]; + public static final BlockCarvable obsidian = null; + public static final BlockCarvablePowered redstone_block = null; + public static final BlockHolystone holystone = null; + public static final BlockGrimstone grimstone = null; + public static final BlockLavastone lavastone = null; + public static final BlockWaterstone waterstone = null; + public static final BlockCarvable leaves = null; + public static final BlockCarvable fantasy = null; + public static final BlockCarvable fantasyblock2 = null; + public static final BlockCarvable carpet_block = null; + public static final BlockMarbleCarpet carpet = null; + public static final BlockCarvable bookshelf = null; + public static final BlockCarvable tyrian = null; + public static final BlockCarvable dirt = null; + public static final BlockCloud cloud = null; + public static final BlockCarvable templeblock = null; + public static final BlockCarvable mossy_templeblock = null; + public static final BlockCarvable factoryblock = null; + public static final BlockCarvablePane paperwall = null; + public static final BlockCarvable woolen_clay = null; + public static final BlockCarvable laboratoryblock = null; + public static final BlockCarvablePumpkin[] pumpkin = new BlockCarvablePumpkin[16]; + public static final BlockCarvablePumpkin[] jackolantern = new BlockCarvablePumpkin[16]; + public static final BlockCarvable voidstone = null; + public static final BlockMarbleTexturedOre voidstone2 = null; + public static final BlockVoidstonePillar voidstonePillar = null; + public static final BlockVoidstonePillar2 voidstonePillar2 = null; + public static final BlockPresent[] present = new BlockPresent[16]; + public static final BlockSnakestone stone_snakestone = null; + public static final BlockSnakestone sand_snakestone = null; + public static final BlockSnakestoneObsidian obsidian_snakestone = null; + public static final BlockCarvable hexPlating = null; + public static final BlockCarvable technical = null; + public static final BlockCarvableGlass technical2 = null; + public static final BlockCarvable futura = null; + public static final BlockCarvable bone = null; + public static final BlockCarvable scorching = null; + public static final BlockCarvable brickCustom = null; + public static final BlockCarvable sign = null; + public static final BlockCarvable arcane = null; + public static final BlockCarvable bloodRune = null; + public static final BlockCarvableSand colored_sand = null; + + // 1.7 + public static final BlockCarvableGlass[] stainedGlass = new BlockCarvableGlass[4]; + public static final BlockCarvablePane[] stainedGlassPane = new BlockCarvablePane[8]; + + // 1.8 or at least so you think :P + public static final BlockCarvable granite = null; + public static final BlockCarvable diorite = null; + public static final BlockCarvable andesite = null; + + private ChiselBlocks() { + } +} diff --git a/src/main/java/com/cricketcraft/chisel/init/ChiselItems.java b/src/main/java/com/cricketcraft/chisel/init/ChiselItems.java new file mode 100644 index 00000000..6b97247c --- /dev/null +++ b/src/main/java/com/cricketcraft/chisel/init/ChiselItems.java @@ -0,0 +1,23 @@ +package com.cricketcraft.chisel.init; + +import com.cricketcraft.chisel.Chisel; +import com.cricketcraft.chisel.item.ItemBallOMoss; +import com.cricketcraft.chisel.item.ItemChisel; +import com.cricketcraft.chisel.item.ItemCloudInABottle; +import com.cricketcraft.chisel.item.ItemSmashingRock; +import com.cricketcraft.chisel.item.ItemUpgrade; + +import cpw.mods.fml.common.registry.GameRegistry.ObjectHolder; + +@ObjectHolder(Chisel.MOD_ID) +public final class ChiselItems { + + public static final ItemChisel chisel = null; + public static final ItemCloudInABottle itemCloudInABottle = null; + public static final ItemBallOMoss itemBallOMoss = null; + public static final ItemSmashingRock smashingRock = null; + public static final ItemUpgrade upgrade = null; + + private ChiselItems() { + } +} diff --git a/src/main/java/com/cricketcraft/chisel/init/ModTabs.java b/src/main/java/com/cricketcraft/chisel/init/ChiselTabs.java similarity index 79% rename from src/main/java/com/cricketcraft/chisel/init/ModTabs.java rename to src/main/java/com/cricketcraft/chisel/init/ChiselTabs.java index 2c22a429..30f42ed0 100644 --- a/src/main/java/com/cricketcraft/chisel/init/ModTabs.java +++ b/src/main/java/com/cricketcraft/chisel/init/ChiselTabs.java @@ -8,7 +8,7 @@ import com.cricketcraft.chisel.Chisel; import cpw.mods.fml.common.Loader; -public class ModTabs { +public class ChiselTabs { private static boolean atLeastOneModIsLoaded = false; @@ -21,7 +21,7 @@ public class ModTabs { @Override public Item getTabIconItem() { - return ModItems.chisel; + return ChiselItems.chisel; } }; @@ -38,11 +38,11 @@ public class ModTabs { public Item getTabIconItem() { if (Loader.isModLoaded("Thaumcraft")) { - return Item.getItemFromBlock(ModBlocks.arcane); + return Item.getItemFromBlock(ChiselBlocks.arcane); } else if (Loader.isModLoaded("AWWayOfTime")) { - return Item.getItemFromBlock(ModBlocks.bloodRune); + return Item.getItemFromBlock(ChiselBlocks.bloodRune); } else { - return Item.getItemFromBlock(ModBlocks.voidstone); + return Item.getItemFromBlock(ChiselBlocks.voidstone); } } }; @@ -52,7 +52,7 @@ public class ModTabs { @Override public Item getTabIconItem() { - return Item.getItemFromBlock(ModBlocks.holystone); + return Item.getItemFromBlock(ChiselBlocks.holystone); } }; @@ -68,7 +68,7 @@ public class ModTabs { @Override public Item getTabIconItem() { - return Item.getItemFromBlock(ModBlocks.technical); + return Item.getItemFromBlock(ChiselBlocks.technical); } }; @@ -76,7 +76,7 @@ public class ModTabs { @Override public Item getTabIconItem() { - return Item.getItemFromBlock(ModBlocks.jackolantern[0]); + return Item.getItemFromBlock(ChiselBlocks.jackolantern[0]); } }; } diff --git a/src/main/java/com/cricketcraft/chisel/init/ModBlocks.java b/src/main/java/com/cricketcraft/chisel/init/ModBlocks.java deleted file mode 100644 index 09c50c0d..00000000 --- a/src/main/java/com/cricketcraft/chisel/init/ModBlocks.java +++ /dev/null @@ -1,1785 +0,0 @@ -package com.cricketcraft.chisel.init; - -import net.minecraft.block.Block; -import net.minecraft.block.material.Material; -import net.minecraft.init.Blocks; -import net.minecraft.item.ItemStack; -import net.minecraft.util.StatCollector; -import net.minecraftforge.oredict.OreDictionary; - -import com.cricketcraft.chisel.Chisel; -import com.cricketcraft.chisel.Configurations; -import com.cricketcraft.chisel.block.BlockAutoChisel; -import com.cricketcraft.chisel.block.BlockBeaconBase; -import com.cricketcraft.chisel.block.BlockCarvable; -import com.cricketcraft.chisel.block.BlockCarvableGlass; -import com.cricketcraft.chisel.block.BlockCarvablePane; -import com.cricketcraft.chisel.block.BlockCarvablePowered; -import com.cricketcraft.chisel.block.BlockCarvablePumpkin; -import com.cricketcraft.chisel.block.BlockCarvableSand; -import com.cricketcraft.chisel.block.BlockCloud; -import com.cricketcraft.chisel.block.BlockConcrete; -import com.cricketcraft.chisel.block.BlockEldritch; -import com.cricketcraft.chisel.block.BlockGrimstone; -import com.cricketcraft.chisel.block.BlockHolystone; -import com.cricketcraft.chisel.block.BlockLavastone; -import com.cricketcraft.chisel.block.BlockLeaf; -import com.cricketcraft.chisel.block.BlockLightstoneCarvable; -import com.cricketcraft.chisel.block.BlockMarbleBookshelf; -import com.cricketcraft.chisel.block.BlockMarbleCarpet; -import com.cricketcraft.chisel.block.BlockMarbleIce; -import com.cricketcraft.chisel.block.BlockMarbleIceStairs; -import com.cricketcraft.chisel.block.BlockMarblePackedIce; -import com.cricketcraft.chisel.block.BlockMarblePackedIceStairs; -import com.cricketcraft.chisel.block.BlockMarblePillar; -import com.cricketcraft.chisel.block.BlockMarbleSlab; -import com.cricketcraft.chisel.block.BlockMarbleStairs; -import com.cricketcraft.chisel.block.BlockMarbleStairsMaker; -import com.cricketcraft.chisel.block.BlockMarbleStairsMakerCreator; -import com.cricketcraft.chisel.block.BlockMarbleTexturedOre; -import com.cricketcraft.chisel.block.BlockMarbleWall; -import com.cricketcraft.chisel.block.BlockPresent; -import com.cricketcraft.chisel.block.BlockRoadLine; -import com.cricketcraft.chisel.block.BlockSnakestone; -import com.cricketcraft.chisel.block.BlockSnakestoneObsidian; -import com.cricketcraft.chisel.block.BlockVoidstonePillar; -import com.cricketcraft.chisel.block.BlockVoidstonePillar2; -import com.cricketcraft.chisel.block.BlockWaterstone; -import com.cricketcraft.chisel.carving.CarvableHelper; -import com.cricketcraft.chisel.carving.CarvableVariation; -import com.cricketcraft.chisel.carving.Carving; -import com.cricketcraft.chisel.item.ItemCarvable; -import com.cricketcraft.chisel.item.ItemMarbleSlab; - -import cpw.mods.fml.common.Loader; -import cpw.mods.fml.common.registry.GameRegistry; - -public class ModBlocks { - - public static BlockCarvable marble; - public static BlockCarvable marblePillar; - public static BlockCarvable limestone; - public static BlockMarbleSlab marbleSlab; - public static BlockMarbleSlab limestoneSlab; - public static BlockMarbleSlab marblePillarSlab; - public static BlockCarvable cobblestone; - public static BlockMarbleWall cobblestoneWall; - public static BlockCarvableGlass glass; - public static BlockCarvablePane paneGlass; - public static BlockCarvable sandstone; - public static BlockCarvable sandstoneScribbles; - public static BlockConcrete concrete; - public static BlockRoadLine roadLine; - public static BlockCarvable iron; - public static BlockCarvable gold; - public static BlockCarvable diamond; - public static BlockLightstoneCarvable lightstone; - public static BlockCarvable lapis; - public static BlockCarvable emerald; - public static BlockCarvable netherBrick; - public static BlockCarvable netherrack; - public static BlockCarvable cobblestoneMossy; - public static BlockCarvable stoneBrick; - public static BlockMarbleStairs marbleStairs; - public static BlockMarbleStairs limestoneStairs; - public static BlockCarvablePane paneIron; - public static BlockMarbleIce ice; - public static BlockMarbleIce icePillar; - public static BlockMarblePackedIce packedice; - public static BlockMarblePackedIce packedicePillar; - public static BlockMarbleIceStairs iceStairs; - public static BlockMarblePackedIceStairs packediceStairs; - public static BlockCarvable[] planks = new BlockCarvable[6]; - public static BlockCarvable obsidian; - public static BlockCarvablePowered redstone; - public static BlockHolystone holystone; - public static BlockGrimstone grimstone; - public static BlockLavastone lavastone; - public static BlockWaterstone waterstone; - public static BlockCarvable leaf; - public static BlockCarvable fantasy; - public static BlockCarvable fantasy2; - public static BlockCarvable carpet; - public static BlockMarbleCarpet carpetFloor; - public static BlockCarvable bookshelf; - public static BlockCarvable tyrian; - public static BlockCarvable dirt; - public static BlockCloud cloud; - public static BlockCarvable temple; - public static BlockCarvable templeMossy; - public static BlockCarvable factory; - public static BlockCarvablePane paperWall; - public static BlockCarvable woolenClay; - public static BlockCarvable laboratory; - public static BlockCarvablePumpkin[] pumpkin = new BlockCarvablePumpkin[16]; - public static BlockCarvablePumpkin[] jackolantern = new BlockCarvablePumpkin[16]; - public static BlockCarvable voidstone; - public static BlockMarbleTexturedOre voidstone2; - public static BlockVoidstonePillar voidstonePillar; - public static BlockVoidstonePillar2 voidstonePillar2; - public static Block autoChisel; - public static BlockPresent[] present = new BlockPresent[16]; - public static BlockSnakestone snakestone; - public static BlockSnakestone sandSnakestone; - public static BlockSnakestoneObsidian obsidianSnakestone; - public static BlockCarvable hexPlating; - public static BlockCarvable technical; - public static BlockCarvableGlass technical2; - public static BlockCarvable futura; - public static BlockCarvable bone; - public static BlockCarvable scorching; - public static BlockCarvable brickCustom; - public static BlockCarvable sign; - public static BlockCarvable arcane; - public static BlockCarvable bloodRune; - public static BlockCarvableSand coloredSand; - - // 1.7 - public static BlockCarvableGlass[] stainedGlass = new BlockCarvableGlass[4]; - public static BlockCarvablePane[] stainedGlassPane = new BlockCarvablePane[8]; - - // 1.8 or at least so you think :P - public static BlockCarvable granite; - public static BlockCarvable diorite; - public static BlockCarvable andesite; - - private static boolean areChestsReady = false; - - public static void load() { - if (Configurations.featureEnabled("autoChisel")) { - autoChisel = new BlockAutoChisel().setBlockTextureName(Chisel.MOD_ID + ":autoChisel/autoChisel").setCreativeTab(ModTabs.tabChisel).setBlockName("autoChisel"); - GameRegistry.registerBlock(autoChisel, "autoChisel"); - Chisel.proxy.registerTileEntities(); - } - - if (Configurations.featureEnabled("marble")) { - marble = (BlockCarvable) new BlockCarvable(Material.rock).setCreativeTab(ModTabs.tabStoneChiselBlocks).setHardness(2.0F).setResistance(10F).setStepSound(Block.soundTypeStone); - marble.carverHelper.setChiselBlockName("Marble"); - marble.carverHelper.addVariation(StatCollector.translateToLocal("tile.marble.0.desc"), 0, "marble"); - marble.carverHelper.addVariation(StatCollector.translateToLocal("tile.marble.1.desc"), 1, "marble/a1-stoneornamental-marblebrick"); - marble.carverHelper.addVariation(StatCollector.translateToLocal("tile.marble.2.desc"), 2, "marble/a1-stoneornamental-marbleclassicpanel"); - marble.carverHelper.addVariation(StatCollector.translateToLocal("tile.marble.3.desc"), 3, "marble/a1-stoneornamental-marbleornate"); - marble.carverHelper.addVariation(StatCollector.translateToLocal("tile.marble.4.desc"), 4, "marble/panel"); - marble.carverHelper.addVariation(StatCollector.translateToLocal("tile.marble.5.desc"), 5, "marble/block"); - marble.carverHelper.addVariation(StatCollector.translateToLocal("tile.marble.6.desc"), 6, "marble/terrain-pistonback-marblecreeperdark"); - marble.carverHelper.addVariation(StatCollector.translateToLocal("tile.marble.7.desc"), 7, "marble/terrain-pistonback-marblecreeperlight"); - marble.carverHelper.addVariation(StatCollector.translateToLocal("tile.marble.8.desc"), 8, "marble/a1-stoneornamental-marblecarved"); - marble.carverHelper.addVariation(StatCollector.translateToLocal("tile.marble.9.desc"), 9, "marble/a1-stoneornamental-marblecarvedradial"); - marble.carverHelper.addVariation(StatCollector.translateToLocal("tile.marble.10.desc"), 10, "marble/terrain-pistonback-marbledent"); - marble.carverHelper.addVariation(StatCollector.translateToLocal("tile.marble.11.desc"), 11, "marble/terrain-pistonback-marbledent-small"); - marble.carverHelper.addVariation(StatCollector.translateToLocal("tile.marble.12.desc"), 12, "marble/marble-bricks"); - marble.carverHelper.addVariation(StatCollector.translateToLocal("tile.marble.13.desc"), 13, "marble/marble-arranged-bricks"); - marble.carverHelper.addVariation(StatCollector.translateToLocal("tile.marble.14.desc"), 14, "marble/marble-fancy-bricks"); - marble.carverHelper.addVariation(StatCollector.translateToLocal("tile.marble.15.desc"), 15, "marble/marble-blocks"); - marble.carverHelper.register(marble, "marble"); - OreDictionary.registerOre("marble", marble); - OreDictionary.registerOre("blockMarble", marble); - Carving.chisel.registerOre("marble", "marble"); - - marbleSlab = (BlockMarbleSlab) new BlockMarbleSlab(marble).setHardness(2.0F).setResistance(10F); - marbleSlab.carverHelper.setChiselBlockName("Marble Slab"); - marbleSlab.carverHelper.addVariation(StatCollector.translateToLocal("tile.marbleSlab.0.desc"), 0, "marble"); - marbleSlab.carverHelper.addVariation(StatCollector.translateToLocal("tile.marbleSlab.1.desc"), 1, "marbleslab/a1-stoneornamental-marblebrick"); - marbleSlab.carverHelper.addVariation(StatCollector.translateToLocal("tile.marbleSlab.2.desc"), 2, "marbleslab/a1-stoneornamental-marbleclassicpanel"); - marbleSlab.carverHelper.addVariation(StatCollector.translateToLocal("tile.marbleSlab.3.desc"), 3, "marbleslab/a1-stoneornamental-marbleornate"); - marbleSlab.carverHelper.addVariation(StatCollector.translateToLocal("tile.marbleSlab.4.desc"), 4, "marbleslab/a1-stoneornamental-marblepanel"); - marbleSlab.carverHelper.addVariation(StatCollector.translateToLocal("tile.marbleSlab.5.desc"), 5, "marbleslab/terrain-pistonback-marble"); - marbleSlab.carverHelper.addVariation(StatCollector.translateToLocal("tile.marbleSlab.6.desc"), 6, "marbleslab/terrain-pistonback-marblecreeperdark"); - marbleSlab.carverHelper.addVariation(StatCollector.translateToLocal("tile.marbleSlab.7.desc"), 7, "marbleslab/terrain-pistonback-marblecreeperlight"); - marbleSlab.carverHelper.addVariation(StatCollector.translateToLocal("tile.marbleSlab.8.desc"), 8, "marbleslab/a1-stoneornamental-marblecarved"); - marbleSlab.carverHelper.addVariation(StatCollector.translateToLocal("tile.marbleSlab.9.desc"), 9, "marbleslab/a1-stoneornamental-marblecarvedradial"); - marbleSlab.carverHelper.addVariation(StatCollector.translateToLocal("tile.marbleSlab.10.desc"), 10, "marbleslab/terrain-pistonback-marbledent"); - marbleSlab.carverHelper.addVariation(StatCollector.translateToLocal("tile.marbleSlab.11.desc"), 11, "marbleslab/terrain-pistonback-marbledent-small"); - marbleSlab.carverHelper.addVariation(StatCollector.translateToLocal("tile.marbleSlab.12.desc"), 12, "marbleslab/marble-bricks"); - marbleSlab.carverHelper.addVariation(StatCollector.translateToLocal("tile.marbleSlab.13.desc"), 13, "marbleslab/marble-arranged-bricks"); - marbleSlab.carverHelper.addVariation(StatCollector.translateToLocal("tile.marbleSlab.14.desc"), 14, "marbleslab/marble-fancy-bricks"); - marbleSlab.carverHelper.addVariation(StatCollector.translateToLocal("tile.marbleSlab.15.desc"), 15, "marbleslab/marble-blocks"); - marbleSlab.carverHelper.register(marbleSlab, "marble_slab", ItemMarbleSlab.class); - Carving.chisel.registerOre("marble_slab", "marble_slab"); - - if (Configurations.featureEnabled("marblePillar")) { - if (Configurations.oldPillars) { - marblePillar = (BlockCarvable) new BlockCarvable(Material.rock).setCreativeTab(ModTabs.tabStoneChiselBlocks).setHardness(2.0F).setResistance(10F) - .setStepSound(Block.soundTypeStone); - marblePillar.carverHelper.setChiselBlockName("Marble Pillar"); - marblePillar.carverHelper.addVariation(StatCollector.translateToLocal("tile.marblePillarOld.0.desc"), 0, "marblepillarold/column"); - marblePillar.carverHelper.addVariation(StatCollector.translateToLocal("tile.marblePillarOld.1.desc"), 1, "marblepillarold/capstone"); - marblePillar.carverHelper.addVariation(StatCollector.translateToLocal("tile.marblePillarOld.2.desc"), 2, "marblepillarold/base"); - marblePillar.carverHelper.addVariation(StatCollector.translateToLocal("tile.marblePillarOld.3.desc"), 3, "marblepillarold/small"); - marblePillar.carverHelper.addVariation(StatCollector.translateToLocal("tile.marblePillarOld.4.desc"), 4, "marblepillarold/pillar-carved"); - marblePillar.carverHelper.addVariation(StatCollector.translateToLocal("tile.marblePillarOld.5.desc"), 5, "marblepillarold/a1-stoneornamental-marblegreek"); - marblePillar.carverHelper.addVariation(StatCollector.translateToLocal("tile.marblePillarOld.6.desc"), 6, "marblepillarold/a1-stonepillar-greek"); - marblePillar.carverHelper.addVariation(StatCollector.translateToLocal("tile.marblePillarOld.7.desc"), 7, "marblepillarold/a1-stonepillar-plain"); - marblePillar.carverHelper.addVariation(StatCollector.translateToLocal("tile.marblePillarOld.8.desc"), 8, "marblepillarold/a1-stonepillar-greektopplain"); - marblePillar.carverHelper.addVariation(StatCollector.translateToLocal("tile.marblePillarOld.9.desc"), 9, "marblepillarold/a1-stonepillar-plaintopplain"); - marblePillar.carverHelper.addVariation(StatCollector.translateToLocal("tile.marblePillarOld.10.desc"), 10, "marblepillarold/a1-stonepillar-greekbottomplain"); - marblePillar.carverHelper.addVariation(StatCollector.translateToLocal("tile.marblePillarOld.11.desc"), 11, "marblepillarold/a1-stonepillar-plainbottomplain"); - marblePillar.carverHelper.addVariation(StatCollector.translateToLocal("tile.marblePillarOld.12.desc"), 12, "marblepillarold/a1-stonepillar-greektopgreek"); - marblePillar.carverHelper.addVariation(StatCollector.translateToLocal("tile.marblePillarOld.13.desc"), 13, "marblepillarold/a1-stonepillar-plaintopgreek"); - marblePillar.carverHelper.addVariation(StatCollector.translateToLocal("tile.marblePillarOld.14.desc"), 14, "marblepillarold/a1-stonepillar-greekbottomgreek"); - marblePillar.carverHelper.addVariation(StatCollector.translateToLocal("tile.marblePillarOld.15.desc"), 15, "marblepillarold/a1-stonepillar-plainbottomgreek"); - } else { - marblePillar = (BlockCarvable) new BlockMarblePillar(Material.rock).setCreativeTab(ModTabs.tabStoneChiselBlocks).setHardness(2.0F).setResistance(10F) - .setStepSound(Block.soundTypeStone); - marblePillar.carverHelper.setChiselBlockName("Marble Pillar"); - marblePillar.carverHelper.addVariation(StatCollector.translateToLocal("tile.marblePillar.0.desc"), 0, "marblepillar/pillar"); - marblePillar.carverHelper.addVariation(StatCollector.translateToLocal("tile.marblePillar.1.desc"), 1, "marblepillar/default"); - marblePillar.carverHelper.addVariation(StatCollector.translateToLocal("tile.marblePillar.2.desc"), 2, "marblepillar/simple"); - marblePillar.carverHelper.addVariation(StatCollector.translateToLocal("tile.marblePillar.3.desc"), 3, "marblepillar/convex"); - marblePillar.carverHelper.addVariation(StatCollector.translateToLocal("tile.marblePillar.4.desc"), 4, "marblepillar/rough"); - marblePillar.carverHelper.addVariation(StatCollector.translateToLocal("tile.marblePillar.5.desc"), 5, "marblepillar/greekdecor"); - marblePillar.carverHelper.addVariation(StatCollector.translateToLocal("tile.marblePillar.6.desc"), 6, "marblepillar/greekgreek"); - marblePillar.carverHelper.addVariation(StatCollector.translateToLocal("tile.marblePillar.7.desc"), 7, "marblepillar/greekplain"); - marblePillar.carverHelper.addVariation(StatCollector.translateToLocal("tile.marblePillar.8.desc"), 8, "marblepillar/plaindecor"); - marblePillar.carverHelper.addVariation(StatCollector.translateToLocal("tile.marblePillar.9.desc"), 9, "marblepillar/plaingreek"); - marblePillar.carverHelper.addVariation(StatCollector.translateToLocal("tile.marblePillar.10.desc"), 10, "marblepillar/plainplain"); - marblePillar.carverHelper.addVariation(StatCollector.translateToLocal("tile.marblePillar.11.desc"), 11, "marblepillar/widedecor"); - marblePillar.carverHelper.addVariation(StatCollector.translateToLocal("tile.marblePillar.12.desc"), 12, "marblepillar/widegreek"); - marblePillar.carverHelper.addVariation(StatCollector.translateToLocal("tile.marblePillar.13.desc"), 13, "marblepillar/wideplain"); - marblePillar.carverHelper.addVariation(StatCollector.translateToLocal("tile.marblePillar.14.desc"), 14, "marblepillar/carved"); - marblePillar.carverHelper.addVariation(StatCollector.translateToLocal("tile.marblePillar.15.desc"), 15, "marblepillar/ornamental"); - } - marblePillar.carverHelper.register(marblePillar, "marble_pillar"); - Carving.chisel.setGroupClass("marble_pillar", "marble"); - - marblePillarSlab = (BlockMarbleSlab) new BlockMarbleSlab(marblePillar).setCreativeTab(ModTabs.tabStoneChiselBlocks).setHardness(2.0F).setResistance(10F) - .setStepSound(Block.soundTypeStone); - marblePillarSlab.carverHelper.setChiselBlockName("Marble Pillar Slab"); - if (Configurations.oldPillars) { - marblePillarSlab.carverHelper.addVariation(StatCollector.translateToLocal("tile.marblePillarSlabOld.0.desc"), 0, "marblepillarslabold/column"); - marblePillarSlab.carverHelper.addVariation(StatCollector.translateToLocal("tile.marblePillarSlabOld.1.desc"), 1, "marblepillarslabold/capstone"); - marblePillarSlab.carverHelper.addVariation(StatCollector.translateToLocal("tile.marblePillarSlabOld.2.desc"), 2, "marblepillarslabold/base"); - marblePillarSlab.carverHelper.addVariation(StatCollector.translateToLocal("tile.marblePillarSlabOld.3.desc"), 3, "marblepillarslabold/small"); - marblePillarSlab.carverHelper.addVariation(StatCollector.translateToLocal("tile.marblePillarSlabOld.4.desc"), 4, "marblepillarslabold/pillar-carved"); - marblePillarSlab.carverHelper.addVariation(StatCollector.translateToLocal("tile.marblePillarSlabOld.5.desc"), 5, "marblepillarslabold/a1-stoneornamental-marblegreek"); - marblePillarSlab.carverHelper.addVariation(StatCollector.translateToLocal("tile.marblePillarSlabOld.6.desc"), 6, "marblepillarslabold/a1-stonepillar-greek"); - marblePillarSlab.carverHelper.addVariation(StatCollector.translateToLocal("tile.marblePillarSlabOld.7.desc"), 7, "marblepillarslabold/a1-stonepillar-plain"); - marblePillarSlab.carverHelper.addVariation(StatCollector.translateToLocal("tile.marblePillarSlabOld.8.desc"), 8, "marblepillarslabold/a1-stonepillar-greektopplain"); - marblePillarSlab.carverHelper.addVariation(StatCollector.translateToLocal("tile.marblePillarSlabOld.9.desc"), 9, "marblepillarslabold/a1-stonepillar-plaintopplain"); - marblePillarSlab.carverHelper.addVariation(StatCollector.translateToLocal("tile.marblePillarSlabOld.10.desc"), 10, "marblepillarslabold/a1-stonepillar-greekbottomplain"); - marblePillarSlab.carverHelper.addVariation(StatCollector.translateToLocal("tile.marblePillarSlabOld.11.desc"), 11, "marblepillarslabold/a1-stonepillar-plainbottomplain"); - marblePillarSlab.carverHelper.addVariation(StatCollector.translateToLocal("tile.marblePillarSlabOld.12.desc"), 12, "marblepillarslabold/a1-stonepillar-greektopgreek"); - marblePillarSlab.carverHelper.addVariation(StatCollector.translateToLocal("tile.marblePillarSlabOld.13.desc"), 13, "marblepillarslabold/a1-stonepillar-plaintopgreek"); - marblePillarSlab.carverHelper.addVariation(StatCollector.translateToLocal("tile.marblePillarSlabOld.14.desc"), 14, "marblepillarslabold/a1-stonepillar-greekbottomgreek"); - marblePillarSlab.carverHelper.addVariation(StatCollector.translateToLocal("tile.marblePillarSlabOld.15.desc"), 15, "marblepillarslabold/a1-stonepillar-plainbottomgreek"); - } else { - marblePillarSlab.carverHelper.addVariation(StatCollector.translateToLocal("tile.marblePillarSlab.0.desc"), 0, "marblepillarslab/pillar"); - marblePillarSlab.carverHelper.addVariation(StatCollector.translateToLocal("tile.marblePillarSlab.1.desc"), 1, "marblepillarslab/default"); - marblePillarSlab.carverHelper.addVariation(StatCollector.translateToLocal("tile.marblePillarSlab.2.desc"), 2, "marblepillarslab/simple"); - marblePillarSlab.carverHelper.addVariation(StatCollector.translateToLocal("tile.marblePillarSlab.3.desc"), 3, "marblepillarslab/convex"); - marblePillarSlab.carverHelper.addVariation(StatCollector.translateToLocal("tile.marblePillarSlab.4.desc"), 4, "marblepillarslab/rough"); - marblePillarSlab.carverHelper.addVariation(StatCollector.translateToLocal("tile.marblePillarSlab.5.desc"), 5, "marblepillarslab/greekdecor"); - marblePillarSlab.carverHelper.addVariation(StatCollector.translateToLocal("tile.marblePillarSlab.6.desc"), 6, "marblepillarslab/greekgreek"); - marblePillarSlab.carverHelper.addVariation(StatCollector.translateToLocal("tile.marblePillarSlab.7.desc"), 7, "marblepillarslab/greekplain"); - marblePillarSlab.carverHelper.addVariation(StatCollector.translateToLocal("tile.marblePillarSlab.8.desc"), 8, "marblepillarslab/plaindecor"); - marblePillarSlab.carverHelper.addVariation(StatCollector.translateToLocal("tile.marblePillarSlab.9.desc"), 9, "marblepillarslab/plaingreek"); - marblePillarSlab.carverHelper.addVariation(StatCollector.translateToLocal("tile.marblePillarSlab.10.desc"), 10, "marblepillarslab/plainplain"); - marblePillarSlab.carverHelper.addVariation(StatCollector.translateToLocal("tile.marblePillarSlab.11.desc"), 11, "marblepillarslab/widedecor"); - marblePillarSlab.carverHelper.addVariation(StatCollector.translateToLocal("tile.marblePillarSlab.12.desc"), 12, "marblepillarslab/widegreek"); - marblePillarSlab.carverHelper.addVariation(StatCollector.translateToLocal("tile.marblePillarSlab.13.desc"), 13, "marblepillarslab/wideplain"); - marblePillarSlab.carverHelper.addVariation(StatCollector.translateToLocal("tile.marblePillarSlab.14.desc"), 14, "marblepillarslab/carved"); - marblePillarSlab.carverHelper.addVariation(StatCollector.translateToLocal("tile.marblePillarSlab.15.desc"), 15, "marblepillarslab/ornamental"); - } - marblePillarSlab.carverHelper.register(marblePillarSlab, "marble_pillar_slab", ItemMarbleSlab.class); - } - - BlockMarbleStairsMaker makerMarbleStairs = new BlockMarbleStairsMaker(marble); - makerMarbleStairs.carverHelper.setChiselBlockName("Marble Stairs"); - makerMarbleStairs.carverHelper.addVariation(StatCollector.translateToLocal("tile.marbleStairs.0.desc"), 0, "marble"); - makerMarbleStairs.carverHelper.addVariation(StatCollector.translateToLocal("tile.marbleStairs.6.desc"), 1, "marbleslab/a1-stoneornamental-marblebrick"); - makerMarbleStairs.carverHelper.addVariation(StatCollector.translateToLocal("tile.marbleStairs.2.desc"), 2, "marbleslab/a1-stoneornamental-marbleclassicpanel"); - makerMarbleStairs.carverHelper.addVariation(StatCollector.translateToLocal("tile.marbleStairs.3.desc"), 3, "marbleslab/a1-stoneornamental-marbleornate"); - makerMarbleStairs.carverHelper.addVariation(StatCollector.translateToLocal("tile.marbleStairs.4.desc"), 4, "marbleslab/a1-stoneornamental-marblepanel"); - makerMarbleStairs.carverHelper.addVariation(StatCollector.translateToLocal("tile.marbleStairs.5.desc"), 5, "marbleslab/terrain-pistonback-marble"); - makerMarbleStairs.carverHelper.addVariation(StatCollector.translateToLocal("tile.marbleStairs.6.desc"), 6, "marbleslab/terrain-pistonback-marblecreeperdark"); - makerMarbleStairs.carverHelper.addVariation(StatCollector.translateToLocal("tile.marbleStairs.7.desc"), 7, "marbleslab/terrain-pistonback-marblecreeperlight"); - makerMarbleStairs.carverHelper.addVariation(StatCollector.translateToLocal("tile.marbleStairs.8.desc"), 8, "marbleslab/a1-stoneornamental-marblecarved"); - makerMarbleStairs.carverHelper.addVariation(StatCollector.translateToLocal("tile.marbleStairs.9.desc"), 9, "marbleslab/a1-stoneornamental-marblecarvedradial"); - makerMarbleStairs.carverHelper.addVariation(StatCollector.translateToLocal("tile.marbleStairs.10.desc"), 10, "marbleslab/terrain-pistonback-marbledent"); - makerMarbleStairs.carverHelper.addVariation(StatCollector.translateToLocal("tile.marbleStairs.11.desc"), 11, "marbleslab/terrain-pistonback-marbledent-small"); - makerMarbleStairs.carverHelper.addVariation(StatCollector.translateToLocal("tile.marbleStairs.12.desc"), 12, "marbleslab/marble-bricks"); - makerMarbleStairs.carverHelper.addVariation(StatCollector.translateToLocal("tile.marbleStairs.13.desc"), 13, "marbleslab/marble-arranged-bricks"); - makerMarbleStairs.carverHelper.addVariation(StatCollector.translateToLocal("tile.marbleStairs.14.desc"), 14, "marbleslab/marble-fancy-bricks"); - makerMarbleStairs.carverHelper.addVariation(StatCollector.translateToLocal("tile.marbleStairs.15.desc"), 15, "marbleslab/marble-blocks"); - makerMarbleStairs.create("marble_stairs"); - } - - if (Configurations.featureEnabled("limestone")) { - limestone = (BlockCarvable) new BlockCarvable(Material.rock).setCreativeTab(ModTabs.tabStoneChiselBlocks).setHardness(2.0F).setResistance(10F).setStepSound(Block.soundTypeStone); - limestone.carverHelper.setChiselBlockName("Limestone"); - limestone.carverHelper.addVariation(StatCollector.translateToLocal("tile.limestone.0.desc"), 0, "limestone"); - limestone.carverHelper.addVariation(StatCollector.translateToLocal("tile.limestone.1.desc"), 1, "limestone/terrain-cobbsmalltilelight"); - limestone.carverHelper.addVariation(StatCollector.translateToLocal("tile.limestone.2.desc"), 2, "limestone/terrain-cob-frenchlight"); - limestone.carverHelper.addVariation(StatCollector.translateToLocal("tile.limestone.3.desc"), 3, "limestone/terrain-cob-french2light"); - limestone.carverHelper.addVariation(StatCollector.translateToLocal("tile.limestone.4.desc"), 4, "limestone/terrain-cobmoss-creepdungeonlight"); - limestone.carverHelper.addVariation(StatCollector.translateToLocal("tile.limestone.5.desc"), 5, "limestone/terrain-cob-smallbricklight"); - limestone.carverHelper.addVariation(StatCollector.translateToLocal("tile.limestone.6.desc"), 6, "limestone/terrain-mossysmalltilelight"); - limestone.carverHelper.addVariation(StatCollector.translateToLocal("tile.limestone.7.desc"), 7, "limestone/terrain-pistonback-dungeon"); - limestone.carverHelper.addVariation(StatCollector.translateToLocal("tile.limestone.8.desc"), 8, "limestone/terrain-pistonback-dungeonornate"); - limestone.carverHelper.addVariation(StatCollector.translateToLocal("tile.limestone.9.desc"), 9, "limestone/terrain-pistonback-dungeonvent"); - limestone.carverHelper.addVariation(StatCollector.translateToLocal("tile.limestone.10.desc"), 10, "limestone/terrain-pistonback-lightcreeper"); - limestone.carverHelper.addVariation(StatCollector.translateToLocal("tile.limestone.11.desc"), 11, "limestone/terrain-pistonback-lightdent"); - limestone.carverHelper.addVariation(StatCollector.translateToLocal("tile.limestone.12.desc"), 12, "limestone/terrain-pistonback-lightemboss"); - limestone.carverHelper.addVariation(StatCollector.translateToLocal("tile.limestone.13.desc"), 13, "limestone/terrain-pistonback-lightfour"); - limestone.carverHelper.addVariation(StatCollector.translateToLocal("tile.limestone.14.desc"), 14, "limestone/terrain-pistonback-lightmarker"); - limestone.carverHelper.addVariation(StatCollector.translateToLocal("tile.limestone.15.desc"), 15, "limestone/terrain-pistonback-lightpanel"); - limestone.carverHelper.register(limestone, "limestone"); - OreDictionary.registerOre("limestone", limestone); - Carving.chisel.registerOre("limestone", "limestone"); - - limestoneSlab = (BlockMarbleSlab) new BlockMarbleSlab(limestone).setCreativeTab(ModTabs.tabStoneChiselBlocks).setHardness(2.0F).setResistance(10F); - limestoneSlab.carverHelper.setChiselBlockName("Limestone Slab"); - limestoneSlab.carverHelper.addVariation(StatCollector.translateToLocal("tile.limestoneSlab.0.desc"), 0, "limestone"); - limestoneSlab.carverHelper.addVariation(StatCollector.translateToLocal("tile.limestoneSlab.1.desc"), 1, "limestone/terrain-cobbsmalltilelight"); - limestoneSlab.carverHelper.addVariation(StatCollector.translateToLocal("tile.limestoneSlab.2.desc"), 2, "limestone/terrain-cob-frenchlight"); - limestoneSlab.carverHelper.addVariation(StatCollector.translateToLocal("tile.limestoneSlab.3.desc"), 3, "limestone/terrain-cob-french2light"); - limestoneSlab.carverHelper.addVariation(StatCollector.translateToLocal("tile.limestoneSlab.4.desc"), 4, "limestone/terrain-cobmoss-creepdungeonlight"); - limestoneSlab.carverHelper.addVariation(StatCollector.translateToLocal("tile.limestoneSlab.5.desc"), 5, "limestone/terrain-cob-smallbricklight"); - limestoneSlab.carverHelper.addVariation(StatCollector.translateToLocal("tile.limestoneSlab.6.desc"), 6, "limestone/terrain-mossysmalltilelight"); - limestoneSlab.carverHelper.addVariation(StatCollector.translateToLocal("tile.limestoneSlab.7.desc"), 7, "limestone/terrain-pistonback-dungeon"); - limestoneSlab.carverHelper.addVariation(StatCollector.translateToLocal("tile.limestoneSlab.8.desc"), 8, "limestone/terrain-pistonback-dungeonornate"); - limestoneSlab.carverHelper.addVariation(StatCollector.translateToLocal("tile.limestoneSlab.9.desc"), 9, "limestone/terrain-pistonback-dungeonvent"); - limestoneSlab.carverHelper.addVariation(StatCollector.translateToLocal("tile.limestoneSlab.10.desc"), 10, "limestone/terrain-pistonback-lightcreeper"); - limestoneSlab.carverHelper.addVariation(StatCollector.translateToLocal("tile.limestoneSlab.11.desc"), 11, "limestone/terrain-pistonback-lightdent"); - limestoneSlab.carverHelper.addVariation(StatCollector.translateToLocal("tile.limestoneSlab.12.desc"), 12, "limestone/terrain-pistonback-lightemboss"); - limestoneSlab.carverHelper.addVariation(StatCollector.translateToLocal("tile.limestoneSlab.13.desc"), 13, "limestone/terrain-pistonback-lightfour"); - limestoneSlab.carverHelper.addVariation(StatCollector.translateToLocal("tile.limestoneSlab.14.desc"), 14, "limestone/terrain-pistonback-lightmarker"); - limestoneSlab.carverHelper.addVariation(StatCollector.translateToLocal("tile.limestoneSlab.15.desc"), 15, "limestone/terrain-pistonback-lightpanel"); - limestoneSlab.carverHelper.register(limestoneSlab, "limestone_slab", ItemMarbleSlab.class); - Carving.chisel.registerOre("limestone_slab", "limestone_slab"); - - BlockMarbleStairsMaker makerLimestoneStairs = new BlockMarbleStairsMaker(limestone); - makerLimestoneStairs.carverHelper.setChiselBlockName("Limestone Stairs"); - makerLimestoneStairs.carverHelper.addVariation(StatCollector.translateToLocal("tile.limestoneStairs.0.desc"), 0, "limestone"); - makerLimestoneStairs.carverHelper.addVariation(StatCollector.translateToLocal("tile.limestoneStairs.1.desc"), 1, "limestone/terrain-cobbsmalltilelight"); - makerLimestoneStairs.carverHelper.addVariation(StatCollector.translateToLocal("tile.limestoneStairs.2.desc"), 2, "limestone/terrain-cob-frenchlight"); - makerLimestoneStairs.carverHelper.addVariation(StatCollector.translateToLocal("tile.limestoneStairs.3.desc"), 3, "limestone/terrain-cob-french2light"); - makerLimestoneStairs.carverHelper.addVariation(StatCollector.translateToLocal("tile.limestoneStairs.4.desc"), 4, "limestone/terrain-cobmoss-creepdungeonlight"); - makerLimestoneStairs.carverHelper.addVariation(StatCollector.translateToLocal("tile.limestoneStairs.5.desc"), 5, "limestone/terrain-cob-smallbricklight"); - makerLimestoneStairs.carverHelper.addVariation(StatCollector.translateToLocal("tile.limestoneStairs.6.desc"), 6, "limestone/terrain-mossysmalltilelight"); - makerLimestoneStairs.carverHelper.addVariation(StatCollector.translateToLocal("tile.limestoneStairs.7.desc"), 7, "limestone/terrain-pistonback-dungeon"); - makerLimestoneStairs.carverHelper.addVariation(StatCollector.translateToLocal("tile.limestoneStairs.8.desc"), 8, "limestone/terrain-pistonback-dungeonornate"); - makerLimestoneStairs.carverHelper.addVariation(StatCollector.translateToLocal("tile.limestoneStairs.9.desc"), 9, "limestone/terrain-pistonback-dungeonvent"); - makerLimestoneStairs.carverHelper.addVariation(StatCollector.translateToLocal("tile.limestoneStairs.10.desc"), 10, "limestone/terrain-pistonback-lightcreeper"); - makerLimestoneStairs.carverHelper.addVariation(StatCollector.translateToLocal("tile.limestoneStairs.11.desc"), 11, "limestone/terrain-pistonback-lightdent"); - makerLimestoneStairs.carverHelper.addVariation(StatCollector.translateToLocal("tile.limestoneStairs.12.desc"), 12, "limestone/terrain-pistonback-lightemboss"); - makerLimestoneStairs.carverHelper.addVariation(StatCollector.translateToLocal("tile.limestoneStairs.13.desc"), 13, "limestone/terrain-pistonback-lightfour"); - makerLimestoneStairs.carverHelper.addVariation(StatCollector.translateToLocal("tile.limestoneStairs.14.desc"), 14, "limestone/terrain-pistonback-lightmarker"); - makerLimestoneStairs.carverHelper.addVariation(StatCollector.translateToLocal("tile.limestoneStairs.15.desc"), 15, "limestone/terrain-pistonback-lightpanel"); - makerLimestoneStairs.create("limestone_stairs"); - Carving.chisel.registerOre("limestone_stairs", "limestone_stairs"); - } - - if (Configurations.featureEnabled("cobblestone")) { - cobblestone = (BlockCarvable) new BlockCarvable(Material.rock).setCreativeTab(ModTabs.tabStoneChiselBlocks).setHardness(2.0F).setResistance(10F).setStepSound(Block.soundTypeStone); - Carving.chisel.addVariation("cobblestone", Blocks.cobblestone, 0, 0); - cobblestone.carverHelper.addVariation(StatCollector.translateToLocal("tile.cobblestone.0.desc"), 1, "cobblestone/terrain-cobb-brickaligned"); - cobblestone.carverHelper.addVariation(StatCollector.translateToLocal("tile.cobblestone.1.desc"), 2, "cobblestone/terrain-cob-detailedbrick"); - cobblestone.carverHelper.addVariation(StatCollector.translateToLocal("tile.cobblestone.2.desc"), 3, "cobblestone/terrain-cob-smallbrick"); - cobblestone.carverHelper.addVariation(StatCollector.translateToLocal("tile.cobblestone.3.desc"), 4, "cobblestone/terrain-cobblargetiledark"); - cobblestone.carverHelper.addVariation(StatCollector.translateToLocal("tile.cobblestone.4.desc"), 5, "cobblestone/terrain-cobbsmalltile"); - cobblestone.carverHelper.addVariation(StatCollector.translateToLocal("tile.cobblestone.5.desc"), 6, "cobblestone/terrain-cob-french"); - cobblestone.carverHelper.addVariation(StatCollector.translateToLocal("tile.cobblestone.6.desc"), 7, "cobblestone/terrain-cob-french2"); - cobblestone.carverHelper.addVariation(StatCollector.translateToLocal("tile.cobblestone.7.desc"), 8, "cobblestone/terrain-cobmoss-creepdungeon"); - cobblestone.carverHelper.addVariation(StatCollector.translateToLocal("tile.cobblestone.8.desc"), 9, "cobblestone/terrain-mossysmalltiledark"); - cobblestone.carverHelper.addVariation(StatCollector.translateToLocal("tile.cobblestone.9.desc"), 10, "cobblestone/terrain-pistonback-dungeontile"); - cobblestone.carverHelper.addVariation(StatCollector.translateToLocal("tile.cobblestone.10.desc"), 11, "cobblestone/terrain-pistonback-darkcreeper"); - cobblestone.carverHelper.addVariation(StatCollector.translateToLocal("tile.cobblestone.11.desc"), 12, "cobblestone/terrain-pistonback-darkdent"); - cobblestone.carverHelper.addVariation(StatCollector.translateToLocal("tile.cobblestone.12.desc"), 13, "cobblestone/terrain-pistonback-darkemboss"); - cobblestone.carverHelper.addVariation(StatCollector.translateToLocal("tile.cobblestone.13.desc"), 14, "cobblestone/terrain-pistonback-darkmarker"); - cobblestone.carverHelper.addVariation(StatCollector.translateToLocal("tile.cobblestone.14.desc"), 15, "cobblestone/terrain-pistonback-darkpanel"); - cobblestone.carverHelper.register(cobblestone, "cobblestone"); - Carving.chisel.registerOre("cobblestone", "cobblestone"); - } - - if (Configurations.featureEnabled("glass")) { - glass = (BlockCarvableGlass) new BlockCarvableGlass().setCreativeTab(ModTabs.tabOtherChiselBlocks).setHardness(0.3F).setStepSound(Block.soundTypeGlass); - Carving.chisel.addVariation("glass", Blocks.glass, 0, 0); - glass.carverHelper.addVariation(StatCollector.translateToLocal("tile.glass.1.desc"), 1, "glass/terrain-glassbubble"); - glass.carverHelper.addVariation(StatCollector.translateToLocal("tile.glass.2.desc"), 2, "glass/terrain-glass-chinese"); - glass.carverHelper.addVariation(StatCollector.translateToLocal("tile.glass.3.desc"), 3, "glass/japanese"); - glass.carverHelper.addVariation(StatCollector.translateToLocal("tile.glass.4.desc"), 4, "glass/terrain-glassdungeon"); - glass.carverHelper.addVariation(StatCollector.translateToLocal("tile.glass.5.desc"), 5, "glass/terrain-glasslight"); - glass.carverHelper.addVariation(StatCollector.translateToLocal("tile.glass.6.desc"), 6, "glass/terrain-glassnoborder"); - glass.carverHelper.addVariation(StatCollector.translateToLocal("tile.glass.7.desc"), 7, "glass/terrain-glass-ornatesteel"); - glass.carverHelper.addVariation(StatCollector.translateToLocal("tile.glass.8.desc"), 8, "glass/terrain-glass-screen"); - glass.carverHelper.addVariation(StatCollector.translateToLocal("tile.glass.9.desc"), 9, "glass/terrain-glassshale"); - glass.carverHelper.addVariation(StatCollector.translateToLocal("tile.glass.10.desc"), 10, "glass/terrain-glass-steelframe"); - glass.carverHelper.addVariation(StatCollector.translateToLocal("tile.glass.11.desc"), 11, "glass/terrain-glassstone"); - glass.carverHelper.addVariation(StatCollector.translateToLocal("tile.glass.12.desc"), 12, "glass/terrain-glassstreak"); - glass.carverHelper.addVariation(StatCollector.translateToLocal("tile.glass.13.desc"), 13, "glass/terrain-glass-thickgrid"); - glass.carverHelper.addVariation(StatCollector.translateToLocal("tile.glass.14.desc"), 14, "glass/terrain-glass-thingrid"); - glass.carverHelper.addVariation(StatCollector.translateToLocal("tile.glass.15.desc"), 15, "glass/a1-glasswindow-ironfencemodern"); - glass.carverHelper.register(glass, "glass"); - Carving.chisel.registerOre("glass", "glass"); - } - - if (Configurations.featureEnabled("sandstone")) { - sandstone = (BlockCarvable) new BlockCarvable(Material.rock).setCreativeTab(ModTabs.tabStoneChiselBlocks).setStepSound(Block.soundTypeStone).setHardness(0.8F); - Carving.chisel.addVariation("sandstone", Blocks.sandstone, 0, 0); - Carving.chisel.addVariation("sandstone", Blocks.sandstone, 1, 1); - Carving.chisel.addVariation("sandstone", Blocks.sandstone, 2, 2); - sandstone.carverHelper.addVariation(StatCollector.translateToLocal("tile.sandstone.3.desc"), 3, "sandstone/faded"); - sandstone.carverHelper.addVariation(StatCollector.translateToLocal("tile.sandstone.4.desc"), 4, "sandstone/column"); - sandstone.carverHelper.addVariation(StatCollector.translateToLocal("tile.sandstone.5.desc"), 5, "sandstone/capstone"); - sandstone.carverHelper.addVariation(StatCollector.translateToLocal("tile.sandstone.6.desc"), 6, "sandstone/small"); - sandstone.carverHelper.addVariation(StatCollector.translateToLocal("tile.sandstone.7.desc"), 7, "sandstone/base"); - sandstone.carverHelper.addVariation(StatCollector.translateToLocal("tile.sandstone.8.desc"), 8, "sandstone/smooth"); - sandstone.carverHelper.addVariation(StatCollector.translateToLocal("tile.sandstone.9.desc"), 9, "sandstone/smooth-cap"); - sandstone.carverHelper.addVariation(StatCollector.translateToLocal("tile.sandstone.10.desc"), 10, "sandstone/smooth-small"); - sandstone.carverHelper.addVariation(StatCollector.translateToLocal("tile.sandstone.11.desc"), 11, "sandstone/smooth-base"); - sandstone.carverHelper.addVariation(StatCollector.translateToLocal("tile.sandstone.12.desc"), 12, "sandstone/block"); - sandstone.carverHelper.addVariation(StatCollector.translateToLocal("tile.sandstone.13.desc"), 13, "sandstone/blocks"); - sandstone.carverHelper.addVariation(StatCollector.translateToLocal("tile.sandstone.14.desc"), 14, "sandstone/mosaic"); - sandstone.carverHelper.addVariation(StatCollector.translateToLocal("tile.sandstone.15.desc"), 15, "sandstone/horizontal-tiles"); - sandstone.carverHelper.register(sandstone, "sandstone"); - Carving.chisel.registerOre("sandstone", "sandstone"); - - if (Configurations.featureEnabled("snakeSandstone")) { - sandSnakestone = (BlockSnakestone) new BlockSnakestone("Chisel:snakestone/sandsnake/").setCreativeTab(ModTabs.tabStoneChiselBlocks).setBlockName("snakestoneSand"); - GameRegistry.registerBlock(sandSnakestone, ItemCarvable.class, "sand_snakestone"); - // TODO- eat me! - // LanguageRegistry.addName(new ItemStack(sandSnakestone, 1, 1), - // "Sandstone snake block head"); - // LanguageRegistry.addName(new ItemStack(sandSnakestone, 1, - // 13), "Sandstone snake block body"); - Carving.chisel.addVariation("sandstone", sandSnakestone, 1, 16); - Carving.chisel.addVariation("sandstone", sandSnakestone, 13, 17); - Carving.chisel.registerOre("sandSnakestone", "sandSnakestone"); - } - } - - if (Configurations.featureEnabled("sandstoneScribbles")) { - sandstoneScribbles = (BlockCarvable) new BlockCarvable(Material.rock).setCreativeTab(ModTabs.tabStoneChiselBlocks).setStepSound(Block.soundTypeStone).setHardness(0.8F); - sandstoneScribbles.carverHelper.addVariation(StatCollector.translateToLocal("tile.sandstoneScribbles.desc"), 0, "sandstone-scribbles/scribbles-0"); - sandstoneScribbles.carverHelper.addVariation(StatCollector.translateToLocal("tile.sandstoneScribbles.desc"), 1, "sandstone-scribbles/scribbles-1"); - sandstoneScribbles.carverHelper.addVariation(StatCollector.translateToLocal("tile.sandstoneScribbles.desc"), 2, "sandstone-scribbles/scribbles-2"); - sandstoneScribbles.carverHelper.addVariation(StatCollector.translateToLocal("tile.sandstoneScribbles.desc"), 3, "sandstone-scribbles/scribbles-3"); - sandstoneScribbles.carverHelper.addVariation(StatCollector.translateToLocal("tile.sandstoneScribbles.desc"), 4, "sandstone-scribbles/scribbles-4"); - sandstoneScribbles.carverHelper.addVariation(StatCollector.translateToLocal("tile.sandstoneScribbles.desc"), 5, "sandstone-scribbles/scribbles-5"); - sandstoneScribbles.carverHelper.addVariation(StatCollector.translateToLocal("tile.sandstoneScribbles.desc"), 6, "sandstone-scribbles/scribbles-6"); - sandstoneScribbles.carverHelper.addVariation(StatCollector.translateToLocal("tile.sandstoneScribbles.desc"), 7, "sandstone-scribbles/scribbles-7"); - sandstoneScribbles.carverHelper.addVariation(StatCollector.translateToLocal("tile.sandstoneScribbles.desc"), 8, "sandstone-scribbles/scribbles-8"); - sandstoneScribbles.carverHelper.addVariation(StatCollector.translateToLocal("tile.sandstoneScribbles.desc"), 9, "sandstone-scribbles/scribbles-9"); - sandstoneScribbles.carverHelper.addVariation(StatCollector.translateToLocal("tile.sandstoneScribbles.desc"), 10, "sandstone-scribbles/scribbles-10"); - sandstoneScribbles.carverHelper.addVariation(StatCollector.translateToLocal("tile.sandstoneScribbles.desc"), 11, "sandstone-scribbles/scribbles-11"); - sandstoneScribbles.carverHelper.addVariation(StatCollector.translateToLocal("tile.sandstoneScribbles.desc"), 12, "sandstone-scribbles/scribbles-12"); - sandstoneScribbles.carverHelper.addVariation(StatCollector.translateToLocal("tile.sandstoneScribbles.desc"), 13, "sandstone-scribbles/scribbles-13"); - sandstoneScribbles.carverHelper.addVariation(StatCollector.translateToLocal("tile.sandstoneScribbles.desc"), 14, "sandstone-scribbles/scribbles-14"); - sandstoneScribbles.carverHelper.addVariation(StatCollector.translateToLocal("tile.sandstoneScribbles.desc"), 15, "sandstone-scribbles/scribbles-15"); - sandstoneScribbles.carverHelper.register(sandstoneScribbles, "sandstone_scribbles"); - Carving.chisel.registerOre("sandstone_scribbles", "sandstone_scribbles"); - } - - if (Configurations.featureEnabled("concrete")) { - concrete = (BlockConcrete) new BlockConcrete().setStepSound(Block.soundTypeStone).setCreativeTab(ModTabs.tabStoneChiselBlocks).setHardness(0.5F); - concrete.carverHelper.addVariation(StatCollector.translateToLocal("tile.concrete.0.desc"), 0, "concrete/default"); - concrete.carverHelper.addVariation(StatCollector.translateToLocal("tile.concrete.1.desc"), 1, "concrete/block"); - concrete.carverHelper.addVariation(StatCollector.translateToLocal("tile.concrete.2.desc"), 2, "concrete/doubleslab"); - concrete.carverHelper.addVariation(StatCollector.translateToLocal("tile.concrete.3.desc"), 3, "concrete/blocks"); - concrete.carverHelper.addVariation(StatCollector.translateToLocal("tile.concrete.4.desc"), 4, "concrete/weathered"); - concrete.carverHelper.addVariation(StatCollector.translateToLocal("tile.concrete.5.desc"), 5, "concrete/weathered-block"); - concrete.carverHelper.addVariation(StatCollector.translateToLocal("tile.concrete.6.desc"), 6, "concrete/weathered-doubleslab"); - concrete.carverHelper.addVariation(StatCollector.translateToLocal("tile.concrete.7.desc"), 7, "concrete/weathered-blocks"); - concrete.carverHelper.addVariation(StatCollector.translateToLocal("tile.concrete.8.desc"), 8, "concrete/weathered-half"); - concrete.carverHelper.addVariation(StatCollector.translateToLocal("tile.concrete.9.desc"), 9, "concrete/weathered-block-half"); - concrete.carverHelper.addVariation(StatCollector.translateToLocal("tile.concrete.10.desc"), 10, "concrete/asphalt"); - concrete.carverHelper.register(concrete, "concrete"); - OreDictionary.registerOre("concrete", concrete); - Carving.chisel.registerOre("concrete", "concrete"); - } - - if (Configurations.featureEnabled("roadLine")) { - roadLine = (BlockRoadLine) new BlockRoadLine().setStepSound(Block.soundTypeStone).setCreativeTab(ModTabs.tabOtherChiselBlocks).setHardness(0.01F).setBlockName("roadLine"); - GameRegistry.registerBlock(roadLine, ItemCarvable.class, "road_line"); - Carving.chisel.registerOre("roadLine", "roadLine"); - } - - if (Configurations.featureEnabled("ironBlock")) { - iron = (BlockBeaconBase) new BlockBeaconBase().setCreativeTab(ModTabs.tabMetalChiselBlocks).setHardness(5F).setResistance(10F).setStepSound(Block.soundTypeMetal); - Carving.chisel.addVariation("iron_block", Blocks.iron_block, 0, 0); - iron.carverHelper.addVariation(StatCollector.translateToLocal("tile.iron.1.desc"), 1, "iron/terrain-iron-largeingot"); - iron.carverHelper.addVariation(StatCollector.translateToLocal("tile.iron.2.desc"), 2, "iron/terrain-iron-smallingot"); - iron.carverHelper.addVariation(StatCollector.translateToLocal("tile.iron.3.desc"), 3, "iron/terrain-iron-gears"); - iron.carverHelper.addVariation(StatCollector.translateToLocal("tile.iron.4.desc"), 4, "iron/terrain-iron-brick"); - iron.carverHelper.addVariation(StatCollector.translateToLocal("tile.iron.5.desc"), 5, "iron/terrain-iron-plates"); - iron.carverHelper.addVariation(StatCollector.translateToLocal("tile.iron.6.desc"), 6, "iron/terrain-iron-rivets"); - iron.carverHelper.addVariation(StatCollector.translateToLocal("tile.iron.7.desc"), 7, "iron/terrain-iron-coin-heads"); - iron.carverHelper.addVariation(StatCollector.translateToLocal("tile.iron.8.desc"), 8, "iron/terrain-iron-coin-tails"); - iron.carverHelper.addVariation(StatCollector.translateToLocal("tile.iron.9.desc"), 9, "iron/terrain-iron-crate-dark"); - iron.carverHelper.addVariation(StatCollector.translateToLocal("tile.iron.10.desc"), 10, "iron/terrain-iron-crate-light"); - iron.carverHelper.addVariation(StatCollector.translateToLocal("tile.iron.11.desc"), 11, "iron/terrain-iron-moon"); - iron.carverHelper.addVariation(StatCollector.translateToLocal("tile.iron.12.desc"), 12, "iron/terrain-iron-space"); - iron.carverHelper.addVariation(StatCollector.translateToLocal("tile.iron.13.desc"), 13, "iron/terrain-iron-spaceblack"); - iron.carverHelper.addVariation(StatCollector.translateToLocal("tile.iron.14.desc"), 14, "iron/terrain-iron-vents"); - iron.carverHelper.addVariation(StatCollector.translateToLocal("tile.iron.15.desc"), 15, "iron/terrain-iron-simple"); - iron.carverHelper.register(iron, "iron_block"); - Carving.chisel.registerOre("iron_block", "iron"); - } - - if (Configurations.featureEnabled("goldBlock")) { - gold = (BlockBeaconBase) new BlockBeaconBase().setCreativeTab(ModTabs.tabMetalChiselBlocks).setHardness(3F).setResistance(10F).setStepSound(Block.soundTypeMetal); - Carving.chisel.addVariation("gold_block", Blocks.gold_block, 0, 0); - gold.carverHelper.addVariation(StatCollector.translateToLocal("tile.gold.1.desc"), 1, "gold/terrain-gold-largeingot"); - gold.carverHelper.addVariation(StatCollector.translateToLocal("tile.gold.2.desc"), 2, "gold/terrain-gold-smallingot"); - gold.carverHelper.addVariation(StatCollector.translateToLocal("tile.gold.3.desc"), 3, "gold/terrain-gold-brick"); - gold.carverHelper.addVariation(StatCollector.translateToLocal("tile.gold.4.desc"), 4, "gold/terrain-gold-cart"); - gold.carverHelper.addVariation(StatCollector.translateToLocal("tile.gold.5.desc"), 5, "gold/terrain-gold-coin-heads"); - gold.carverHelper.addVariation(StatCollector.translateToLocal("tile.gold.6.desc"), 6, "gold/terrain-gold-coin-tails"); - gold.carverHelper.addVariation(StatCollector.translateToLocal("tile.gold.7.desc"), 7, "gold/terrain-gold-crate-dark"); - gold.carverHelper.addVariation(StatCollector.translateToLocal("tile.gold.8.desc"), 8, "gold/terrain-gold-crate-light"); - gold.carverHelper.addVariation(StatCollector.translateToLocal("tile.gold.9.desc"), 9, "gold/terrain-gold-plates"); - gold.carverHelper.addVariation(StatCollector.translateToLocal("tile.gold.10.desc"), 10, "gold/terrain-gold-rivets"); - gold.carverHelper.addVariation(StatCollector.translateToLocal("tile.gold.11.desc"), 11, "gold/terrain-gold-star"); - gold.carverHelper.addVariation(StatCollector.translateToLocal("tile.gold.12.desc"), 12, "gold/terrain-gold-space"); - gold.carverHelper.addVariation(StatCollector.translateToLocal("tile.gold.13.desc"), 13, "gold/terrain-gold-spaceblack"); - gold.carverHelper.addVariation(StatCollector.translateToLocal("tile.gold.14.desc"), 14, "gold/terrain-gold-simple"); - gold.carverHelper.register(gold, "gold_block"); - Carving.chisel.registerOre("gold_block", "gold"); - } - - if (Configurations.featureEnabled("diamondBlock")) { - diamond = (BlockBeaconBase) new BlockBeaconBase().setCreativeTab(ModTabs.tabOtherChiselBlocks).setHardness(5F).setResistance(10F).setStepSound(Block.soundTypeMetal); - Carving.chisel.addVariation("diamond_block", Blocks.diamond_block, 0, 0); - diamond.carverHelper.addVariation(StatCollector.translateToLocal("tile.diamond.1.desc"), 1, "diamond/terrain-diamond-embossed"); - diamond.carverHelper.addVariation(StatCollector.translateToLocal("tile.diamond.2.desc"), 2, "diamond/terrain-diamond-gem"); - diamond.carverHelper.addVariation(StatCollector.translateToLocal("tile.diamond.3.desc"), 3, "diamond/terrain-diamond-cells"); - diamond.carverHelper.addVariation(StatCollector.translateToLocal("tile.diamond.4.desc"), 4, "diamond/terrain-diamond-space"); - diamond.carverHelper.addVariation(StatCollector.translateToLocal("tile.diamond.5.desc"), 5, "diamond/terrain-diamond-spaceblack"); - diamond.carverHelper.addVariation(StatCollector.translateToLocal("tile.diamond.6.desc"), 6, "diamond/terrain-diamond-simple"); - diamond.carverHelper.addVariation(StatCollector.translateToLocal("tile.diamond.7.desc"), 7, "diamond/terrain-diamond-bismuth"); - diamond.carverHelper.addVariation(StatCollector.translateToLocal("tile.diamond.8.desc"), 8, "diamond/terrain-diamond-crushed"); - diamond.carverHelper.addVariation(StatCollector.translateToLocal("tile.diamond.9.desc"), 9, "diamond/terrain-diamond-four"); - diamond.carverHelper.addVariation(StatCollector.translateToLocal("tile.diamond.10.desc"), 10, "diamond/terrain-diamond-fourornate"); - diamond.carverHelper.addVariation(StatCollector.translateToLocal("tile.diamond.11.desc"), 11, "diamond/terrain-diamond-zelda"); - diamond.carverHelper.addVariation(StatCollector.translateToLocal("tile.diamond.12.desc"), 12, "diamond/terrain-diamond-ornatelayer"); - diamond.carverHelper.register(diamond, "diamond_block"); - Carving.chisel.registerOre("diamond_block", "diamond"); - } - - if (Configurations.featureEnabled("glowstone")) { - lightstone = (BlockLightstoneCarvable) new BlockLightstoneCarvable().setCreativeTab(ModTabs.tabOtherChiselBlocks).setHardness(0.3F).setLightLevel(1.0F).setStepSound(Block.soundTypeGlass); - Carving.chisel.addVariation("glowstone", Blocks.glowstone, 0, 0); - lightstone.carverHelper.addVariation(StatCollector.translateToLocal("tile.lightstone.1.desc"), 1, "lightstone/terrain-sulphur-cobble"); - lightstone.carverHelper.addVariation(StatCollector.translateToLocal("tile.lightstone.2.desc"), 2, "lightstone/terrain-sulphur-corroded"); - lightstone.carverHelper.addVariation(StatCollector.translateToLocal("tile.lightstone.3.desc"), 3, "lightstone/terrain-sulphur-glass"); - lightstone.carverHelper.addVariation(StatCollector.translateToLocal("tile.lightstone.4.desc"), 4, "lightstone/terrain-sulphur-neon"); - lightstone.carverHelper.addVariation(StatCollector.translateToLocal("tile.lightstone.5.desc"), 5, "lightstone/terrain-sulphur-ornate"); - lightstone.carverHelper.addVariation(StatCollector.translateToLocal("tile.lightstone.6.desc"), 6, "lightstone/terrain-sulphur-rocky"); - lightstone.carverHelper.addVariation(StatCollector.translateToLocal("tile.lightstone.7.desc"), 7, "lightstone/terrain-sulphur-shale"); - lightstone.carverHelper.addVariation(StatCollector.translateToLocal("tile.lightstone.8.desc"), 8, "lightstone/terrain-sulphur-tile"); - lightstone.carverHelper.addVariation(StatCollector.translateToLocal("tile.lightstone.9.desc"), 9, "lightstone/terrain-sulphur-weavelanternlight"); - lightstone.carverHelper.addVariation(StatCollector.translateToLocal("tile.lightstone.10.desc"), 10, "lightstone/a1-glowstone-cobble"); - lightstone.carverHelper.addVariation(StatCollector.translateToLocal("tile.lightstone.11.desc"), 11, "lightstone/a1-glowstone-growth"); - lightstone.carverHelper.addVariation(StatCollector.translateToLocal("tile.lightstone.12.desc"), 12, "lightstone/a1-glowstone-layers"); - lightstone.carverHelper.addVariation(StatCollector.translateToLocal("tile.lightstone.13.desc"), 13, "lightstone/a1-glowstone-tilecorroded"); - lightstone.carverHelper.addVariation(StatCollector.translateToLocal("tile.lightstone.14.desc"), 14, "lightstone/glowstone-bismuth"); - lightstone.carverHelper.addVariation(StatCollector.translateToLocal("tile.lightstone.15.desc"), 15, "lightstone/glowstone-bismuth-panel"); - lightstone.carverHelper.register(lightstone, "glowstone"); - Carving.chisel.registerOre("glowstone", "glowstone"); - } - - if (Configurations.featureEnabled("lapisBlock")) { - lapis = (BlockCarvable) new BlockCarvable(Material.rock).setCreativeTab(ModTabs.tabOtherChiselBlocks).setHardness(3F).setResistance(5F).setStepSound(Block.soundTypeStone); - Carving.chisel.addVariation("lapis_block", Blocks.lapis_block, 0, 0); - lapis.carverHelper.addVariation(StatCollector.translateToLocal("tile.lapis.1.desc"), 1, "lapis/terrain-lapisblock-chunky"); - lapis.carverHelper.addVariation(StatCollector.translateToLocal("tile.lapis.2.desc"), 2, "lapis/terrain-lapisblock-panel"); - lapis.carverHelper.addVariation(StatCollector.translateToLocal("tile.lapis.3.desc"), 3, "lapis/terrain-lapisblock-zelda"); - lapis.carverHelper.addVariation(StatCollector.translateToLocal("tile.lapis.4.desc"), 4, "lapis/terrain-lapisornate"); - lapis.carverHelper.addVariation(StatCollector.translateToLocal("tile.lapis.5.desc"), 5, "lapis/terrain-lapistile"); - lapis.carverHelper.addVariation(StatCollector.translateToLocal("tile.lapis.6.desc"), 6, "lapis/a1-blocklapis-panel"); - lapis.carverHelper.addVariation(StatCollector.translateToLocal("tile.lapis.7.desc"), 7, "lapis/a1-blocklapis-smooth"); - lapis.carverHelper.addVariation(StatCollector.translateToLocal("tile.lapis.8.desc"), 8, "lapis/a1-blocklapis-ornatelayer"); - lapis.carverHelper.register(lapis, "lapis_block"); - Carving.chisel.registerOre("lapis_block", "lapis"); - } - - if (Configurations.featureEnabled("emeraldBlock")) { - emerald = (BlockBeaconBase) new BlockBeaconBase().setCreativeTab(ModTabs.tabOtherChiselBlocks).setHardness(5.0F).setResistance(10.0F).setStepSound(Block.soundTypeMetal); - Carving.chisel.addVariation("emerald_block", Blocks.emerald_block, 0, 0); - emerald.carverHelper.addVariation(StatCollector.translateToLocal("tile.emerald.1.desc"), 1, "emerald/panel"); - emerald.carverHelper.addVariation(StatCollector.translateToLocal("tile.emerald.2.desc"), 2, "emerald/panelclassic"); - emerald.carverHelper.addVariation(StatCollector.translateToLocal("tile.emerald.3.desc"), 3, "emerald/smooth"); - emerald.carverHelper.addVariation(StatCollector.translateToLocal("tile.emerald.4.desc"), 4, "emerald/chunk"); - emerald.carverHelper.addVariation(StatCollector.translateToLocal("tile.emerald.5.desc"), 5, "emerald/goldborder"); - emerald.carverHelper.addVariation(StatCollector.translateToLocal("tile.emerald.6.desc"), 6, "emerald/zelda"); - emerald.carverHelper.addVariation(StatCollector.translateToLocal("tile.emerald.7.desc"), 7, "emerald/cell"); - emerald.carverHelper.addVariation(StatCollector.translateToLocal("tile.emerald.8.desc"), 8, "emerald/cellbismuth"); - emerald.carverHelper.addVariation(StatCollector.translateToLocal("tile.emerald.9.desc"), 9, "emerald/four"); - emerald.carverHelper.addVariation(StatCollector.translateToLocal("tile.emerald.10.desc"), 10, "emerald/fourornate"); - emerald.carverHelper.addVariation(StatCollector.translateToLocal("tile.emerald.11.desc"), 11, "emerald/ornate"); - emerald.carverHelper.register(emerald, "emerald_block"); - Carving.chisel.registerOre("emerald_block", "emerald"); - } - - if (Configurations.featureEnabled("netherBrick")) { - netherBrick = (BlockCarvable) new BlockCarvable(Material.rock).setCreativeTab(ModTabs.tabStoneChiselBlocks).setHardness(2.0F).setResistance(10.0F).setStepSound(Block.soundTypeStone); - Carving.chisel.addVariation("nether_brick", Blocks.nether_brick, 0, 0); - // netherBrick.carverHelper.addVariation("Nether brick", 0, - // Blocks.nether_brick); - netherBrick.carverHelper.addVariation(StatCollector.translateToLocal("tile.netherBrick.1.desc"), 1, "netherbrick/a1-netherbrick-brinstar"); - netherBrick.carverHelper.addVariation(StatCollector.translateToLocal("tile.netherBrick.2.desc"), 2, "netherbrick/a1-netherbrick-classicspatter"); - netherBrick.carverHelper.addVariation(StatCollector.translateToLocal("tile.netherBrick.3.desc"), 3, "netherbrick/a1-netherbrick-guts"); - netherBrick.carverHelper.addVariation(StatCollector.translateToLocal("tile.netherBrick.4.desc"), 4, "netherbrick/a1-netherbrick-gutsdark"); - netherBrick.carverHelper.addVariation(StatCollector.translateToLocal("tile.netherBrick.5.desc"), 5, "netherbrick/a1-netherbrick-gutssmall"); - netherBrick.carverHelper.addVariation(StatCollector.translateToLocal("tile.netherBrick.6.desc"), 6, "netherbrick/a1-netherbrick-lavabrinstar"); - netherBrick.carverHelper.addVariation(StatCollector.translateToLocal("tile.netherBrick.7.desc"), 7, "netherbrick/a1-netherbrick-lavabrown"); - netherBrick.carverHelper.addVariation(StatCollector.translateToLocal("tile.netherBrick.8.desc"), 8, "netherbrick/a1-netherbrick-lavaobsidian"); - netherBrick.carverHelper.addVariation(StatCollector.translateToLocal("tile.netherBrick.9.desc"), 9, "netherbrick/a1-netherbrick-lavastonedark"); - netherBrick.carverHelper.addVariation(StatCollector.translateToLocal("tile.netherBrick.10.desc"), 10, "netherbrick/a1-netherbrick-meat"); - netherBrick.carverHelper.addVariation(StatCollector.translateToLocal("tile.netherBrick.11.desc"), 11, "netherbrick/a1-netherbrick-meatred"); - netherBrick.carverHelper.addVariation(StatCollector.translateToLocal("tile.netherBrick.12.desc"), 12, "netherbrick/a1-netherbrick-meatredsmall"); - netherBrick.carverHelper.addVariation(StatCollector.translateToLocal("tile.netherBrick.13.desc"), 13, "netherbrick/a1-netherbrick-meatsmall"); - netherBrick.carverHelper.addVariation(StatCollector.translateToLocal("tile.netherBrick.14.desc"), 14, "netherbrick/a1-netherbrick-red"); - netherBrick.carverHelper.addVariation(StatCollector.translateToLocal("tile.netherBrick.15.desc"), 15, "netherbrick/a1-netherbrick-redsmall"); - netherBrick.carverHelper.register(netherBrick, "nether_brick"); - Carving.chisel.registerOre("nether_brick", "nether_brick"); - } - - if (Configurations.featureEnabled("netherRack")) { - netherrack = (BlockCarvable) new BlockCarvable(Material.rock).setCreativeTab(ModTabs.tabStoneChiselBlocks).setHardness(0.4F).setStepSound(Block.soundTypeStone); - Carving.chisel.addVariation("netherrack", Blocks.netherrack, 0, 0); - netherrack.carverHelper.addVariation(StatCollector.translateToLocal("tile.hellrock.1.desc"), 1, "netherrack/a1-netherrack-bloodgravel"); - netherrack.carverHelper.addVariation(StatCollector.translateToLocal("tile.hellrock.2.desc"), 2, "netherrack/a1-netherrack-bloodrock"); - netherrack.carverHelper.addVariation(StatCollector.translateToLocal("tile.hellrock.3.desc"), 3, "netherrack/a1-netherrack-bloodrockgrey"); - netherrack.carverHelper.addVariation(StatCollector.translateToLocal("tile.hellrock.4.desc"), 4, "netherrack/a1-netherrack-brinstar"); - netherrack.carverHelper.addVariation(StatCollector.translateToLocal("tile.hellrock.5.desc"), 5, "netherrack/a1-netherrack-brinstarshale"); - netherrack.carverHelper.addVariation(StatCollector.translateToLocal("tile.hellrock.6.desc"), 6, "netherrack/a1-netherrack-classic"); - netherrack.carverHelper.addVariation(StatCollector.translateToLocal("tile.hellrock.7.desc"), 7, "netherrack/a1-netherrack-classicspatter"); - netherrack.carverHelper.addVariation(StatCollector.translateToLocal("tile.hellrock.8.desc"), 8, "netherrack/a1-netherrack-guts"); - netherrack.carverHelper.addVariation(StatCollector.translateToLocal("tile.hellrock.9.desc"), 9, "netherrack/a1-netherrack-gutsdark"); - netherrack.carverHelper.addVariation(StatCollector.translateToLocal("tile.hellrock.10.desc"), 10, "netherrack/a1-netherrack-meat"); - netherrack.carverHelper.addVariation(StatCollector.translateToLocal("tile.hellrock.11.desc"), 11, "netherrack/a1-netherrack-meatred"); - netherrack.carverHelper.addVariation(StatCollector.translateToLocal("tile.hellrock.12.desc"), 12, "netherrack/a1-netherrack-meatrock"); - netherrack.carverHelper.addVariation(StatCollector.translateToLocal("tile.hellrock.13.desc"), 13, "netherrack/a1-netherrack-red"); - netherrack.carverHelper.addVariation(StatCollector.translateToLocal("tile.hellrock.14.desc"), 14, "netherrack/a1-netherrack-wells"); - netherrack.carverHelper.register(netherrack, "netherrack"); - Carving.chisel.registerOre("netherrack", "netherrack"); - } - - if (Configurations.featureEnabled("cobblestoneMossy")) { - cobblestoneMossy = (BlockCarvable) new BlockCarvable(Material.rock).setCreativeTab(ModTabs.tabStoneChiselBlocks).setHardness(2.0F).setResistance(10.0F).setStepSound(Block.soundTypeStone); - Carving.chisel.addVariation("mossy_cobblestone", Blocks.mossy_cobblestone, 0, 0); - cobblestoneMossy.carverHelper.addVariation(StatCollector.translateToLocal("tile.stoneMoss.1.desc"), 1, "cobblestonemossy/terrain-cobb-brickaligned"); - cobblestoneMossy.carverHelper.addVariation(StatCollector.translateToLocal("tile.stoneMoss.2.desc"), 2, "cobblestonemossy/terrain-cob-detailedbrick"); - cobblestoneMossy.carverHelper.addVariation(StatCollector.translateToLocal("tile.stoneMoss.3.desc"), 3, "cobblestonemossy/terrain-cob-smallbrick"); - cobblestoneMossy.carverHelper.addVariation(StatCollector.translateToLocal("tile.stoneMoss.4.desc"), 4, "cobblestonemossy/terrain-cobblargetiledark"); - cobblestoneMossy.carverHelper.addVariation(StatCollector.translateToLocal("tile.stoneMoss.5.desc"), 5, "cobblestonemossy/terrain-cobbsmalltile"); - cobblestoneMossy.carverHelper.addVariation(StatCollector.translateToLocal("tile.stoneMoss.6.desc"), 6, "cobblestonemossy/terrain-cob-french"); - cobblestoneMossy.carverHelper.addVariation(StatCollector.translateToLocal("tile.stoneMoss.7.desc"), 7, "cobblestonemossy/terrain-cob-french2"); - cobblestoneMossy.carverHelper.addVariation(StatCollector.translateToLocal("tile.stoneMoss.8.desc"), 8, "cobblestonemossy/terrain-cobmoss-creepdungeon"); - cobblestoneMossy.carverHelper.addVariation(StatCollector.translateToLocal("tile.stoneMoss.9.desc"), 9, "cobblestonemossy/terrain-mossysmalltiledark"); - cobblestoneMossy.carverHelper.addVariation(StatCollector.translateToLocal("tile.stoneMoss.10.desc"), 10, "cobblestonemossy/terrain-pistonback-dungeontile"); - cobblestoneMossy.carverHelper.addVariation(StatCollector.translateToLocal("tile.stoneMoss.11.desc"), 11, "cobblestonemossy/terrain-pistonback-darkcreeper"); - cobblestoneMossy.carverHelper.addVariation(StatCollector.translateToLocal("tile.stoneMoss.12.desc"), 12, "cobblestonemossy/terrain-pistonback-darkdent"); - cobblestoneMossy.carverHelper.addVariation(StatCollector.translateToLocal("tile.stoneMoss.13.desc"), 13, "cobblestonemossy/terrain-pistonback-darkemboss"); - cobblestoneMossy.carverHelper.addVariation(StatCollector.translateToLocal("tile.stoneMoss.14.desc"), 14, "cobblestonemossy/terrain-pistonback-darkmarker"); - cobblestoneMossy.carverHelper.addVariation(StatCollector.translateToLocal("tile.stoneMoss.15.desc"), 15, "cobblestonemossy/terrain-pistonback-darkpanel"); - cobblestoneMossy.carverHelper.register(cobblestoneMossy, "mossy_cobblestone"); - Carving.chisel.registerOre("mossy_cobblestone", "mossy_cobblestone"); - } - - if (Configurations.featureEnabled("stoneBrick")) { - stoneBrick = (BlockCarvable) new BlockCarvable(Material.rock).setCreativeTab(ModTabs.tabStoneChiselBlocks).setHardness(1.5F).setResistance(10.0F).setStepSound(Block.soundTypeStone); - for (int i = 0; i < 4; i++) { - if (i == 1) { - if (Configurations.allowMossy) - Carving.chisel.addVariation("stonebricksmooth", Blocks.stonebrick, i, i); - } else - Carving.chisel.addVariation("stonebricksmooth", Blocks.stonebrick, i, i); - } - stoneBrick.carverHelper.addVariation(StatCollector.translateToLocal("tile.stoneBrick.4.desc"), 4, "stonebrick/smallbricks"); - stoneBrick.carverHelper.addVariation(StatCollector.translateToLocal("tile.stoneBrick.5.desc"), 5, "stonebrick/largebricks"); - stoneBrick.carverHelper.addVariation(StatCollector.translateToLocal("tile.stoneBrick.6.desc"), 6, "stonebrick/smallchaotic"); - stoneBrick.carverHelper.addVariation(StatCollector.translateToLocal("tile.stoneBrick.7.desc"), 7, "stonebrick/chaoticbricks"); - stoneBrick.carverHelper.addVariation(StatCollector.translateToLocal("tile.stoneBrick.8.desc"), 8, "stonebrick/chaotic"); - stoneBrick.carverHelper.addVariation(StatCollector.translateToLocal("tile.stoneBrick.9.desc"), 9, "stonebrick/fancy"); - stoneBrick.carverHelper.addVariation(StatCollector.translateToLocal("tile.stoneBrick.10.desc"), 10, "stonebrick/ornate"); - stoneBrick.carverHelper.addVariation(StatCollector.translateToLocal("tile.stoneBrick.11.desc"), 11, "stonebrick/largeornate"); - stoneBrick.carverHelper.addVariation(StatCollector.translateToLocal("tile.stoneBrick.12.desc"), 12, "stonebrick/panel-hard"); - stoneBrick.carverHelper.addVariation(StatCollector.translateToLocal("tile.stoneBrick.13.desc"), 13, "stonebrick/sunken"); - stoneBrick.carverHelper.addVariation(StatCollector.translateToLocal("tile.stoneBrick.14.desc"), 14, "stonebrick/ornatepanel"); - stoneBrick.carverHelper.addVariation(StatCollector.translateToLocal("tile.stoneBrick.15.desc"), 15, "stonebrick/poison"); - stoneBrick.carverHelper.register(stoneBrick, "stonebricksmooth"); - Carving.chisel.registerOre("stonebricksmooth", "stonebricksmooth"); - } - - if (Configurations.featureEnabled("snakestone")) { - snakestone = (BlockSnakestone) new BlockSnakestone("Chisel:snakestone/snake/").setBlockName("snakestoneStone").setCreativeTab(ModTabs.tabStoneChiselBlocks); - GameRegistry.registerBlock(snakestone, ItemCarvable.class, "stone_snakestone"); - // LanguageRegistry.addName(new ItemStack(snakestone, 1, 1), - // "Stone snake block head"); - // LanguageRegistry.addName(new ItemStack(snakestone, 1, 13), - // "Stone snake block body"); - Carving.chisel.addVariation("stonebrick", snakestone, 1, 16); - Carving.chisel.addVariation("stonebrick", snakestone, 13, 17); - Carving.chisel.registerOre("snakestoneStone", "snakestoneStone"); - } - - if (Configurations.featureEnabled("dirt")) { - dirt = (BlockCarvable) new BlockCarvable(Material.ground).setCreativeTab(ModTabs.tabOtherChiselBlocks).setHardness(0.5F).setStepSound(Block.soundTypeGravel).setBlockName("dirt.default"); - Carving.chisel.addVariation("dirt", Blocks.dirt, 0, 0); - dirt.carverHelper.setChiselBlockName("Dirt"); - // dirt.carverHelper.addVariation("Dirt", 0, Blocks.dirt); - dirt.carverHelper.addVariation(StatCollector.translateToLocal("tile.dirt.0.desc"), 0, "dirt/bricks"); - dirt.carverHelper.addVariation(StatCollector.translateToLocal("tile.dirt.1.desc"), 1, "dirt/netherbricks"); - dirt.carverHelper.addVariation(StatCollector.translateToLocal("tile.dirt.2.desc"), 2, "dirt/bricks3"); - dirt.carverHelper.addVariation(StatCollector.translateToLocal("tile.dirt.3.desc"), 3, "dirt/cobble"); - dirt.carverHelper.addVariation(StatCollector.translateToLocal("tile.dirt.4.desc"), 4, "dirt/reinforcedCobbleDirt"); - dirt.carverHelper.addVariation(StatCollector.translateToLocal("tile.dirt.5.desc"), 5, "dirt/reinforcedDirt"); - dirt.carverHelper.addVariation(StatCollector.translateToLocal("tile.dirt.6.desc"), 6, "dirt/happy"); - dirt.carverHelper.addVariation(StatCollector.translateToLocal("tile.dirt.7.desc"), 7, "dirt/bricks2"); - dirt.carverHelper.addVariation(StatCollector.translateToLocal("tile.dirt.8.desc"), 8, "dirt/bricks+dirt2"); - dirt.carverHelper.addVariation(StatCollector.translateToLocal("tile.dirt.9.desc"), 9, "dirt/hor"); - dirt.carverHelper.addVariation(StatCollector.translateToLocal("tile.dirt.10.desc"), 10, "dirt/vert"); - dirt.carverHelper.addVariation(StatCollector.translateToLocal("tile.dirt.11.desc"), 11, "dirt/layers"); - dirt.carverHelper.addVariation(StatCollector.translateToLocal("tile.dirt.12.desc"), 12, "dirt/vertical"); - dirt.carverHelper.register(dirt, "dirt"); - dirt.setHarvestLevel("shovel", 0); - OreDictionary.registerOre("dirt", dirt); - Carving.chisel.registerOre("dirt", "dirt"); - } - - if (Configurations.featureEnabled("ice")) { - ice = (BlockMarbleIce) new BlockMarbleIce().setCreativeTab(ModTabs.tabOtherChiselBlocks).setHardness(0.5F).setLightOpacity(3).setStepSound(Block.soundTypeGlass); - Carving.chisel.addVariation("ice", Blocks.ice, 0, 0); - ice.carverHelper.addVariation(StatCollector.translateToLocal("tile.ice.1.desc"), 1, "ice/a1-ice-light"); - ice.carverHelper.addVariation(StatCollector.translateToLocal("tile.ice.2.desc"), 2, "ice/a1-stonecobble-icecobble"); - ice.carverHelper.addVariation(StatCollector.translateToLocal("tile.ice.3.desc"), 3, "ice/a1-netherbrick-ice"); - ice.carverHelper.addVariation(StatCollector.translateToLocal("tile.ice.4.desc"), 4, "ice/a1-stonecobble-icebrick"); - ice.carverHelper.addVariation(StatCollector.translateToLocal("tile.ice.5.desc"), 5, "ice/a1-stonecobble-icebricksmall"); - ice.carverHelper.addVariation(StatCollector.translateToLocal("tile.ice.6.desc"), 6, "ice/a1-stonecobble-icedungeon"); - ice.carverHelper.addVariation(StatCollector.translateToLocal("tile.ice.7.desc"), 7, "ice/a1-stonecobble-icefour"); - ice.carverHelper.addVariation(StatCollector.translateToLocal("tile.ice.8.desc"), 8, "ice/a1-stonecobble-icefrench"); - ice.carverHelper.addVariation(StatCollector.translateToLocal("tile.ice.9.desc"), 9, "ice/sunkentiles"); - ice.carverHelper.addVariation(StatCollector.translateToLocal("tile.ice.10.desc"), 10, "ice/tiles"); - ice.carverHelper.addVariation(StatCollector.translateToLocal("tile.ice.11.desc"), 11, "ice/a1-stonecobble-icepanel"); - ice.carverHelper.addVariation(StatCollector.translateToLocal("tile.ice.12.desc"), 12, "ice/a1-stoneslab-ice"); - ice.carverHelper.addVariation(StatCollector.translateToLocal("tile.ice.13.desc"), 13, "ice/zelda"); - ice.carverHelper.addVariation(StatCollector.translateToLocal("tile.ice.14.desc"), 14, "ice/bismuth"); - ice.carverHelper.addVariation(StatCollector.translateToLocal("tile.ice.15.desc"), 15, "ice/poison"); - ice.carverHelper.register(ice, "ice"); - Carving.chisel.registerOre("ice", "ice"); - - if (Configurations.featureEnabled("icePillar")) { - icePillar = (BlockMarbleIce) new BlockMarbleIce().setCreativeTab(ModTabs.tabOtherChiselBlocks).setHardness(0.5F).setLightOpacity(3).setStepSound(Block.soundTypeGlass); - icePillar.carverHelper.setChiselBlockName("Ice Pillar"); - icePillar.carverHelper.addVariation(StatCollector.translateToLocal("tile.icePillar.0.desc"), 0, "icepillar/column"); - icePillar.carverHelper.addVariation(StatCollector.translateToLocal("tile.icePillar.1.desc"), 1, "icepillar/capstone"); - icePillar.carverHelper.addVariation(StatCollector.translateToLocal("tile.icePillar.2.desc"), 2, "icepillar/base"); - icePillar.carverHelper.addVariation(StatCollector.translateToLocal("tile.icePillar.3.desc"), 3, "icepillar/small"); - icePillar.carverHelper.addVariation(StatCollector.translateToLocal("tile.icePillar.4.desc"), 4, "icepillar/pillar-carved"); - icePillar.carverHelper.addVariation(StatCollector.translateToLocal("tile.icePillar.5.desc"), 5, "icepillar/a1-stoneornamental-marblegreek"); - icePillar.carverHelper.addVariation(StatCollector.translateToLocal("tile.icePillar.6.desc"), 6, "icepillar/a1-stonepillar-greek"); - icePillar.carverHelper.addVariation(StatCollector.translateToLocal("tile.icePillar.7.desc"), 7, "icepillar/a1-stonepillar-plain"); - icePillar.carverHelper.addVariation(StatCollector.translateToLocal("tile.icePillar.8.desc"), 8, "icepillar/a1-stonepillar-greektopplain"); - icePillar.carverHelper.addVariation(StatCollector.translateToLocal("tile.icePillar.9.desc"), 9, "icepillar/a1-stonepillar-plaintopplain"); - icePillar.carverHelper.addVariation(StatCollector.translateToLocal("tile.icePillar.10.desc"), 10, "icepillar/a1-stonepillar-greekbottomplain"); - icePillar.carverHelper.addVariation(StatCollector.translateToLocal("tile.icePillar.11.desc"), 11, "icepillar/a1-stonepillar-plainbottomplain"); - icePillar.carverHelper.addVariation(StatCollector.translateToLocal("tile.icePillar.12.desc"), 12, "icepillar/a1-stonepillar-greektopgreek"); - icePillar.carverHelper.addVariation(StatCollector.translateToLocal("tile.icePillar.13.desc"), 13, "icepillar/a1-stonepillar-plaintopgreek"); - icePillar.carverHelper.addVariation(StatCollector.translateToLocal("tile.icePillar.14.desc"), 14, "icepillar/a1-stonepillar-greekbottomgreek"); - icePillar.carverHelper.addVariation(StatCollector.translateToLocal("tile.icePillar.15.desc"), 15, "icepillar/a1-stonepillar-plainbottomgreek"); - icePillar.carverHelper.register(icePillar, "ice_pillar"); - Carving.chisel.setGroupClass("ice_pillar", "ice"); - } - - if (Configurations.featureEnabled("iceStairs")) { - BlockMarbleStairsMaker makerIceStairs = new BlockMarbleStairsMaker(Blocks.ice); - makerIceStairs.carverHelper.setChiselBlockName("Ice Stairs"); - makerIceStairs.carverHelper.addVariation(StatCollector.translateToLocal("tile.iceStairs.0.desc"), 0, Blocks.ice); - makerIceStairs.carverHelper.addVariation(StatCollector.translateToLocal("tile.iceStairs.1.desc"), 1, "ice/a1-ice-light"); - makerIceStairs.carverHelper.addVariation(StatCollector.translateToLocal("tile.iceStairs.2.desc"), 2, "ice/a1-stonecobble-icecobble"); - makerIceStairs.carverHelper.addVariation(StatCollector.translateToLocal("tile.iceStairs.3.desc"), 3, "ice/a1-netherbrick-ice"); - makerIceStairs.carverHelper.addVariation(StatCollector.translateToLocal("tile.iceStairs.4.desc"), 4, "ice/a1-stonecobble-icebrick"); - makerIceStairs.carverHelper.addVariation(StatCollector.translateToLocal("tile.iceStairs.5.desc"), 5, "ice/a1-stonecobble-icebricksmall"); - makerIceStairs.carverHelper.addVariation(StatCollector.translateToLocal("tile.iceStairs.6.desc"), 6, "ice/a1-stonecobble-icedungeon"); - makerIceStairs.carverHelper.addVariation(StatCollector.translateToLocal("tile.iceStairs.7.desc"), 7, "ice/a1-stonecobble-icefour"); - makerIceStairs.carverHelper.addVariation(StatCollector.translateToLocal("tile.iceStairs.8.desc"), 8, "ice/a1-stonecobble-icefrench"); - makerIceStairs.carverHelper.addVariation(StatCollector.translateToLocal("tile.iceStairs.9.desc"), 9, "ice/sunkentiles"); - makerIceStairs.carverHelper.addVariation(StatCollector.translateToLocal("tile.iceStairs.10.desc"), 10, "ice/tiles"); - makerIceStairs.carverHelper.addVariation(StatCollector.translateToLocal("tile.iceStairs.11.desc"), 11, "ice/a1-stonecobble-icepanel"); - makerIceStairs.carverHelper.addVariation(StatCollector.translateToLocal("tile.iceStairs.12.desc"), 12, "ice/a1-stoneslab-ice"); - makerIceStairs.carverHelper.addVariation(StatCollector.translateToLocal("tile.iceStairs.13.desc"), 13, "ice/zelda"); - makerIceStairs.carverHelper.addVariation(StatCollector.translateToLocal("tile.iceStairs.14.desc"), 14, "ice/bismuth"); - makerIceStairs.carverHelper.addVariation(StatCollector.translateToLocal("tile.iceStairs.15.desc"), 15, "ice/poison"); - makerIceStairs.create(new BlockMarbleStairsMakerCreator() { - - @Override - public BlockMarbleStairs create(Block block, int meta, CarvableHelper helper) { - return new BlockMarbleIceStairs(block, meta, helper); - } - }, "ice_stairs"); - Carving.chisel.registerOre("iceStairs", "iceStairs"); - } - } - if (Configurations.featureEnabled("packedice")) { - packedice = (BlockMarblePackedIce) new BlockMarblePackedIce().setCreativeTab(ModTabs.tabOtherChiselBlocks).setHardness(0.5F).setLightOpacity(3).setStepSound(Block.soundTypeGlass); - Carving.chisel.addVariation("packedice", Blocks.packed_ice, 0, 0); - packedice.carverHelper.addVariation(StatCollector.translateToLocal("tile.packedice.1.desc"), 1, "packedice/a1-ice-light"); - packedice.carverHelper.addVariation(StatCollector.translateToLocal("tile.packedice.2.desc"), 2, "packedice/a1-stonecobble-icecobble"); - packedice.carverHelper.addVariation(StatCollector.translateToLocal("tile.packedice.3.desc"), 3, "packedice/a1-netherbrick-ice"); - packedice.carverHelper.addVariation(StatCollector.translateToLocal("tile.packedice.4.desc"), 4, "packedice/a1-stonecobble-icebrick"); - packedice.carverHelper.addVariation(StatCollector.translateToLocal("tile.packedice.5.desc"), 5, "packedice/a1-stonecobble-icebricksmall"); - packedice.carverHelper.addVariation(StatCollector.translateToLocal("tile.packedice.6.desc"), 6, "packedice/a1-stonecobble-icedungeon"); - packedice.carverHelper.addVariation(StatCollector.translateToLocal("tile.packedice.7.desc"), 7, "packedice/a1-stonecobble-icefour"); - packedice.carverHelper.addVariation(StatCollector.translateToLocal("tile.packedice.8.desc"), 8, "packedice/a1-stonecobble-icefrench"); - packedice.carverHelper.addVariation(StatCollector.translateToLocal("tile.packedice.9.desc"), 9, "packedice/sunkentiles"); - packedice.carverHelper.addVariation(StatCollector.translateToLocal("tile.packedice.10.desc"), 10, "packedice/tiles"); - packedice.carverHelper.addVariation(StatCollector.translateToLocal("tile.packedice.11.desc"), 11, "packedice/a1-stonecobble-icepanel"); - packedice.carverHelper.addVariation(StatCollector.translateToLocal("tile.packedice.12.desc"), 12, "packedice/a1-stoneslab-ice"); - packedice.carverHelper.addVariation(StatCollector.translateToLocal("tile.packedice.13.desc"), 13, "packedice/zelda"); - packedice.carverHelper.addVariation(StatCollector.translateToLocal("tile.packedice.14.desc"), 14, "packedice/bismuth"); - packedice.carverHelper.addVariation(StatCollector.translateToLocal("tile.packedice.15.desc"), 15, "packedice/poison"); - packedice.carverHelper.register(packedice, "packedice"); - Carving.chisel.registerOre("packedice", "packedice"); - - if (Configurations.featureEnabled("packedicePillar")) { - packedicePillar = (BlockMarblePackedIce) new BlockMarblePackedIce().setCreativeTab(ModTabs.tabOtherChiselBlocks).setHardness(0.5F).setLightOpacity(3) - .setStepSound(Block.soundTypeGlass); - packedicePillar.carverHelper.setChiselBlockName("Packed Ice Pillar"); - packedicePillar.carverHelper.addVariation(StatCollector.translateToLocal("tile.packedicePillar.0.desc"), 0, "packedicepillar/column"); - packedicePillar.carverHelper.addVariation(StatCollector.translateToLocal("tile.packedicePillar.1.desc"), 1, "packedicepillar/capstone"); - packedicePillar.carverHelper.addVariation(StatCollector.translateToLocal("tile.packedicePillar.2.desc"), 2, "packedicepillar/base"); - packedicePillar.carverHelper.addVariation(StatCollector.translateToLocal("tile.packedicePillar.3.desc"), 3, "packedicepillar/small"); - packedicePillar.carverHelper.addVariation(StatCollector.translateToLocal("tile.packedicePillar.4.desc"), 4, "packedicepillar/pillar-carved"); - packedicePillar.carverHelper.addVariation(StatCollector.translateToLocal("tile.packedicePillar.5.desc"), 5, "packedicepillar/a1-stoneornamental-marblegreek"); - packedicePillar.carverHelper.addVariation(StatCollector.translateToLocal("tile.packedicePillar.6.desc"), 6, "packedicepillar/a1-stonepillar-greek"); - packedicePillar.carverHelper.addVariation(StatCollector.translateToLocal("tile.packedicePillar.7.desc"), 7, "packedicepillar/a1-stonepillar-plain"); - packedicePillar.carverHelper.addVariation(StatCollector.translateToLocal("tile.packedicePillar.8.desc"), 8, "packedicepillar/a1-stonepillar-greektopplain"); - packedicePillar.carverHelper.addVariation(StatCollector.translateToLocal("tile.packedicePillar.9.desc"), 9, "packedicepillar/a1-stonepillar-plaintopplain"); - packedicePillar.carverHelper.addVariation(StatCollector.translateToLocal("tile.packedicePillar.10.desc"), 10, "packedicepillar/a1-stonepillar-greekbottomplain"); - packedicePillar.carverHelper.addVariation(StatCollector.translateToLocal("tile.packedicePillar.11.desc"), 11, "packedicepillar/a1-stonepillar-plainbottomplain"); - packedicePillar.carverHelper.addVariation(StatCollector.translateToLocal("tile.packedicePillar.12.desc"), 12, "packedicepillar/a1-stonepillar-greektopgreek"); - packedicePillar.carverHelper.addVariation(StatCollector.translateToLocal("tile.packedicePillar.13.desc"), 13, "packedicepillar/a1-stonepillar-plaintopgreek"); - packedicePillar.carverHelper.addVariation(StatCollector.translateToLocal("tile.packedicePillar.14.desc"), 14, "packedicepillar/a1-stonepillar-greekbottomgreek"); - packedicePillar.carverHelper.addVariation(StatCollector.translateToLocal("tile.packedicePillar.15.desc"), 15, "packedicepillar/a1-stonepillar-plainbottomgreek"); - packedicePillar.carverHelper.register(packedicePillar, "packedice_pillar"); - Carving.chisel.setGroupClass("packedice_pillar", "packedice"); - } - - if (Configurations.featureEnabled("packediceStairs")) { - BlockMarbleStairsMaker makerPackedIceStairs = new BlockMarbleStairsMaker(Blocks.packed_ice); - makerPackedIceStairs.carverHelper.setChiselBlockName("Packed Ice Stairs"); - makerPackedIceStairs.carverHelper.addVariation(StatCollector.translateToLocal("tile.packediceStairs.0.desc"), 0, Blocks.packed_ice); - makerPackedIceStairs.carverHelper.addVariation(StatCollector.translateToLocal("tile.packediceStairs.1.desc"), 1, "packedice/a1-ice-light"); - makerPackedIceStairs.carverHelper.addVariation(StatCollector.translateToLocal("tile.packediceStairs.2.desc"), 2, "packedice/a1-stonecobble-icecobble"); - makerPackedIceStairs.carverHelper.addVariation(StatCollector.translateToLocal("tile.packediceStairs.3.desc"), 3, "packedice/a1-netherbrick-ice"); - makerPackedIceStairs.carverHelper.addVariation(StatCollector.translateToLocal("tile.packediceStairs.4.desc"), 4, "packedice/a1-stonecobble-icebrick"); - makerPackedIceStairs.carverHelper.addVariation(StatCollector.translateToLocal("tile.packediceStairs.5.desc"), 5, "packedice/a1-stonecobble-icebricksmall"); - makerPackedIceStairs.carverHelper.addVariation(StatCollector.translateToLocal("tile.packediceStairs.6.desc"), 6, "packedice/a1-stonecobble-icedungeon"); - makerPackedIceStairs.carverHelper.addVariation(StatCollector.translateToLocal("tile.packediceStairs.7.desc"), 7, "packedice/a1-stonecobble-icefour"); - makerPackedIceStairs.carverHelper.addVariation(StatCollector.translateToLocal("tile.packediceStairs.8.desc"), 8, "packedice/a1-stonecobble-icefrench"); - makerPackedIceStairs.carverHelper.addVariation(StatCollector.translateToLocal("tile.packediceStairs.9.desc"), 9, "packedice/sunkentiles"); - makerPackedIceStairs.carverHelper.addVariation(StatCollector.translateToLocal("tile.packediceStairs.10.desc"), 10, "packedice/tiles"); - makerPackedIceStairs.carverHelper.addVariation(StatCollector.translateToLocal("tile.packediceStairs.11.desc"), 11, "packedice/a1-stonecobble-icepanel"); - makerPackedIceStairs.carverHelper.addVariation(StatCollector.translateToLocal("tile.packediceStairs.12.desc"), 12, "packedice/a1-stoneslab-ice"); - makerPackedIceStairs.carverHelper.addVariation(StatCollector.translateToLocal("tile.packediceStairs.13.desc"), 13, "packedice/zelda"); - makerPackedIceStairs.carverHelper.addVariation(StatCollector.translateToLocal("tile.packediceStairs.14.desc"), 14, "packedice/bismuth"); - makerPackedIceStairs.carverHelper.addVariation(StatCollector.translateToLocal("tile.packediceStairs.15.desc"), 15, "packedice/poison"); - makerPackedIceStairs.create(new BlockMarbleStairsMakerCreator() { - - @Override - public BlockMarbleStairs create(Block block, int meta, CarvableHelper helper) { - return new BlockMarblePackedIceStairs(block, meta, helper); - } - }, "packedice_stairs"); - Carving.chisel.registerOre("packedIceStairs", "packedIceStairs"); - } - } - - if (Configurations.featureEnabled("wood")) { - String[] plank_names = { "oak", "spruce", "birch", "jungle", "acacia", "dark-oak" }; - String[] plank_ucnames = { "Oak", "Spruce", "Birch", "Jungle", "Acacia", "Dark Oak" }; - for (int i = 0; i < 6; i++) { - String n = plank_names[i]; - String u = plank_ucnames[i]; - final String orename = n.replace('-', '_') + "_planks"; - - planks[i] = (BlockCarvable) (new BlockCarvable(Material.wood)).setCreativeTab(ModTabs.tabWoodChiselBlocks).setHardness(2.0F).setResistance(5.0F).setStepSound(Block.soundTypeWood); - planks[i].carverHelper.setChiselBlockName(u + " Wood Planks"); - planks[i].carverHelper.addVariation("Smooth " + n + " wood planks", 1, "planks-" + n + "/clean"); - planks[i].carverHelper.addVariation("Short " + n + " wood planks", 2, "planks-" + n + "/short"); - planks[i].carverHelper.addVariation("Fancy " + n + " wood plank arrangement", 6, "planks-" + n + "/fancy"); - planks[i].carverHelper.addVariation(u + " wood panel", 8, "planks-" + n + "/panel-nails"); - planks[i].carverHelper.addVariation(u + " wood double slab", 9, "planks-" + n + "/double"); - planks[i].carverHelper.addVariation(u + " wood crate", 10, "planks-" + n + "/crate"); - planks[i].carverHelper.addVariation("Fancy " + n + " wood crate", 11, "planks-" + n + "/crate-fancy"); - planks[i].carverHelper.addVariation("Large long " + n + " wood planks", 13, "planks-" + n + "/large"); - planks[i].carverHelper.addVariation("Vertical " + n + " wood planks", 3, "planks-" + n + "/vertical"); - planks[i].carverHelper.addVariation("Vertical uneven " + n + " wood planks", 4, "planks-" + n + "/vertical-uneven"); - planks[i].carverHelper.addVariation(u + " wood parquet", 5, "planks-" + n + "/parquet"); - planks[i].carverHelper.addVariation(u + " wood plank blinds", 7, "planks-" + n + "/blinds"); - planks[i].carverHelper.addVariation(u + " wood scaffold", 12, "planks-" + n + "/crateex"); - planks[i].carverHelper.addVariation(u + " wood planks in disarray", 14, "planks-" + n + "/chaotic-hor"); - planks[i].carverHelper.addVariation("Vertical " + n + " wood planks in disarray", 15, "planks-" + n + "/chaotic"); - planks[i].carverHelper.register(planks[i], orename); - Carving.chisel.addVariation(orename, Blocks.planks, i, 0); - planks[i].setHarvestLevel("axe", 0); - Carving.chisel.registerOre("wood", "wood"); - Carving.chisel.setVariationSound(orename, Chisel.MOD_ID + ":chisel.wood"); - } - } - - if (Configurations.featureEnabled("obsidian")) { - obsidian = (BlockCarvable) new BlockCarvable(Material.rock).setCreativeTab(ModTabs.tabStoneChiselBlocks).setHardness(50.0F).setResistance(2000.0F).setStepSound(Block.soundTypeStone); - Carving.chisel.addVariation("obsidian", Blocks.obsidian, 0, 0); - obsidian.carverHelper.addVariation(StatCollector.translateToLocal("tile.obsidian.1.desc"), 1, "obsidian/pillar"); - obsidian.carverHelper.addVariation(StatCollector.translateToLocal("tile.obsidian.2.desc"), 2, "obsidian/pillar-quartz"); - obsidian.carverHelper.addVariation(StatCollector.translateToLocal("tile.obsidian.3.desc"), 3, "obsidian/chiseled"); - obsidian.carverHelper.addVariation(StatCollector.translateToLocal("tile.obsidian.4.desc"), 4, "obsidian/panel-shiny"); - obsidian.carverHelper.addVariation(StatCollector.translateToLocal("tile.obsidian.5.desc"), 5, "obsidian/panel"); - obsidian.carverHelper.addVariation(StatCollector.translateToLocal("tile.obsidian.6.desc"), 6, "obsidian/chunks"); - obsidian.carverHelper.addVariation(StatCollector.translateToLocal("tile.obsidian.7.desc"), 7, "obsidian/growth"); - obsidian.carverHelper.addVariation(StatCollector.translateToLocal("tile.obsidian.8.desc"), 8, "obsidian/crystal"); - obsidian.carverHelper.addVariation(StatCollector.translateToLocal("tile.obsidian.9.desc"), 9, "obsidian/map-a"); - obsidian.carverHelper.addVariation(StatCollector.translateToLocal("tile.obsidian.10.desc"), 10, "obsidian/map-b"); - obsidian.carverHelper.addVariation(StatCollector.translateToLocal("tile.obsidian.11.desc"), 11, "obsidian/panel-light"); - obsidian.carverHelper.addVariation(StatCollector.translateToLocal("tile.obsidian.12.desc"), 12, "obsidian/blocks"); - obsidian.carverHelper.addVariation(StatCollector.translateToLocal("tile.obsidian.13.desc"), 13, "obsidian/tiles"); - obsidian.carverHelper.addVariation(StatCollector.translateToLocal("tile.obsidian.14.desc"), 14, "obsidian/greek"); - obsidian.carverHelper.addVariation(StatCollector.translateToLocal("tile.obsidian.15.desc"), 15, "obsidian/crate"); - obsidian.carverHelper.register(obsidian, "obsidian"); - Carving.chisel.registerOre("obsidian", "obsidian"); - } - - if (Configurations.featureEnabled("snakestoneObsidian")) { - obsidianSnakestone = (BlockSnakestoneObsidian) new BlockSnakestoneObsidian("Chisel:snakestone/obsidian/").setBlockName("obsidianSnakestone").setHardness(50.0F).setResistance(2000.0F); - GameRegistry.registerBlock(obsidianSnakestone, ItemCarvable.class, "obsidian_snakestone"); - Carving.chisel.addVariation("obsidian", obsidianSnakestone, 1, 16); - Carving.chisel.addVariation("obsidian", obsidianSnakestone, 13, 17); - Carving.chisel.registerOre("obsidianSnakestone", "obsidianSnakestone"); - } - - if (Configurations.featureEnabled("ironBars")) { - paneIron = (BlockCarvablePane) new BlockCarvablePane(Material.iron, true).setCreativeTab(ModTabs.tabOtherChiselBlocks).setHardness(0.3F).setStepSound(Block.soundTypeMetal); - Carving.chisel.addVariation("iron_bars", Blocks.iron_bars, 0, 0); - paneIron.carverHelper.addVariation(StatCollector.translateToLocal("tile.iron_bars.1.desc"), 1, "ironpane/fenceIron"); - paneIron.carverHelper.addVariation(StatCollector.translateToLocal("tile.iron_bars.2.desc"), 2, "ironpane/barbedwire"); - paneIron.carverHelper.addVariation(StatCollector.translateToLocal("tile.iron_bars.3.desc"), 3, "ironpane/cage"); - paneIron.carverHelper.addVariation(StatCollector.translateToLocal("tile.iron_bars.4.desc"), 4, "ironpane/fenceIronTop"); - paneIron.carverHelper.addVariation(StatCollector.translateToLocal("tile.iron_bars.5.desc"), 5, "ironpane/terrain-glass-thickgrid"); - paneIron.carverHelper.addVariation(StatCollector.translateToLocal("tile.iron_bars.6.desc"), 6, "ironpane/terrain-glass-thingrid"); - paneIron.carverHelper.addVariation(StatCollector.translateToLocal("tile.iron_bars.7.desc"), 7, "ironpane/terrain-glass-ornatesteel"); - paneIron.carverHelper.addVariation(StatCollector.translateToLocal("tile.iron_bars.8.desc"), 8, "ironpane/bars"); - paneIron.carverHelper.addVariation(StatCollector.translateToLocal("tile.iron_bars.9.desc"), 9, "ironpane/spikes"); - paneIron.carverHelper.register(paneIron, "iron_bars"); - Carving.chisel.registerOre("iron_bars", "iron_bars"); - } - - if (Configurations.featureEnabled("glassPane")) { - paneGlass = (BlockCarvablePane) new BlockCarvablePane(Material.glass, false).setCreativeTab(ModTabs.tabOtherChiselBlocks).setHardness(0.3F).setStepSound(Block.soundTypeGlass); - Carving.chisel.addVariation("glass_pane", Blocks.glass_pane, 0, 0); - paneGlass.carverHelper.addVariation(StatCollector.translateToLocal("tile.glass_pane.1.desc"), 1, "glasspane/terrain-glassbubble"); - paneGlass.carverHelper.addVariation(StatCollector.translateToLocal("tile.glass_pane.2.desc"), 2, "glasspane/terrain-glassnoborder"); - paneGlass.carverHelper.addVariation(StatCollector.translateToLocal("tile.glass_pane.3.desc"), 3, "glasspane/terrain-glass-screen"); - paneGlass.carverHelper.addVariation(StatCollector.translateToLocal("tile.glass_pane.4.desc"), 4, "glasspane/terrain-glassstreak"); - paneGlass.carverHelper.addVariation(StatCollector.translateToLocal("tile.glass_pane.12.desc"), 12, "glasspane/chinese"); - paneGlass.carverHelper.addVariation(StatCollector.translateToLocal("tile.glass_pane.13.desc"), 13, "glasspane/chinese2"); - paneGlass.carverHelper.addVariation(StatCollector.translateToLocal("tile.glass_pane.14.desc"), 14, "glasspane/japanese"); - paneGlass.carverHelper.addVariation(StatCollector.translateToLocal("tile.glass_pane.15.desc"), 15, "glasspane/japanese2"); - paneGlass.carverHelper.register(paneGlass, "glass_pane"); - Carving.chisel.registerOre("glass_pane", "glass_pane"); - } - - if (Configurations.featureEnabled("redstoneBlock")) { - redstone = (BlockCarvablePowered) (new BlockCarvablePowered(Material.iron)).setCreativeTab(ModTabs.tabOtherChiselBlocks).setHardness(5.0F).setResistance(10.0F) - .setStepSound(Block.soundTypeMetal); - Carving.chisel.addVariation("redstone_block", Blocks.redstone_block, 0, 0); - redstone.carverHelper.addVariation(StatCollector.translateToLocal("tile.redstone_block.1.desc"), 1, "redstone/smooth"); - redstone.carverHelper.addVariation(StatCollector.translateToLocal("tile.redstone_block.2.desc"), 2, "redstone/block"); - redstone.carverHelper.addVariation(StatCollector.translateToLocal("tile.redstone_block.3.desc"), 3, "redstone/blocks"); - redstone.carverHelper.addVariation(StatCollector.translateToLocal("tile.redstone_block.4.desc"), 4, "redstone/bricks"); - redstone.carverHelper.addVariation(StatCollector.translateToLocal("tile.redstone_block.5.desc"), 5, "redstone/smallbricks"); - redstone.carverHelper.addVariation(StatCollector.translateToLocal("tile.redstone_block.6.desc"), 6, "redstone/smallchaotic"); - redstone.carverHelper.addVariation(StatCollector.translateToLocal("tile.redstone_block.7.desc"), 7, "redstone/chiseled"); - redstone.carverHelper.addVariation(StatCollector.translateToLocal("tile.redstone_block.8.desc"), 8, "redstone/ere"); - redstone.carverHelper.addVariation(StatCollector.translateToLocal("tile.redstone_block.9.desc"), 9, "redstone/ornate-tiles"); - redstone.carverHelper.addVariation(StatCollector.translateToLocal("tile.redstone_block.10.desc"), 10, "redstone/pillar"); - redstone.carverHelper.addVariation(StatCollector.translateToLocal("tile.redstone_block.11.desc"), 11, "redstone/tiles"); - redstone.carverHelper.addVariation(StatCollector.translateToLocal("tile.redstone_block.12.desc"), 12, "redstone/circuit"); - redstone.carverHelper.addVariation(StatCollector.translateToLocal("tile.redstone_block.13.desc"), 13, "redstone/supaplex"); - redstone.carverHelper.addVariation(StatCollector.translateToLocal("tile.redstone_block.14.desc"), 14, "redstone/a1-blockredstone-skullred"); - redstone.carverHelper.addVariation(StatCollector.translateToLocal("tile.redstone_block.15.desc"), 15, "redstone/a1-blockredstone-redstonezelda"); - redstone.carverHelper.register(redstone, "redstone_block"); - Carving.chisel.registerOre("redstone_block", "redstone"); - } - - if (Configurations.featureEnabled("holystone")) { - holystone = (BlockHolystone) new BlockHolystone(Material.rock).setCreativeTab(ModTabs.tabStoneChiselBlocks).setHardness(2.0F).setResistance(10F) - .setStepSound(Chisel.soundHolystoneFootstep); - holystone.carverHelper.addVariation(StatCollector.translateToLocal("tile.holystone.0.desc"), 0, "holystone/holystone"); - holystone.carverHelper.addVariation(StatCollector.translateToLocal("tile.holystone.1.desc"), 1, "holystone/smooth"); - holystone.carverHelper.addVariation(StatCollector.translateToLocal("tile.holystone.2.desc"), 2, "holystone/love"); - holystone.carverHelper.addVariation(StatCollector.translateToLocal("tile.holystone.3.desc"), 3, "holystone/chiseled"); - holystone.carverHelper.addVariation(StatCollector.translateToLocal("tile.holystone.4.desc"), 4, "holystone/blocks"); - holystone.carverHelper.addVariation(StatCollector.translateToLocal("tile.holystone.5.desc"), 5, "holystone/blocks-rough"); - holystone.carverHelper.addVariation(StatCollector.translateToLocal("tile.holystone.6.desc"), 6, "holystone/brick"); - holystone.carverHelper.addVariation(StatCollector.translateToLocal("tile.holystone.7.desc"), 7, "holystone/largebricks"); - holystone.carverHelper.addVariation(StatCollector.translateToLocal("tile.holystone.8.desc"), 8, "holystone/platform"); - holystone.carverHelper.addVariation(StatCollector.translateToLocal("tile.holystone.9.desc"), 9, "holystone/platform-tiles"); - holystone.carverHelper.addVariation(StatCollector.translateToLocal("tile.holystone.10.desc"), 10, "holystone/construction"); - holystone.carverHelper.addVariation(StatCollector.translateToLocal("tile.holystone.11.desc"), 11, "holystone/fancy-tiles"); - holystone.carverHelper.addVariation(StatCollector.translateToLocal("tile.holystone.12.desc"), 12, "holystone/plate"); - holystone.carverHelper.addVariation(StatCollector.translateToLocal("tile.holystone.13.desc"), 13, "holystone/plate-rough"); - holystone.carverHelper.register(holystone, "holystone"); - OreDictionary.registerOre("holystone", holystone); - Carving.chisel.registerOre("holystone", "holystone"); - } - - if (Configurations.featureEnabled("lavastone")) { - lavastone = (BlockLavastone) new BlockLavastone(Material.rock, "lava_flow").setCreativeTab(ModTabs.tabStoneChiselBlocks).setHardness(2.0F).setResistance(10F); - lavastone.carverHelper.addVariation(StatCollector.translateToLocal("tile.lavastone.0.desc"), 0, "lavastone/cobble"); - lavastone.carverHelper.addVariation(StatCollector.translateToLocal("tile.lavastone.1.desc"), 1, "lavastone/black"); - lavastone.carverHelper.addVariation(StatCollector.translateToLocal("tile.lavastone.2.desc"), 2, "lavastone/tiles"); - lavastone.carverHelper.addVariation(StatCollector.translateToLocal("tile.lavastone.3.desc"), 3, "lavastone/chaotic"); - lavastone.carverHelper.addVariation(StatCollector.translateToLocal("tile.lavastone.4.desc"), 4, "lavastone/creeper"); - lavastone.carverHelper.addVariation(StatCollector.translateToLocal("tile.lavastone.5.desc"), 5, "lavastone/panel"); - lavastone.carverHelper.addVariation(StatCollector.translateToLocal("tile.lavastone.6.desc"), 6, "lavastone/panel-ornate"); - lavastone.carverHelper.addVariation(StatCollector.translateToLocal("tile.lavastone.7.desc"), 7, "lavastone/dark"); - lavastone.carverHelper.register(lavastone, "lavastone"); - OreDictionary.registerOre("lavastone", lavastone); - Carving.chisel.registerOre("lavastone", "lavastone"); - } - - if (Configurations.featureEnabled("fantasy")) { - fantasy = (BlockCarvable) new BlockCarvable(Material.rock).setCreativeTab(ModTabs.tabStoneChiselBlocks).setHardness(2.0F).setResistance(10F); - fantasy.carverHelper.setChiselBlockName("Fantasy Block"); - fantasy.carverHelper.addVariation(StatCollector.translateToLocal("tile.fantasyblock.0.desc"), 0, "fantasy/brick"); - fantasy.carverHelper.addVariation(StatCollector.translateToLocal("tile.fantasyblock.1.desc"), 1, "fantasy/brick-faded"); - fantasy.carverHelper.addVariation(StatCollector.translateToLocal("tile.fantasyblock.2.desc"), 2, "fantasy/brick-wear"); - fantasy.carverHelper.addVariation(StatCollector.translateToLocal("tile.fantasyblock.3.desc"), 3, "fantasy/bricks"); - fantasy.carverHelper.addVariation(StatCollector.translateToLocal("tile.fantasyblock.4.desc"), 4, "fantasy/decor"); - fantasy.carverHelper.addVariation(StatCollector.translateToLocal("tile.fantasyblock.5.desc"), 5, "fantasy/decor-block"); - fantasy.carverHelper.addVariation(StatCollector.translateToLocal("tile.fantasyblock.6.desc"), 6, "fantasy/pillar"); - fantasy.carverHelper.addVariation(StatCollector.translateToLocal("tile.fantasyblock.7.desc"), 7, "fantasy/pillar-decorated"); - fantasy.carverHelper.addVariation(StatCollector.translateToLocal("tile.fantasyblock.8.desc"), 8, "fantasy/gold-decor-1"); - fantasy.carverHelper.addVariation(StatCollector.translateToLocal("tile.fantasyblock.9.desc"), 9, "fantasy/gold-decor-2"); - fantasy.carverHelper.addVariation(StatCollector.translateToLocal("tile.fantasyblock.10.desc"), 10, "fantasy/gold-decor-3"); - fantasy.carverHelper.addVariation(StatCollector.translateToLocal("tile.fantasyblock.11.desc"), 11, "fantasy/gold-decor-4"); - fantasy.carverHelper.addVariation(StatCollector.translateToLocal("tile.fantasyblock.12.desc"), 12, "fantasy/plate"); - fantasy.carverHelper.addVariation(StatCollector.translateToLocal("tile.fantasyblock.13.desc"), 13, "fantasy/block"); - fantasy.carverHelper.addVariation(StatCollector.translateToLocal("tile.fantasyblock.14.desc"), 14, "fantasy/bricks-chaotic"); - fantasy.carverHelper.addVariation(StatCollector.translateToLocal("tile.fantasyblock.15.desc"), 15, "fantasy/bricks-wear"); - fantasy.carverHelper.register(fantasy, "fantasyblock"); - OreDictionary.registerOre("fantasy", fantasy); - Carving.chisel.registerOre("fantasyblock", "fantasy"); - } - - if (Configurations.featureEnabled("carpet")) { - carpet = (BlockCarvable) new BlockCarvable(Material.cloth).setCreativeTab(ModTabs.tabOtherChiselBlocks).setHardness(2.0F).setResistance(10F).setStepSound(Block.soundTypeCloth); - carpet.carverHelper.setChiselBlockName("Carpet Block"); - carpet.carverHelper.addVariation(StatCollector.translateToLocal("tile.carpet_block.0.desc"), 0, "carpet/white"); - carpet.carverHelper.addVariation(StatCollector.translateToLocal("tile.carpet_block.1.desc"), 1, "carpet/orange"); - carpet.carverHelper.addVariation(StatCollector.translateToLocal("tile.carpet_block.2.desc"), 2, "carpet/lily"); - carpet.carverHelper.addVariation(StatCollector.translateToLocal("tile.carpet_block.3.desc"), 3, "carpet/lightblue"); - carpet.carverHelper.addVariation(StatCollector.translateToLocal("tile.carpet_block.4.desc"), 4, "carpet/yellow"); - carpet.carverHelper.addVariation(StatCollector.translateToLocal("tile.carpet_block.5.desc"), 5, "carpet/lightgreen"); - carpet.carverHelper.addVariation(StatCollector.translateToLocal("tile.carpet_block.6.desc"), 6, "carpet/pink"); - carpet.carverHelper.addVariation(StatCollector.translateToLocal("tile.carpet_block.7.desc"), 7, "carpet/darkgrey"); - carpet.carverHelper.addVariation(StatCollector.translateToLocal("tile.carpet_block.8.desc"), 8, "carpet/grey"); - carpet.carverHelper.addVariation(StatCollector.translateToLocal("tile.carpet_block.9.desc"), 9, "carpet/teal"); - carpet.carverHelper.addVariation(StatCollector.translateToLocal("tile.carpet_block.10.desc"), 10, "carpet/purple"); - carpet.carverHelper.addVariation(StatCollector.translateToLocal("tile.carpet_block.11.desc"), 11, "carpet/darkblue"); - carpet.carverHelper.addVariation(StatCollector.translateToLocal("tile.carpet_block.12.desc"), 12, "carpet/brown"); - carpet.carverHelper.addVariation(StatCollector.translateToLocal("tile.carpet_block.13.desc"), 13, "carpet/green"); - carpet.carverHelper.addVariation(StatCollector.translateToLocal("tile.carpet_block.14.desc"), 14, "carpet/red"); - carpet.carverHelper.addVariation(StatCollector.translateToLocal("tile.carpet_block.15.desc"), 15, "carpet/black"); - carpet.carverHelper.forbidChiseling = true; - carpet.carverHelper.register(carpet, "carpet_block"); - OreDictionary.registerOre("carpet", carpet); - Carving.chisel.registerOre("carpet_block", "carpet"); - } - - if (Configurations.featureEnabled("carpetFloor")) { - carpetFloor = (BlockMarbleCarpet) new BlockMarbleCarpet(Material.cloth).setCreativeTab(ModTabs.tabOtherChiselBlocks).setHardness(2.0F).setResistance(10F) - .setStepSound(Block.soundTypeCloth); - carpetFloor.carverHelper.setChiselBlockName("Carpet"); - carpetFloor.carverHelper.addVariation(StatCollector.translateToLocal("tile.carpet.0.desc"), 0, "carpet/white"); - carpetFloor.carverHelper.addVariation(StatCollector.translateToLocal("tile.carpet.1.desc"), 1, "carpet/orange"); - carpetFloor.carverHelper.addVariation(StatCollector.translateToLocal("tile.carpet.2.desc"), 2, "carpet/lily"); - carpetFloor.carverHelper.addVariation(StatCollector.translateToLocal("tile.carpet.3.desc"), 3, "carpet/lightblue"); - carpetFloor.carverHelper.addVariation(StatCollector.translateToLocal("tile.carpet.4.desc"), 4, "carpet/yellow"); - carpetFloor.carverHelper.addVariation(StatCollector.translateToLocal("tile.carpet.5.desc"), 5, "carpet/lightgreen"); - carpetFloor.carverHelper.addVariation(StatCollector.translateToLocal("tile.carpet.6.desc"), 6, "carpet/pink"); - carpetFloor.carverHelper.addVariation(StatCollector.translateToLocal("tile.carpet.7.desc"), 7, "carpet/darkgrey"); - carpetFloor.carverHelper.addVariation(StatCollector.translateToLocal("tile.carpet.8.desc"), 8, "carpet/grey"); - carpetFloor.carverHelper.addVariation(StatCollector.translateToLocal("tile.carpet.9.desc"), 9, "carpet/teal"); - carpetFloor.carverHelper.addVariation(StatCollector.translateToLocal("tile.carpet.10.desc"), 10, "carpet/purple"); - carpetFloor.carverHelper.addVariation(StatCollector.translateToLocal("tile.carpet.11.desc"), 11, "carpet/darkblue"); - carpetFloor.carverHelper.addVariation(StatCollector.translateToLocal("tile.carpet.12.desc"), 12, "carpet/brown"); - carpetFloor.carverHelper.addVariation(StatCollector.translateToLocal("tile.carpet.13.desc"), 13, "carpet/green"); - carpetFloor.carverHelper.addVariation(StatCollector.translateToLocal("tile.carpet.14.desc"), 14, "carpet/red"); - carpetFloor.carverHelper.addVariation(StatCollector.translateToLocal("tile.carpet.15.desc"), 15, "carpet/black"); - carpetFloor.carverHelper.forbidChiseling = true; - carpetFloor.carverHelper.register(carpetFloor, "carpet"); - - for (int i = 0; i < 16; i++) { - String group = "carpet." + i; - - Carving.needle.addVariation(group, Blocks.carpet, i, 0); - Carving.needle.addVariation(group, carpetFloor, i, 2); - Carving.needle.addVariation(group, carpet, i, 1); - } - - Carving.chisel.registerOre("carpet", "carpet"); - } - - if (Configurations.featureEnabled("bookshelf")) { - bookshelf = (BlockCarvable) new BlockMarbleBookshelf().setHardness(1.5F).setCreativeTab(ModTabs.tabWoodChiselBlocks).setStepSound(Block.soundTypeWood); - Carving.chisel.addVariation("bookshelf", Blocks.bookshelf, 0, 0); - bookshelf.carverHelper.addVariation(StatCollector.translateToLocal("tile.bookshelf.1.desc"), 1, "bookshelf/rainbow"); - bookshelf.carverHelper.addVariation(StatCollector.translateToLocal("tile.bookshelf.2.desc"), 2, "bookshelf/necromancer-novice"); - bookshelf.carverHelper.addVariation(StatCollector.translateToLocal("tile.bookshelf.3.desc"), 3, "bookshelf/necromancer"); - bookshelf.carverHelper.addVariation(StatCollector.translateToLocal("tile.bookshelf.4.desc"), 4, "bookshelf/redtomes"); - bookshelf.carverHelper.addVariation(StatCollector.translateToLocal("tile.bookshelf.5.desc"), 5, "bookshelf/abandoned"); - bookshelf.carverHelper.addVariation(StatCollector.translateToLocal("tile.bookshelf.6.desc"), 6, "bookshelf/hoarder"); - bookshelf.carverHelper.addVariation(StatCollector.translateToLocal("tile.bookshelf.7.desc"), 7, "bookshelf/brim"); - bookshelf.carverHelper.addVariation(StatCollector.translateToLocal("tile.bookshelf.8.desc"), 8, "bookshelf/historician"); - bookshelf.carverHelper.register(bookshelf, "bookshelf"); - bookshelf.setHarvestLevel("axe", 0); - Carving.chisel.registerOre("bookshelf", "bookshelf"); - } - - if (Configurations.featureEnabled("futuristicArmorPlating")) { - tyrian = (BlockCarvable) new BlockCarvable(Material.iron).setCreativeTab(ModTabs.tabMetalChiselBlocks).setHardness(5.0F).setResistance(10.0F).setStepSound(Block.soundTypeMetal); - tyrian.carverHelper.setChiselBlockName("Futuristic Armor Plating Block"); - tyrian.carverHelper.addVariation(StatCollector.translateToLocal("tile.tyrian.0.desc"), 0, "tyrian/shining"); - tyrian.carverHelper.addVariation(StatCollector.translateToLocal("tile.tyrian.1.desc"), 1, "tyrian/tyrian"); - tyrian.carverHelper.addVariation(StatCollector.translateToLocal("tile.tyrian.2.desc"), 2, "tyrian/chaotic"); - tyrian.carverHelper.addVariation(StatCollector.translateToLocal("tile.tyrian.3.desc"), 3, "tyrian/softplate"); - tyrian.carverHelper.addVariation(StatCollector.translateToLocal("tile.tyrian.4.desc"), 4, "tyrian/rust"); - tyrian.carverHelper.addVariation(StatCollector.translateToLocal("tile.tyrian.5.desc"), 5, "tyrian/elaborate"); - tyrian.carverHelper.addVariation(StatCollector.translateToLocal("tile.tyrian.6.desc"), 6, "tyrian/routes"); - tyrian.carverHelper.addVariation(StatCollector.translateToLocal("tile.tyrian.7.desc"), 7, "tyrian/platform"); - tyrian.carverHelper.addVariation(StatCollector.translateToLocal("tile.tyrian.8.desc"), 8, "tyrian/platetiles"); - tyrian.carverHelper.addVariation(StatCollector.translateToLocal("tile.tyrian.9.desc"), 9, "tyrian/diagonal"); - tyrian.carverHelper.addVariation(StatCollector.translateToLocal("tile.tyrian.10.desc"), 10, "tyrian/dent"); - tyrian.carverHelper.addVariation(StatCollector.translateToLocal("tile.tyrian.11.desc"), 11, "tyrian/blueplating"); - tyrian.carverHelper.addVariation(StatCollector.translateToLocal("tile.tyrian.12.desc"), 12, "tyrian/black"); - tyrian.carverHelper.addVariation(StatCollector.translateToLocal("tile.tyrian.13.desc"), 13, "tyrian/black2"); - tyrian.carverHelper.addVariation(StatCollector.translateToLocal("tile.tyrian.14.desc"), 14, "tyrian/opening"); - tyrian.carverHelper.addVariation(StatCollector.translateToLocal("tile.tyrian.15.desc"), 15, "tyrian/plate"); - tyrian.carverHelper.register(tyrian, "tyrian"); - OreDictionary.registerOre("tyrian", tyrian); - Carving.chisel.registerOre("tyrian", "tyrian"); - } - - if (Configurations.featureEnabled("templeBlock")) { - temple = (BlockCarvable) new BlockEldritch().setHardness(2.0F).setCreativeTab(ModTabs.tabStoneChiselBlocks).setResistance(10F).setStepSound(Chisel.soundTempleFootstep); - temple.carverHelper.setChiselBlockName("Temple Block"); - temple.carverHelper.addVariation(StatCollector.translateToLocal("tile.templeblock.0.desc"), 0, "temple/cobble"); - temple.carverHelper.addVariation(StatCollector.translateToLocal("tile.templeblock.1.desc"), 1, "temple/ornate"); - temple.carverHelper.addVariation(StatCollector.translateToLocal("tile.templeblock.2.desc"), 2, "temple/plate"); - temple.carverHelper.addVariation(StatCollector.translateToLocal("tile.templeblock.3.desc"), 3, "temple/plate-cracked"); - temple.carverHelper.addVariation(StatCollector.translateToLocal("tile.templeblock.4.desc"), 4, "temple/bricks"); - temple.carverHelper.addVariation(StatCollector.translateToLocal("tile.templeblock.5.desc"), 5, "temple/bricks-large"); - temple.carverHelper.addVariation(StatCollector.translateToLocal("tile.templeblock.6.desc"), 6, "temple/bricks-weared"); - temple.carverHelper.addVariation(StatCollector.translateToLocal("tile.templeblock.7.desc"), 7, "temple/bricks-disarray"); - temple.carverHelper.addVariation(StatCollector.translateToLocal("tile.templeblock.8.desc"), 8, "temple/column"); - temple.carverHelper.addVariation(StatCollector.translateToLocal("tile.templeblock.9.desc"), 9, "temple/stand"); - temple.carverHelper.addVariation(StatCollector.translateToLocal("tile.templeblock.10.desc"), 10, "temple/stand-mosaic"); - temple.carverHelper.addVariation(StatCollector.translateToLocal("tile.templeblock.11.desc"), 11, "temple/stand-creeper"); - temple.carverHelper.addVariation(StatCollector.translateToLocal("tile.templeblock.12.desc"), 12, "temple/tiles"); - temple.carverHelper.addVariation(StatCollector.translateToLocal("tile.templeblock.13.desc"), 13, "temple/smalltiles"); - temple.carverHelper.addVariation(StatCollector.translateToLocal("tile.templeblock.14.desc"), 14, "temple/tiles-light"); - temple.carverHelper.addVariation(StatCollector.translateToLocal("tile.templeblock.15.desc"), 15, "temple/smalltiles-light"); - temple.carverHelper.register(temple, "templeblock"); - Carving.chisel.registerOre("templeblock", "templeblock"); - - if (Configurations.featureEnabled("templeBlockMossy")) { - templeMossy = (BlockCarvable) new BlockEldritch().setHardness(2.0F).setCreativeTab(ModTabs.tabStoneChiselBlocks).setResistance(10F).setStepSound(Chisel.soundTempleFootstep); - templeMossy.carverHelper.setChiselBlockName("Mossy Temple Block"); - templeMossy.carverHelper.addVariation(StatCollector.translateToLocal("tile.mossy_templeblock.0.desc"), 0, "templemossy/cobble"); - templeMossy.carverHelper.addVariation(StatCollector.translateToLocal("tile.mossy_templeblock.1.desc"), 1, "templemossy/ornate"); - templeMossy.carverHelper.addVariation(StatCollector.translateToLocal("tile.mossy_templeblock.2.desc"), 2, "templemossy/plate"); - templeMossy.carverHelper.addVariation(StatCollector.translateToLocal("tile.mossy_templeblock.3.desc"), 3, "templemossy/plate-cracked"); - templeMossy.carverHelper.addVariation(StatCollector.translateToLocal("tile.mossy_templeblock.4.desc"), 4, "templemossy/bricks"); - templeMossy.carverHelper.addVariation(StatCollector.translateToLocal("tile.mossy_templeblock.5.desc"), 5, "templemossy/bricks-large"); - templeMossy.carverHelper.addVariation(StatCollector.translateToLocal("tile.mossy_templeblock.6.desc"), 6, "templemossy/bricks-weared"); - templeMossy.carverHelper.addVariation(StatCollector.translateToLocal("tile.mossy_templeblock.7.desc"), 7, "templemossy/bricks-disarray"); - templeMossy.carverHelper.addVariation(StatCollector.translateToLocal("tile.mossy_templeblock.8.desc"), 8, "templemossy/column"); - templeMossy.carverHelper.addVariation(StatCollector.translateToLocal("tile.mossy_templeblock.9.desc"), 9, "templemossy/stand"); - templeMossy.carverHelper.addVariation(StatCollector.translateToLocal("tile.mossy_templeblock.10.desc"), 10, "templemossy/stand-mosaic"); - templeMossy.carverHelper.addVariation(StatCollector.translateToLocal("tile.mossy_templeblock.11.desc"), 11, "templemossy/stand-creeper"); - templeMossy.carverHelper.addVariation(StatCollector.translateToLocal("tile.mossy_templeblock.12.desc"), 12, "templemossy/tiles"); - templeMossy.carverHelper.addVariation(StatCollector.translateToLocal("tile.mossy_templeblock.13.desc"), 13, "templemossy/smalltiles"); - templeMossy.carverHelper.addVariation(StatCollector.translateToLocal("tile.mossy_templeblock.14.desc"), 14, "templemossy/tiles-light"); - templeMossy.carverHelper.addVariation(StatCollector.translateToLocal("tile.mossy_templeblock.15.desc"), 15, "templemossy/smalltiles-light"); - templeMossy.carverHelper.register(templeMossy, "mossy_templeblock"); - Carving.chisel.registerOre("mossy_templeblock", "mossy_templeblock"); - } - } - - if (Configurations.featureEnabled("cloud")) { - cloud = (BlockCloud) new BlockCloud().setHardness(0.2F).setCreativeTab(ModTabs.tabOtherChiselBlocks).setLightOpacity(3).setStepSound(Block.soundTypeCloth); - cloud.carverHelper.addVariation(StatCollector.translateToLocal("tile.cloud.0.desc"), 0, "cloud/cloud"); - cloud.carverHelper.addVariation(StatCollector.translateToLocal("tile.cloud.1.desc"), 1, "cloud/large"); - cloud.carverHelper.addVariation(StatCollector.translateToLocal("tile.cloud.2.desc"), 2, "cloud/small"); - cloud.carverHelper.addVariation(StatCollector.translateToLocal("tile.cloud.3.desc"), 3, "cloud/vertical"); - cloud.carverHelper.addVariation(StatCollector.translateToLocal("tile.cloud.4.desc"), 4, "cloud/grid"); - cloud.carverHelper.register(cloud, "cloud"); - OreDictionary.registerOre("cloud", cloud); - Carving.chisel.registerOre("cloud", "cloud"); - } - - if (Configurations.featureEnabled("factory")) { - factory = (BlockCarvable) new BlockCarvable(Material.iron).setCreativeTab(ModTabs.tabMetalChiselBlocks).setHardness(2.0F).setResistance(10F).setStepSound(Chisel.soundMetalFootstep); - factory.carverHelper.setChiselBlockName("factoryblock"); - factory.carverHelper.addVariation(StatCollector.translateToLocal("tile.factory.0.desc"), 0, "factory/dots"); - factory.carverHelper.addVariation(StatCollector.translateToLocal("tile.factory.1.desc"), 1, "factory/rust2"); - factory.carverHelper.addVariation(StatCollector.translateToLocal("tile.factory.2.desc"), 2, "factory/rust"); - factory.carverHelper.addVariation(StatCollector.translateToLocal("tile.factory.3.desc"), 3, "factory/platex"); - factory.carverHelper.addVariation(StatCollector.translateToLocal("tile.factory.4.desc"), 4, "factory/wireframewhite"); - factory.carverHelper.addVariation(StatCollector.translateToLocal("tile.factory.5.desc"), 5, "factory/wireframe"); - factory.carverHelper.addVariation(StatCollector.translateToLocal("tile.factory.6.desc"), 6, "factory/hazard"); - factory.carverHelper.addVariation(StatCollector.translateToLocal("tile.factory.7.desc"), 7, "factory/hazardorange"); - factory.carverHelper.addVariation(StatCollector.translateToLocal("tile.factory.8.desc"), 8, "factory/circuit"); - factory.carverHelper.addVariation(StatCollector.translateToLocal("tile.factory.9.desc"), 9, "factory/metalbox"); - factory.carverHelper.addVariation(StatCollector.translateToLocal("tile.factory.10.desc"), 10, "factory/goldplate"); - factory.carverHelper.addVariation(StatCollector.translateToLocal("tile.factory.11.desc"), 11, "factory/goldplating"); - factory.carverHelper.addVariation(StatCollector.translateToLocal("tile.factory.12.desc"), 12, "factory/grinder"); - factory.carverHelper.addVariation(StatCollector.translateToLocal("tile.factory.13.desc"), 13, "factory/plating"); - factory.carverHelper.addVariation(StatCollector.translateToLocal("tile.factory.14.desc"), 14, "factory/rustplates"); - factory.carverHelper.addVariation(StatCollector.translateToLocal("tile.factory.15.desc"), 15, "factory/column"); - factory.carverHelper.register(factory, "factoryblock"); - Carving.chisel.registerOre("factoryblock", "factoryblock"); - } - - // 1.7! Let's go! Let's go-go! - - String[] sGNames = new String[] { "White", "Orange", "Magenta", "Light Blue", "Yellow", "Lime", "Pink", "Gray", "Light Gray", "Cyan", "Purple", "Blue", "Brown", "Green", "Red", "Black" }; - - if (Configurations.featureEnabled("glassStained")) - for (int i = 0; i < 16; i++) { - final String blockName = "stained_glass_" + sGNames[i].replaceAll(" ", "").toLowerCase(); - String oreName = "stainedGlass" + sGNames[i].replaceAll(" ", ""); - String texName = "glassdyed/" + sGNames[i].toLowerCase().replaceAll(" ", "") + "-"; - int glassPrefix = (i & 3) << 2; - int glassId = i >> 2; - Carving.chisel.addVariation(blockName, Blocks.stained_glass, i, 0); - if (glassPrefix == 0) { - stainedGlass[glassId] = (BlockCarvableGlass) new BlockCarvableGlass().setStained(true).setHardness(0.3F).setStepSound(Block.soundTypeGlass).setBlockName("Stained Glass"); - stainedGlass[glassId].carverHelper.registerBlock(stainedGlass[glassId], blockName); - } - stainedGlass[glassId].carverHelper.addVariation(sGNames[i] + " bubble glass", glassPrefix, texName + "bubble"); - stainedGlass[glassId].carverHelper.addVariation(sGNames[i] + " glass panel", glassPrefix + 1, texName + "panel"); - stainedGlass[glassId].carverHelper.addVariation(sGNames[i] + " fancy glass panel", glassPrefix + 2, texName + "panel-fancy"); - stainedGlass[glassId].carverHelper.addVariation(sGNames[i] + " borderless glass", glassPrefix + 3, texName + "transparent"); - OreDictionary.registerOre(oreName, new ItemStack(Blocks.stained_glass, 1, i)); - Carving.chisel.registerOre(blockName, oreName); - for (CarvableVariation cv : stainedGlass[glassId].carverHelper.variations) { - if (cv.metadata < glassPrefix || cv.metadata >= glassPrefix + 4) - continue; - stainedGlass[glassId].carverHelper.registerVariation(blockName, cv, stainedGlass[glassId], cv.metadata); - } - } - - if (Configurations.featureEnabled("glassStainedPane")) - for (int i = 0; i < 16; i++) { - final String blockName = "stained_glass_pane_" + sGNames[i].replaceAll(" ", "").toLowerCase(); - String oreName = "stainedGlassPane" + sGNames[i].replaceAll(" ", ""); - String texName = "glasspanedyed/" + sGNames[i].toLowerCase().replaceAll(" ", "") + "-"; - Carving.chisel.addVariation(blockName, Blocks.stained_glass_pane, i, 0); - int glassPrefix = (i & 1) << 3; - int glassId = i >> 1; - if (glassPrefix == 0) { - stainedGlassPane[glassId] = (BlockCarvablePane) new BlockCarvablePane(Material.glass, true).setStained(true).setHardness(0.3F).setStepSound(Block.soundTypeGlass) - .setBlockName("Stained Glass Pane").setCreativeTab(ModTabs.tabOtherChiselBlocks); - stainedGlassPane[glassId].carverHelper.registerBlock(stainedGlassPane[glassId], blockName); - stainedGlassPane[glassId].carverHelper.blockName = "Stained Glass Pane"; - } - stainedGlassPane[glassId].carverHelper.addVariation(sGNames[i] + " bubble glass", glassPrefix, texName + "bubble"); - stainedGlassPane[glassId].carverHelper.addVariation(sGNames[i] + " glass panel", glassPrefix + 1, texName + "panel"); - stainedGlassPane[glassId].carverHelper.addVariation(sGNames[i] + " fancy glass panel", glassPrefix + 2, texName + "panel-fancy"); - stainedGlassPane[glassId].carverHelper.addVariation(sGNames[i] + " borderless glass", glassPrefix + 3, texName + "transparent"); - stainedGlassPane[glassId].carverHelper.addVariation(sGNames[i] + " quadrant glass", glassPrefix + 4, texName + "quad"); - stainedGlassPane[glassId].carverHelper.addVariation(sGNames[i] + " fancy quadrant glass", glassPrefix + 5, texName + "quad-fancy"); - OreDictionary.registerOre(oreName, new ItemStack(Blocks.stained_glass_pane, 1, i)); - Carving.chisel.registerOre(blockName, oreName); - for (CarvableVariation cv : stainedGlassPane[glassId].carverHelper.variations) { - if (cv.metadata < glassPrefix || cv.metadata >= glassPrefix + 8) - continue; - stainedGlassPane[glassId].carverHelper.registerVariation(blockName, cv, stainedGlassPane[glassId], cv.metadata); - } - } - - if (Configurations.featureEnabled("paperWall")) { - paperWall = (BlockCarvablePane) new BlockCarvablePane(Material.ground, true).setCreativeTab(ModTabs.tabOtherChiselBlocks).setHardness(0.5F).setResistance(10F); - paperWall.carverHelper.setChiselBlockName("Paper Wall"); - paperWall.carverHelper.addVariation(StatCollector.translateToLocal("tile.paperwall.0.desc"), 0, "paper/box"); - paperWall.carverHelper.addVariation(StatCollector.translateToLocal("tile.paperwall.1.desc"), 1, "paper/throughMiddle"); - paperWall.carverHelper.addVariation(StatCollector.translateToLocal("tile.paperwall.2.desc"), 2, "paper/cross"); - paperWall.carverHelper.addVariation(StatCollector.translateToLocal("tile.paperwall.3.desc"), 3, "paper/sixSections"); - paperWall.carverHelper.addVariation(StatCollector.translateToLocal("tile.paperwall.4.desc"), 4, "paper/vertical"); - paperWall.carverHelper.addVariation(StatCollector.translateToLocal("tile.paperwall.5.desc"), 5, "paper/horizontal"); - paperWall.carverHelper.addVariation(StatCollector.translateToLocal("tile.paperwall.6.desc"), 6, "paper/floral"); - paperWall.carverHelper.addVariation(StatCollector.translateToLocal("tile.paperwall.7.desc"), 7, "paper/plain"); - paperWall.carverHelper.addVariation(StatCollector.translateToLocal("tile.paperwall.8.desc"), 8, "paper/door"); - - paperWall.carverHelper.register(paperWall, "paperwall"); - Carving.chisel.registerOre("paperwall", "paperwall"); - - } - - if (Configurations.featureEnabled("woolenClay")) { - woolenClay = (BlockCarvable) new BlockCarvable(Material.clay).setCreativeTab(ModTabs.tabOtherChiselBlocks).setHardness(2F).setResistance(10F); - woolenClay.carverHelper.setChiselBlockName("Woolen Clay"); - - for (int i = 0; i < 16; i++) - woolenClay.carverHelper.addVariation(StatCollector.translateToLocal("tile.woolenClay." + i + ".desc"), i, "woolenClay/" + sGNames[i].replaceAll(" ", "").toLowerCase()); - woolenClay.carverHelper.register(woolenClay, "woolen_clay"); - - Carving.chisel.registerOre("woolen_clay", "woolen_clay"); - } - if (Configurations.featureEnabled("coloredSand")) { - coloredSand = (BlockCarvableSand) new BlockCarvableSand().setCreativeTab(ModTabs.tabOtherChiselBlocks); - coloredSand.carverHelper.setChiselBlockName("Colored Sand"); - - for (int i = 0; i < 16; i++) - coloredSand.carverHelper.addVariation(StatCollector.translateToLocal("tile.coloredSand." + i + ".desc"), i, "coloredSand/" + sGNames[i].replaceAll(" ", "").toLowerCase()); - coloredSand.carverHelper.register(coloredSand, "colored_sand"); - - Carving.chisel.registerOre("colored_sand", "colored_sand"); - } - - if (Configurations.featureEnabled("laboratory")) { - laboratory = (BlockCarvable) new BlockCarvable(Material.iron).setCreativeTab(ModTabs.tabMetalChiselBlocks).setHardness(2.0F).setResistance(10F).setStepSound(Chisel.soundMetalFootstep); - laboratory.carverHelper.setChiselBlockName("laboratoryblock"); - laboratory.carverHelper.addVariation(StatCollector.translateToLocal("tile.laboratory.0.desc"), 0, "laboratory/wallpanel"); - laboratory.carverHelper.addVariation(StatCollector.translateToLocal("tile.laboratory.1.desc"), 1, "laboratory/dottedpanel"); - laboratory.carverHelper.addVariation(StatCollector.translateToLocal("tile.laboratory.2.desc"), 2, "laboratory/largewall"); - laboratory.carverHelper.addVariation(StatCollector.translateToLocal("tile.laboratory.3.desc"), 3, "laboratory/roundel"); - laboratory.carverHelper.addVariation(StatCollector.translateToLocal("tile.laboratory.4.desc"), 4, "laboratory/wallvents"); - laboratory.carverHelper.addVariation(StatCollector.translateToLocal("tile.laboratory.5.desc"), 5, "laboratory/largetile"); - laboratory.carverHelper.addVariation(StatCollector.translateToLocal("tile.laboratory.6.desc"), 6, "laboratory/smalltile"); - laboratory.carverHelper.addVariation(StatCollector.translateToLocal("tile.laboratory.7.desc"), 7, "laboratory/floortile"); - laboratory.carverHelper.addVariation(StatCollector.translateToLocal("tile.laboratory.8.desc"), 8, "laboratory/checkertile"); - laboratory.carverHelper.addVariation(StatCollector.translateToLocal("tile.laboratory.9.desc"), 9, "laboratory/clearscreen"); - laboratory.carverHelper.addVariation(StatCollector.translateToLocal("tile.laboratory.10.desc"), 10, "laboratory/fuzzscreen"); - laboratory.carverHelper.addVariation(StatCollector.translateToLocal("tile.laboratory.11.desc"), 11, "laboratory/largesteel"); - laboratory.carverHelper.addVariation(StatCollector.translateToLocal("tile.laboratory.12.desc"), 12, "laboratory/smallsteel"); - laboratory.carverHelper.addVariation(StatCollector.translateToLocal("tile.laboratory.13.desc"), 13, "laboratory/directionright"); - laboratory.carverHelper.addVariation(StatCollector.translateToLocal("tile.laboratory.14.desc"), 14, "laboratory/directionleft"); - laboratory.carverHelper.addVariation(StatCollector.translateToLocal("tile.laboratory.15.desc"), 15, "laboratory/infocon"); - laboratory.carverHelper.register(laboratory, "laboratoryblock"); - Carving.chisel.registerOre("laboratoryblock", "laboratoryblock"); - } - - if (Configurations.featureEnabled("pumpkin")) { - for (int metadata = 0; metadata < 16; metadata++) { - pumpkin[metadata] = (BlockCarvablePumpkin) new BlockCarvablePumpkin(false).setCreativeTab(ModTabs.tabOtherChiselBlocks).setHardness(1.0F).setBlockName("pumpkin") - .setCreativeTab(ModTabs.tabOtherChiselBlocks); - pumpkin[metadata].setInformation("pumpkin/pumpkin_face_" + (metadata + 1) + "_off"); - GameRegistry.registerBlock(pumpkin[metadata], "pumpkin" + (metadata + 1)); - Carving.chisel.addVariation("pumpkin", pumpkin[metadata], 0, (metadata + 1)); - } - Carving.chisel.addVariation("pumpkin", Blocks.pumpkin, 0, 0); - Carving.chisel.registerOre("pumpkin", "pumpkin"); - } - - if (Configurations.featureEnabled("jackolantern")) { - for (int metadata = 0; metadata < 16; metadata++) { - jackolantern[metadata] = (BlockCarvablePumpkin) new BlockCarvablePumpkin(true).setCreativeTab(ModTabs.tabOtherChiselBlocks).setHardness(1.0F).setBlockName("litpumpkin") - .setCreativeTab(ModTabs.tabOtherChiselBlocks); - jackolantern[metadata].setInformation("pumpkin/pumpkin_face_" + (metadata + 1) + "_on"); - GameRegistry.registerBlock(jackolantern[metadata], ("jackolantern" + (metadata + 1))); - Carving.chisel.addVariation("jackolantern", jackolantern[metadata], 0, (metadata + 1)); - } - Carving.chisel.addVariation("jackolantern", Blocks.lit_pumpkin, 0, 0); - Carving.chisel.registerOre("jackolantern", "jackolantern"); - } - - if (Configurations.featureEnabled("leaves")) { - leaf = (BlockLeaf) new BlockLeaf(Material.leaves).setCreativeTab(ModTabs.tabOtherChiselBlocks).setHardness(0.2F).setStepSound(Block.soundTypeGrass); - Carving.chisel.addVariation("leaves", Blocks.leaves, 0, 0); - Carving.chisel.addVariation("leaves", Blocks.leaves, 1, 0); - Carving.chisel.addVariation("leaves", Blocks.leaves, 2, 0); - 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) { - leaf.carverHelper.addVariation(StatCollector.translateToLocal("tile.leaves.6.desc"), 6, "leaves/dead"); - leaf.carverHelper.addVariation(StatCollector.translateToLocal("tile.leaves.7.desc"), 7, "leaves/fancy"); - leaf.carverHelper.addVariation(StatCollector.translateToLocal("tile.leaves.8.desc"), 8, "leaves/pinkpetal"); - leaf.carverHelper.addVariation(StatCollector.translateToLocal("tile.leaves.9.desc"), 9, "leaves/red_roses"); - leaf.carverHelper.addVariation(StatCollector.translateToLocal("tile.leaves.10.desc"), 10, "leaves/roses"); - leaf.carverHelper.addVariation(StatCollector.translateToLocal("tile.leaves.11.desc"), 11, "leaves/christmasBalls"); - leaf.carverHelper.addVariation(StatCollector.translateToLocal("tile.leaves.12.desc"), 12, "leaves/christmasLights"); - } else { - leaf.carverHelper.addVariation(StatCollector.translateToLocal("tile.leaves.6.desc"), 6, "leaves/dead_opaque"); - leaf.carverHelper.addVariation(StatCollector.translateToLocal("tile.leaves.7.desc"), 7, "leaves/fancy_opaque"); - leaf.carverHelper.addVariation(StatCollector.translateToLocal("tile.leaves.8.desc"), 8, "leaves/pinkpetal_opaque"); - leaf.carverHelper.addVariation(StatCollector.translateToLocal("tile.leaves.9.desc"), 9, "leaves/red_roses_opaque"); - leaf.carverHelper.addVariation(StatCollector.translateToLocal("tile.leaves.10.desc"), 10, "leaves/roses_opaque"); - leaf.carverHelper.addVariation(StatCollector.translateToLocal("tile.leaves.11.desc"), 11, "leaves/christmasBalls_opaque"); - leaf.carverHelper.addVariation(StatCollector.translateToLocal("tile.leaves.12.desc"), 12, "leaves/christmasLights_opaque"); - } - - leaf.carverHelper.register(leaf, "leaves"); - Carving.chisel.registerOre("leaves", "leaves"); - } - - if (areChestsReady) { - for (int x = 0; x < 16; x++) { - present[x] = (BlockPresent) new BlockPresent(x).setCreativeTab(ModTabs.tabOtherChiselBlocks).setHardness(2.0F).setResistance(10.0F).setBlockName("present"); - GameRegistry.registerBlock(present[x], "chest" + x); - Carving.chisel.addVariation("present", present[x], 0, (x + 1)); - } - Carving.chisel.registerOre("chest", "chest"); - } - - if (Configurations.featureEnabled("voidstone")) { - voidstone = (BlockCarvable) new BlockCarvable().setCreativeTab(ModTabs.tabStoneChiselBlocks).setStepSound(Block.soundTypeStone).setCreativeTab(ModTabs.tabStoneChiselBlocks) - .setHardness(5.0F).setResistance(10.0F); - voidstone.carverHelper.addVariation(StatCollector.translateToLocal("tile.voidstone.0.desc"), 0, "voidstone/raw"); - voidstone.carverHelper.addVariation(StatCollector.translateToLocal("tile.voidstone.1.desc"), 1, "voidstone/quarters"); - voidstone.carverHelper.addVariation(StatCollector.translateToLocal("tile.voidstone.2.desc"), 2, "voidstone/smooth"); - voidstone.carverHelper.addVariation(StatCollector.translateToLocal("tile.voidstone.3.desc"), 3, "voidstone/skulls"); - voidstone.carverHelper.addVariation(StatCollector.translateToLocal("tile.voidstone.4.desc"), 4, "voidstone/rune"); - voidstone.carverHelper.addVariation(StatCollector.translateToLocal("tile.voidstone.5.desc"), 5, "voidstone/metalborder"); - voidstone.carverHelper.addVariation(StatCollector.translateToLocal("tile.voidstone.6.desc"), 6, "voidstone/eye"); - voidstone.carverHelper.addVariation(StatCollector.translateToLocal("tile.voidstone.7.desc"), 7, "voidstone/bevel"); - - voidstone.carverHelper.register(voidstone, "voidstone"); - Carving.chisel.registerOre("voidstone", "voidstone"); - - voidstone2 = (BlockMarbleTexturedOre) new BlockMarbleTexturedOre(Material.rock, Chisel.MOD_ID + ":voidstone/animated/void").setStepSound(Block.soundTypeStone) - .setCreativeTab(ModTabs.tabStoneChiselBlocks).setHardness(5.0F).setResistance(10.0F); - voidstone2.carverHelper.addVariation(StatCollector.translateToLocal("tile.voidstone.0.desc"), 0, "voidstone/animated/raw"); - voidstone2.carverHelper.addVariation(StatCollector.translateToLocal("tile.voidstone.1.desc"), 1, "voidstone/animated/quarters"); - voidstone2.carverHelper.addVariation(StatCollector.translateToLocal("tile.voidstone.2.desc"), 2, "voidstone/animated/smooth"); - voidstone2.carverHelper.addVariation(StatCollector.translateToLocal("tile.voidstone.3.desc"), 3, "voidstone/animated/skulls"); - voidstone2.carverHelper.addVariation(StatCollector.translateToLocal("tile.voidstone.4.desc"), 4, "voidstone/animated/rune"); - voidstone2.carverHelper.addVariation(StatCollector.translateToLocal("tile.voidstone.5.desc"), 5, "voidstone/animated/metalborder"); - voidstone2.carverHelper.addVariation(StatCollector.translateToLocal("tile.voidstone.6.desc"), 6, "voidstone/animated/eye"); - voidstone2.carverHelper.addVariation(StatCollector.translateToLocal("tile.voidstone.7.desc"), 7, "voidstone/animated/bevel"); - - voidstone2.carverHelper.register(voidstone2, "voidstone2"); - Carving.chisel.registerOre("voidstone2", "voidstone2"); - } - - if (Configurations.featureEnabled("voidstonePillars")) { - voidstonePillar = (BlockVoidstonePillar) new BlockVoidstonePillar().setCreativeTab(ModTabs.tabStoneChiselBlocks).setStepSound(Block.soundTypeStone); - voidstonePillar.carvableHelper.addVariation(StatCollector.translateToLocal("tile.voidstonePillar.0.desc"), 0, "voidstone/pillar-side"); - voidstonePillar.carvableHelper.register(voidstonePillar, "voidstonePillar"); - Carving.chisel.registerOre("voidstonePillar", "voidstonePillar"); - - voidstonePillar2 = (BlockVoidstonePillar2) new BlockVoidstonePillar2().setStepSound(Block.soundTypeStone); - voidstonePillar2.carvableHelper.addVariation(StatCollector.translateToLocal("tile.voidstonePillar2.0.desc"), 0, "voidstone/pillar-side"); - voidstonePillar2.carvableHelper.register(voidstonePillar2, "voidstonePillar2"); - Carving.chisel.registerOre("voidstonePillar2", "voidstonePillar2"); - } - - if (Configurations.featureEnabled("waterstone")) { - waterstone = (BlockWaterstone) new BlockWaterstone(Material.rock, "water_flow").setCreativeTab(ModTabs.tabStoneChiselBlocks).setHardness(2.0F).setResistance(10.0F); - waterstone.carverHelper.addVariation(StatCollector.translateToLocal("tile.waterstone.0.desc"), 0, "waterstone/cobble"); - waterstone.carverHelper.addVariation(StatCollector.translateToLocal("tile.waterstone.1.desc"), 1, "waterstone/black"); - waterstone.carverHelper.addVariation(StatCollector.translateToLocal("tile.waterstone.2.desc"), 2, "waterstone/tiles"); - waterstone.carverHelper.addVariation(StatCollector.translateToLocal("tile.waterstone.3.desc"), 3, "waterstone/chaotic"); - waterstone.carverHelper.addVariation(StatCollector.translateToLocal("tile.waterstone.4.desc"), 4, "waterstone/creeper"); - waterstone.carverHelper.addVariation(StatCollector.translateToLocal("tile.waterstone.5.desc"), 5, "waterstone/panel"); - waterstone.carverHelper.addVariation(StatCollector.translateToLocal("tile.waterstone.6.desc"), 6, "waterstone/panel-ornate"); - waterstone.carverHelper.register(waterstone, "waterstone"); - OreDictionary.registerOre("blockWaterstone", waterstone); - Carving.chisel.registerOre("waterstone", "blockWaterstone"); - } - - if (Configurations.featureEnabled("hexPlating")) { - hexPlating = (BlockCarvable) new BlockCarvable().setCreativeTab(ModTabs.tabMetalChiselBlocks).setHardness(2.0F).setResistance(10.0F); - hexPlating.carverHelper.addVariation(StatCollector.translateToLocal("tile.hexPlating.0.desc"), 0, "hexPlating/black"); - hexPlating.carverHelper.addVariation(StatCollector.translateToLocal("tile.hexPlating.1.desc"), 1, "hexPlating/blue"); - hexPlating.carverHelper.addVariation(StatCollector.translateToLocal("tile.hexPlating.2.desc"), 2, "hexPlating/brown"); - hexPlating.carverHelper.addVariation(StatCollector.translateToLocal("tile.hexPlating.3.desc"), 3, "hexPlating/cyan"); - hexPlating.carverHelper.addVariation(StatCollector.translateToLocal("tile.hexPlating.4.desc"), 4, "hexPlating/green"); - hexPlating.carverHelper.addVariation(StatCollector.translateToLocal("tile.hexPlating.5.desc"), 5, "hexPlating/light_blue"); - hexPlating.carverHelper.addVariation(StatCollector.translateToLocal("tile.hexPlating.6.desc"), 6, "hexPlating/light_gray"); - hexPlating.carverHelper.addVariation(StatCollector.translateToLocal("tile.hexPlating.7.desc"), 7, "hexPlating/lime"); - hexPlating.carverHelper.addVariation(StatCollector.translateToLocal("tile.hexPlating.8.desc"), 8, "hexPlating/magenta"); - hexPlating.carverHelper.addVariation(StatCollector.translateToLocal("tile.hexPlating.9.desc"), 9, "hexPlating/orange"); - hexPlating.carverHelper.addVariation(StatCollector.translateToLocal("tile.hexPlating.10.desc"), 10, "hexPlating/pink"); - hexPlating.carverHelper.addVariation(StatCollector.translateToLocal("tile.hexPlating.11.desc"), 11, "hexPlating/purple"); - hexPlating.carverHelper.addVariation(StatCollector.translateToLocal("tile.hexPlating.12.desc"), 12, "hexPlating/red"); - hexPlating.carverHelper.addVariation(StatCollector.translateToLocal("tile.hexPlating.13.desc"), 13, "hexPlating/white"); - hexPlating.carverHelper.addVariation(StatCollector.translateToLocal("tile.hexPlating.14.desc"), 14, "hexPlating/yellow"); - hexPlating.carverHelper.addVariation(StatCollector.translateToLocal("tile.hexPlating.15.desc"), 15, "hexPlating/gray"); - hexPlating.carverHelper.register(hexPlating, "hexPlating"); - Carving.chisel.registerOre("hexPlating", "hexPlating"); - } - - if (Configurations.featureEnabled("fantasy2")) { - fantasy2 = (BlockCarvable) new BlockCarvable().setCreativeTab(ModTabs.tabStoneChiselBlocks).setHardness(2.0F).setResistance(10F); - fantasy2.carverHelper.addVariation(StatCollector.translateToLocal("tile.fantasyblock2.0.desc"), 0, "fantasy2/brick"); - fantasy2.carverHelper.addVariation(StatCollector.translateToLocal("tile.fantasyblock2.1.desc"), 1, "fantasy2/brick-faded"); - fantasy2.carverHelper.addVariation(StatCollector.translateToLocal("tile.fantasyblock2.2.desc"), 2, "fantasy2/brick-wear"); - fantasy2.carverHelper.addVariation(StatCollector.translateToLocal("tile.fantasyblock2.3.desc"), 3, "fantasy2/bricks"); - fantasy2.carverHelper.addVariation(StatCollector.translateToLocal("tile.fantasyblock2.4.desc"), 4, "fantasy2/decor"); - fantasy2.carverHelper.addVariation(StatCollector.translateToLocal("tile.fantasyblock2.5.desc"), 5, "fantasy2/decor-block"); - fantasy2.carverHelper.addVariation(StatCollector.translateToLocal("tile.fantasyblock2.6.desc"), 6, "fantasy2/pillar"); - fantasy2.carverHelper.addVariation(StatCollector.translateToLocal("tile.fantasyblock2.7.desc"), 7, "fantasy2/pillar-decorated"); - fantasy2.carverHelper.addVariation(StatCollector.translateToLocal("tile.fantasyblock2.8.desc"), 8, "fantasy2/gold-decor-1"); - fantasy2.carverHelper.addVariation(StatCollector.translateToLocal("tile.fantasyblock2.9.desc"), 9, "fantasy2/gold-decor-2"); - fantasy2.carverHelper.addVariation(StatCollector.translateToLocal("tile.fantasyblock2.10.desc"), 10, "fantasy2/gold-decor-3"); - fantasy2.carverHelper.addVariation(StatCollector.translateToLocal("tile.fantasyblock2.11.desc"), 11, "fantasy2/gold-decor-4"); - fantasy2.carverHelper.addVariation(StatCollector.translateToLocal("tile.fantasyblock2.12.desc"), 12, "fantasy2/plate"); - fantasy2.carverHelper.addVariation(StatCollector.translateToLocal("tile.fantasyblock2.13.desc"), 13, "fantasy2/block"); - fantasy2.carverHelper.addVariation(StatCollector.translateToLocal("tile.fantasyblock2.14.desc"), 14, "fantasy2/bricks-chaotic"); - fantasy2.carverHelper.addVariation(StatCollector.translateToLocal("tile.fantasyblock2.15.desc"), 15, "fantasy2/bricks-wear"); - fantasy2.carverHelper.register(fantasy2, "fantasyblock2"); - OreDictionary.registerOre("fantasy2", fantasy2); - Carving.chisel.registerOre("fantasyblock2", "fantasy2"); - } - - if (Configurations.featureEnabled("grimstone")) { - grimstone = (BlockGrimstone) new BlockGrimstone(Material.rock).setCreativeTab(ModTabs.tabStoneChiselBlocks).setHardness(2.0F).setResistance(10F); - grimstone.carverHelper.addVariation(StatCollector.translateToLocal("tile.grimstone.0.desc"), 0, "grimstone/grimstone"); - grimstone.carverHelper.addVariation(StatCollector.translateToLocal("tile.grimstone.1.desc"), 1, "grimstone/smooth"); - grimstone.carverHelper.addVariation(StatCollector.translateToLocal("tile.grimstone.2.desc"), 2, "grimstone/hate"); - grimstone.carverHelper.addVariation(StatCollector.translateToLocal("tile.grimstone.3.desc"), 3, "grimstone/chiseled"); - grimstone.carverHelper.addVariation(StatCollector.translateToLocal("tile.grimstone.4.desc"), 4, "grimstone/blocks"); - grimstone.carverHelper.addVariation(StatCollector.translateToLocal("tile.grimstone.5.desc"), 5, "grimstone/blocks-rough"); - grimstone.carverHelper.addVariation(StatCollector.translateToLocal("tile.grimstone.6.desc"), 6, "grimstone/brick"); - grimstone.carverHelper.addVariation(StatCollector.translateToLocal("tile.grimstone.7.desc"), 7, "grimstone/largebricks"); - grimstone.carverHelper.addVariation(StatCollector.translateToLocal("tile.grimstone.8.desc"), 8, "grimstone/platform"); - grimstone.carverHelper.addVariation(StatCollector.translateToLocal("tile.grimstone.9.desc"), 9, "grimstone/platform-tiles"); - grimstone.carverHelper.addVariation(StatCollector.translateToLocal("tile.grimstone.10.desc"), 10, "grimstone/construction"); - grimstone.carverHelper.addVariation(StatCollector.translateToLocal("tile.grimstone.11.desc"), 11, "grimstone/fancy-tiles"); - grimstone.carverHelper.addVariation(StatCollector.translateToLocal("tile.grimstone.12.desc"), 12, "grimstone/plate"); - grimstone.carverHelper.addVariation(StatCollector.translateToLocal("tile.grimstone.13.desc"), 13, "grimstone/plate-rough"); - grimstone.carverHelper.addVariation(StatCollector.translateToLocal("tile.grimstone.14.desc"), 14, "grimstone/flaky"); - grimstone.carverHelper.register(grimstone, "grimstone"); - Carving.chisel.registerOre("grimstone", "grimstone"); - } - - if (Configurations.featureEnabled("technical")) { - technical = (BlockCarvable) new BlockCarvable(Material.rock).setCreativeTab(ModTabs.tabMetalChiselBlocks).setHardness(2.0F).setResistance(10F); - technical.carverHelper.addVariation(StatCollector.translateToLocal("tile.technical.0.desc"), 0, "technical/scaffold"); - technical.carverHelper.addVariation(StatCollector.translateToLocal("tile.technical.1.desc"), 1, "technical/cautiontape"); - technical.carverHelper.addVariation(StatCollector.translateToLocal("tile.technical.2.desc"), 2, "technical/industrialrelic"); - technical.carverHelper.addVariation(StatCollector.translateToLocal("tile.technical.3.desc"), 3, "technical/pipesLarge"); - technical.carverHelper.addVariation(StatCollector.translateToLocal("tile.technical.4.desc"), 4, "technical/fanFast"); - technical.carverHelper.addVariation(StatCollector.translateToLocal("tile.technical.5.desc"), 5, "technical/pipesSmall"); - technical.carverHelper.addVariation(StatCollector.translateToLocal("tile.technical.6.desc"), 6, "technical/fanStill"); - technical.carverHelper.addVariation(StatCollector.translateToLocal("tile.technical.7.desc"), 7, "technical/vent"); - technical.carverHelper.addVariation(StatCollector.translateToLocal("tile.technical.8.desc"), 8, "technical/ventGlowing"); - technical.carverHelper.addVariation(StatCollector.translateToLocal("tile.technical.9.desc"), 9, "technical/insulationv2"); - technical.carverHelper.addVariation(StatCollector.translateToLocal("tile.technical.10.desc"), 10, "technical/spinningStuffAnim"); - technical.carverHelper.addVariation(StatCollector.translateToLocal("tile.technical.11.desc"), 11, "technical/cables"); - technical.carverHelper.addVariation(StatCollector.translateToLocal("tile.technical.12.desc"), 12, "technical/rustyBoltedPlates"); - technical.carverHelper.addVariation(StatCollector.translateToLocal("tile.technical.13.desc"), 13, "technical/grate"); - technical.carverHelper.addVariation(StatCollector.translateToLocal("tile.technical.14.desc"), 14, "technical/fanMalfunction"); - technical.carverHelper.addVariation(StatCollector.translateToLocal("tile.technical.15.desc"), 15, "technical/grateRusty"); - technical.carverHelper.register(technical, "technical"); - Carving.chisel.registerOre("technical", "technical"); - - technical2 = (BlockCarvableGlass) new BlockCarvableGlass().setHardness(2.0F).setResistance(10F); - technical2.carverHelper.addVariation(StatCollector.translateToLocal("tile.technical.0.desc"), 0, "technical/scaffoldTransparent"); - technical2.carverHelper.addVariation(StatCollector.translateToLocal("tile.technical.4.desc"), 1, "technical/fanFastTransparent"); - technical2.carverHelper.addVariation(StatCollector.translateToLocal("tile.technical.6.desc"), 2, "technical/fanStillTransparent"); - technical2.carverHelper.addVariation(StatCollector.translateToLocal("tile.technical.14.desc"), 3, "technical/fanStillTransparent"); - technical2.carverHelper.register(technical2, "technical2"); - Carving.chisel.registerOre("technical2", "technical2"); - } - - // Once screen overlay is done, remove WIP texs - - if (Configurations.featureEnabled("futura")) { - futura = (BlockCarvable) new BlockCarvable(Material.rock).setCreativeTab(ModTabs.tabMetalChiselBlocks).setHardness(2.0F).setResistance(10F); - futura.carverHelper.addVariation(StatCollector.translateToLocal("tile.futura.0.desc"), 0, "futura/screenMetallicWIP"); - futura.carverHelper.addVariation(StatCollector.translateToLocal("tile.futura.1.desc"), 1, "futura/screenCyanWIP"); - futura.carverHelper.addVariation(StatCollector.translateToLocal("tile.futura.2.desc"), 2, "futura/controllerWIP"); - futura.carverHelper.register(futura, "futura"); - Carving.chisel.registerOre("futura", "futura"); - } - - if (Configurations.featureEnabled("brickCustom")) { - brickCustom = (BlockCarvable) new BlockCarvable(Material.rock).setStepSound(Block.soundTypeStone).setCreativeTab(ModTabs.tabStoneChiselBlocks); - Carving.chisel.addVariation("brickCustom", Blocks.brick_block, 0, 0); - brickCustom.carverHelper.addVariation(StatCollector.translateToLocal("tile.brickCustom.1.desc"), 1, "brickCustom/large"); - brickCustom.carverHelper.addVariation(StatCollector.translateToLocal("tile.brickCustom.2.desc"), 2, "brickCustom/mortarless"); - brickCustom.carverHelper.addVariation(StatCollector.translateToLocal("tile.brickCustom.3.desc"), 3, "brickCustom/varied"); - // brickCustom.carverHelper.addVariation(StatCollector.translateToLocal("tile.brickCustom.4.desc"), - // 4, "brickCustom/cracked"); - brickCustom.carverHelper.addVariation(StatCollector.translateToLocal("tile.brickCustom.5.desc"), 5, "brickCustom/aged"); - // brickCustom.carverHelper.addVariation(StatCollector.translateToLocal("tile.brickCustom.6.desc"), - // 6, "brickCustom/mossy"); - brickCustom.carverHelper.register(brickCustom, "brickCustom"); - Carving.chisel.registerOre("brickCustom", "brickCustom"); - } - - if (Configurations.featureEnabled("quartz")) { - Carving.chisel.addVariation("quartz", Blocks.quartz_block, 0, 0); - Carving.chisel.addVariation("quartz", Blocks.quartz_block, 1, 0); - Carving.chisel.addVariation("quartz", Blocks.quartz_block, 2, 0); - Carving.chisel.registerOre("quartz", "quartz"); - } - - // 1.8 - if (Configurations.featureEnabled("granite")) { - granite = (BlockCarvable) new BlockCarvable(Material.rock).setHardness(2.0F).setResistance(10.0F).setCreativeTab(ModTabs.tabStoneChiselBlocks); - granite.carverHelper.setChiselBlockName("granite"); - granite.carverHelper.addVariation(StatCollector.translateToLocal("tile.granite.0.desc"), 0, "granite/granite"); - granite.carverHelper.addVariation(StatCollector.translateToLocal("tile.granite.1.desc"), 1, "granite/polishedGranite"); - granite.carverHelper.register(granite, "granite"); - Carving.chisel.registerOre("granite", "granite"); - } - - if (Configurations.featureEnabled("diorite")) { - diorite = (BlockCarvable) new BlockCarvable(Material.rock).setHardness(2.0F).setResistance(10.0F).setCreativeTab(ModTabs.tabStoneChiselBlocks); - diorite.carverHelper.setChiselBlockName("diorite"); - diorite.carverHelper.addVariation(StatCollector.translateToLocal("tile.diorite.0.desc"), 0, "diorite/diorite"); - diorite.carverHelper.addVariation(StatCollector.translateToLocal("tile.diorite.1.desc"), 1, "diorite/polishedDiorite"); - diorite.carverHelper.register(diorite, "diorite"); - Carving.chisel.registerOre("diorite", "diorite"); - } - - if (Configurations.featureEnabled("andesite")) { - andesite = (BlockCarvable) new BlockCarvable(Material.rock).setHardness(2.0F).setResistance(10.0F).setCreativeTab(ModTabs.tabStoneChiselBlocks); - andesite.carverHelper.setChiselBlockName("andesite"); - andesite.carverHelper.addVariation(StatCollector.translateToLocal("tile.andesite.0.desc"), 0, "andesite/andesite"); - andesite.carverHelper.addVariation(StatCollector.translateToLocal("tile.andesite.1.desc"), 1, "andesite/polishedAndesite"); - andesite.carverHelper.register(andesite, "andesite"); - Carving.chisel.registerOre("andesite", "andesite"); - } - } - - public static void postLoad() { - - // Thaumcraft - if (Configurations.featureEnabled("arcane") && Loader.isModLoaded("Thaumcraft")) { - arcane = (BlockCarvable) new BlockCarvable(Material.rock).setCreativeTab(ModTabs.tabModdedChiselBlocks).setStepSound(Block.soundTypeStone); - Carving.chisel.addVariation("arcane", GameRegistry.findBlock("Thaumcraft", "blockCosmeticSolid"), 6, 0); - Carving.chisel.addVariation("arcane", GameRegistry.findBlock("Thaumcraft", "blockCosmeticSolid"), 7, 1); - arcane.carverHelper.addVariation(StatCollector.translateToLocal("tile.arcane.0.desc"), 0, "arcane/moonEngrave"); - arcane.carverHelper.addVariation(StatCollector.translateToLocal("tile.arcane.1.desc"), 1, "arcane/moonGlowAnim"); - arcane.carverHelper.addVariation(StatCollector.translateToLocal("tile.arcane.2.desc"), 2, "arcane/arcaneTile"); - arcane.carverHelper.addVariation(StatCollector.translateToLocal("tile.arcane.3.desc"), 3, "arcane/arcaneRunes"); - arcane.carverHelper.addVariation(StatCollector.translateToLocal("tile.arcane.4.desc"), 4, "arcane/arcaneRunesGlow"); - arcane.carverHelper.addVariation(StatCollector.translateToLocal("tile.arcane.5.desc"), 5, "arcane/bigBrick"); - arcane.carverHelper.addVariation(StatCollector.translateToLocal("tile.arcane.6.desc"), 6, "arcane/conduitGlowAnim"); - arcane.carverHelper.addVariation(StatCollector.translateToLocal("tile.arcane.7.desc"), 7, "arcane/BorderBrain"); - arcane.carverHelper.register(arcane, "arcane"); - Carving.chisel.registerOre("arcane", "arcane"); - } - - // Blood Magic - if (Configurations.featureEnabled("bloodRune") && Loader.isModLoaded("AWWayOfTime")) { - bloodRune = (BlockCarvable) new BlockCarvable(Material.rock).setCreativeTab(ModTabs.tabModdedChiselBlocks).setStepSound(Block.soundTypeStone); - Carving.chisel.addVariation("bloodRune", GameRegistry.findBlock("AWWayOfTime", "bloodRune.blank"), 0, 0); - bloodRune.carverHelper.addVariation(StatCollector.translateToLocal("tile.bloodRune.0.desc"), 0, "bloodMagic/bloodRuneArranged"); - bloodRune.carverHelper.addVariation(StatCollector.translateToLocal("tile.bloodRune.1.desc"), 1, "bloodMagic/bloodRuneBricks"); - bloodRune.carverHelper.addVariation(StatCollector.translateToLocal("tile.bloodRune.2.desc"), 2, "bloodMagic/bloodRuneCarved"); - bloodRune.carverHelper.addVariation(StatCollector.translateToLocal("tile.bloodRune.3.desc"), 3, "bloodMagic/bloodRuneCarvedRadial"); - bloodRune.carverHelper.addVariation(StatCollector.translateToLocal("tile.bloodRune.4.desc"), 4, "bloodMagic/bloodRuneClassicPanel"); - bloodRune.carverHelper.addVariation(StatCollector.translateToLocal("tile.bloodRune.5.desc"), 5, "bloodMagic/bloodRuneTiles"); - bloodRune.carverHelper.register(bloodRune, "bloodRune"); - Carving.chisel.registerOre("bloodRune", "bloodRune"); - } - - // Twilight Forest - - if (Configurations.featureEnabled("TFMazestone") && Loader.isModLoaded("TwilightForest")) { - Carving.chisel.addVariation("TFMazestone", GameRegistry.findBlock("TwilightForest", "tile.TFMazestone"), 0, 0); - Carving.chisel.addVariation("TFMazestone", GameRegistry.findBlock("TwilightForest", "tile.TFMazestone"), 1, 1); - Carving.chisel.addVariation("TFMazestone", GameRegistry.findBlock("TwilightForest", "tile.TFMazestone"), 2, 2); - Carving.chisel.addVariation("TFMazestone", GameRegistry.findBlock("TwilightForest", "tile.TFMazestone"), 3, 3); - Carving.chisel.addVariation("TFMazestone", GameRegistry.findBlock("TwilightForest", "tile.TFMazestone"), 4, 4); - Carving.chisel.addVariation("TFMazestone", GameRegistry.findBlock("TwilightForest", "tile.TFMazestone"), 5, 5); - Carving.chisel.addVariation("TFMazestone", GameRegistry.findBlock("TwilightForest", "tile.TFMazestone"), 6, 6); - Carving.chisel.addVariation("TFMazestone", GameRegistry.findBlock("TwilightForest", "tile.TFMazestone"), 7, 7); - Carving.chisel.registerOre("TFMazestone", "TFMazestone"); - } - - if (Configurations.featureEnabled("TFTowerStone") && Loader.isModLoaded("TwilightForest")) { - Carving.chisel.addVariation("TFTowerStone", GameRegistry.findBlock("TwilightForest", "tile.TFTowerStone"), 0, 0); - Carving.chisel.addVariation("TFTowerStone", GameRegistry.findBlock("TwilightForest", "tile.TFTowerStone"), 1, 1); - Carving.chisel.addVariation("TFTowerStone", GameRegistry.findBlock("TwilightForest", "tile.TFTowerStone"), 2, 2); - Carving.chisel.addVariation("TFTowerStone", GameRegistry.findBlock("TwilightForest", "tile.TFTowerStone"), 3, 3); - Carving.chisel.registerOre("TFTowerStone", "TFTowerStone"); - } - - if (Configurations.featureEnabled("TFUnderBrick") && Loader.isModLoaded("TwilightForest")) { - Carving.chisel.addVariation("TFUnderBrick", GameRegistry.findBlock("TwilightForest", "tile.TFUnderBrick"), 0, 0); - Carving.chisel.addVariation("TFUnderBrick", GameRegistry.findBlock("TwilightForest", "tile.TFUnderBrick"), 1, 1); - Carving.chisel.addVariation("TFUnderBrick", GameRegistry.findBlock("TwilightForest", "tile.TFUnderBrick"), 2, 2); - Carving.chisel.registerOre("TFUnderBrick", "TFUnderBrick"); - } - - // Applied Energistics - - if (Configurations.featureEnabled("AECertusQuartz") && Loader.isModLoaded("appliedenergistics2")) { - Carving.chisel.addVariation("AECertusQuartz", GameRegistry.findBlock("appliedenergistics2", "tile.BlockQuartz"), 0, 0); - Carving.chisel.addVariation("AECertusQuartz", GameRegistry.findBlock("appliedenergistics2", "tile.BlockQuartzPillar"), 0, 1); - Carving.chisel.addVariation("AECertusQuartz", GameRegistry.findBlock("appliedenergistics2", "tile.BlockQuartzChiseled"), 0, 2); - Carving.chisel.registerOre("AECertusQuartz", "AECertusQuartz"); - } - - if (Configurations.featureEnabled("AESkyStone") && Loader.isModLoaded("appliedenergistics2")) { - Carving.chisel.addVariation("AESkyStone", GameRegistry.findBlock("appliedenergistics2", "tile.BlockSkyStone"), 1, 0); - Carving.chisel.addVariation("AESkyStone", GameRegistry.findBlock("appliedenergistics2", "tile.BlockSkyStone"), 2, 1); - Carving.chisel.addVariation("AESkyStone", GameRegistry.findBlock("appliedenergistics2", "tile.BlockSkyStone"), 3, 2); - Carving.chisel.registerOre("AESkyStone", "AESkyStone"); - } - - // Railcraft - if (Configurations.featureEnabled("RCInfernalStone") && Loader.isModLoaded("Railcraft")) { - Carving.chisel.addVariation("RCInfernalStone", GameRegistry.findBlock("Railcraft", "tile.railcraft.brick.infernal"), 0, 0); - Carving.chisel.addVariation("RCInfernalStone", GameRegistry.findBlock("Railcraft", "tile.railcraft.brick.infernal"), 1, 1); - Carving.chisel.addVariation("RCInfernalStone", GameRegistry.findBlock("Railcraft", "tile.railcraft.brick.infernal"), 2, 2); - Carving.chisel.addVariation("RCInfernalStone", GameRegistry.findBlock("Railcraft", "tile.railcraft.brick.infernal"), 3, 3); - Carving.chisel.addVariation("RCInfernalStone", GameRegistry.findBlock("Railcraft", "tile.railcraft.brick.infernal"), 4, 4); - Carving.chisel.addVariation("RCInfernalStone", GameRegistry.findBlock("Railcraft", "tile.railcraft.brick.infernal"), 5, 5); - Carving.chisel.registerOre("RCInfernalStone", "RCInfernalStone"); - } - - if (Configurations.featureEnabled("RCSandyStone") && Loader.isModLoaded("Railcraft")) { - Carving.chisel.addVariation("RCSandyStone", GameRegistry.findBlock("Railcraft", "tile.railcraft.brick.sandy"), 0, 0); - Carving.chisel.addVariation("RCSandyStone", GameRegistry.findBlock("Railcraft", "tile.railcraft.brick.sandy"), 1, 1); - Carving.chisel.addVariation("RCSandyStone", GameRegistry.findBlock("Railcraft", "tile.railcraft.brick.sandy"), 2, 2); - Carving.chisel.addVariation("RCSandyStone", GameRegistry.findBlock("Railcraft", "tile.railcraft.brick.sandy"), 3, 3); - Carving.chisel.addVariation("RCSandyStone", GameRegistry.findBlock("Railcraft", "tile.railcraft.brick.sandy"), 4, 4); - Carving.chisel.addVariation("RCSandyStone", GameRegistry.findBlock("Railcraft", "tile.railcraft.brick.sandy"), 5, 5); - Carving.chisel.registerOre("RCSandyStone", "RCSandyStone"); - } - - if (Configurations.featureEnabled("RCFrostBoundBlock") && Loader.isModLoaded("Railcraft")) { - Carving.chisel.addVariation("RCFrostBoundBlock", GameRegistry.findBlock("Railcraft", "tile.railcraft.brick.frostbound"), 0, 0); - Carving.chisel.addVariation("RCFrostBoundBlock", GameRegistry.findBlock("Railcraft", "tile.railcraft.brick.frostbound"), 1, 1); - Carving.chisel.addVariation("RCFrostBoundBlock", GameRegistry.findBlock("Railcraft", "tile.railcraft.brick.frostbound"), 2, 2); - Carving.chisel.addVariation("RCFrostBoundBlock", GameRegistry.findBlock("Railcraft", "tile.railcraft.brick.frostbound"), 3, 3); - Carving.chisel.addVariation("RCFrostBoundBlock", GameRegistry.findBlock("Railcraft", "tile.railcraft.brick.frostbound"), 4, 4); - Carving.chisel.addVariation("RCFrostBoundBlock", GameRegistry.findBlock("Railcraft", "tile.railcraft.brick.frostbound"), 5, 5); - Carving.chisel.registerOre("RCFrostBoundBlock", "RCFrostBoundBlock"); - } - - if (Configurations.featureEnabled("RCQuarriedBlock") && Loader.isModLoaded("Railcraft")) { - Carving.chisel.addVariation("RCQuarriedBlock", GameRegistry.findBlock("Railcraft", "tile.railcraft.brick.quarried"), 0, 0); - Carving.chisel.addVariation("RCQuarriedBlock", GameRegistry.findBlock("Railcraft", "tile.railcraft.brick.quarried"), 1, 1); - Carving.chisel.addVariation("RCQuarriedBlock", GameRegistry.findBlock("Railcraft", "tile.railcraft.brick.quarried"), 2, 2); - Carving.chisel.addVariation("RCQuarriedBlock", GameRegistry.findBlock("Railcraft", "tile.railcraft.brick.quarried"), 3, 3); - Carving.chisel.addVariation("RCQuarriedBlock", GameRegistry.findBlock("Railcraft", "tile.railcraft.brick.quarried"), 4, 4); - Carving.chisel.addVariation("RCQuarriedBlock", GameRegistry.findBlock("Railcraft", "tile.railcraft.brick.quarried"), 5, 5); - Carving.chisel.registerOre("RCQuarriedBlock", "RCQuarriedBlock"); - } - - if (Configurations.featureEnabled("RCBleachedBone") && Loader.isModLoaded("Railcraft")) { - Carving.chisel.addVariation("RCBleachedBone", GameRegistry.findBlock("Railcraft", "tile.railcraft.brick.bleachedbone"), 0, 0); - Carving.chisel.addVariation("RCBleachedBone", GameRegistry.findBlock("Railcraft", "tile.railcraft.brick.bleachedbone"), 1, 1); - Carving.chisel.addVariation("RCBleachedBone", GameRegistry.findBlock("Railcraft", "tile.railcraft.brick.bleachedbone"), 2, 2); - Carving.chisel.addVariation("RCBleachedBone", GameRegistry.findBlock("Railcraft", "tile.railcraft.brick.bleachedbone"), 3, 3); - Carving.chisel.addVariation("RCBleachedBone", GameRegistry.findBlock("Railcraft", "tile.railcraft.brick.bleachedbone"), 4, 4); - Carving.chisel.addVariation("RCBleachedBone", GameRegistry.findBlock("Railcraft", "tile.railcraft.brick.bleachedbone"), 5, 5); - Carving.chisel.registerOre("RCBleachedBone", "RCBleachedBone"); - } - - if (Configurations.featureEnabled("RCBloodStained") && Loader.isModLoaded("Railcraft")) { - Carving.chisel.addVariation("RCBloodStained", GameRegistry.findBlock("Railcraft", "tile.railcraft.brick.bloodstained"), 0, 0); - Carving.chisel.addVariation("RCBloodStained", GameRegistry.findBlock("Railcraft", "tile.railcraft.brick.bloodstained"), 1, 1); - Carving.chisel.addVariation("RCBloodStained", GameRegistry.findBlock("Railcraft", "tile.railcraft.brick.bloodstained"), 2, 2); - Carving.chisel.addVariation("RCBloodStained", GameRegistry.findBlock("Railcraft", "tile.railcraft.brick.bloodstained"), 3, 3); - Carving.chisel.addVariation("RCBloodStained", GameRegistry.findBlock("Railcraft", "tile.railcraft.brick.bloodstained"), 4, 4); - Carving.chisel.addVariation("RCBloodStained", GameRegistry.findBlock("Railcraft", "tile.railcraft.brick.bloodstained"), 5, 5); - Carving.chisel.registerOre("RCBloodStained", "RCBloodStained"); - } - } -} diff --git a/src/main/java/com/cricketcraft/chisel/init/ModItems.java b/src/main/java/com/cricketcraft/chisel/init/ModItems.java deleted file mode 100644 index 039059ec..00000000 --- a/src/main/java/com/cricketcraft/chisel/init/ModItems.java +++ /dev/null @@ -1,52 +0,0 @@ -package com.cricketcraft.chisel.init; - -import com.cricketcraft.chisel.Chisel; -import com.cricketcraft.chisel.Configurations; -import com.cricketcraft.chisel.entity.EntityBallOMoss; -import com.cricketcraft.chisel.entity.EntityCloudInABottle; -import com.cricketcraft.chisel.entity.EntitySmashingRock; -import com.cricketcraft.chisel.item.ItemBallOMoss; -import com.cricketcraft.chisel.item.ItemChisel; -import com.cricketcraft.chisel.item.ItemCloudInABottle; -import com.cricketcraft.chisel.item.ItemSmashingRock; -import com.cricketcraft.chisel.item.ItemUpgrade; - -import cpw.mods.fml.common.registry.EntityRegistry; -import cpw.mods.fml.common.registry.GameRegistry; - -public class ModItems { - - public static ItemChisel chisel; - public static ItemCloudInABottle itemCloudInABottle; - public static ItemBallOMoss itemBallOMoss; - public static ItemSmashingRock smashingRock; - public static ItemUpgrade upgrade; - - public static void load() { - chisel = (ItemChisel) new ItemChisel().setCreativeTab(ModTabs.tabChisel); - GameRegistry.registerItem(chisel, "chisel"); - - if (Configurations.featureEnabled("cloud")) { - itemCloudInABottle = (ItemCloudInABottle) new ItemCloudInABottle().setTextureName("Chisel:cloudinabottle-x").setCreativeTab(ModTabs.tabChisel); - EntityRegistry.registerModEntity(EntityCloudInABottle.class, "CloudInABottle", 1, Chisel.instance, 40, 1, true); - GameRegistry.registerItem(itemCloudInABottle, "cloudinabottle"); - } - - if (Configurations.featureEnabled("ballOfMoss")) { - itemBallOMoss = (ItemBallOMoss) new ItemBallOMoss().setTextureName("Chisel:ballomoss").setCreativeTab(ModTabs.tabChisel); - EntityRegistry.registerModEntity(EntityBallOMoss.class, "BallOMoss", 2, Chisel.instance, 40, 1, true); - GameRegistry.registerItem(itemBallOMoss, "ballomoss"); - } - - if (Configurations.featureEnabled("smashingRock")) { - smashingRock = (ItemSmashingRock) new ItemSmashingRock().setTextureName("Chisel:smashingrock").setCreativeTab(ModTabs.tabChisel); - EntityRegistry.registerModEntity(EntitySmashingRock.class, "SmashingRock", 2, Chisel.instance, 40, 1, true); - GameRegistry.registerItem(smashingRock, "smashingrock"); - } - - if (Configurations.featureEnabled("autoChiselUpgrades")) { - upgrade = (ItemUpgrade) new ItemUpgrade("upgrade").setCreativeTab(ModTabs.tabChisel); - GameRegistry.registerItem(upgrade, upgrade.getUnlocalizedName()); - } - } -} diff --git a/src/main/java/com/cricketcraft/chisel/inventory/ContainerAutoChisel.java b/src/main/java/com/cricketcraft/chisel/inventory/ContainerAutoChisel.java index 101e2a44..cca3d7c5 100644 --- a/src/main/java/com/cricketcraft/chisel/inventory/ContainerAutoChisel.java +++ b/src/main/java/com/cricketcraft/chisel/inventory/ContainerAutoChisel.java @@ -8,7 +8,7 @@ import net.minecraft.item.ItemStack; import com.cricketcraft.chisel.block.tileentity.TileEntityAutoChisel; import com.cricketcraft.chisel.block.tileentity.TileEntityAutoChisel.Upgrade; -import com.cricketcraft.chisel.init.ModItems; +import com.cricketcraft.chisel.init.ChiselItems; public class ContainerAutoChisel extends Container { @@ -23,7 +23,7 @@ public class ContainerAutoChisel extends Container { @Override public boolean isItemValid(ItemStack stack) { - return stack.getItem() == ModItems.upgrade && stack.getItemDamage() == upgradeType.ordinal(); + return stack.getItem() == ChiselItems.upgrade && stack.getItemDamage() == upgradeType.ordinal(); } } @@ -83,7 +83,7 @@ public class ContainerAutoChisel extends Container { } } else { // if this is an upgrade, check the upgrade slots - if (itemStack1.getItem() == ModItems.upgrade) { + if (itemStack1.getItem() == ChiselItems.upgrade) { if (!this.mergeItemStack(itemStack1, 3, 6, false)) { return null; } diff --git a/src/main/java/com/cricketcraft/chisel/item/ItemCarvable.java b/src/main/java/com/cricketcraft/chisel/item/ItemCarvable.java index 1b95242b..97fc55fa 100644 --- a/src/main/java/com/cricketcraft/chisel/item/ItemCarvable.java +++ b/src/main/java/com/cricketcraft/chisel/item/ItemCarvable.java @@ -9,9 +9,9 @@ import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; -import com.cricketcraft.chisel.Configurations; import com.cricketcraft.chisel.api.ICarvable; import com.cricketcraft.chisel.carving.CarvableVariation; +import com.cricketcraft.chisel.config.Configurations; import com.cricketcraft.chisel.utils.General; public class ItemCarvable extends ItemBlock { diff --git a/src/main/java/com/cricketcraft/chisel/proxy/ClientProxy.java b/src/main/java/com/cricketcraft/chisel/proxy/ClientProxy.java index 4635294a..e6eca230 100644 --- a/src/main/java/com/cricketcraft/chisel/proxy/ClientProxy.java +++ b/src/main/java/com/cricketcraft/chisel/proxy/ClientProxy.java @@ -24,8 +24,8 @@ import com.cricketcraft.chisel.client.render.tile.RenderPresent; import com.cricketcraft.chisel.entity.EntityBallOMoss; import com.cricketcraft.chisel.entity.EntityCloudInABottle; import com.cricketcraft.chisel.entity.EntitySmashingRock; -import com.cricketcraft.chisel.init.ModBlocks; -import com.cricketcraft.chisel.init.ModItems; +import com.cricketcraft.chisel.init.ChiselBlocks; +import com.cricketcraft.chisel.init.ChiselItems; import cpw.mods.fml.client.registry.ClientRegistry; import cpw.mods.fml.client.registry.RenderingRegistry; @@ -55,19 +55,19 @@ public class ClientProxy extends CommonProxy { RenderAutoChisel rac = new RenderAutoChisel(); Chisel.renderAutoChiselId = RenderingRegistry.getNextAvailableRenderId(); RenderingRegistry.registerBlockHandler(rac); - MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(ModBlocks.autoChisel), rac); + MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(ChiselBlocks.autoChisel), rac); ClientRegistry.bindTileEntitySpecialRenderer(TileEntityAutoChisel.class, rac); ClientRegistry.bindTileEntitySpecialRenderer(TileEntityPresent.class, new RenderPresent()); for (int x = 0; x < 16; x++) { - MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(ModBlocks.present[x]), new ItemPresentRenderer(x)); + MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(ChiselBlocks.present[x]), new ItemPresentRenderer(x)); } - RenderingRegistry.registerEntityRenderingHandler(EntityCloudInABottle.class, new RenderSnowball(ModItems.itemCloudInABottle)); - RenderingRegistry.registerEntityRenderingHandler(EntityBallOMoss.class, new RenderSnowball(ModItems.itemBallOMoss)); - RenderingRegistry.registerEntityRenderingHandler(EntitySmashingRock.class, new RenderSnowball(ModItems.smashingRock)); + RenderingRegistry.registerEntityRenderingHandler(EntityCloudInABottle.class, new RenderSnowball(ChiselItems.itemCloudInABottle)); + RenderingRegistry.registerEntityRenderingHandler(EntityBallOMoss.class, new RenderSnowball(ChiselItems.itemBallOMoss)); + RenderingRegistry.registerEntityRenderingHandler(EntitySmashingRock.class, new RenderSnowball(ChiselItems.smashingRock)); - MinecraftForgeClient.registerItemRenderer(ModItems.chisel, renderer); + MinecraftForgeClient.registerItemRenderer(ChiselItems.chisel, renderer); } } diff --git a/src/main/java/com/cricketcraft/chisel/utils/General.java b/src/main/java/com/cricketcraft/chisel/utils/General.java index cd5fe6c3..4cb71915 100644 --- a/src/main/java/com/cricketcraft/chisel/utils/General.java +++ b/src/main/java/com/cricketcraft/chisel/utils/General.java @@ -90,4 +90,5 @@ public class General { return par1World.rayTraceBlocks(var13, var23, par3); } + public static final String[] sGNames = new String[] { "White", "Orange", "Magenta", "Light Blue", "Yellow", "Lime", "Pink", "Gray", "Light Gray", "Cyan", "Purple", "Blue", "Brown", "Green", "Red", "Black" }; } diff --git a/src/main/resources/assets/chisel/models/autoChisel/autoChisel.obj b/src/main/resources/assets/chisel/models/autoChisel/autoChisel.obj index e0bb257e..ba6d4262 100644 --- a/src/main/resources/assets/chisel/models/autoChisel/autoChisel.obj +++ b/src/main/resources/assets/chisel/models/autoChisel/autoChisel.obj @@ -70,10 +70,16 @@ v 0.750000 0.062500 -0.750000 v 0.750000 0.000000 -0.750000 v 0.750000 0.062500 -0.250000 v 0.750000 0.000000 -0.250000 +vt 0.125000 0.500000 vt 0.062500 0.500000 +vt 0.062500 0.421875 +vt 0.125000 0.421875 +vt 0.187500 0.500000 +vt 0.187500 0.421875 +vt 0.250000 0.500000 +vt 0.250000 0.421875 vt 0.000000 0.500000 -vt 0.000000 0.437500 -vt 0.062500 0.437500 +vt 0.000000 0.421875 vt 0.375000 1.000000 vt 0.187500 1.000000 vt 0.187500 0.921875 @@ -87,7 +93,6 @@ vt 0.250000 0.625000 vt 0.125000 0.625000 vt 0.125000 0.609375 vt 0.250000 0.609375 -vt 0.125000 0.500000 vt 0.203125 0.906250 vt 0.203125 0.859375 vt 0.218750 0.859375 @@ -95,61 +100,58 @@ vt 0.218750 0.906250 vt 0.187500 0.859375 vt 0.203125 0.921875 vt 0.218750 0.921875 -vt 0.234375 0.906250 -vt 0.234375 0.921875 -vt 0.187500 0.437500 -vt 0.093750 0.437500 vt 0.093750 0.421875 -vt 0.187500 0.421875 -vt 0.000000 0.343750 -vt 0.093750 0.343750 -vt 0.250000 0.343750 -vt 0.125000 0.343750 -vt 0.125000 0.328125 +vt 0.093750 0.406250 +vt 0.187500 0.406250 +vt 0.000000 0.328125 +vt 0.093750 0.328125 vt 0.250000 0.328125 -vt 0.000000 0.218750 -vt 0.000000 0.093750 -vt 0.125000 0.093750 -vt 0.125000 0.218750 +vt 0.125000 0.328125 +vt 0.125000 0.312500 +vt 0.250000 0.312500 +vt 0.000000 0.203125 +vt 0.000000 0.078125 +vt 0.125000 0.078125 +vt 0.125000 0.203125 usemtl None s off f 1/1 2/2 3/3 4/4 -f 2/1 5/2 6/3 3/4 -f 5/1 7/2 8/3 6/4 -f 7/1 1/2 4/3 8/4 -f 9/5 10/6 11/7 12/8 -f 10/5 13/6 14/7 11/8 -f 13/5 15/6 16/7 14/8 -f 15/5 9/6 12/7 16/8 -f 10/9 9/10 15/11 13/6 -f 18/10 17/12 19/13 20/11 -f 21/14 22/15 23/16 24/17 -f 22/14 25/15 26/16 23/17 -f 25/14 27/15 28/16 26/17 -f 27/14 21/15 24/16 28/17 -f 24/12 23/2 26/18 28/15 -f 29/19 30/20 31/21 32/22 -f 33/21 35/22 36/19 34/20 -f 32/19 31/20 34/21 36/22 -f 30/21 29/22 35/19 33/20 -f 37/23 38/20 39/24 40/7 -f 38/23 41/20 42/24 39/7 -f 41/23 43/20 44/24 42/7 -f 43/23 37/20 40/24 44/7 -f 38/25 37/22 43/26 41/27 -f 45/23 46/20 47/24 48/7 -f 46/23 49/20 50/24 47/7 -f 49/23 51/20 52/24 50/7 -f 51/23 45/20 48/24 52/7 -f 46/24 45/19 51/22 49/25 -f 53/28 54/29 55/30 56/31 -f 54/28 57/29 58/30 55/31 -f 57/28 59/29 60/30 58/31 -f 59/28 53/29 56/30 60/31 -f 54/3 53/32 59/33 57/29 -f 61/34 62/35 63/36 64/37 -f 62/34 65/35 66/36 63/37 -f 65/34 67/35 68/36 66/37 -f 67/34 61/35 64/36 68/37 -f 64/38 63/39 66/40 68/41 -f 62/32 61/38 67/41 65/35 +f 2/5 5/1 6/4 3/6 +f 5/7 7/5 8/6 6/8 +f 7/2 1/9 4/10 8/3 +f 9/11 10/12 11/13 12/14 +f 10/11 13/12 14/13 11/14 +f 13/11 15/12 16/13 14/14 +f 15/11 9/12 12/13 16/14 +f 10/15 9/16 15/17 13/12 +f 18/16 17/18 19/19 20/17 +f 21/20 22/21 23/22 24/23 +f 22/20 25/21 26/22 23/23 +f 25/20 27/21 28/22 26/23 +f 27/20 21/21 24/22 28/23 +f 24/18 23/9 26/1 28/21 +f 29/24 30/25 31/26 32/27 +f 33/26 35/27 36/24 34/25 +f 32/24 31/25 34/26 36/27 +f 30/26 29/27 35/24 33/25 +f 37/28 38/25 39/29 40/13 +f 38/28 41/25 42/29 39/13 +f 41/28 43/25 44/29 42/13 +f 43/28 37/25 40/29 44/13 +f 38/29 37/24 43/27 41/30 +f 45/28 46/25 47/29 48/13 +f 46/28 49/25 50/29 47/13 +f 49/28 51/25 52/29 50/13 +f 51/28 45/25 48/29 52/13 +f 46/29 45/24 51/27 49/30 +f 53/6 54/31 55/32 56/33 +f 54/6 57/31 58/32 55/33 +f 57/6 59/31 60/32 58/33 +f 59/6 53/31 56/32 60/33 +f 54/10 53/34 59/35 57/31 +f 61/36 62/37 63/38 64/39 +f 62/36 65/37 66/38 63/39 +f 65/36 67/37 68/38 66/39 +f 67/36 61/37 64/38 68/39 +f 64/40 63/41 66/42 68/43 +f 62/34 61/40 67/43 65/37 diff --git a/src/main/resources/assets/chisel/textures/blocks/autoChisel/autoChisel.png b/src/main/resources/assets/chisel/textures/blocks/autoChisel/autoChisel.png index 6f7f16b7b9036abbf6ab045e50977530639639f9..d29fdad85746fdf220b606f98f5d8e30b89edade 100644 GIT binary patch literal 1884 zcmZuydstI-7)C)IHi{wYFba1Ok|u0U!5J6D!(b%?X@^T@kIg zAh_ivqf;Ob#efh3CYOyZBb;kC60s=|69hMepxCQ&Uv2iobUVI_x;}UouUwC zfX&KvD=jQ6Y#4!1D7f!19n^AgMGk$UwXj%0U_d)rnM>~f=o{y#TGxJei1&w4-aZ`m z)y?6LeLt&(#x|TheYANxG3uKX>TgJuwskJsYQ-{I)$N@pxZkh8ps~J^pM1|x9kX!8 z(CQ=2ZHh`v_*@jQrX;@zg%lg!#Ne!PKQ(Sr(Bx=XO6&GroZp37LOnmWoh2m6dLBDc zJLM1NL|6jS=k)13F8jxr%MlUfu@w%cT)j7iZc3B$DI9JW_7er0Tj8MP*}<_gS|K7) z#~U9jee>Nb9335RlhNCBfh-{e1s0!MeS-;ZS;k)?bWFpz{$|@z>*PT(d-FHLlzO{+CGn)r1m6B8+t?GKh#bddTP+SA55uK@V_^>-8EJ zKB_47Rq8G%1cve;0LQt1gS&XKeOMaDwla|&*s|Ms)vt|Gp0eB^>XMVGEMc<2{X?I{ zW6}~;2dZb_>);?L8Bix`c?IltUNFE`giO`Xc|I@WBi4}7d=$<~4v2)n5)wg~Do0b# z>v=D9OG;8!r`EWdW2bs^31s>wPbusa`J&r^6%AzJ+K`Hx3M@EOQ6u9 zJkKO8ihx&&yc?+{DRQ0fLg=D-Wg7n>?bcB0bj05U4;Px#$uPVgtb_L zmM0-~$|GvSfOr{0M?T6vhY<08q4vut^o6Hm?i_)=|FKF6+HxBv;j&>spkqbmd7i1xYpjI%m%KBf$K{gw}IQcFc! zYI&t>tQkJ~3ez zO>AmvVrOKW!V-G>`)yiUTDq`|#Kc77WVciPrHX2?STi%T)qhWjYHML(VbuQp@7pg+ z-bPNaxxbu=Q3|sG~%s%{DJU%*F?4@K} z9M~8h9u7p^e1_T7+>BSImOf1D8ys8>R>2ps8?&Vs5Z5?Ox$=G%Q`0!_F1sI!#e9SG zfi(X;_31e|Oc?I)UJt`+h2mA5RcYOr@zGt&*vOTJqbxYKK`pp===M_(>F(}+_FB9L zp{b>X5P3-js^75;g@soWWMLv5@!y;T%~X?@vU0a`yvOUmHr`*1bUW1%z8gU#57XY= zV?Tebxy}^fGhn!}pQ2oPsM^a2r8aI z8JUWEAvtw(v;T%-ONP*s>X!bD3K2AI*%$FK!M;4q)6NT)mtkU_U==W zPQAzO0s?B(YFyrqpVQv}3e6l2iYzzd_o(VWc)FmrpW7L;`D|Srg4oebJk{~^l#GmS z9dLlTpo@#k6XRs`n_ijiVPM}o`R0rmjS*N%*378T`|va$C_FkRDtyf;B`b?zD&5=L qTQtcK>8|`IEWw$3Bh=`lG_!<;9H^D{x2b_E%og7@W zkHJ4f7sW|%Rg^Pn$w70M9x1k59x2y6n&k3*zwejFarAg0mx{**V*n7(q^&%T6Xc49 z@%PQf_A`#c>)DhAHu;=CT%O^Qo~`uKELy$P0>w$NS4;D;B^o zWUT4JK0=8^sf296JqQH!DO4Sx4J6^S`<97_$4GjSSGf2mWqrC#i3}}m7P{h@D zNE0|8UgCyHw1`pga87)u@M!gaRE`rRI49?WkE<6g7pJl-MB!&4b=AG z83nYR;(*`4C?MblYWwiCS3pRV;sWys@mBJku`mI$17-~_On^~<B?%q3>pGln$WDkC_poVyWpy;fRowD3Vj#A1>3s-**}eY zg6r=3u4jNeJog9*#WqFUJ%MUKJ#1Mk;u2796o%7YHDb5~s0P%rAd^5>}8o=X644w!;B+O`%W7;4DNmf;dGYu5$vt+)=j1W-%b@Jf@Ov9b!F zXk`aTaqwak=Bxs=!58vXfYeUnO8}k&qy|V0$&0n01GHCwx<_N4=9zLs07Hm&S?v{o zz`pZ54LVXlb4o9R+AF{i;7DE5gi(N|hIe2a1vpe_njoh^rPp~syK3(Oegv7{4FiUO kfHDwYt&ZTKWy${n{L>Ie-}8sn=