diff --git a/src/main/java/info/jbcs/minecraft/chisel/BlockNameConversion.java b/src/main/java/info/jbcs/minecraft/chisel/BlockNameConversion.java index e10518f2..49c2806d 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/BlockNameConversion.java +++ b/src/main/java/info/jbcs/minecraft/chisel/BlockNameConversion.java @@ -1,6 +1,6 @@ package info.jbcs.minecraft.chisel; -import info.jbcs.minecraft.utilities.General; +import info.jbcs.minecraft.chisel.utils.General; import java.util.HashMap; @@ -26,7 +26,7 @@ public class BlockNameConversion return namingConversion.get(oldname); case 1: // simple lower case return oldname.toLowerCase(); - case 2: // rename "marbleSlab" -> "marble_slab", "blockRedstone" -> "redstone_block" + case 2: // rename "marbleSlab" -> "marble_slab", "redstone" -> "redstone_block" newname = oldname.replaceAll("([a-z]+)([A-Z])", "$1_$2").toLowerCase(); if (newname.startsWith("block_")) { @@ -44,8 +44,8 @@ public class BlockNameConversion newname = newname.replaceFirst("wood_([a-z_]+)", "$1_planks"); } return newname; - case (MAX - 1): // ALWAYS last: rename "blockYxx" -> "yxx" (e.g. "blockDirt" -> "dirt"). - // This can be dangerous in cases like "blockCarpet" (a block) -> "carpet" (NO block) + case (MAX - 1): // ALWAYS last: rename "blockYxx" -> "yxx" (e.g. "dirt" -> "dirt"). + // This can be dangerous in cases like "carpet" (a block) -> "carpet" (NO block) return oldname.replaceAll("([a-z]+)([A-Z])", "$1_$2").toLowerCase().replaceFirst("block_", ""); default: throw new IndexOutOfBoundsException("conversion got invalid parameter step=" + step); @@ -66,12 +66,12 @@ public class BlockNameConversion namingConversion.put("stoneMoss", "mossy_cobblestone"); namingConversion.put("stoneBrick", "stonebrick"); namingConversion.put("fenceIron", "iron_bars"); - namingConversion.put("blockFft", "fantasyblock"); - namingConversion.put("blockCarpetFloor", "carpet"); - namingConversion.put("blockTemple", "templeblock"); - namingConversion.put("blockTempleMossy", "mossy_templeblock"); - namingConversion.put("blockFactory", "factoryblock"); - namingConversion.put("blockLaboratory", "laboratoryblock"); + namingConversion.put("fantasy", "fantasyblock"); + namingConversion.put("carpetFloor", "carpet"); + namingConversion.put("temple", "templeblock"); + namingConversion.put("templeMossy", "mossy_templeblock"); + namingConversion.put("factory", "factoryblock"); + namingConversion.put("laboratory", "laboratoryblock"); // "LightGray" is unfortunately converted to "light_gray" namingConversion.put("stainedGlassLightGray", "stained_glass_lightgray"); namingConversion.put("stainedGlassPaneLightGray", "stained_glass_pane_lightgray"); diff --git a/src/main/java/info/jbcs/minecraft/chisel/Chisel.java b/src/main/java/info/jbcs/minecraft/chisel/Chisel.java index 02eafe8a..23be08ab 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/Chisel.java +++ b/src/main/java/info/jbcs/minecraft/chisel/Chisel.java @@ -1,28 +1,26 @@ package info.jbcs.minecraft.chisel; -import info.jbcs.minecraft.chisel.block.BlockAutoChisel; import info.jbcs.minecraft.chisel.block.BlockCarvable; import info.jbcs.minecraft.chisel.block.tileentity.TileEntityAutoChisel; import info.jbcs.minecraft.chisel.client.gui.GuiAutoChisel; import info.jbcs.minecraft.chisel.client.gui.GuiChisel; -import info.jbcs.minecraft.chisel.entity.EntityBallOMoss; -import info.jbcs.minecraft.chisel.entity.EntityCloudInABottle; -import info.jbcs.minecraft.chisel.entity.EntitySmashingRock; +import info.jbcs.minecraft.chisel.compat.Compatibility; +import info.jbcs.minecraft.chisel.compat.FMPIntegration; +import info.jbcs.minecraft.chisel.compat.ModIntegration; +import info.jbcs.minecraft.chisel.init.ModBlocks; +import info.jbcs.minecraft.chisel.init.ModItems; +import info.jbcs.minecraft.chisel.init.ModTabs; import info.jbcs.minecraft.chisel.inventory.ContainerAutoChisel; import info.jbcs.minecraft.chisel.inventory.ContainerChisel; import info.jbcs.minecraft.chisel.inventory.InventoryChiselSelection; -import info.jbcs.minecraft.chisel.item.ItemBallOMoss; -import info.jbcs.minecraft.chisel.item.ItemChisel; -import info.jbcs.minecraft.chisel.item.ItemCloudInABottle; -import info.jbcs.minecraft.chisel.item.ItemSmashingRock; +import info.jbcs.minecraft.chisel.proxy.CommonProxy; import info.jbcs.minecraft.chisel.world.GeneratorLimestone; import info.jbcs.minecraft.chisel.world.GeneratorMarble; -import info.jbcs.minecraft.utilities.General; +import info.jbcs.minecraft.chisel.utils.General; import java.io.File; import net.minecraft.block.Block; -import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.tileentity.TileEntity; @@ -45,32 +43,23 @@ import cpw.mods.fml.common.event.FMLPreInitializationEvent; import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.common.network.IGuiHandler; import cpw.mods.fml.common.network.NetworkRegistry; -import cpw.mods.fml.common.registry.EntityRegistry; import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.common.registry.GameRegistry.Type; -@Mod(modid = Chisel.MOD_ID, name = Chisel.MOD_NAME, version = "@MOD_VERSION@", guiFactory = "info.jbcs.minecraft.chisel.client.gui.GuiFactory"/*, dependencies = "after:ForgeMicroblock;"*/) +@Mod(modid = Chisel.MOD_ID, name = Chisel.MOD_NAME, version = "@MOD_VERSION@", guiFactory = "info.jbcs.minecraft.chisel.client.gui.GuiFactory", dependencies = "after:ForgeMultipart;") public class Chisel { public static final String MOD_ID = "chisel"; public static final String MOD_NAME = "Chisel"; - public static ItemChisel chisel; - // public static ItemChisel needle; - public static ItemCloudInABottle itemCloudInABottle; - public static ItemBallOMoss itemBallOMoss; - public static ItemSmashingRock smashingRock; - - public static CreativeTabs tabChisel; - public static boolean multipartLoaded = false; public static final BlockCarvable.SoundType soundHolystoneFootstep = new BlockCarvable.SoundType("holystone", 1.0f, 1.0f); public static final BlockCarvable.SoundType soundTempleFootstep = new BlockCarvable.SoundType("dig.stone", MOD_ID+":step.templeblock", 1.0f, 1.0f); public static final BlockCarvable.SoundType soundMetalFootstep = new BlockCarvable.SoundType("metal", 1.0f, 1.0f); - public static Block autoChisel; + public static int RenderEldritchId; public static int RenderCTMId; @@ -79,7 +68,7 @@ public class Chisel @Instance(MOD_ID) public static Chisel instance; - @SidedProxy(clientSide = "info.jbcs.minecraft.chisel.ClientProxy", serverSide = "info.jbcs.minecraft.chisel.CommonProxy") + @SidedProxy(clientSide = "info.jbcs.minecraft.chisel.proxy.ClientProxy", serverSide = "info.jbcs.minecraft.chisel.proxy.CommonProxy") public static CommonProxy proxy; @EventHandler @@ -132,45 +121,9 @@ public class Chisel Configurations.config.load(); Configurations.refreshConfig(); - tabChisel = new CreativeTabs("tabChisel") - { - @Override - public Item getTabIconItem() - { - return chisel; - } - }; - - chisel = (ItemChisel) new ItemChisel().setTextureName("chisel:chisel").setCreativeTab(CreativeTabs.tabTools); - GameRegistry.registerItem(chisel, "chisel"); - - if(Configurations.featureEnabled("autoChisel")){ - autoChisel = new BlockAutoChisel().setBlockTextureName("Chisel:autoChisel").setCreativeTab(CreativeTabs.tabTools); - GameRegistry.registerBlock(autoChisel, autoChisel.getUnlocalizedName()); - proxy.registerTileEntities(); - } - - if(Configurations.featureEnabled("cloud")) - { - itemCloudInABottle = (ItemCloudInABottle) new ItemCloudInABottle().setTextureName("Chisel:cloudinabottle").setCreativeTab(CreativeTabs.tabTools); - EntityRegistry.registerModEntity(EntityCloudInABottle.class, "CloudInABottle", 1, this, 40, 1, true); - GameRegistry.registerItem(itemCloudInABottle, "cloudinabottle"); - } - - if(Configurations.featureEnabled("ballOfMoss")) - { - itemBallOMoss = (ItemBallOMoss) new ItemBallOMoss().setTextureName("Chisel:ballomoss").setCreativeTab(CreativeTabs.tabTools); - EntityRegistry.registerModEntity(EntityBallOMoss.class, "BallOMoss", 2, this, 40, 1, true); - GameRegistry.registerItem(itemBallOMoss, "ballomoss"); - } - - if(Configurations.featureEnabled("smashingRock")) - { - smashingRock = (ItemSmashingRock) new ItemSmashingRock().setTextureName("Chisel:smashingrock").setCreativeTab(CreativeTabs.tabTools); - EntityRegistry.registerModEntity(EntitySmashingRock.class, "SmashingRock", 2, this, 40, 1, true); - GameRegistry.registerItem(smashingRock, "smashingrock"); - } - ChiselBlocks.load(); + ModItems.load(); + ModTabs.load(); + ModBlocks.load(); proxy.preInit(); } @@ -213,8 +166,12 @@ public class Chisel }); - GameRegistry.registerWorldGenerator(new GeneratorMarble(ChiselBlocks.blockMarble, 32, Configurations.marbleAmount), 1000); - GameRegistry.registerWorldGenerator(new GeneratorLimestone(ChiselBlocks.blockLimestone, 32, Configurations.limestoneAmount), 1000); + GameRegistry.registerWorldGenerator(new GeneratorMarble(ModBlocks.marble, 32, Configurations.marbleAmount), 1000); + GameRegistry.registerWorldGenerator(new GeneratorLimestone(ModBlocks.limestone, 32, Configurations.limestoneAmount), 1000); + + ModIntegration.addMod(FMPIntegration.class); + + ModIntegration.init(); proxy.init(); MinecraftForge.EVENT_BUS.register(this); @@ -227,6 +184,7 @@ public class Chisel @EventHandler public void postInit(FMLPostInitializationEvent event) { + ModIntegration.postInit(); Compatibility.init(event); } diff --git a/src/main/java/info/jbcs/minecraft/chisel/ChiselBlocks.java b/src/main/java/info/jbcs/minecraft/chisel/ChiselBlocks.java deleted file mode 100644 index 0a591df0..00000000 --- a/src/main/java/info/jbcs/minecraft/chisel/ChiselBlocks.java +++ /dev/null @@ -1,1262 +0,0 @@ -package info.jbcs.minecraft.chisel; - -import cpw.mods.fml.common.registry.GameRegistry; -import info.jbcs.minecraft.chisel.block.*; -import info.jbcs.minecraft.chisel.carving.CarvableHelper; -import info.jbcs.minecraft.chisel.carving.CarvableVariation; -import info.jbcs.minecraft.chisel.carving.Carving; -import info.jbcs.minecraft.chisel.item.ItemCarvable; -import info.jbcs.minecraft.chisel.item.ItemMarbleSlab; -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; - -public class ChiselBlocks -{ - public static BlockCarvable blockMarble; - public static BlockCarvable blockMarblePillar; - public static BlockCarvable blockLimestone; - public static BlockMarbleSlab blockMarbleSlab; - public static BlockMarbleSlab blockLimestoneSlab; - public static BlockMarbleSlab blockMarblePillarSlab; - public static BlockCarvable blockCobblestone; - public static BlockMarbleWall cobblestoneWall; - public static BlockCarvableGlass blockGlass; - public static BlockCarvablePane blockPaneGlass; - public static BlockCarvable blockSandstone; - public static BlockCarvable blockSandstoneScribbles; - public static BlockConcrete blockConcrete; - public static BlockRoadLine blockRoadLine; - public static BlockCarvable blockIron; - public static BlockCarvable blockGold; - public static BlockCarvable blockDiamond; - public static BlockLightstoneCarvable blockLightstone; - public static BlockCarvable blockLapis; - public static BlockCarvable blockEmerald; - public static BlockCarvable blockNetherBrick; - public static BlockCarvable blockNetherrack; - public static BlockCarvable blockCobblestoneMossy; - public static BlockCarvable stoneBrick; - public static BlockMarbleStairs blockMarbleStairs; - public static BlockMarbleStairs blockLimestoneStairs; - public static BlockCarvablePane blockPaneIron; - public static BlockMarbleIce blockIce; - public static BlockMarbleIce blockIcePillar; - public static BlockMarbleIceStairs blockIceStairs; - public static BlockCarvable[] blockPlanks = new BlockCarvable[6]; - public static BlockCarvable blockObsidian; - public static BlockCarvablePowered blockRedstone; - public static BlockHolystone blockHolystone; - public static BlockLavastone blockLavastone; - public static BlockCarvable blockFft; - public static BlockCarvable blockCarpet; - public static BlockMarbleCarpet blockCarpetFloor; - public static BlockCarvable blockBookshelf; - public static BlockCarvable blockTyrian; - public static BlockCarvable blockDirt; - public static BlockCloud blockCloud; - public static BlockCarvable blockTemple; - public static BlockCarvable blockTempleMossy; - public static BlockCarvable blockFactory; - public static BlockCarvablePane blockPaperwall; - public static BlockCarvable blockWoolenClay; - public static BlockCarvable blockLaboratory; - public static BlockCarvablePumpkin blockPumpkinOn; - public static BlockCarvablePumpkin blockPumpkinOff; - - public static BlockSnakestone blockSnakestone; - public static BlockSnakestone blockSandSnakestone; - public static BlockSnakestoneObsidian blockObsidianSnakestone; - - public static BlockSpikes blockSpiketrap; - - // 1.7 - public static BlockCarvableGlass[] blockStainedGlass = new BlockCarvableGlass[4]; - public static BlockCarvablePane[] blockStainedGlassPane = new BlockCarvablePane[8]; - - public static void load() - { - if(Configurations.featureEnabled("marble")) - { - blockMarble = (BlockCarvable) new BlockCarvable().setHardness(2.0F).setResistance(10F).setStepSound(Block.soundTypeStone); - blockMarble.carverHelper.setChiselBlockName("Marble"); - blockMarble.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.marble.0.desc"), 0, "marble"); - blockMarble.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.marble.1.desc"), 1, "marble/a1-stoneornamental-marblebrick"); - blockMarble.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.marble.2.desc"), 2, "marble/a1-stoneornamental-marbleclassicpanel"); - blockMarble.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.marble.3.desc"), 3, "marble/a1-stoneornamental-marbleornate"); - blockMarble.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.marble.4.desc"), 4, "marble/panel"); - blockMarble.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.marble.5.desc"), 5, "marble/block"); - blockMarble.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.marble.6.desc"), 6, "marble/terrain-pistonback-marblecreeperdark"); - blockMarble.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.marble.7.desc"), 7, "marble/terrain-pistonback-marblecreeperlight"); - blockMarble.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.marble.8.desc"), 8, "marble/a1-stoneornamental-marblecarved"); - blockMarble.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.marble.9.desc"), 9, "marble/a1-stoneornamental-marblecarvedradial"); - blockMarble.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.marble.10.desc"), 10, "marble/terrain-pistonback-marbledent"); - blockMarble.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.marble.11.desc"), 11, "marble/terrain-pistonback-marbledent-small"); - blockMarble.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.marble.12.desc"), 12, "marble/marble-bricks"); - blockMarble.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.marble.13.desc"), 13, "marble/marble-arranged-bricks"); - blockMarble.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.marble.14.desc"), 14, "marble/marble-fancy-bricks"); - blockMarble.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.marble.15.desc"), 15, "marble/marble-blocks"); - blockMarble.carverHelper.register(blockMarble, "marble"); - OreDictionary.registerOre("blockMarble", blockMarble); - Carving.chisel.registerOre("marble", "blockMarble"); - - if(Chisel.multipartLoaded) - { - // for(int i = 0; i < 16; i++) - // MicroMaterialRegistry.registerMaterial(new BlockMicroMaterial(blockMarble, i), "blockMarble" + i); - } - - blockMarbleSlab = (BlockMarbleSlab) new BlockMarbleSlab(blockMarble).setHardness(2.0F).setResistance(10F); - blockMarbleSlab.carverHelper.setChiselBlockName("Marble Slab"); - blockMarbleSlab.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.marbleSlab.0.desc"), 0, "marble"); - blockMarbleSlab.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.marbleSlab.1.desc"), 1, "marbleslab/a1-stoneornamental-marblebrick"); - blockMarbleSlab.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.marbleSlab.2.desc"), 2, "marbleslab/a1-stoneornamental-marbleclassicpanel"); - blockMarbleSlab.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.marbleSlab.3.desc"), 3, "marbleslab/a1-stoneornamental-marbleornate"); - blockMarbleSlab.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.marbleSlab.4.desc"), 4, "marbleslab/a1-stoneornamental-marblepanel"); - blockMarbleSlab.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.marbleSlab.5.desc"), 5, "marbleslab/terrain-pistonback-marble"); - blockMarbleSlab.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.marbleSlab.6.desc"), 6, "marbleslab/terrain-pistonback-marblecreeperdark"); - blockMarbleSlab.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.marbleSlab.7.desc"), 7, "marbleslab/terrain-pistonback-marblecreeperlight"); - blockMarbleSlab.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.marbleSlab.8.desc"), 8, "marbleslab/a1-stoneornamental-marblecarved"); - blockMarbleSlab.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.marbleSlab.9.desc"), 9, "marbleslab/a1-stoneornamental-marblecarvedradial"); - blockMarbleSlab.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.marbleSlab.10.desc"), 10, "marbleslab/terrain-pistonback-marbledent"); - blockMarbleSlab.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.marbleSlab.11.desc"), 11, "marbleslab/terrain-pistonback-marbledent-small"); - blockMarbleSlab.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.marbleSlab.12.desc"), 12, "marbleslab/marble-bricks"); - blockMarbleSlab.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.marbleSlab.13.desc"), 13, "marbleslab/marble-arranged-bricks"); - blockMarbleSlab.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.marbleSlab.14.desc"), 14, "marbleslab/marble-fancy-bricks"); - blockMarbleSlab.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.marbleSlab.15.desc"), 15, "marbleslab/marble-blocks"); - blockMarbleSlab.carverHelper.register(blockMarbleSlab, "marble_slab", ItemMarbleSlab.class); - - if(Configurations.featureEnabled("marblePillar")) - { - if(Configurations.oldPillars) - { - blockMarblePillar = (BlockCarvable) new BlockCarvable().setHardness(2.0F).setResistance(10F).setStepSound(Block.soundTypeStone); - blockMarblePillar.carverHelper.setChiselBlockName("Marble Pillar"); - blockMarblePillar.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.marblePillarOld.0.desc"), 0, "marblepillarold/column"); - blockMarblePillar.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.marblePillarOld.1.desc"), 1, "marblepillarold/capstone"); - blockMarblePillar.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.marblePillarOld.2.desc"), 2, "marblepillarold/base"); - blockMarblePillar.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.marblePillarOld.3.desc"), 3, "marblepillarold/small"); - blockMarblePillar.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.marblePillarOld.4.desc"), 4, "marblepillarold/pillar-carved"); - blockMarblePillar.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.marblePillarOld.5.desc"), 5, "marblepillarold/a1-stoneornamental-marblegreek"); - blockMarblePillar.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.marblePillarOld.6.desc"), 6, "marblepillarold/a1-stonepillar-greek"); - blockMarblePillar.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.marblePillarOld.7.desc"), 7, "marblepillarold/a1-stonepillar-plain"); - blockMarblePillar.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.marblePillarOld.8.desc"), 8, "marblepillarold/a1-stonepillar-greektopplain"); - blockMarblePillar.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.marblePillarOld.9.desc"), 9, "marblepillarold/a1-stonepillar-plaintopplain"); - blockMarblePillar.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.marblePillarOld.10.desc"), 10, "marblepillarold/a1-stonepillar-greekbottomplain"); - blockMarblePillar.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.marblePillarOld.11.desc"), 11, "marblepillarold/a1-stonepillar-plainbottomplain"); - blockMarblePillar.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.marblePillarOld.12.desc"), 12, "marblepillarold/a1-stonepillar-greektopgreek"); - blockMarblePillar.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.marblePillarOld.13.desc"), 13, "marblepillarold/a1-stonepillar-plaintopgreek"); - blockMarblePillar.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.marblePillarOld.14.desc"), 14, "marblepillarold/a1-stonepillar-greekbottomgreek"); - blockMarblePillar.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.marblePillarOld.15.desc"), 15, "marblepillarold/a1-stonepillar-plainbottomgreek"); - } else - { - blockMarblePillar = (BlockCarvable) new BlockMarblePillar(Material.rock).setHardness(2.0F).setResistance(10F).setStepSound(Block.soundTypeStone); - blockMarblePillar.carverHelper.setChiselBlockName("Marble Pillar"); - blockMarblePillar.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.marblePillar.0.desc"), 0, "marblepillar/pillar"); - blockMarblePillar.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.marblePillar.1.desc"), 1, "marblepillar/default"); - blockMarblePillar.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.marblePillar.2.desc"), 2, "marblepillar/simple"); - blockMarblePillar.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.marblePillar.3.desc"), 3, "marblepillar/convex"); - blockMarblePillar.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.marblePillar.4.desc"), 4, "marblepillar/rough"); - blockMarblePillar.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.marblePillar.5.desc"), 5, "marblepillar/greekdecor"); - blockMarblePillar.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.marblePillar.6.desc"), 6, "marblepillar/greekgreek"); - blockMarblePillar.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.marblePillar.7.desc"), 7, "marblepillar/greekplain"); - blockMarblePillar.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.marblePillar.8.desc"), 8, "marblepillar/plaindecor"); - blockMarblePillar.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.marblePillar.9.desc"), 9, "marblepillar/plaingreek"); - blockMarblePillar.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.marblePillar.10.desc"), 10, "marblepillar/plainplain"); - blockMarblePillar.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.marblePillar.11.desc"), 11, "marblepillar/widedecor"); - blockMarblePillar.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.marblePillar.12.desc"), 12, "marblepillar/widegreek"); - blockMarblePillar.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.marblePillar.13.desc"), 13, "marblepillar/wideplain"); - blockMarblePillar.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.marblePillar.14.desc"), 14, "marblepillar/carved"); - blockMarblePillar.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.marblePillar.15.desc"), 15, "marblepillar/ornamental"); - } - blockMarblePillar.carverHelper.register(blockMarblePillar, "marble_pillar"); - Carving.chisel.setGroupClass("marble_pillar", "marble"); - - blockMarblePillarSlab = (BlockMarbleSlab) new BlockMarbleSlab(blockMarblePillar).setHardness(2.0F).setResistance(10F).setStepSound(Block.soundTypeStone); - blockMarblePillarSlab.carverHelper.setChiselBlockName("Marble Pillar Slab"); - if(Configurations.oldPillars) - { - blockMarblePillarSlab.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.marblePillarSlabOld.0.desc"), 0, "marblepillarslabold/column"); - blockMarblePillarSlab.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.marblePillarSlabOld.1.desc"), 1, "marblepillarslabold/capstone"); - blockMarblePillarSlab.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.marblePillarSlabOld.2.desc"), 2, "marblepillarslabold/base"); - blockMarblePillarSlab.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.marblePillarSlabOld.3.desc"), 3, "marblepillarslabold/small"); - blockMarblePillarSlab.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.marblePillarSlabOld.4.desc"), 4, "marblepillarslabold/pillar-carved"); - blockMarblePillarSlab.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.marblePillarSlabOld.5.desc"), 5, "marblepillarslabold/a1-stoneornamental-marblegreek"); - blockMarblePillarSlab.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.marblePillarSlabOld.6.desc"), 6, "marblepillarslabold/a1-stonepillar-greek"); - blockMarblePillarSlab.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.marblePillarSlabOld.7.desc"), 7, "marblepillarslabold/a1-stonepillar-plain"); - blockMarblePillarSlab.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.marblePillarSlabOld.8.desc"), 8, "marblepillarslabold/a1-stonepillar-greektopplain"); - blockMarblePillarSlab.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.marblePillarSlabOld.9.desc"), 9, "marblepillarslabold/a1-stonepillar-plaintopplain"); - blockMarblePillarSlab.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.marblePillarSlabOld.10.desc"), 10, "marblepillarslabold/a1-stonepillar-greekbottomplain"); - blockMarblePillarSlab.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.marblePillarSlabOld.11.desc"), 11, "marblepillarslabold/a1-stonepillar-plainbottomplain"); - blockMarblePillarSlab.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.marblePillarSlabOld.12.desc"), 12, "marblepillarslabold/a1-stonepillar-greektopgreek"); - blockMarblePillarSlab.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.marblePillarSlabOld.13.desc"), 13, "marblepillarslabold/a1-stonepillar-plaintopgreek"); - blockMarblePillarSlab.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.marblePillarSlabOld.14.desc"), 14, "marblepillarslabold/a1-stonepillar-greekbottomgreek"); - blockMarblePillarSlab.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.marblePillarSlabOld.15.desc"), 15, "marblepillarslabold/a1-stonepillar-plainbottomgreek"); - } else - { - blockMarblePillarSlab.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.marblePillarSlab.0.desc"), 0, "marblepillarslab/pillar"); - blockMarblePillarSlab.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.marblePillarSlab.1.desc"), 1, "marblepillarslab/default"); - blockMarblePillarSlab.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.marblePillarSlab.2.desc"), 2, "marblepillarslab/simple"); - blockMarblePillarSlab.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.marblePillarSlab.3.desc"), 3, "marblepillarslab/convex"); - blockMarblePillarSlab.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.marblePillarSlab.4.desc"), 4, "marblepillarslab/rough"); - blockMarblePillarSlab.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.marblePillarSlab.5.desc"), 5, "marblepillarslab/greekdecor"); - blockMarblePillarSlab.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.marblePillarSlab.6.desc"), 6, "marblepillarslab/greekgreek"); - blockMarblePillarSlab.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.marblePillarSlab.7.desc"), 7, "marblepillarslab/greekplain"); - blockMarblePillarSlab.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.marblePillarSlab.8.desc"), 8, "marblepillarslab/plaindecor"); - blockMarblePillarSlab.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.marblePillarSlab.9.desc"), 9, "marblepillarslab/plaingreek"); - blockMarblePillarSlab.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.marblePillarSlab.10.desc"), 10, "marblepillarslab/plainplain"); - blockMarblePillarSlab.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.marblePillarSlab.11.desc"), 11, "marblepillarslab/widedecor"); - blockMarblePillarSlab.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.marblePillarSlab.12.desc"), 12, "marblepillarslab/widegreek"); - blockMarblePillarSlab.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.marblePillarSlab.13.desc"), 13, "marblepillarslab/wideplain"); - blockMarblePillarSlab.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.marblePillarSlab.14.desc"), 14, "marblepillarslab/carved"); - blockMarblePillarSlab.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.marblePillarSlab.15.desc"), 15, "marblepillarslab/ornamental"); - } - blockMarblePillarSlab.carverHelper.register(blockMarblePillarSlab, "marble_pillar_slab", ItemMarbleSlab.class); - } - - BlockMarbleStairsMaker makerMarbleStairs = new BlockMarbleStairsMaker(blockMarble); - makerMarbleStairs.carverHelper.setChiselBlockName("Marble Stairs"); - makerMarbleStairs.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.marbleStairs.0.desc"), 0, "marble"); - makerMarbleStairs.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.marbleStairs.6.desc"), 1, "marbleslab/a1-stoneornamental-marblebrick"); - makerMarbleStairs.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.marbleStairs.2.desc"), 2, "marbleslab/a1-stoneornamental-marbleclassicpanel"); - makerMarbleStairs.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.marbleStairs.3.desc"), 3, "marbleslab/a1-stoneornamental-marbleornate"); - makerMarbleStairs.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.marbleStairs.4.desc"), 4, "marbleslab/a1-stoneornamental-marblepanel"); - makerMarbleStairs.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.marbleStairs.5.desc"), 5, "marbleslab/terrain-pistonback-marble"); - makerMarbleStairs.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.marbleStairs.6.desc"), 6, "marbleslab/terrain-pistonback-marblecreeperdark"); - makerMarbleStairs.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.marbleStairs.7.desc"), 7, "marbleslab/terrain-pistonback-marblecreeperlight"); - makerMarbleStairs.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.marbleStairs.8.desc"), 8, "marbleslab/a1-stoneornamental-marblecarved"); - makerMarbleStairs.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.marbleStairs.9.desc"), 9, "marbleslab/a1-stoneornamental-marblecarvedradial"); - makerMarbleStairs.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.marbleStairs.10.desc"), 10, "marbleslab/terrain-pistonback-marbledent"); - makerMarbleStairs.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.marbleStairs.11.desc"), 11, "marbleslab/terrain-pistonback-marbledent-small"); - makerMarbleStairs.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.marbleStairs.12.desc"), 12, "marbleslab/marble-bricks"); - makerMarbleStairs.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.marbleStairs.13.desc"), 13, "marbleslab/marble-arranged-bricks"); - makerMarbleStairs.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.marbleStairs.14.desc"), 14, "marbleslab/marble-fancy-bricks"); - makerMarbleStairs.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.marbleStairs.15.desc"), 15, "marbleslab/marble-blocks"); - makerMarbleStairs.create("marble_stairs"); - } - - if(Configurations.featureEnabled("limestone")) - { - blockLimestone = (BlockCarvable) new BlockCarvable().setHardness(2.0F).setResistance(10F).setStepSound(Block.soundTypeStone); - blockLimestone.carverHelper.setChiselBlockName("Limestone"); - blockLimestone.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.limestone.0.desc"), 0, "limestone"); - blockLimestone.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.limestone.1.desc"), 1, "limestone/terrain-cobbsmalltilelight"); - blockLimestone.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.limestone.2.desc"), 2, "limestone/terrain-cob-frenchlight"); - blockLimestone.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.limestone.3.desc"), 3, "limestone/terrain-cob-french2light"); - blockLimestone.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.limestone.4.desc"), 4, "limestone/terrain-cobmoss-creepdungeonlight"); - blockLimestone.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.limestone.5.desc"), 5, "limestone/terrain-cob-smallbricklight"); - blockLimestone.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.limestone.6.desc"), 6, "limestone/terrain-mossysmalltilelight"); - blockLimestone.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.limestone.7.desc"), 7, "limestone/terrain-pistonback-dungeon"); - blockLimestone.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.limestone.8.desc"), 8, "limestone/terrain-pistonback-dungeonornate"); - blockLimestone.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.limestone.9.desc"), 9, "limestone/terrain-pistonback-dungeonvent"); - blockLimestone.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.limestone.10.desc"), 10, "limestone/terrain-pistonback-lightcreeper"); - blockLimestone.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.limestone.11.desc"), 11, "limestone/terrain-pistonback-lightdent"); - blockLimestone.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.limestone.12.desc"), 12, "limestone/terrain-pistonback-lightemboss"); - blockLimestone.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.limestone.13.desc"), 13, "limestone/terrain-pistonback-lightfour"); - blockLimestone.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.limestone.14.desc"), 14, "limestone/terrain-pistonback-lightmarker"); - blockLimestone.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.limestone.15.desc"), 15, "limestone/terrain-pistonback-lightpanel"); - blockLimestone.carverHelper.register(blockLimestone, "limestone"); - OreDictionary.registerOre("blockLimestone", blockLimestone); - Carving.chisel.registerOre("limestone", "blockLimestone"); - - blockLimestoneSlab = (BlockMarbleSlab) new BlockMarbleSlab(blockLimestone).setHardness(2.0F).setResistance(10F); - blockLimestoneSlab.carverHelper.setChiselBlockName("Limestone Slab"); - blockLimestoneSlab.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.limestoneSlab.0.desc"), 0, "limestone"); - blockLimestoneSlab.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.limestoneSlab.1.desc"), 1, "limestone/terrain-cobbsmalltilelight"); - blockLimestoneSlab.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.limestoneSlab.2.desc"), 2, "limestone/terrain-cob-frenchlight"); - blockLimestoneSlab.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.limestoneSlab.3.desc"), 3, "limestone/terrain-cob-french2light"); - blockLimestoneSlab.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.limestoneSlab.4.desc"), 4, "limestone/terrain-cobmoss-creepdungeonlight"); - blockLimestoneSlab.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.limestoneSlab.5.desc"), 5, "limestone/terrain-cob-smallbricklight"); - blockLimestoneSlab.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.limestoneSlab.6.desc"), 6, "limestone/terrain-mossysmalltilelight"); - blockLimestoneSlab.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.limestoneSlab.7.desc"), 7, "limestone/terrain-pistonback-dungeon"); - blockLimestoneSlab.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.limestoneSlab.8.desc"), 8, "limestone/terrain-pistonback-dungeonornate"); - blockLimestoneSlab.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.limestoneSlab.9.desc"), 9, "limestone/terrain-pistonback-dungeonvent"); - blockLimestoneSlab.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.limestoneSlab.10.desc"), 10, "limestone/terrain-pistonback-lightcreeper"); - blockLimestoneSlab.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.limestoneSlab.11.desc"), 11, "limestone/terrain-pistonback-lightdent"); - blockLimestoneSlab.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.limestoneSlab.12.desc"), 12, "limestone/terrain-pistonback-lightemboss"); - blockLimestoneSlab.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.limestoneSlab.13.desc"), 13, "limestone/terrain-pistonback-lightfour"); - blockLimestoneSlab.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.limestoneSlab.14.desc"), 14, "limestone/terrain-pistonback-lightmarker"); - blockLimestoneSlab.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.limestoneSlab.15.desc"), 15, "limestone/terrain-pistonback-lightpanel"); - blockLimestoneSlab.carverHelper.register(blockLimestoneSlab, "limestone_slab", ItemMarbleSlab.class); - - BlockMarbleStairsMaker makerLimestoneStairs = new BlockMarbleStairsMaker(blockLimestone); - makerLimestoneStairs.carverHelper.setChiselBlockName("Limestone Stairs"); - makerLimestoneStairs.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.limestoneStairs.0.desc"), 0, "limestone"); - makerLimestoneStairs.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.limestoneStairs.1.desc"), 1, "limestone/terrain-cobbsmalltilelight"); - makerLimestoneStairs.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.limestoneStairs.2.desc"), 2, "limestone/terrain-cob-frenchlight"); - makerLimestoneStairs.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.limestoneStairs.3.desc"), 3, "limestone/terrain-cob-french2light"); - makerLimestoneStairs.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.limestoneStairs.4.desc"), 4, "limestone/terrain-cobmoss-creepdungeonlight"); - makerLimestoneStairs.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.limestoneStairs.5.desc"), 5, "limestone/terrain-cob-smallbricklight"); - makerLimestoneStairs.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.limestoneStairs.6.desc"), 6, "limestone/terrain-mossysmalltilelight"); - makerLimestoneStairs.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.limestoneStairs.7.desc"), 7, "limestone/terrain-pistonback-dungeon"); - makerLimestoneStairs.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.limestoneStairs.8.desc"), 8, "limestone/terrain-pistonback-dungeonornate"); - makerLimestoneStairs.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.limestoneStairs.9.desc"), 9, "limestone/terrain-pistonback-dungeonvent"); - makerLimestoneStairs.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.limestoneStairs.10.desc"), 10, "limestone/terrain-pistonback-lightcreeper"); - makerLimestoneStairs.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.limestoneStairs.11.desc"), 11, "limestone/terrain-pistonback-lightdent"); - makerLimestoneStairs.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.limestoneStairs.12.desc"), 12, "limestone/terrain-pistonback-lightemboss"); - makerLimestoneStairs.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.limestoneStairs.13.desc"), 13, "limestone/terrain-pistonback-lightfour"); - makerLimestoneStairs.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.limestoneStairs.14.desc"), 14, "limestone/terrain-pistonback-lightmarker"); - makerLimestoneStairs.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.limestoneStairs.15.desc"), 15, "limestone/terrain-pistonback-lightpanel"); - makerLimestoneStairs.create("limestone_stairs"); - } - - if(Configurations.featureEnabled("cobblestone")) - { - blockCobblestone = (BlockCarvable) new BlockCarvable().setHardness(2.0F).setResistance(10F).setStepSound(Block.soundTypeStone); - Carving.chisel.addVariation("cobblestone", Blocks.cobblestone, 0, 0); - blockCobblestone.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.cobblestone.0.desc"), 1, "cobblestone/terrain-cobb-brickaligned"); - blockCobblestone.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.cobblestone.1.desc"), 2, "cobblestone/terrain-cob-detailedbrick"); - blockCobblestone.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.cobblestone.2.desc"), 3, "cobblestone/terrain-cob-smallbrick"); - blockCobblestone.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.cobblestone.3.desc"), 4, "cobblestone/terrain-cobblargetiledark"); - blockCobblestone.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.cobblestone.4.desc"), 5, "cobblestone/terrain-cobbsmalltile"); - blockCobblestone.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.cobblestone.5.desc"), 6, "cobblestone/terrain-cob-french"); - blockCobblestone.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.cobblestone.6.desc"), 7, "cobblestone/terrain-cob-french2"); - blockCobblestone.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.cobblestone.7.desc"), 8, "cobblestone/terrain-cobmoss-creepdungeon"); - blockCobblestone.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.cobblestone.8.desc"), 9, "cobblestone/terrain-mossysmalltiledark"); - blockCobblestone.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.cobblestone.9.desc"), 10, "cobblestone/terrain-pistonback-dungeontile"); - blockCobblestone.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.cobblestone.10.desc"), 11, "cobblestone/terrain-pistonback-darkcreeper"); - blockCobblestone.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.cobblestone.11.desc"), 12, "cobblestone/terrain-pistonback-darkdent"); - blockCobblestone.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.cobblestone.12.desc"), 13, "cobblestone/terrain-pistonback-darkemboss"); - blockCobblestone.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.cobblestone.13.desc"), 14, "cobblestone/terrain-pistonback-darkmarker"); - blockCobblestone.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.cobblestone.14.desc"), 15, "cobblestone/terrain-pistonback-darkpanel"); - blockCobblestone.carverHelper.register(blockCobblestone, "cobblestone"); - Carving.chisel.registerOre("cobblestone", "cobblestone"); - } - - if(Configurations.featureEnabled("glass")) - { - blockGlass = (BlockCarvableGlass) new BlockCarvableGlass().setHardness(0.3F).setStepSound(Block.soundTypeGlass); - Carving.chisel.addVariation("glass", Blocks.glass, 0, 0); - blockGlass.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.glass.1.desc"), 1, "glass/terrain-glassbubble"); - blockGlass.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.glass.2.desc"), 2, "glass/terrain-glass-chinese"); - blockGlass.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.glass.3.desc"), 3, "glass/japanese"); - blockGlass.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.glass.4.desc"), 4, "glass/terrain-glassdungeon"); - blockGlass.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.glass.5.desc"), 5, "glass/terrain-glasslight"); - blockGlass.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.glass.6.desc"), 6, "glass/terrain-glassnoborder"); - blockGlass.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.glass.7.desc"), 7, "glass/terrain-glass-ornatesteel"); - blockGlass.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.glass.8.desc"), 8, "glass/terrain-glass-screen"); - blockGlass.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.glass.9.desc"), 9, "glass/terrain-glassshale"); - blockGlass.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.glass.10.desc"), 10, "glass/terrain-glass-steelframe"); - blockGlass.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.glass.11.desc"), 11, "glass/terrain-glassstone"); - blockGlass.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.glass.12.desc"), 12, "glass/terrain-glassstreak"); - blockGlass.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.glass.13.desc"), 13, "glass/terrain-glass-thickgrid"); - blockGlass.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.glass.14.desc"), 14, "glass/terrain-glass-thingrid"); - blockGlass.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.glass.15.desc"), 15, "glass/a1-glasswindow-ironfencemodern"); - blockGlass.carverHelper.register(blockGlass, "glass"); - Carving.chisel.registerOre("glass", "blockGlass"); - } - - if(Configurations.featureEnabled("sandstone")) - { - blockSandstone = (BlockCarvable) new BlockCarvable().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); - blockSandstone.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.sandstone.3.desc"), 3, "sandstone/faded"); - blockSandstone.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.sandstone.4.desc"), 4, "sandstone/column"); - blockSandstone.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.sandstone.5.desc"), 5, "sandstone/capstone"); - blockSandstone.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.sandstone.6.desc"), 6, "sandstone/small"); - blockSandstone.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.sandstone.7.desc"), 7, "sandstone/base"); - blockSandstone.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.sandstone.8.desc"), 8, "sandstone/smooth"); - blockSandstone.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.sandstone.9.desc"), 9, "sandstone/smooth-cap"); - blockSandstone.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.sandstone.10.desc"), 10, "sandstone/smooth-small"); - blockSandstone.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.sandstone.11.desc"), 11, "sandstone/smooth-base"); - blockSandstone.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.sandstone.12.desc"), 12, "sandstone/block"); - blockSandstone.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.sandstone.13.desc"), 13, "sandstone/blocks"); - blockSandstone.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.sandstone.14.desc"), 14, "sandstone/mosaic"); - blockSandstone.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.sandstone.15.desc"), 15, "sandstone/horizontal-tiles"); - blockSandstone.carverHelper.register(blockSandstone, "sandstone"); - Carving.chisel.registerOre("sandstone", "blockSandstone"); - - if(Configurations.featureEnabled("snakeSandstone")) - { - blockSandSnakestone = (BlockSnakestone) new BlockSnakestone("Chisel:snakestone/sandsnake/").setBlockName("snakestoneSand"); - GameRegistry.registerBlock(blockSandSnakestone, ItemCarvable.class, "sand_snakestone"); - //TODO- eat me! - //LanguageRegistry.addName(new ItemStack(blockSandSnakestone, 1, 1), "Sandstone snake block head"); - //LanguageRegistry.addName(new ItemStack(blockSandSnakestone, 1, 13), "Sandstone snake block body"); - Carving.chisel.addVariation("sandstone", blockSandSnakestone, 1, 16); - Carving.chisel.addVariation("sandstone", blockSandSnakestone, 13, 17); - } - } - - if(Configurations.featureEnabled("sandstoneScribbles")) - { - blockSandstoneScribbles = (BlockCarvable) new BlockCarvable().setStepSound(Block.soundTypeStone).setHardness(0.8F); - blockSandstoneScribbles.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.sandstoneScribbles.desc"), 0, "sandstone-scribbles/scribbles-0"); - blockSandstoneScribbles.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.sandstoneScribbles.desc"), 1, "sandstone-scribbles/scribbles-1"); - blockSandstoneScribbles.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.sandstoneScribbles.desc"), 2, "sandstone-scribbles/scribbles-2"); - blockSandstoneScribbles.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.sandstoneScribbles.desc"), 3, "sandstone-scribbles/scribbles-3"); - blockSandstoneScribbles.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.sandstoneScribbles.desc"), 4, "sandstone-scribbles/scribbles-4"); - blockSandstoneScribbles.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.sandstoneScribbles.desc"), 5, "sandstone-scribbles/scribbles-5"); - blockSandstoneScribbles.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.sandstoneScribbles.desc"), 6, "sandstone-scribbles/scribbles-6"); - blockSandstoneScribbles.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.sandstoneScribbles.desc"), 7, "sandstone-scribbles/scribbles-7"); - blockSandstoneScribbles.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.sandstoneScribbles.desc"), 8, "sandstone-scribbles/scribbles-8"); - blockSandstoneScribbles.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.sandstoneScribbles.desc"), 9, "sandstone-scribbles/scribbles-9"); - blockSandstoneScribbles.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.sandstoneScribbles.desc"), 10, "sandstone-scribbles/scribbles-10"); - blockSandstoneScribbles.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.sandstoneScribbles.desc"), 11, "sandstone-scribbles/scribbles-11"); - blockSandstoneScribbles.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.sandstoneScribbles.desc"), 12, "sandstone-scribbles/scribbles-12"); - blockSandstoneScribbles.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.sandstoneScribbles.desc"), 13, "sandstone-scribbles/scribbles-13"); - blockSandstoneScribbles.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.sandstoneScribbles.desc"), 14, "sandstone-scribbles/scribbles-14"); - blockSandstoneScribbles.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.sandstoneScribbles.desc"), 15, "sandstone-scribbles/scribbles-15"); - blockSandstoneScribbles.carverHelper.register(blockSandstoneScribbles, "sandstone_scribbles"); - } - - if(Configurations.featureEnabled("concrete")) - { - blockConcrete = (BlockConcrete) new BlockConcrete().setStepSound(Block.soundTypeStone).setHardness(0.5F); - blockConcrete.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.blockConcrete.0.desc"), 0, "concrete/default"); - blockConcrete.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.blockConcrete.1.desc"), 1, "concrete/block"); - blockConcrete.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.blockConcrete.2.desc"), 2, "concrete/doubleslab"); - blockConcrete.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.blockConcrete.3.desc"), 3, "concrete/blocks"); - blockConcrete.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.blockConcrete.4.desc"), 4, "concrete/weathered"); - blockConcrete.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.blockConcrete.5.desc"), 5, "concrete/weathered-block"); - blockConcrete.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.blockConcrete.6.desc"), 6, "concrete/weathered-doubleslab"); - blockConcrete.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.blockConcrete.7.desc"), 7, "concrete/weathered-blocks"); - blockConcrete.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.blockConcrete.8.desc"), 8, "concrete/weathered-half"); - blockConcrete.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.blockConcrete.9.desc"), 9, "concrete/weathered-block-half"); - blockConcrete.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.blockConcrete.10.desc"), 10, "concrete/asphalt"); - blockConcrete.carverHelper.register(blockConcrete, "concrete"); - OreDictionary.registerOre("blockConcrete", blockConcrete); - Carving.chisel.registerOre("concrete", "blockConcrete"); - } - - if(Configurations.featureEnabled("roadLine")) - { - blockRoadLine = (BlockRoadLine) new BlockRoadLine().setStepSound(Block.soundTypeStone).setHardness(0.01F).setBlockName("roadLine"); - GameRegistry.registerBlock(blockRoadLine, ItemCarvable.class, "road_line"); - //TODO- flag - //LanguageRegistry.addName(new ItemStack(blockRoadLine, 1, 0), "Road lines"); - } - - if(Configurations.featureEnabled("ironBlock")) - { - blockIron = (BlockBeaconBase) new BlockBeaconBase().setHardness(5F).setResistance(10F).setStepSound(Block.soundTypeMetal); - Carving.chisel.addVariation("iron_block", Blocks.iron_block, 0, 0); - blockIron.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.iron.1.desc"), 1, "iron/terrain-iron-largeingot"); - blockIron.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.iron.2.desc"), 2, "iron/terrain-iron-smallingot"); - blockIron.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.iron.3.desc"), 3, "iron/terrain-iron-gears"); - blockIron.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.iron.4.desc"), 4, "iron/terrain-iron-brick"); - blockIron.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.iron.5.desc"), 5, "iron/terrain-iron-plates"); - blockIron.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.iron.6.desc"), 6, "iron/terrain-iron-rivets"); - blockIron.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.iron.7.desc"), 7, "iron/terrain-iron-coin-heads"); - blockIron.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.iron.8.desc"), 8, "iron/terrain-iron-coin-tails"); - blockIron.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.iron.9.desc"), 9, "iron/terrain-iron-crate-dark"); - blockIron.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.iron.10.desc"), 10, "iron/terrain-iron-crate-light"); - blockIron.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.iron.11.desc"), 11, "iron/terrain-iron-moon"); - blockIron.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.iron.12.desc"), 12, "iron/terrain-iron-space"); - blockIron.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.iron.13.desc"), 13, "iron/terrain-iron-spaceblack"); - blockIron.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.iron.14.desc"), 14, "iron/terrain-iron-vents"); - blockIron.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.iron.15.desc"), 15, "iron/terrain-iron-simple"); - blockIron.carverHelper.register(blockIron, "iron_block"); - Carving.chisel.registerOre("iron_block", "blockIron"); - } - - if(Configurations.featureEnabled("goldBlock")) - { - blockGold = (BlockBeaconBase) new BlockBeaconBase().setHardness(3F).setResistance(10F).setStepSound(Block.soundTypeMetal); - Carving.chisel.addVariation("gold_block", Blocks.gold_block, 0, 0); - blockGold.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.gold.1.desc"), 1, "gold/terrain-gold-largeingot"); - blockGold.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.gold.2.desc"), 2, "gold/terrain-gold-smallingot"); - blockGold.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.gold.3.desc"), 3, "gold/terrain-gold-brick"); - blockGold.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.gold.4.desc"), 4, "gold/terrain-gold-cart"); - blockGold.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.gold.5.desc"), 5, "gold/terrain-gold-coin-heads"); - blockGold.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.gold.6.desc"), 6, "gold/terrain-gold-coin-tails"); - blockGold.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.gold.7.desc"), 7, "gold/terrain-gold-crate-dark"); - blockGold.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.gold.8.desc"), 8, "gold/terrain-gold-crate-light"); - blockGold.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.gold.9.desc"), 9, "gold/terrain-gold-plates"); - blockGold.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.gold.10.desc"), 10, "gold/terrain-gold-rivets"); - blockGold.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.gold.11.desc"), 11, "gold/terrain-gold-star"); - blockGold.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.gold.12.desc"), 12, "gold/terrain-gold-space"); - blockGold.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.gold.13.desc"), 13, "gold/terrain-gold-spaceblack"); - blockGold.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.gold.14.desc"), 14, "gold/terrain-gold-simple"); - blockGold.carverHelper.register(blockGold, "gold_block"); - Carving.chisel.registerOre("gold_block", "blockGold"); - } - - if(Configurations.featureEnabled("diamondBlock")) - { - blockDiamond = (BlockBeaconBase) new BlockBeaconBase().setHardness(5F).setResistance(10F).setStepSound(Block.soundTypeMetal); - Carving.chisel.addVariation("diamond_block", Blocks.diamond_block, 0, 0); - blockDiamond.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.diamond.1.desc"), 1, "diamond/terrain-diamond-embossed"); - blockDiamond.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.diamond.2.desc"), 2, "diamond/terrain-diamond-gem"); - blockDiamond.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.diamond.3.desc"), 3, "diamond/terrain-diamond-cells"); - blockDiamond.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.diamond.4.desc"), 4, "diamond/terrain-diamond-space"); - blockDiamond.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.diamond.5.desc"), 5, "diamond/terrain-diamond-spaceblack"); - blockDiamond.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.diamond.6.desc"), 6, "diamond/terrain-diamond-simple"); - blockDiamond.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.diamond.7.desc"), 7, "diamond/a1-blockdiamond-bismuth"); - blockDiamond.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.diamond.8.desc"), 8, "diamond/a1-blockdiamond-crushed"); - blockDiamond.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.diamond.9.desc"), 9, "diamond/a1-blockdiamond-four"); - blockDiamond.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.diamond.10.desc"), 10, "diamond/a1-blockdiamond-fourornate"); - blockDiamond.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.diamond.11.desc"), 11, "diamond/a1-blockdiamond-zelda"); - blockDiamond.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.diamond.12.desc"), 12, "diamond/a1-blockdiamond-ornatelayer"); - blockDiamond.carverHelper.register(blockDiamond, "diamond_block"); - Carving.chisel.registerOre("diamond_block", "blockDiamond"); - } - - if(Configurations.featureEnabled("glowstone")) - { - blockLightstone = (BlockLightstoneCarvable) new BlockLightstoneCarvable().setHardness(0.3F).setLightLevel(1.0F).setStepSound(Block.soundTypeGlass); - Carving.chisel.addVariation("glowstone", Blocks.glowstone, 0, 0); - blockLightstone.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.lightstone.1.desc"), 1, "lightstone/terrain-sulphur-cobble"); - blockLightstone.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.lightstone.2.desc"), 2, "lightstone/terrain-sulphur-corroded"); - blockLightstone.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.lightstone.3.desc"), 3, "lightstone/terrain-sulphur-glass"); - blockLightstone.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.lightstone.4.desc"), 4, "lightstone/terrain-sulphur-neon"); - blockLightstone.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.lightstone.5.desc"), 5, "lightstone/terrain-sulphur-ornate"); - blockLightstone.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.lightstone.6.desc"), 6, "lightstone/terrain-sulphur-rocky"); - blockLightstone.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.lightstone.7.desc"), 7, "lightstone/terrain-sulphur-shale"); - blockLightstone.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.lightstone.8.desc"), 8, "lightstone/terrain-sulphur-tile"); - blockLightstone.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.lightstone.9.desc"), 9, "lightstone/terrain-sulphur-weavelanternlight"); - blockLightstone.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.lightstone.10.desc"), 10, "lightstone/a1-glowstone-cobble"); - blockLightstone.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.lightstone.11.desc"), 11, "lightstone/a1-glowstone-growth"); - blockLightstone.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.lightstone.12.desc"), 12, "lightstone/a1-glowstone-layers"); - blockLightstone.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.lightstone.13.desc"), 13, "lightstone/a1-glowstone-tilecorroded"); - blockLightstone.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.lightstone.14.desc"), 14, "lightstone/glowstone-bismuth"); - blockLightstone.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.lightstone.15.desc"), 15, "lightstone/glowstone-bismuth-panel"); - blockLightstone.carverHelper.register(blockLightstone, "glowstone"); - Carving.chisel.registerOre("glowstone", "glowstone"); - } - - if(Configurations.featureEnabled("lapisBlock")) - { - blockLapis = (BlockCarvable) new BlockCarvable().setHardness(3F).setResistance(5F).setStepSound(Block.soundTypeStone); - Carving.chisel.addVariation("lapis_block", Blocks.lapis_block, 0, 0); - blockLapis.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.lapis.1.desc"), 1, "lapis/terrain-lapisblock-chunky"); - blockLapis.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.lapis.2.desc"), 2, "lapis/terrain-lapisblock-panel"); - blockLapis.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.lapis.3.desc"), 3, "lapis/terrain-lapisblock-zelda"); - blockLapis.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.lapis.4.desc"), 4, "lapis/terrain-lapisornate"); - blockLapis.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.lapis.5.desc"), 5, "lapis/terrain-lapistile"); - blockLapis.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.lapis.6.desc"), 6, "lapis/a1-blocklapis-panel"); - blockLapis.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.lapis.7.desc"), 7, "lapis/a1-blocklapis-smooth"); - blockLapis.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.lapis.8.desc"), 8, "lapis/a1-blocklapis-ornatelayer"); - blockLapis.carverHelper.register(blockLapis, "lapis_block"); - Carving.chisel.registerOre("lapis_block", "blockLapis"); - } - - if(Configurations.featureEnabled("emeraldBlock")) - { - blockEmerald = (BlockBeaconBase) new BlockBeaconBase().setHardness(5.0F).setResistance(10.0F).setStepSound(Block.soundTypeMetal); - Carving.chisel.addVariation("emerald_block", Blocks.emerald_block, 0, 0); - blockEmerald.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.emerald.1.desc"), 1, "emerald/a1-blockemerald-emeraldpanel"); - blockEmerald.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.emerald.2.desc"), 2, "emerald/a1-blockemerald-emeraldpanelclassic"); - blockEmerald.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.emerald.3.desc"), 3, "emerald/a1-blockemerald-emeraldsmooth"); - blockEmerald.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.emerald.4.desc"), 4, "emerald/a1-blockemerald-emeraldchunk"); - blockEmerald.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.emerald.5.desc"), 5, "emerald/a1-blockemerald-emeraldornatelayer"); - blockEmerald.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.emerald.6.desc"), 6, "emerald/a1-blockemerald-emeraldzelda"); - blockEmerald.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.emerald.7.desc"), 7, "emerald/a1-blockquartz-cell"); - blockEmerald.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.emerald.8.desc"), 8, "emerald/a1-blockquartz-cellbismuth"); - blockEmerald.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.emerald.9.desc"), 9, "emerald/a1-blockquartz-four"); - blockEmerald.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.emerald.10.desc"), 10, "emerald/a1-blockquartz-fourornate"); - blockEmerald.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.emerald.11.desc"), 11, "emerald/a1-blockquartz-ornate"); - blockEmerald.carverHelper.register(blockEmerald, "emerald_block"); - Carving.chisel.registerOre("emerald_block", "blockEmerald"); - } - - if(Configurations.featureEnabled("netherBrick")) - { - blockNetherBrick = (BlockCarvable) new BlockCarvable().setHardness(2.0F).setResistance(10.0F).setStepSound(Block.soundTypeStone); - Carving.chisel.addVariation("nether_brick", Blocks.nether_brick, 0, 0); - //blockNetherBrick.carverHelper.addVariation("Nether brick", 0, Blocks.nether_brick); - blockNetherBrick.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.netherBrick.1.desc"), 1, "netherbrick/a1-netherbrick-brinstar"); - blockNetherBrick.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.netherBrick.2.desc"), 2, "netherbrick/a1-netherbrick-classicspatter"); - blockNetherBrick.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.netherBrick.3.desc"), 3, "netherbrick/a1-netherbrick-guts"); - blockNetherBrick.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.netherBrick.4.desc"), 4, "netherbrick/a1-netherbrick-gutsdark"); - blockNetherBrick.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.netherBrick.5.desc"), 5, "netherbrick/a1-netherbrick-gutssmall"); - blockNetherBrick.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.netherBrick.6.desc"), 6, "netherbrick/a1-netherbrick-lavabrinstar"); - blockNetherBrick.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.netherBrick.7.desc"), 7, "netherbrick/a1-netherbrick-lavabrown"); - blockNetherBrick.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.netherBrick.8.desc"), 8, "netherbrick/a1-netherbrick-lavaobsidian"); - blockNetherBrick.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.netherBrick.9.desc"), 9, "netherbrick/a1-netherbrick-lavastonedark"); - blockNetherBrick.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.netherBrick.10.desc"), 10, "netherbrick/a1-netherbrick-meat"); - blockNetherBrick.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.netherBrick.11.desc"), 11, "netherbrick/a1-netherbrick-meatred"); - blockNetherBrick.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.netherBrick.12.desc"), 12, "netherbrick/a1-netherbrick-meatredsmall"); - blockNetherBrick.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.netherBrick.13.desc"), 13, "netherbrick/a1-netherbrick-meatsmall"); - blockNetherBrick.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.netherBrick.14.desc"), 14, "netherbrick/a1-netherbrick-red"); - blockNetherBrick.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.netherBrick.15.desc"), 15, "netherbrick/a1-netherbrick-redsmall"); - blockNetherBrick.carverHelper.register(blockNetherBrick, "nether_brick"); - Carving.chisel.registerOre("nether_brick", "nether_brick"); - } - - if(Configurations.featureEnabled("netherRack")) - { - blockNetherrack = (BlockCarvable) new BlockCarvable().setHardness(0.4F).setStepSound(Block.soundTypeStone); - Carving.chisel.addVariation("netherrack", Blocks.netherrack, 0, 0); - blockNetherrack.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.hellrock.1.desc"), 1, "netherrack/a1-netherrack-bloodgravel"); - blockNetherrack.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.hellrock.2.desc"), 2, "netherrack/a1-netherrack-bloodrock"); - blockNetherrack.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.hellrock.3.desc"), 3, "netherrack/a1-netherrack-bloodrockgrey"); - blockNetherrack.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.hellrock.4.desc"), 4, "netherrack/a1-netherrack-brinstar"); - blockNetherrack.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.hellrock.5.desc"), 5, "netherrack/a1-netherrack-brinstarshale"); - blockNetherrack.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.hellrock.6.desc"), 6, "netherrack/a1-netherrack-classic"); - blockNetherrack.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.hellrock.7.desc"), 7, "netherrack/a1-netherrack-classicspatter"); - blockNetherrack.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.hellrock.8.desc"), 8, "netherrack/a1-netherrack-guts"); - blockNetherrack.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.hellrock.9.desc"), 9, "netherrack/a1-netherrack-gutsdark"); - blockNetherrack.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.hellrock.10.desc"), 10, "netherrack/a1-netherrack-meat"); - blockNetherrack.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.hellrock.11.desc"), 11, "netherrack/a1-netherrack-meatred"); - blockNetherrack.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.hellrock.12.desc"), 12, "netherrack/a1-netherrack-meatrock"); - blockNetherrack.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.hellrock.13.desc"), 13, "netherrack/a1-netherrack-red"); - blockNetherrack.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.hellrock.14.desc"), 14, "netherrack/a1-netherrack-wells"); - blockNetherrack.carverHelper.register(blockNetherrack, "netherrack"); - Carving.chisel.registerOre("netherrack", "netherrack"); - } - - if(Configurations.featureEnabled("cobblestoneMossy")) - { - blockCobblestoneMossy = (BlockCarvable) new BlockCarvable().setHardness(2.0F).setResistance(10.0F).setStepSound(Block.soundTypeStone); - Carving.chisel.addVariation("mossy_cobblestone", Blocks.mossy_cobblestone, 0, 0); - blockCobblestoneMossy.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.stoneMoss.1.desc"), 1, "cobblestonemossy/terrain-cobb-brickaligned"); - blockCobblestoneMossy.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.stoneMoss.2.desc"), 2, "cobblestonemossy/terrain-cob-detailedbrick"); - blockCobblestoneMossy.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.stoneMoss.3.desc"), 3, "cobblestonemossy/terrain-cob-smallbrick"); - blockCobblestoneMossy.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.stoneMoss.4.desc"), 4, "cobblestonemossy/terrain-cobblargetiledark"); - blockCobblestoneMossy.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.stoneMoss.5.desc"), 5, "cobblestonemossy/terrain-cobbsmalltile"); - blockCobblestoneMossy.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.stoneMoss.6.desc"), 6, "cobblestonemossy/terrain-cob-french"); - blockCobblestoneMossy.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.stoneMoss.7.desc"), 7, "cobblestonemossy/terrain-cob-french2"); - blockCobblestoneMossy.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.stoneMoss.8.desc"), 8, "cobblestonemossy/terrain-cobmoss-creepdungeon"); - blockCobblestoneMossy.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.stoneMoss.9.desc"), 9, "cobblestonemossy/terrain-mossysmalltiledark"); - blockCobblestoneMossy.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.stoneMoss.10.desc"), 10, "cobblestonemossy/terrain-pistonback-dungeontile"); - blockCobblestoneMossy.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.stoneMoss.11.desc"), 11, "cobblestonemossy/terrain-pistonback-darkcreeper"); - blockCobblestoneMossy.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.stoneMoss.12.desc"), 12, "cobblestonemossy/terrain-pistonback-darkdent"); - blockCobblestoneMossy.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.stoneMoss.13.desc"), 13, "cobblestonemossy/terrain-pistonback-darkemboss"); - blockCobblestoneMossy.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.stoneMoss.14.desc"), 14, "cobblestonemossy/terrain-pistonback-darkmarker"); - blockCobblestoneMossy.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.stoneMoss.15.desc"), 15, "cobblestonemossy/terrain-pistonback-darkpanel"); - blockCobblestoneMossy.carverHelper.register(blockCobblestoneMossy, "mossy_cobblestone"); - Carving.chisel.registerOre("mossy_cobblestone", "mossy_cobblestone"); - } - - if(Configurations.featureEnabled("stoneBrick")) - { - stoneBrick = (BlockCarvable) new BlockCarvable().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("stonebrick", Blocks.stonebrick, i, i); - } else - Carving.chisel.addVariation("stonebrick", Blocks.stonebrick, i, i); - } - stoneBrick.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.stoneBrick.4.desc"), 4, "stonebrick/smallbricks"); - stoneBrick.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.stoneBrick.5.desc"), 5, "stonebrick/largebricks"); - stoneBrick.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.stoneBrick.6.desc"), 6, "stonebrick/smallchaotic"); - stoneBrick.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.stoneBrick.7.desc"), 7, "stonebrick/chaoticbricks"); - stoneBrick.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.stoneBrick.8.desc"), 8, "stonebrick/chaotic"); - stoneBrick.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.stoneBrick.9.desc"), 9, "stonebrick/fancy"); - stoneBrick.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.stoneBrick.10.desc"), 10, "stonebrick/ornate"); - stoneBrick.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.stoneBrick.11.desc"), 11, "stonebrick/largeornate"); - stoneBrick.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.stoneBrick.12.desc"), 12, "stonebrick/panel-hard"); - stoneBrick.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.stoneBrick.13.desc"), 13, "stonebrick/sunken"); - stoneBrick.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.stoneBrick.14.desc"), 14, "stonebrick/ornatepanel"); - stoneBrick.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.stoneBrick.15.desc"), 15, "stonebrick/poison"); - stoneBrick.carverHelper.register(stoneBrick, "stonebrick"); - Carving.chisel.registerOre("stonebrick", "stonebrick"); - } - - if(Configurations.featureEnabled("snakestone")) - { - blockSnakestone = (BlockSnakestone) new BlockSnakestone("Chisel:snakestone/snake/").setBlockName("snakestoneStone"); - GameRegistry.registerBlock(blockSnakestone, ItemCarvable.class, "stone_snakestone"); - //LanguageRegistry.addName(new ItemStack(blockSnakestone, 1, 1), "Stone snake block head"); - //LanguageRegistry.addName(new ItemStack(blockSnakestone, 1, 13), "Stone snake block body"); - Carving.chisel.addVariation("stonebrick", blockSnakestone, 1, 16); - Carving.chisel.addVariation("stonebrick", blockSnakestone, 13, 17); - } - - if(Configurations.featureEnabled("dirt")) - { - blockDirt = (BlockCarvable) new BlockCarvable(Material.ground).setHardness(0.5F).setStepSound(Block.soundTypeGravel).setBlockName("dirt.default"); - Carving.chisel.addVariation("dirt", Blocks.dirt, 0, 0); - blockDirt.carverHelper.setChiselBlockName("Dirt"); - //blockDirt.carverHelper.addVariation("Dirt", 0, Blocks.dirt); - blockDirt.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.blockDirt.0.desc"), 0, "dirt/bricks"); - blockDirt.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.blockDirt.1.desc"), 1, "dirt/netherbricks"); - blockDirt.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.blockDirt.2.desc"), 2, "dirt/bricks3"); - blockDirt.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.blockDirt.3.desc"), 3, "dirt/cobble"); - blockDirt.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.blockDirt.4.desc"), 4, "dirt/reinforced"); - blockDirt.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.blockDirt.5.desc"), 5, "dirt/dirt-reinforced"); - blockDirt.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.blockDirt.6.desc"), 6, "dirt/happy"); - blockDirt.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.blockDirt.7.desc"), 7, "dirt/bricks2"); - blockDirt.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.blockDirt.8.desc"), 8, "dirt/bricks+dirt2"); - blockDirt.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.blockDirt.9.desc"), 9, "dirt/hor"); - blockDirt.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.blockDirt.10.desc"), 10, "dirt/vert"); - blockDirt.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.blockDirt.11.desc"), 11, "dirt/layers"); - blockDirt.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.blockDirt.12.desc"), 12, "dirt/vertical"); - blockDirt.carverHelper.register(blockDirt, "dirt"); - blockDirt.setHarvestLevel("shovel", 0); - OreDictionary.registerOre("blockDirt", blockDirt); - Carving.chisel.registerOre("dirt", "blockDirt"); - } - - if(Configurations.featureEnabled("ice")) - { - blockIce = (BlockMarbleIce) new BlockMarbleIce().setHardness(0.5F).setLightOpacity(3).setStepSound(Block.soundTypeGlass); - Carving.chisel.addVariation("ice", Blocks.ice, 0, 0); - blockIce.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.ice.1.desc"), 1, "ice/a1-ice-light"); - blockIce.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.ice.2.desc"), 2, "ice/a1-stonecobble-icecobble"); - blockIce.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.ice.3.desc"), 3, "ice/a1-netherbrick-ice"); - blockIce.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.ice.4.desc"), 4, "ice/a1-stonecobble-icebrick"); - blockIce.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.ice.5.desc"), 5, "ice/a1-stonecobble-icebricksmall"); - blockIce.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.ice.6.desc"), 6, "ice/a1-stonecobble-icedungeon"); - blockIce.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.ice.7.desc"), 7, "ice/a1-stonecobble-icefour"); - blockIce.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.ice.8.desc"), 8, "ice/a1-stonecobble-icefrench"); - blockIce.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.ice.9.desc"), 9, "ice/sunkentiles"); - blockIce.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.ice.10.desc"), 10, "ice/tiles"); - blockIce.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.ice.11.desc"), 11, "ice/a1-stonecobble-icepanel"); - blockIce.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.ice.12.desc"), 12, "ice/a1-stoneslab-ice"); - blockIce.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.ice.13.desc"), 13, "ice/zelda"); - blockIce.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.ice.14.desc"), 14, "ice/bismuth"); - blockIce.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.ice.15.desc"), 15, "ice/poison"); - blockIce.carverHelper.register(blockIce, "ice"); - Carving.chisel.registerOre("ice", "blockIce"); - - if(Configurations.featureEnabled("icePillar")) - { - blockIcePillar = (BlockMarbleIce) new BlockMarbleIce().setHardness(0.5F).setLightOpacity(3).setStepSound(Block.soundTypeGlass); - blockIcePillar.carverHelper.setChiselBlockName("Ice Pillar"); - blockIcePillar.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.icePillar.0.desc"), 0, "icepillar/column"); - blockIcePillar.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.icePillar.1.desc"), 1, "icepillar/capstone"); - blockIcePillar.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.icePillar.2.desc"), 2, "icepillar/base"); - blockIcePillar.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.icePillar.3.desc"), 3, "icepillar/small"); - blockIcePillar.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.icePillar.4.desc"), 4, "icepillar/pillar-carved"); - blockIcePillar.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.icePillar.5.desc"), 5, "icepillar/a1-stoneornamental-marblegreek"); - blockIcePillar.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.icePillar.6.desc"), 6, "icepillar/a1-stonepillar-greek"); - blockIcePillar.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.icePillar.7.desc"), 7, "icepillar/a1-stonepillar-plain"); - blockIcePillar.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.icePillar.8.desc"), 8, "icepillar/a1-stonepillar-greektopplain"); - blockIcePillar.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.icePillar.9.desc"), 9, "icepillar/a1-stonepillar-plaintopplain"); - blockIcePillar.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.icePillar.10.desc"), 10, "icepillar/a1-stonepillar-greekbottomplain"); - blockIcePillar.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.icePillar.11.desc"), 11, "icepillar/a1-stonepillar-plainbottomplain"); - blockIcePillar.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.icePillar.12.desc"), 12, "icepillar/a1-stonepillar-greektopgreek"); - blockIcePillar.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.icePillar.13.desc"), 13, "icepillar/a1-stonepillar-plaintopgreek"); - blockIcePillar.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.icePillar.14.desc"), 14, "icepillar/a1-stonepillar-greekbottomgreek"); - blockIcePillar.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.icePillar.15.desc"), 15, "icepillar/a1-stonepillar-plainbottomgreek"); - blockIcePillar.carverHelper.register(blockIcePillar, "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("chisel.tile.iceStairs.0.desc"), 0, Blocks.ice); - makerIceStairs.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.iceStairs.1.desc"), 1, "ice/a1-ice-light"); - makerIceStairs.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.iceStairs.2.desc"), 2, "ice/a1-stonecobble-icecobble"); - makerIceStairs.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.iceStairs.3.desc"), 3, "ice/a1-netherbrick-ice"); - makerIceStairs.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.iceStairs.4.desc"), 4, "ice/a1-stonecobble-icebrick"); - makerIceStairs.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.iceStairs.5.desc"), 5, "ice/a1-stonecobble-icebricksmall"); - makerIceStairs.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.iceStairs.6.desc"), 6, "ice/a1-stonecobble-icedungeon"); - makerIceStairs.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.iceStairs.7.desc"), 7, "ice/a1-stonecobble-icefour"); - makerIceStairs.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.iceStairs.8.desc"), 8, "ice/a1-stonecobble-icefrench"); - makerIceStairs.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.iceStairs.9.desc"), 9, "ice/sunkentiles"); - makerIceStairs.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.iceStairs.10.desc"), 10, "ice/tiles"); - makerIceStairs.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.iceStairs.11.desc"), 11, "ice/a1-stonecobble-icepanel"); - makerIceStairs.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.iceStairs.12.desc"), 12, "ice/a1-stoneslab-ice"); - makerIceStairs.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.iceStairs.13.desc"), 13, "ice/zelda"); - makerIceStairs.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.iceStairs.14.desc"), 14, "ice/bismuth"); - makerIceStairs.carverHelper.addVariation(StatCollector.translateToLocal("chisel.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"); - } - } - - 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"; - - blockPlanks[i] = (BlockCarvable) (new BlockCarvable()).setHardness(2.0F).setResistance(5.0F).setStepSound(Block.soundTypeWood); - blockPlanks[i].carverHelper.setChiselBlockName(u + " Wood Planks"); - blockPlanks[i].carverHelper.addVariation("Smooth " + n + " wood planks", 1, "planks-" + n + "/clean"); - blockPlanks[i].carverHelper.addVariation("Short " + n + " wood planks", 2, "planks-" + n + "/short"); - blockPlanks[i].carverHelper.addVariation("Fancy " + n + " wood plank arrangement", 6, "planks-" + n + "/fancy"); - blockPlanks[i].carverHelper.addVariation(u + " wood panel", 8, "planks-" + n + "/panel-nails"); - blockPlanks[i].carverHelper.addVariation(u + " wood double slab", 9, "planks-" + n + "/double"); - blockPlanks[i].carverHelper.addVariation(u + " wood crate", 10, "planks-" + n + "/crate"); - blockPlanks[i].carverHelper.addVariation("Fancy " + n + " wood crate", 11, "planks-" + n + "/crate-fancy"); - blockPlanks[i].carverHelper.addVariation("Large long " + n + " wood planks", 13, "planks-" + n + "/large"); - if(i < 4) - { // TODO: We lack textures for these! - blockPlanks[i].carverHelper.addVariation("Vertical " + n + " wood planks", 3, "planks-" + n + "/vertical"); - blockPlanks[i].carverHelper.addVariation("Vertical uneven " + n + " wood planks", 4, "planks-" + n + "/vertical-uneven"); - blockPlanks[i].carverHelper.addVariation(u + " wood parquet", 5, "planks-" + n + "/parquet"); - blockPlanks[i].carverHelper.addVariation(u + " wood plank blinds", 7, "planks-" + n + "/blinds"); - blockPlanks[i].carverHelper.addVariation(u + " wood scaffold", 12, "planks-" + n + "/crateex"); - blockPlanks[i].carverHelper.addVariation(u + " wood planks in disarray", 14, "planks-" + n + "/chaotic-hor"); - blockPlanks[i].carverHelper.addVariation("Vertical " + n + " wood planks in disarray", 15, "planks-" + n + "/chaotic"); - } - blockPlanks[i].carverHelper.register(blockPlanks[i], orename); - Carving.chisel.addVariation(orename, Blocks.planks, i, 0); - Blocks.planks.setHarvestLevel("chisel", 0, i); - blockPlanks[i].setHarvestLevel("axe", 0); - - Carving.chisel.setVariationSound(orename, Chisel.MOD_ID+":chisel.wood"); - } - } - - if(Configurations.featureEnabled("obsidian")) - { - blockObsidian = (BlockCarvable) new BlockCarvable().setHardness(50.0F).setResistance(2000.0F).setStepSound(Block.soundTypeStone); - Carving.chisel.addVariation("obsidian", Blocks.obsidian, 0, 0); - blockObsidian.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.obsidian.1.desc"), 1, "obsidian/pillar"); - blockObsidian.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.obsidian.2.desc"), 2, "obsidian/pillar-quartz"); - blockObsidian.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.obsidian.3.desc"), 3, "obsidian/chiseled"); - blockObsidian.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.obsidian.4.desc"), 4, "obsidian/panel-shiny"); - blockObsidian.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.obsidian.5.desc"), 5, "obsidian/panel"); - blockObsidian.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.obsidian.6.desc"), 6, "obsidian/chunks"); - blockObsidian.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.obsidian.7.desc"), 7, "obsidian/growth"); - blockObsidian.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.obsidian.8.desc"), 8, "obsidian/crystal"); - blockObsidian.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.obsidian.9.desc"), 9, "obsidian/map-a"); - blockObsidian.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.obsidian.10.desc"), 10, "obsidian/map-b"); - blockObsidian.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.obsidian.11.desc"), 11, "obsidian/panel-light"); - blockObsidian.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.obsidian.12.desc"), 12, "obsidian/blocks"); - blockObsidian.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.obsidian.13.desc"), 13, "obsidian/tiles"); - blockObsidian.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.obsidian.14.desc"), 14, "obsidian/greek"); - blockObsidian.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.obsidian.15.desc"), 15, "obsidian/crate"); - blockObsidian.carverHelper.register(blockObsidian, "obsidian"); - Carving.chisel.registerOre("obsidian", "obsidian"); - } - - if(Configurations.featureEnabled("snakestoneObsidian")) - { - blockObsidianSnakestone = (BlockSnakestoneObsidian) new BlockSnakestoneObsidian("Chisel:snakestone/obsidian/").setBlockName("obsidianSnakestone").setHardness(50.0F).setResistance(2000.0F); - GameRegistry.registerBlock(blockObsidianSnakestone, ItemCarvable.class, "obsidian_snakestone"); - //LanguageRegistry.addName(new ItemStack(blockObsidianSnakestone, 1, 1), "Obsidian snakestone head"); - //LanguageRegistry.addName(new ItemStack(blockObsidianSnakestone, 1, 13), "Obsidian snakestone body"); - Carving.chisel.addVariation("obsidian", blockObsidianSnakestone, 1, 16); - Carving.chisel.addVariation("obsidian", blockObsidianSnakestone, 13, 17); - } - - if(Configurations.featureEnabled("ironBars")) - { - blockPaneIron = (BlockCarvablePane) new BlockCarvablePane(Material.iron, true).setHardness(0.3F).setStepSound(Block.soundTypeMetal); - Carving.chisel.addVariation("iron_bars", Blocks.iron_bars, 0, 0); - blockPaneIron.carverHelper.addVariation("Iron bars without frame", 1, "ironpane/fenceIron"); - blockPaneIron.carverHelper.addVariation("Menacing iron bars", 2, "ironpane/barbedwire"); - blockPaneIron.carverHelper.addVariation("Iron cage bars", 3, "ironpane/cage"); - blockPaneIron.carverHelper.addVariation("Menacing iron spikes", 4, "ironpane/fenceIronTop"); - blockPaneIron.carverHelper.addVariation("Thick iron grid", 5, "ironpane/terrain-glass-thickgrid"); - blockPaneIron.carverHelper.addVariation("Thin iron grid", 6, "ironpane/terrain-glass-thingrid"); - blockPaneIron.carverHelper.addVariation("Ornate iron pane fence", 7, "ironpane/terrain-glass-ornatesteel"); - blockPaneIron.carverHelper.addVariation("Vertical iron bars", 8, "ironpane/bars"); - blockPaneIron.carverHelper.addVariation("Iron spikes", 9, "ironpane/spikes"); - blockPaneIron.carverHelper.register(blockPaneIron, "iron_bars"); - } - - if(Configurations.featureEnabled("glassPane")) - { - blockPaneGlass = (BlockCarvablePane) new BlockCarvablePane(Material.glass, false).setHardness(0.3F).setStepSound(Block.soundTypeGlass); - Carving.chisel.addVariation("glass_pane", Blocks.glass_pane, 0, 0); - blockPaneGlass.carverHelper.addVariation("Bubble glass pane", 1, "glasspane/terrain-glassbubble"); - blockPaneGlass.carverHelper.addVariation("Borderless glass pane", 2, "glasspane/terrain-glassnoborder"); - blockPaneGlass.carverHelper.addVariation("Screen pane", 3, "glasspane/terrain-glass-screen"); - blockPaneGlass.carverHelper.addVariation("Streak glass pane", 4, "glasspane/terrain-glassstreak"); - blockPaneGlass.carverHelper.addVariation("Chinese glass pane", 12, "glasspane/chinese"); - blockPaneGlass.carverHelper.addVariation("Chinese glass pane with golden frame", 13, "glasspane/chinese2"); - blockPaneGlass.carverHelper.addVariation("Japanese glass pane", 14, "glasspane/japanese"); - blockPaneGlass.carverHelper.addVariation("Ornate japanese glass pane", 15, "glasspane/japanese2"); - blockPaneGlass.carverHelper.register(blockPaneGlass, "glass_pane"); - } - - if(Configurations.featureEnabled("redstoneBlock")) - { - blockRedstone = (BlockCarvablePowered) (new BlockCarvablePowered(Material.iron)).setHardness(5.0F).setResistance(10.0F).setStepSound(Block.soundTypeMetal); - Carving.chisel.addVariation("redstone_block", Blocks.redstone_block, 0, 0); - blockRedstone.carverHelper.addVariation("Smooth redstone", 1, "redstone/smooth"); - blockRedstone.carverHelper.addVariation("Large redstone block", 2, "redstone/block"); - blockRedstone.carverHelper.addVariation("Small redstone blocks", 3, "redstone/blocks"); - blockRedstone.carverHelper.addVariation("Redstone bricks", 4, "redstone/bricks"); - blockRedstone.carverHelper.addVariation("Small redstone bricks", 5, "redstone/smallbricks"); - blockRedstone.carverHelper.addVariation("Chaotic redstone bricks", 6, "redstone/smallchaotic"); - blockRedstone.carverHelper.addVariation("Chiseled redstone", 7, "redstone/chiseled"); - blockRedstone.carverHelper.addVariation("Redstone Greek decoration", 8, "redstone/ere"); - blockRedstone.carverHelper.addVariation("Ornate redstone tiles", 9, "redstone/ornate-tiles"); - blockRedstone.carverHelper.addVariation("Redstone pillar", 10, "redstone/pillar"); - blockRedstone.carverHelper.addVariation("Redstone tiles", 11, "redstone/tiles"); - blockRedstone.carverHelper.addVariation("Redstone circuit", 12, "redstone/circuit"); - blockRedstone.carverHelper.addVariation("Redstone supaplex circuit", 13, "redstone/supaplex"); - blockRedstone.carverHelper.addVariation("Redstone skulls", 14, "redstone/a1-blockredstone-skullred"); - blockRedstone.carverHelper.addVariation("Redstone Zelda block", 15, "redstone/a1-blockredstone-redstonezelda"); - blockRedstone.carverHelper.register(blockRedstone, "redstone_block"); - Carving.chisel.registerOre("redstone_block", "blockRedstone"); - } - - if(Configurations.featureEnabled("holystone")) - { - blockHolystone = (BlockHolystone) new BlockHolystone(Material.rock).setHardness(2.0F).setResistance(10F).setStepSound(Chisel.soundHolystoneFootstep); - blockHolystone.carverHelper.addVariation("Holystone", 0, "holystone/holystone"); - blockHolystone.carverHelper.addVariation("Smooth holystone", 1, "holystone/smooth"); - blockHolystone.carverHelper.addVariation("Mysterious holystone symbol", 2, "holystone/love"); - blockHolystone.carverHelper.addVariation("Chiseled holystone", 3, "holystone/chiseled"); - blockHolystone.carverHelper.addVariation("Holystone blocks", 4, "holystone/blocks"); - blockHolystone.carverHelper.addVariation("Rough holystone blocks", 5, "holystone/blocks-rough"); - blockHolystone.carverHelper.addVariation("Holystone bricks", 6, "holystone/brick"); - blockHolystone.carverHelper.addVariation("Large holystone bricks", 7, "holystone/largebricks"); - blockHolystone.carverHelper.addVariation("Holystone platform", 8, "holystone/platform"); - blockHolystone.carverHelper.addVariation("Holystone platform tiles", 9, "holystone/platform-tiles"); - blockHolystone.carverHelper.addVariation("Fancy holystone construction", 10, "holystone/construction"); - blockHolystone.carverHelper.addVariation("Fancy holystone tiles", 11, "holystone/fancy-tiles"); - blockHolystone.carverHelper.addVariation("Smooth holystone plate", 12, "holystone/plate"); - blockHolystone.carverHelper.addVariation("Holystone plate", 13, "holystone/plate-rough"); - blockHolystone.carverHelper.register(blockHolystone, "holystone"); - OreDictionary.registerOre("blockHolystone", blockHolystone); - Carving.chisel.registerOre("holystone", "blockHolystone"); - } - - if(Configurations.featureEnabled("lavastone")) - { - blockLavastone = (BlockLavastone) new BlockLavastone(Material.rock, "lava_flow").setHardness(2.0F).setResistance(10F); - blockLavastone.carverHelper.addVariation("Lavastone", 0, "lavastone/cobble"); - blockLavastone.carverHelper.addVariation("Black lavastone", 1, "lavastone/black"); - blockLavastone.carverHelper.addVariation("Lavastone tiles", 2, "lavastone/tiles"); - blockLavastone.carverHelper.addVariation("Chaotic lavastone bricks", 3, "lavastone/chaotic"); - blockLavastone.carverHelper.addVariation("Lava creeper in tiles", 4, "lavastone/creeper"); - blockLavastone.carverHelper.addVariation("Lava panel", 5, "lavastone/panel"); - blockLavastone.carverHelper.addVariation("Ornate lava panel", 6, "lavastone/panel-ornate"); - blockLavastone.carverHelper.register(blockLavastone, "lavastone"); - OreDictionary.registerOre("blockLavastone", blockLavastone); - Carving.chisel.registerOre("lavastone", "blockLavastone"); - } - - if(Configurations.featureEnabled("fantasy")) - { - blockFft = (BlockCarvable) new BlockCarvable(Material.rock).setHardness(2.0F).setResistance(10F); - blockFft.carverHelper.setChiselBlockName("Fantasy Block"); - blockFft.carverHelper.addVariation("Fantasy brick", 0, "fft/brick"); - blockFft.carverHelper.addVariation("Faded fantasy brick", 1, "fft/brick-faded"); - blockFft.carverHelper.addVariation("Weared fantasy brick", 2, "fft/brick-wear"); - blockFft.carverHelper.addVariation("Damaged fantasy bricks", 3, "fft/bricks"); - blockFft.carverHelper.addVariation("Fantasy decoration", 4, "fft/decor"); - blockFft.carverHelper.addVariation("Fantasy decoration block", 5, "fft/decor-block"); - blockFft.carverHelper.addVariation("Fantasy pillar", 6, "fft/pillar"); - blockFft.carverHelper.addVariation("Fantasy pillar decoration", 7, "fft/pillar-decorated"); - blockFft.carverHelper.addVariation("Fantasy gold snake decoration", 8, "fft/gold-decor-1"); - blockFft.carverHelper.addVariation("Fantasy gold noise decoration", 9, "fft/gold-decor-2"); - blockFft.carverHelper.addVariation("Fantasy gold engravings decoration", 10, "fft/gold-decor-3"); - blockFft.carverHelper.addVariation("Fantasy gold chains decoration", 11, "fft/gold-decor-4"); - blockFft.carverHelper.addVariation("Fantasy plate decoration", 12, "fft/plate"); - blockFft.carverHelper.addVariation("Fantasy block", 13, "fft/block"); - blockFft.carverHelper.addVariation("Fantasy bricks in disarray", 14, "fft/bricks-chaotic"); - blockFft.carverHelper.addVariation("Weared fantasy bricks", 15, "fft/bricks-wear"); - blockFft.carverHelper.register(blockFft, "fantasyblock"); - OreDictionary.registerOre("blockFft", blockFft); - Carving.chisel.registerOre("fantasyblock", "blockFft"); - } - - if(Configurations.featureEnabled("carpet")) - { - blockCarpet = (BlockCarvable) new BlockCarvable(Material.cloth).setHardness(2.0F).setResistance(10F).setStepSound(Block.soundTypeCloth); - blockCarpet.carverHelper.setChiselBlockName("Carpet Block"); - blockCarpet.carverHelper.addVariation("White carpet block", 0, "carpet/white"); - blockCarpet.carverHelper.addVariation("Orange carpet block", 1, "carpet/orange"); - blockCarpet.carverHelper.addVariation("Magenta carpet block", 2, "carpet/lily"); - blockCarpet.carverHelper.addVariation("Light blue carpet block", 3, "carpet/lightblue"); - blockCarpet.carverHelper.addVariation("Yellow carpet block", 4, "carpet/yellow"); - blockCarpet.carverHelper.addVariation("Light green carpet block", 5, "carpet/lightgreen"); - blockCarpet.carverHelper.addVariation("Pink carpet block", 6, "carpet/pink"); - blockCarpet.carverHelper.addVariation("Dark grey carpet block", 7, "carpet/darkgrey"); - blockCarpet.carverHelper.addVariation("Grey carpet block", 8, "carpet/grey"); - blockCarpet.carverHelper.addVariation("Teal carpet block", 9, "carpet/teal"); - blockCarpet.carverHelper.addVariation("Purple carpet block", 10, "carpet/purple"); - blockCarpet.carverHelper.addVariation("Dark blue carpet block", 11, "carpet/darkblue"); - blockCarpet.carverHelper.addVariation("Brown carpet block", 12, "carpet/brown"); - blockCarpet.carverHelper.addVariation("Green carpet block", 13, "carpet/green"); - blockCarpet.carverHelper.addVariation("Red carpet block", 14, "carpet/red"); - blockCarpet.carverHelper.addVariation("Black carpet block", 15, "carpet/black"); - blockCarpet.carverHelper.forbidChiseling = true; - blockCarpet.carverHelper.register(blockCarpet, "carpet_block"); - OreDictionary.registerOre("blockCarpet", blockCarpet); - Carving.chisel.registerOre("carpet_block", "blockCarpet"); - } - - if(Configurations.featureEnabled("carpetFloor")) - { - blockCarpetFloor = (BlockMarbleCarpet) new BlockMarbleCarpet(Material.cloth).setHardness(2.0F).setResistance(10F).setStepSound(Block.soundTypeCloth); - blockCarpetFloor.carverHelper.setChiselBlockName("Carpet"); - blockCarpetFloor.carverHelper.addVariation("White carpet", 0, "carpet/white"); - blockCarpetFloor.carverHelper.addVariation("Orange carpet", 1, "carpet/orange"); - blockCarpetFloor.carverHelper.addVariation("Magenta carpet", 2, "carpet/lily"); - blockCarpetFloor.carverHelper.addVariation("Light blue carpet", 3, "carpet/lightblue"); - blockCarpetFloor.carverHelper.addVariation("Yellow carpet", 4, "carpet/yellow"); - blockCarpetFloor.carverHelper.addVariation("Light green carpet", 5, "carpet/lightgreen"); - blockCarpetFloor.carverHelper.addVariation("Pink carpet", 6, "carpet/pink"); - blockCarpetFloor.carverHelper.addVariation("Dark grey carpet", 7, "carpet/darkgrey"); - blockCarpetFloor.carverHelper.addVariation("Grey carpet", 8, "carpet/grey"); - blockCarpetFloor.carverHelper.addVariation("Teal carpet", 9, "carpet/teal"); - blockCarpetFloor.carverHelper.addVariation("Purple carpet", 10, "carpet/purple"); - blockCarpetFloor.carverHelper.addVariation("Dark blue carpet", 11, "carpet/darkblue"); - blockCarpetFloor.carverHelper.addVariation("Brown carpet", 12, "carpet/brown"); - blockCarpetFloor.carverHelper.addVariation("Green carpet", 13, "carpet/green"); - blockCarpetFloor.carverHelper.addVariation("Red carpet", 14, "carpet/red"); - blockCarpetFloor.carverHelper.addVariation("Black carpet", 15, "carpet/black"); - blockCarpetFloor.carverHelper.forbidChiseling = true; - blockCarpetFloor.carverHelper.register(blockCarpetFloor, "carpet"); - - for(int i = 0; i < 16; i++) - { - String group = "carpet." + i; - - Carving.needle.addVariation(group, Blocks.carpet, i, 0); - Carving.needle.addVariation(group, blockCarpetFloor, i, 2); - Carving.needle.addVariation(group, blockCarpet, i, 1); - } - } - - if(Configurations.featureEnabled("bookshelf")) - { - blockBookshelf = (BlockCarvable) new BlockMarbleBookshelf().setHardness(1.5F).setStepSound(Block.soundTypeWood); - Carving.chisel.addVariation("bookshelf", Blocks.bookshelf, 0, 0); - blockBookshelf.carverHelper.addVariation("Bookshelf with rainbow colored books", 1, "bookshelf/rainbow"); - blockBookshelf.carverHelper.addVariation("Necromancer novice's bookshelf", 2, "bookshelf/necromancer-novice"); - blockBookshelf.carverHelper.addVariation("Necromancer's bookshelf", 3, "bookshelf/necromancer"); - blockBookshelf.carverHelper.addVariation("Bookshelf with red tomes", 4, "bookshelf/redtomes"); - blockBookshelf.carverHelper.addVariation("Abandoned bookshelf", 5, "bookshelf/abandoned"); - blockBookshelf.carverHelper.addVariation("Hoarder's bookshelf", 6, "bookshelf/hoarder"); - blockBookshelf.carverHelper.addVariation("Bookshelf filled to brim with boring pastel books", 7, "bookshelf/brim"); - blockBookshelf.carverHelper.addVariation("Historician's bookshelf", 8, "bookshelf/historician"); - blockBookshelf.carverHelper.register(blockBookshelf, "bookshelf"); - blockBookshelf.setHarvestLevel("axe", 0); - Carving.chisel.registerOre("bookshelf", "bookshelf"); - } - - if(Configurations.featureEnabled("futuristicArmorPlating")) - { - blockTyrian = (BlockCarvable) new BlockCarvable(Material.iron).setHardness(5.0F).setResistance(10.0F).setStepSound(Block.soundTypeMetal); - blockTyrian.carverHelper.setChiselBlockName("Futuristic Armor Plating Block"); - blockTyrian.carverHelper.addVariation("Futuristic armor plating block", 0, "tyrian/shining"); - blockTyrian.carverHelper.addVariation("Bleak futuristic armor plating block", 1, "tyrian/tyrian"); - blockTyrian.carverHelper.addVariation("Purple futuristic armor plating block", 2, "tyrian/chaotic"); - blockTyrian.carverHelper.addVariation("Faded purple futuristic armor plating block", 3, "tyrian/softplate"); - blockTyrian.carverHelper.addVariation("Rusted futuristic armor plating block", 4, "tyrian/rust"); - blockTyrian.carverHelper.addVariation("Elaborate futuristic armor plating block", 5, "tyrian/elaborate"); - blockTyrian.carverHelper.addVariation("Futuristic armor plating block with many seams", 6, "tyrian/routes"); - blockTyrian.carverHelper.addVariation("Futuristic platform block", 7, "tyrian/platform"); - blockTyrian.carverHelper.addVariation("Futuristic armor plating tiles", 8, "tyrian/platetiles"); - blockTyrian.carverHelper.addVariation("Diagonal futuristic armor plating block", 9, "tyrian/diagonal"); - blockTyrian.carverHelper.addVariation("Futuristic armor plating block with dent", 10, "tyrian/dent"); - blockTyrian.carverHelper.addVariation("Blue futuristic armor plating block", 11, "tyrian/blueplating"); - blockTyrian.carverHelper.addVariation("Black futuristic armor plating block", 12, "tyrian/black"); - blockTyrian.carverHelper.addVariation("Black futuristic armor plating tiles", 13, "tyrian/black2"); - blockTyrian.carverHelper.addVariation("Black futuristic armor plating block with an opening", 14, "tyrian/opening"); - blockTyrian.carverHelper.addVariation("Futuristic armor plating with shining metal bits", 15, "tyrian/plate"); - blockTyrian.carverHelper.register(blockTyrian, "tyrian"); - OreDictionary.registerOre("blockTyrian", blockTyrian); - Carving.chisel.registerOre("tyrian", "blockTyrian"); - } - - - if(Configurations.featureEnabled("templeBlock")) - { - blockTemple = (BlockCarvable) new BlockEldritch().setHardness(2.0F).setResistance(10F).setStepSound(Chisel.soundTempleFootstep); - blockTemple.carverHelper.setChiselBlockName("Temple Block"); - blockTemple.carverHelper.addVariation("Temple cobblestone", 0, "temple/cobble"); - blockTemple.carverHelper.addVariation("Orante temple block", 1, "temple/ornate"); - blockTemple.carverHelper.addVariation("Temple plate", 2, "temple/plate"); - blockTemple.carverHelper.addVariation("Cracked temple plate", 3, "temple/plate-cracked"); - blockTemple.carverHelper.addVariation("Temple bricks", 4, "temple/bricks"); - blockTemple.carverHelper.addVariation("Large temple bricks", 5, "temple/bricks-large"); - blockTemple.carverHelper.addVariation("Weared temple bricks", 6, "temple/bricks-weared"); - blockTemple.carverHelper.addVariation("Temple bricks in disarray", 7, "temple/bricks-disarray"); - blockTemple.carverHelper.addVariation("Temple column", 8, "temple/column"); - blockTemple.carverHelper.addVariation("Temple stand", 9, "temple/stand"); - blockTemple.carverHelper.addVariation("Temple mosaic stand", 10, "temple/stand-mosaic"); - blockTemple.carverHelper.addVariation("Temple creeper stand", 11, "temple/stand-creeper"); - blockTemple.carverHelper.addVariation("Temple tiles", 12, "temple/tiles"); - blockTemple.carverHelper.addVariation("Small temple tiles", 13, "temple/smalltiles"); - blockTemple.carverHelper.addVariation("Light temple tiles", 14, "temple/tiles-light"); - blockTemple.carverHelper.addVariation("Small light temple tiles", 15, "temple/smalltiles-light"); - blockTemple.carverHelper.register(blockTemple, "templeblock"); - - if(Configurations.featureEnabled("templeBlockMossy")) - { - blockTempleMossy = (BlockCarvable) new BlockEldritch().setHardness(2.0F).setResistance(10F).setStepSound(Chisel.soundTempleFootstep); - blockTempleMossy.carverHelper.setChiselBlockName("Mossy Temple Block"); - blockTempleMossy.carverHelper.addVariation("Mossy temple cobblestone", 0, "templemossy/cobble"); - blockTempleMossy.carverHelper.addVariation("Orante mossy temple block", 1, "templemossy/ornate"); - blockTempleMossy.carverHelper.addVariation("Mossy temple plate", 2, "templemossy/plate"); - blockTempleMossy.carverHelper.addVariation("Cracked mossy temple plate", 3, "templemossy/plate-cracked"); - blockTempleMossy.carverHelper.addVariation("Mossy temple bricks", 4, "templemossy/bricks"); - blockTempleMossy.carverHelper.addVariation("Large mossy temple bricks", 5, "templemossy/bricks-large"); - blockTempleMossy.carverHelper.addVariation("Weared mossy temple bricks", 6, "templemossy/bricks-weared"); - blockTempleMossy.carverHelper.addVariation("Mossy temple bricks in disarray", 7, "templemossy/bricks-disarray"); - blockTempleMossy.carverHelper.addVariation("Mossy temple column", 8, "templemossy/column"); - blockTempleMossy.carverHelper.addVariation("Mossy temple stand", 9, "templemossy/stand"); - blockTempleMossy.carverHelper.addVariation("Mossy temple mosaic stand", 10, "templemossy/stand-mosaic"); - blockTempleMossy.carverHelper.addVariation("Mossy temple creeper stand", 11, "templemossy/stand-creeper"); - blockTempleMossy.carverHelper.addVariation("Mossy temple tiles", 12, "templemossy/tiles"); - blockTempleMossy.carverHelper.addVariation("Small mossy temple tiles", 13, "templemossy/smalltiles"); - blockTempleMossy.carverHelper.addVariation("Light mossy temple tiles", 14, "templemossy/tiles-light"); - blockTempleMossy.carverHelper.addVariation("Small light mossy temple tiles", 15, "templemossy/smalltiles-light"); - blockTempleMossy.carverHelper.register(blockTempleMossy, "mossy_templeblock"); - } - } - - if(Configurations.featureEnabled("cloud")) - { - blockCloud = (BlockCloud) new BlockCloud().setHardness(0.2F).setLightOpacity(3).setStepSound(Block.soundTypeCloth); - blockCloud.carverHelper.addVariation("Cloud block", 0, "cloud/cloud"); - blockCloud.carverHelper.register(blockCloud, "cloud"); - OreDictionary.registerOre("cloud", blockCloud); - Carving.chisel.registerOre("cloud", "cloud"); - } - - if(Configurations.featureEnabled("factory")) - { - blockFactory = (BlockCarvable) new BlockCarvable().setHardness(2.0F).setResistance(10F).setStepSound(Chisel.soundMetalFootstep); - blockFactory.carverHelper.setChiselBlockName("factoryblock"); - blockFactory.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.blockFactory.0.desc"), 0, "factory/dots"); - blockFactory.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.blockFactory.1.desc"), 1, "factory/rust2"); - blockFactory.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.blockFactory.2.desc"), 2, "factory/rust"); - blockFactory.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.blockFactory.3.desc"), 3, "factory/platex"); - blockFactory.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.blockFactory.4.desc"), 4, "factory/wireframewhite"); - blockFactory.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.blockFactory.5.desc"), 5, "factory/wireframe"); - blockFactory.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.blockFactory.6.desc"), 6, "factory/hazard"); - blockFactory.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.blockFactory.7.desc"), 7, "factory/hazardorange"); - blockFactory.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.blockFactory.8.desc"), 8, "factory/circuit"); - blockFactory.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.blockFactory.9.desc"), 9, "factory/metalbox"); - blockFactory.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.blockFactory.10.desc"), 10, "factory/goldplate"); - blockFactory.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.blockFactory.11.desc"), 11, "factory/goldplating"); - blockFactory.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.blockFactory.12.desc"), 12, "factory/grinder"); - blockFactory.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.blockFactory.13.desc"), 13, "factory/plating"); - blockFactory.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.blockFactory.14.desc"), 14, "factory/rustplates"); - blockFactory.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.blockFactory.15.desc"), 15, "factory/column"); - blockFactory.carverHelper.register(blockFactory, "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) - { - blockStainedGlass[glassId] = (BlockCarvableGlass) new BlockCarvableGlass().setStained(true).setHardness(0.3F).setStepSound(Block.soundTypeGlass).setBlockName("Stained Glass"); - blockStainedGlass[glassId].carverHelper.registerBlock(blockStainedGlass[glassId], blockName); - //blockStainedGlass[glassId].carverHelper.blockName = "Stained Glass"; - } - blockStainedGlass[glassId].carverHelper.addVariation(sGNames[i] + " bubble glass", glassPrefix, texName + "bubble"); - blockStainedGlass[glassId].carverHelper.addVariation(sGNames[i] + " glass panel", glassPrefix + 1, texName + "panel"); - blockStainedGlass[glassId].carverHelper.addVariation(sGNames[i] + " fancy glass panel", glassPrefix + 2, texName + "panel-fancy"); - blockStainedGlass[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 : blockStainedGlass[glassId].carverHelper.variations) - { - if(cv.metadata < glassPrefix || cv.metadata >= glassPrefix + 4) - continue; - blockStainedGlass[glassId].carverHelper.registerVariation(blockName, cv, blockStainedGlass[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) - { - blockStainedGlassPane[glassId] = (BlockCarvablePane) new BlockCarvablePane(Material.glass, false).setStained(true).setHardness(0.3F).setStepSound(Block.soundTypeGlass).setBlockName("Stained Glass Pane"); - blockStainedGlassPane[glassId].carverHelper.registerBlock(blockStainedGlassPane[glassId], blockName); - blockStainedGlassPane[glassId].carverHelper.blockName = "Stained Glass Pane"; - } - blockStainedGlassPane[glassId].carverHelper.addVariation(sGNames[i] + " bubble glass", glassPrefix, texName + "bubble"); - blockStainedGlassPane[glassId].carverHelper.addVariation(sGNames[i] + " glass panel", glassPrefix + 1, texName + "panel"); - blockStainedGlassPane[glassId].carverHelper.addVariation(sGNames[i] + " fancy glass panel", glassPrefix + 2, texName + "panel-fancy"); - blockStainedGlassPane[glassId].carverHelper.addVariation(sGNames[i] + " borderless glass", glassPrefix + 3, texName + "transparent"); - blockStainedGlassPane[glassId].carverHelper.addVariation(sGNames[i] + " quadrant glass", glassPrefix + 4, texName + "quad"); - blockStainedGlassPane[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 : blockStainedGlassPane[glassId].carverHelper.variations) - { - if(cv.metadata < glassPrefix || cv.metadata >= glassPrefix + 8) - continue; - blockStainedGlassPane[glassId].carverHelper.registerVariation(blockName, cv, blockStainedGlassPane[glassId], cv.metadata); - } - } - - if(Configurations.featureEnabled("paperWall")) - { - blockPaperwall = (BlockCarvablePane) new BlockCarvablePane(Material.ground, true).setCreativeTab(Chisel.tabChisel).setHardness(0.5F).setResistance(10F); - blockPaperwall.carverHelper.setChiselBlockName("Paper Wall"); - blockPaperwall.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.paperwall.0.desc"), 0, "paper/box"); - blockPaperwall.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.paperwall.1.desc"), 1, "paper/throughMiddle"); - blockPaperwall.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.paperwall.2.desc"), 2, "paper/cross"); - blockPaperwall.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.paperwall.3.desc"), 3, "paper/sixSections"); - blockPaperwall.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.paperwall.4.desc"), 4, "paper/vertical"); - blockPaperwall.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.paperwall.5.desc"), 5, "paper/horizontal"); - blockPaperwall.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.paperwall.6.desc"), 6, "paper/floral"); - blockPaperwall.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.paperwall.7.desc"), 7, "paper/plain"); - blockPaperwall.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.paperwall.8.desc"), 8, "paper/door"); - - blockPaperwall.carverHelper.register(blockPaperwall, "paperwall"); - - } - - if(Configurations.featureEnabled("woolenClay")) - { - blockWoolenClay = (BlockCarvable) new BlockCarvable().setCreativeTab(Chisel.tabChisel).setHardness(2F).setResistance(10F); - blockWoolenClay.carverHelper.setChiselBlockName("Woolen Clay"); - - for(int i = 0; i < 16; i++) - blockWoolenClay.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.woolenClay." + i + ".desc"), i, "woolenClay/" + sGNames[i].replaceAll(" ", "").toLowerCase()); - blockWoolenClay.carverHelper.register(blockWoolenClay, "woolen_clay"); - - - } - - if(Configurations.featureEnabled("laboratory")) - { - blockLaboratory = (BlockCarvable) new BlockCarvable().setHardness(2.0F).setResistance(10F).setStepSound(Chisel.soundMetalFootstep); - blockLaboratory.carverHelper.setChiselBlockName("laboratoryblock"); - blockLaboratory.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.blockLaboratory.0.desc"), 0, "laboratory/wallpanel"); - blockLaboratory.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.blockLaboratory.1.desc"), 1, "laboratory/dottedpanel"); - blockLaboratory.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.blockLaboratory.2.desc"), 2, "laboratory/largewall"); - blockLaboratory.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.blockLaboratory.3.desc"), 3, "laboratory/roundel"); - blockLaboratory.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.blockLaboratory.4.desc"), 4, "laboratory/wallvents"); - blockLaboratory.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.blockLaboratory.5.desc"), 5, "laboratory/largetile"); - blockLaboratory.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.blockLaboratory.6.desc"), 6, "laboratory/smalltile"); - blockLaboratory.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.blockLaboratory.7.desc"), 7, "laboratory/floortile"); - blockLaboratory.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.blockLaboratory.8.desc"), 8, "laboratory/checkertile"); - blockLaboratory.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.blockLaboratory.9.desc"), 9, "laboratory/clearscreen"); - blockLaboratory.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.blockLaboratory.10.desc"), 10, "laboratory/fuzzscreen"); - blockLaboratory.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.blockLaboratory.11.desc"), 11, "laboratory/largesteel"); - blockLaboratory.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.blockLaboratory.12.desc"), 12, "laboratory/smallsteel"); - blockLaboratory.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.blockLaboratory.13.desc"), 13, "laboratory/directionright"); - blockLaboratory.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.blockLaboratory.14.desc"), 14, "laboratory/directionleft"); - blockLaboratory.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.blockLaboratory.15.desc"), 15, "laboratory/infocon"); - blockLaboratory.carverHelper.register(blockLaboratory, "laboratoryblock"); - } - - if(Configurations.featureEnabled("pumpkin")) - { - //TODO - } - - Blocks.stone.setHarvestLevel("chisel", 0, 0); - } -} diff --git a/src/main/java/info/jbcs/minecraft/chisel/ChiselLeftClick.java b/src/main/java/info/jbcs/minecraft/chisel/ChiselLeftClick.java index ea530102..48638f25 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/ChiselLeftClick.java +++ b/src/main/java/info/jbcs/minecraft/chisel/ChiselLeftClick.java @@ -5,6 +5,8 @@ import cpw.mods.fml.common.eventhandler.SubscribeEvent; import info.jbcs.minecraft.chisel.api.ChiselMode; import info.jbcs.minecraft.chisel.carving.CarvingVariation; import info.jbcs.minecraft.chisel.client.GeneralChiselClient; +import info.jbcs.minecraft.chisel.init.ModBlocks; +import info.jbcs.minecraft.chisel.init.ModItems; import info.jbcs.minecraft.chisel.item.ItemChisel; import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; @@ -33,7 +35,7 @@ public class ChiselLeftClick if(!Configurations.enableChiseling) return; EntityPlayer player = event.entityPlayer; ItemStack stack = player.getHeldItem(); - if(stack == null || stack.getItem() != Chisel.chisel) return; + if(stack == null || stack.getItem() != ModItems.chisel) return; World world = event.world; int x = event.x; @@ -94,9 +96,9 @@ public class ChiselLeftClick /* special case: stone can be carved to cobble and bricks */ if(Configurations.chiselStoneToCobbleBricks) { - if(!match && block.equals(Blocks.stone) && Block.getBlockFromItem(target).equals(ChiselBlocks.blockCobblestone)) + if(!match && block.equals(Blocks.stone) && Block.getBlockFromItem(target).equals(ModBlocks.cobblestone)) match = true; - if(!match && block.equals(Blocks.stone) && Block.getBlockFromItem(target).equals(ChiselBlocks.stoneBrick)) + if(!match && block.equals(Blocks.stone) && Block.getBlockFromItem(target).equals(ModBlocks.stoneBrick)) match = true; } if(!match) @@ -152,7 +154,7 @@ public class ChiselLeftClick if(!Configurations.enableChiseling) return; EntityPlayer player = event.getPlayer(); ItemStack stack = player.getHeldItem(); - if(stack == null || stack.getItem() != Chisel.chisel) return; + if(stack == null || stack.getItem() != ModItems.chisel) return; event.setCanceled(true); } diff --git a/src/main/java/info/jbcs/minecraft/chisel/ChiselModCompatibility.java b/src/main/java/info/jbcs/minecraft/chisel/ChiselModCompatibility.java index 4908ebdd..55a8b28e 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/ChiselModCompatibility.java +++ b/src/main/java/info/jbcs/minecraft/chisel/ChiselModCompatibility.java @@ -97,7 +97,7 @@ public class ChiselModCompatibility public void postInit(FMLPostInitializationEvent event) { - new ClassBlockCompat("shukaro.artifice.ArtificeBlocks", "blockMarble") + new ClassBlockCompat("shukaro.artifice.ArtificeBlocks", "marble") { @Override void action() diff --git a/src/main/java/info/jbcs/minecraft/chisel/Crafting.java b/src/main/java/info/jbcs/minecraft/chisel/Crafting.java index de5af0d2..57ed466a 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/Crafting.java +++ b/src/main/java/info/jbcs/minecraft/chisel/Crafting.java @@ -1,6 +1,8 @@ package info.jbcs.minecraft.chisel; import cpw.mods.fml.common.registry.GameRegistry; +import info.jbcs.minecraft.chisel.init.ModBlocks; +import info.jbcs.minecraft.chisel.init.ModItems; import net.minecraft.block.Block; import net.minecraft.init.Blocks; import net.minecraft.init.Items; @@ -19,57 +21,57 @@ public class Crafting 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; - FurnaceRecipes.smelting().func_151393_a(concreteRecipeBlock, new ItemStack(ChiselBlocks.blockConcrete), 0.1F); + FurnaceRecipes.smelting().func_151393_a(concreteRecipeBlock, new ItemStack(ModBlocks.concrete), 0.1F); - GameRegistry.addRecipe(new ItemStack(ChiselBlocks.blockSandstoneScribbles, 1), new Object[]{"X", 'X', new ItemStack(ChiselBlocks.blockSandstone, 1, 8),}); + GameRegistry.addRecipe(new ItemStack(ModBlocks.sandstoneScribbles, 1), new Object[]{"X", 'X', new ItemStack(ModBlocks.sandstone, 1, 8),}); for(int meta = 0; meta < 16; meta++) { - GameRegistry.addRecipe(new ItemStack(ChiselBlocks.blockMarbleSlab, 6, 0), new Object[]{"***", '*', new ItemStack(ChiselBlocks.blockMarble, 1, meta)}); - GameRegistry.addRecipe(new ItemStack(ChiselBlocks.blockLimestoneSlab, 6, 0), new Object[]{"***", '*', new ItemStack(ChiselBlocks.blockLimestone, 1, meta)}); - GameRegistry.addRecipe(new ItemStack(ChiselBlocks.blockMarblePillarSlab, 6, 0), new Object[]{"***", '*', new ItemStack(ChiselBlocks.blockMarblePillar, 1, meta)}); + GameRegistry.addRecipe(new ItemStack(ModBlocks.marbleSlab, 6, 0), new Object[]{"***", '*', new ItemStack(ModBlocks.marble, 1, meta)}); + GameRegistry.addRecipe(new ItemStack(ModBlocks.limestoneSlab, 6, 0), new Object[]{"***", '*', new ItemStack(ModBlocks.limestone, 1, meta)}); + GameRegistry.addRecipe(new ItemStack(ModBlocks.marblePillarSlab, 6, 0), new Object[]{"***", '*', new ItemStack(ModBlocks.marblePillar, 1, meta)}); - GameRegistry.addRecipe(new ItemStack(ChiselBlocks.blockMarblePillar, 6), new Object[]{"XX", "XX", "XX", 'X', new ItemStack(ChiselBlocks.blockMarble, 1, meta),}); - GameRegistry.addRecipe(new ItemStack(ChiselBlocks.blockMarble, 4), new Object[]{"XX", "XX", 'X', new ItemStack(ChiselBlocks.blockMarblePillar, 1, meta),}); + GameRegistry.addRecipe(new ItemStack(ModBlocks.marblePillar, 6), new Object[]{"XX", "XX", "XX", 'X', new ItemStack(ModBlocks.marble, 1, meta),}); + GameRegistry.addRecipe(new ItemStack(ModBlocks.marble, 4), new Object[]{"XX", "XX", 'X', new ItemStack(ModBlocks.marblePillar, 1, meta),}); - GameRegistry.addRecipe(new ItemStack(ChiselBlocks.blockIcePillar, 6, 1), new Object[]{"XX", "XX", "XX", 'X', new ItemStack(ChiselBlocks.blockIce, 1, meta),}); - GameRegistry.addRecipe(new ItemStack(ChiselBlocks.blockIce, 4, 1), new Object[]{"XX", "XX", 'X', new ItemStack(ChiselBlocks.blockIcePillar, 1, meta),}); + GameRegistry.addRecipe(new ItemStack(ModBlocks.icePillar, 6, 1), new Object[]{"XX", "XX", "XX", 'X', new ItemStack(ModBlocks.ice, 1, meta),}); + GameRegistry.addRecipe(new ItemStack(ModBlocks.ice, 4, 1), new Object[]{"XX", "XX", 'X', new ItemStack(ModBlocks.icePillar, 1, meta),}); - GameRegistry.addRecipe(new ItemStack(Blocks.sandstone, 1, 1), new Object[]{"X", 'X', new ItemStack(ChiselBlocks.blockSandstoneScribbles, 1, meta),}); + GameRegistry.addRecipe(new ItemStack(Blocks.sandstone, 1, 1), new Object[]{"X", 'X', new ItemStack(ModBlocks.sandstoneScribbles, 1, meta),}); - GameRegistry.addRecipe(new ItemStack(ChiselBlocks.blockCarpet, 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.blockCarpetFloor, 3, meta), new Object[]{"XX", 'X', new ItemStack(ChiselBlocks.blockCarpet, 1, meta),}); + 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(ModBlocks.carpetFloor, 3, meta), new Object[]{"XX", 'X', new ItemStack(ModBlocks.carpet, 1, meta),}); } // The following recipe is due to bugs with Chisel 1.5.1 to 1.5.6a - GameRegistry.addRecipe(new ItemStack(Blocks.sandstone, 1, 0), new Object[]{"X", 'X', new ItemStack(ChiselBlocks.blockSandstone, 1, 0),}); + GameRegistry.addRecipe(new ItemStack(Blocks.sandstone, 1, 0), new Object[]{"X", 'X', new ItemStack(ModBlocks.sandstone, 1, 0),}); // The following recipe is due to bug with Chisel 1.5.6b - GameRegistry.addRecipe(new ItemStack(Blocks.sandstone, 1, 1), new Object[]{"X", 'X', new ItemStack(ChiselBlocks.blockSandstone, 1, 1),}); + GameRegistry.addRecipe(new ItemStack(Blocks.sandstone, 1, 1), new Object[]{"X", 'X', new ItemStack(ModBlocks.sandstone, 1, 1),}); - GameRegistry.addRecipe(new ItemStack(ChiselBlocks.blockHolystone, 8, 0), new Object[]{"***", "*X*", "***", '*', new ItemStack(Blocks.stone, 1), 'X', new ItemStack(Items.feather, 1)}); - GameRegistry.addRecipe(new ItemStack(ChiselBlocks.blockLavastone, 8, 0), new Object[]{"***", "*X*", "***", '*', new ItemStack(Blocks.stone, 1), 'X', new ItemStack(Items.lava_bucket, 1)}); - GameRegistry.addRecipe(new ItemStack(ChiselBlocks.blockFft, 8, 0), new Object[]{"***", "*X*", "***", '*', new ItemStack(Blocks.stone, 1), 'X', new ItemStack(Items.gold_nugget, 1)}); - GameRegistry.addRecipe(new ItemStack(ChiselBlocks.blockTyrian, 8, 0), new Object[]{"***", "*X*", "***", '*', new ItemStack(Blocks.stone, 1), 'X', new ItemStack(Items.iron_ingot, 1)}); - GameRegistry.addRecipe(new ItemStack(ChiselBlocks.blockTemple, 8, 0), new Object[]{"***", "*X*", "***", '*', new ItemStack(Blocks.stone, 1), 'X', new ItemStack(Items.dye, 1, 4)}); - GameRegistry.addRecipe(new ItemStack(ChiselBlocks.blockFactory, Configurations.factoryBlockAmount, 0), new Object[]{"*X*", "X X", "*X*", '*', new ItemStack(Blocks.stone, 1), 'X', new ItemStack(Items.iron_ingot, 1)}); + 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(ModBlocks.lavastone, 8, 0), new Object[]{"***", "*X*", "***", '*', new ItemStack(Blocks.stone, 1), 'X', new ItemStack(Items.lava_bucket, 1)}); + 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 ItemStack(ModBlocks.tyrian, 8, 0), new Object[]{"***", "*X*", "***", '*', new ItemStack(Blocks.stone, 1), 'X', new ItemStack(Items.iron_ingot, 1)}); + 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(ModBlocks.factory, Configurations.factoryBlockAmount, 0), new Object[]{"*X*", "X X", "*X*", '*', new ItemStack(Blocks.stone, 1), 'X', new ItemStack(Items.iron_ingot, 1)}); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ChiselBlocks.blockRoadLine, 8, 0), new Object[]{"wrw", "wrw", "wrw", ('w'), "dyeWhite", ('r'), Items.redstone})); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.roadLine, 8, 0), new Object[]{"wrw", "wrw", "wrw", ('w'), "dyeWhite", ('r'), Items.redstone})); if(Configurations.chiselRecipe) { - GameRegistry.addRecipe(new ItemStack(Chisel.chisel, 1), new Object[]{" YY", " YY", "X ", 'X', Items.stick, 'Y', Items.iron_ingot}); + GameRegistry.addRecipe(new ItemStack(ModItems.chisel, 1), new Object[]{" YY", " YY", "X ", 'X', Items.stick, 'Y', Items.iron_ingot}); } else { - GameRegistry.addRecipe(new ItemStack(Chisel.chisel, 1), new Object[]{" Y", "X ", 'X', Items.stick, 'Y', Items.iron_ingot}); + GameRegistry.addRecipe(new ItemStack(ModItems.chisel, 1), new Object[]{" Y", "X ", 'X', Items.stick, 'Y', Items.iron_ingot}); } if(Configurations.featureEnabled("ballOfMoss")) - GameRegistry.addRecipe(new ItemStack(Chisel.itemBallOMoss, 1), new Object[]{"XYX", "YXY", "XYX", 'X', Blocks.vine, 'Y', Items.stick}); + GameRegistry.addRecipe(new ItemStack(ModItems.itemBallOMoss, 1), new Object[]{"XYX", "YXY", "XYX", 'X', Blocks.vine, 'Y', Items.stick}); if(Configurations.featureEnabled("cloud")) - GameRegistry.addRecipe(new ItemStack(Chisel.itemCloudInABottle, 1), new Object[]{"X X", "XYX", " X ", 'X', Blocks.glass, 'Y', Items.quartz}); + GameRegistry.addRecipe(new ItemStack(ModItems.itemCloudInABottle, 1), new Object[]{"X X", "XYX", " X ", 'X', Blocks.glass, 'Y', Items.quartz}); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ChiselBlocks.blockPaperwall, 8), new Object[]{"ppp", "psp", "ppp", ('p'), Items.paper, ('s'), "stickWood"})); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.paperWall, 8), new Object[]{"ppp", "psp", "ppp", ('p'), Items.paper, ('s'), "stickWood"})); String[] sGNames = new String[]{ "White", "Orange", "Magenta", "Light Blue", @@ -82,10 +84,10 @@ public class Crafting { 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)); - GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ChiselBlocks.blockWoolenClay, 2, i), new Object[]{"blockWool" + sGNames[i].replaceAll(" ", ""), "stainedClay" + sGNames[i].replaceAll(" ", "")})); + GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModBlocks.woolenClay, 2, i), new Object[]{"blockWool" + sGNames[i].replaceAll(" ", ""), "stainedClay" + sGNames[i].replaceAll(" ", "")})); } - GameRegistry.addRecipe(new ItemStack(ChiselBlocks.blockLaboratory, 8, 0), new Object[]{"***", "*X*", "***", '*', new ItemStack(Blocks.stone, 1), 'X', new ItemStack(Items.quartz, 1)}); + GameRegistry.addRecipe(new ItemStack(ModBlocks.laboratory, 8, 0), new Object[]{"***", "*X*", "***", '*', new ItemStack(Blocks.stone, 1), 'X', new ItemStack(Items.quartz, 1)}); } } diff --git a/src/main/java/info/jbcs/minecraft/chisel/block/BlockCarvable.java b/src/main/java/info/jbcs/minecraft/chisel/block/BlockCarvable.java index 5f456caf..ecf9d5ec 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/block/BlockCarvable.java +++ b/src/main/java/info/jbcs/minecraft/chisel/block/BlockCarvable.java @@ -6,6 +6,7 @@ import info.jbcs.minecraft.chisel.Chisel; import info.jbcs.minecraft.chisel.api.ICarvable; import info.jbcs.minecraft.chisel.carving.CarvableHelper; import info.jbcs.minecraft.chisel.carving.CarvableVariation; +import info.jbcs.minecraft.chisel.init.ModTabs; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; @@ -30,7 +31,7 @@ public class BlockCarvable extends Block implements ICarvable { super(m); carverHelper = new CarvableHelper(); - setCreativeTab(Chisel.tabChisel); + setCreativeTab(ModTabs.tabChiselBlocks); } public BlockCarvable setStained(boolean a) diff --git a/src/main/java/info/jbcs/minecraft/chisel/block/BlockCarvableGlass.java b/src/main/java/info/jbcs/minecraft/chisel/block/BlockCarvableGlass.java index ab284e2a..b95c3a3f 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/block/BlockCarvableGlass.java +++ b/src/main/java/info/jbcs/minecraft/chisel/block/BlockCarvableGlass.java @@ -6,6 +6,7 @@ import info.jbcs.minecraft.chisel.Chisel; import info.jbcs.minecraft.chisel.api.ICarvable; import info.jbcs.minecraft.chisel.carving.CarvableHelper; import info.jbcs.minecraft.chisel.carving.CarvableVariation; +import info.jbcs.minecraft.chisel.init.ModTabs; import net.minecraft.block.BlockGlass; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; @@ -25,7 +26,7 @@ public class BlockCarvableGlass extends BlockGlass implements ICarvable super(Material.glass, false); carverHelper = new CarvableHelper(); - setCreativeTab(Chisel.tabChisel); + setCreativeTab(ModTabs.tabChiselBlocks); } public BlockCarvableGlass setStained(boolean a) diff --git a/src/main/java/info/jbcs/minecraft/chisel/block/BlockCarvablePane.java b/src/main/java/info/jbcs/minecraft/chisel/block/BlockCarvablePane.java index b14ada32..f912541b 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/block/BlockCarvablePane.java +++ b/src/main/java/info/jbcs/minecraft/chisel/block/BlockCarvablePane.java @@ -7,6 +7,7 @@ import info.jbcs.minecraft.chisel.api.ICarvable; import info.jbcs.minecraft.chisel.carving.CarvableHelper; import info.jbcs.minecraft.chisel.carving.CarvableVariation; import info.jbcs.minecraft.chisel.client.render.BlockMarblePaneRenderer; +import info.jbcs.minecraft.chisel.init.ModTabs; import net.minecraft.block.BlockPane; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; @@ -27,7 +28,7 @@ public class BlockCarvablePane extends BlockPane implements ICarvable carverHelper = new CarvableHelper(); - setCreativeTab(Chisel.tabChisel); + setCreativeTab(ModTabs.tabChiselBlocks); } public BlockCarvablePane setStained(boolean a) diff --git a/src/main/java/info/jbcs/minecraft/chisel/block/BlockHolystone.java b/src/main/java/info/jbcs/minecraft/chisel/block/BlockHolystone.java index b9b342e2..a6e08d8d 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/block/BlockHolystone.java +++ b/src/main/java/info/jbcs/minecraft/chisel/block/BlockHolystone.java @@ -1,7 +1,7 @@ package info.jbcs.minecraft.chisel.block; import info.jbcs.minecraft.chisel.client.GeneralChiselClient; -import info.jbcs.minecraft.utilities.General; +import info.jbcs.minecraft.chisel.utils.General; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.util.IIcon; diff --git a/src/main/java/info/jbcs/minecraft/chisel/block/BlockMarbleCarpet.java b/src/main/java/info/jbcs/minecraft/chisel/block/BlockMarbleCarpet.java index 84a211bc..8d51d647 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/block/BlockMarbleCarpet.java +++ b/src/main/java/info/jbcs/minecraft/chisel/block/BlockMarbleCarpet.java @@ -7,6 +7,7 @@ import info.jbcs.minecraft.chisel.Chisel; import java.util.List; +import info.jbcs.minecraft.chisel.init.ModTabs; import net.minecraft.block.BlockCarpet; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; @@ -23,7 +24,7 @@ public class BlockMarbleCarpet extends BlockCarpet implements ICarvable { carverHelper = new CarvableHelper(); - setCreativeTab(Chisel.tabChisel); + setCreativeTab(ModTabs.tabChiselBlocks); } diff --git a/src/main/java/info/jbcs/minecraft/chisel/block/BlockMarbleIce.java b/src/main/java/info/jbcs/minecraft/chisel/block/BlockMarbleIce.java index 00b2b47a..c6f15ae9 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/block/BlockMarbleIce.java +++ b/src/main/java/info/jbcs/minecraft/chisel/block/BlockMarbleIce.java @@ -8,6 +8,7 @@ import info.jbcs.minecraft.chisel.Chisel; import java.util.List; import java.util.Random; +import info.jbcs.minecraft.chisel.init.ModTabs; import net.minecraft.block.Block; import net.minecraft.block.BlockIce; import net.minecraft.client.renderer.texture.IIconRegister; @@ -28,7 +29,7 @@ public class BlockMarbleIce extends BlockIce implements ICarvable { super(); carverHelper = new CarvableHelper(); - setCreativeTab(Chisel.tabChisel); + setCreativeTab(ModTabs.tabChiselBlocks); } @Override diff --git a/src/main/java/info/jbcs/minecraft/chisel/block/BlockMarbleIceStairs.java b/src/main/java/info/jbcs/minecraft/chisel/block/BlockMarbleIceStairs.java index d3a63da7..6db42386 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/block/BlockMarbleIceStairs.java +++ b/src/main/java/info/jbcs/minecraft/chisel/block/BlockMarbleIceStairs.java @@ -1,10 +1,10 @@ package info.jbcs.minecraft.chisel.block; import info.jbcs.minecraft.chisel.carving.CarvableHelper; -import info.jbcs.minecraft.chisel.ChiselBlocks; import java.util.Random; +import info.jbcs.minecraft.chisel.init.ModBlocks; import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.world.World; @@ -22,13 +22,13 @@ public class BlockMarbleIceStairs extends BlockMarbleStairs @Override public void harvestBlock(World par1World, EntityPlayer par2EntityPlayer, int par3, int par4, int par5, int par6) { - ChiselBlocks.blockIce.harvestBlock(par1World, par2EntityPlayer, par3, par4, par5, par6); + ModBlocks.ice.harvestBlock(par1World, par2EntityPlayer, par3, par4, par5, par6); } @Override public int quantityDropped(Random par1Random) { - return ChiselBlocks.blockIce.quantityDropped(par1Random); + return ModBlocks.ice.quantityDropped(par1Random); } @Override @@ -40,7 +40,7 @@ public class BlockMarbleIceStairs extends BlockMarbleStairs @Override public void updateTick(World par1World, int par2, int par3, int par4, Random par5Random) { - ChiselBlocks.blockIce.updateTick(par1World, par2, par3, par4, par5Random); + ModBlocks.ice.updateTick(par1World, par2, par3, par4, par5Random); } @Override diff --git a/src/main/java/info/jbcs/minecraft/chisel/block/BlockMarbleStairs.java b/src/main/java/info/jbcs/minecraft/chisel/block/BlockMarbleStairs.java index e13c2265..aafcb74a 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/block/BlockMarbleStairs.java +++ b/src/main/java/info/jbcs/minecraft/chisel/block/BlockMarbleStairs.java @@ -8,6 +8,7 @@ import info.jbcs.minecraft.chisel.client.render.BlockMarbleStairsRenderer; import java.util.List; +import info.jbcs.minecraft.chisel.init.ModTabs; import net.minecraft.block.Block; import net.minecraft.block.BlockStairs; import net.minecraft.client.renderer.texture.IIconRegister; @@ -29,7 +30,7 @@ public class BlockMarbleStairs extends BlockStairs implements ICarvable super(block, meta); this.useNeighborBrightness = true; - setCreativeTab(Chisel.tabChisel); + setCreativeTab(ModTabs.tabChiselBlocks); carverHelper = helper; blockMeta = meta; } diff --git a/src/main/java/info/jbcs/minecraft/chisel/block/BlockMarbleTexturedOre.java b/src/main/java/info/jbcs/minecraft/chisel/block/BlockMarbleTexturedOre.java index b9cecf6f..3fec8008 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/block/BlockMarbleTexturedOre.java +++ b/src/main/java/info/jbcs/minecraft/chisel/block/BlockMarbleTexturedOre.java @@ -7,6 +7,7 @@ import info.jbcs.minecraft.chisel.Chisel; import java.util.List; +import info.jbcs.minecraft.chisel.init.ModTabs; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; @@ -23,7 +24,7 @@ public class BlockMarbleTexturedOre extends BlockTexturedOre implements ICarvabl carverHelper = new CarvableHelper(); - setCreativeTab(Chisel.tabChisel); + setCreativeTab(ModTabs.tabChiselBlocks); } @Override diff --git a/src/main/java/info/jbcs/minecraft/chisel/block/BlockMarbleWall.java b/src/main/java/info/jbcs/minecraft/chisel/block/BlockMarbleWall.java index 4e452fc0..8ca566db 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/block/BlockMarbleWall.java +++ b/src/main/java/info/jbcs/minecraft/chisel/block/BlockMarbleWall.java @@ -5,6 +5,7 @@ import info.jbcs.minecraft.chisel.Chisel; import java.util.List; +import info.jbcs.minecraft.chisel.init.ModTabs; import net.minecraft.block.Block; import net.minecraft.block.BlockWall; import net.minecraft.client.renderer.texture.IIconRegister; @@ -22,7 +23,7 @@ public class BlockMarbleWall extends BlockWall carverHelper = new CarvableHelper(); - setCreativeTab(Chisel.tabChisel); + setCreativeTab(ModTabs.tabChiselBlocks); } @Override diff --git a/src/main/java/info/jbcs/minecraft/chisel/block/BlockRoadLine.java b/src/main/java/info/jbcs/minecraft/chisel/block/BlockRoadLine.java index 771f8897..7ee96cc8 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/block/BlockRoadLine.java +++ b/src/main/java/info/jbcs/minecraft/chisel/block/BlockRoadLine.java @@ -2,6 +2,7 @@ package info.jbcs.minecraft.chisel.block; import info.jbcs.minecraft.chisel.Chisel; import info.jbcs.minecraft.chisel.client.render.BlockRoadLineRenderer; +import info.jbcs.minecraft.chisel.init.ModTabs; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; @@ -23,7 +24,7 @@ public class BlockRoadLine extends Block this.setBlockBounds(0.0f, 0.0f, 0.0f, 1.0f, 0.00390625f, 1.0f); // this.setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 0.0625F, 1.0F); - setCreativeTab(Chisel.tabChisel); + setCreativeTab(ModTabs.tabChiselBlocks); } @Override diff --git a/src/main/java/info/jbcs/minecraft/chisel/block/BlockSnakestone.java b/src/main/java/info/jbcs/minecraft/chisel/block/BlockSnakestone.java index 342f9309..36346839 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/block/BlockSnakestone.java +++ b/src/main/java/info/jbcs/minecraft/chisel/block/BlockSnakestone.java @@ -5,6 +5,7 @@ import info.jbcs.minecraft.chisel.client.render.BlockSnakeStoneRenderer; import java.util.List; +import info.jbcs.minecraft.chisel.init.ModTabs; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; @@ -57,7 +58,7 @@ public class BlockSnakestone extends Block setHardness(1.5F); setResistance(10.0F); setStepSound(Block.soundTypeStone); - setCreativeTab(Chisel.tabChisel); + setCreativeTab(ModTabs.tabChiselBlocks); flipTopTextures = false; this.iconPrefix = iconPrefix; diff --git a/src/main/java/info/jbcs/minecraft/chisel/block/BlockSpikes.java b/src/main/java/info/jbcs/minecraft/chisel/block/BlockSpikes.java index de236d59..97d8ad0d 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/block/BlockSpikes.java +++ b/src/main/java/info/jbcs/minecraft/chisel/block/BlockSpikes.java @@ -5,7 +5,7 @@ import cpw.mods.fml.relauncher.Side; import info.jbcs.minecraft.chisel.Configurations; import info.jbcs.minecraft.chisel.client.GeneralChiselClient; import info.jbcs.minecraft.chisel.client.render.BlockSpikesRenderer; -import info.jbcs.minecraft.utilities.General; +import info.jbcs.minecraft.chisel.utils.General; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; diff --git a/src/main/java/info/jbcs/minecraft/chisel/carving/CarvableHelper.java b/src/main/java/info/jbcs/minecraft/chisel/carving/CarvableHelper.java index f03a1085..be6f2d1f 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/carving/CarvableHelper.java +++ b/src/main/java/info/jbcs/minecraft/chisel/carving/CarvableHelper.java @@ -8,7 +8,7 @@ import info.jbcs.minecraft.chisel.carving.CarvableVariation.CarvableVariationCTM import info.jbcs.minecraft.chisel.client.render.CTM; import info.jbcs.minecraft.chisel.client.render.TextureSubmap; import info.jbcs.minecraft.chisel.item.ItemCarvable; -import info.jbcs.minecraft.utilities.GeneralClient; +import info.jbcs.minecraft.chisel.utils.GeneralClient; import net.minecraft.block.Block; import net.minecraft.block.BlockPane; import net.minecraft.block.material.Material; diff --git a/src/main/java/info/jbcs/minecraft/chisel/client/GeneralChiselClient.java b/src/main/java/info/jbcs/minecraft/chisel/client/GeneralChiselClient.java index 107b6156..ec66635e 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/client/GeneralChiselClient.java +++ b/src/main/java/info/jbcs/minecraft/chisel/client/GeneralChiselClient.java @@ -4,10 +4,10 @@ import info.jbcs.minecraft.chisel.Configurations; import info.jbcs.minecraft.chisel.block.BlockHolystone; import info.jbcs.minecraft.chisel.block.BlockLavastone; import info.jbcs.minecraft.chisel.block.BlockSnakestoneObsidian; -import info.jbcs.minecraft.chisel.entity.EntityBallOMossFX; -import info.jbcs.minecraft.chisel.entity.EntityHolystoneFX; -import info.jbcs.minecraft.chisel.entity.EntitySnakestoneObsidianFX; -import info.jbcs.minecraft.utilities.GeneralClient; +import info.jbcs.minecraft.chisel.entity.fx.EntityBallOMossFX; +import info.jbcs.minecraft.chisel.entity.fx.EntityHolystoneFX; +import info.jbcs.minecraft.chisel.entity.fx.EntitySnakestoneObsidianFX; +import info.jbcs.minecraft.chisel.utils.GeneralClient; import net.minecraft.block.Block; import net.minecraft.client.Minecraft; import net.minecraft.client.entity.EntityPlayerSP; diff --git a/src/main/java/info/jbcs/minecraft/chisel/client/gui/GuiChisel.java b/src/main/java/info/jbcs/minecraft/chisel/client/gui/GuiChisel.java index 0f9e4ade..950d3002 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/client/gui/GuiChisel.java +++ b/src/main/java/info/jbcs/minecraft/chisel/client/gui/GuiChisel.java @@ -2,13 +2,11 @@ package info.jbcs.minecraft.chisel.client.gui; import info.jbcs.minecraft.chisel.inventory.ContainerChisel; import info.jbcs.minecraft.chisel.inventory.InventoryChiselSelection; -import info.jbcs.minecraft.utilities.GeneralClient; -import net.minecraft.client.gui.GuiButton; +import info.jbcs.minecraft.chisel.utils.GeneralClient; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.inventory.Slot; import org.lwjgl.opengl.GL11; diff --git a/src/main/java/info/jbcs/minecraft/chisel/client/gui/GuiScreenPlus.java b/src/main/java/info/jbcs/minecraft/chisel/client/gui/GuiScreenPlus.java index f3165b68..8112be99 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/client/gui/GuiScreenPlus.java +++ b/src/main/java/info/jbcs/minecraft/chisel/client/gui/GuiScreenPlus.java @@ -1,7 +1,7 @@ package info.jbcs.minecraft.chisel.client.gui; -import info.jbcs.minecraft.utilities.DummyContainer; -import info.jbcs.minecraft.utilities.GeneralClient; +import info.jbcs.minecraft.chisel.utils.DummyContainer; +import info.jbcs.minecraft.chisel.utils.GeneralClient; import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.gui.GuiScreen; import net.minecraft.client.gui.inventory.GuiContainer; diff --git a/src/main/java/info/jbcs/minecraft/chisel/client/gui/Scrollbar.java b/src/main/java/info/jbcs/minecraft/chisel/client/gui/Scrollbar.java index 18265dd5..1d89172f 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/client/gui/Scrollbar.java +++ b/src/main/java/info/jbcs/minecraft/chisel/client/gui/Scrollbar.java @@ -1,6 +1,6 @@ package info.jbcs.minecraft.chisel.client.gui; -import info.jbcs.minecraft.utilities.GeneralClient; +import info.jbcs.minecraft.chisel.utils.GeneralClient; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiButton; diff --git a/src/main/java/info/jbcs/minecraft/chisel/client/render/BlockAdvancedMarbleRenderer.java b/src/main/java/info/jbcs/minecraft/chisel/client/render/BlockAdvancedMarbleRenderer.java index 027754b0..a17f2b61 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/client/render/BlockAdvancedMarbleRenderer.java +++ b/src/main/java/info/jbcs/minecraft/chisel/client/render/BlockAdvancedMarbleRenderer.java @@ -4,7 +4,7 @@ import info.jbcs.minecraft.chisel.api.ICarvable; import info.jbcs.minecraft.chisel.carving.CarvableHelper; import info.jbcs.minecraft.chisel.carving.CarvableVariation; import info.jbcs.minecraft.chisel.Chisel; -import info.jbcs.minecraft.utilities.Drawing; +import info.jbcs.minecraft.chisel.utils.Drawing; import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.world.IBlockAccess; diff --git a/src/main/java/info/jbcs/minecraft/chisel/client/render/BlockEldritchRenderer.java b/src/main/java/info/jbcs/minecraft/chisel/client/render/BlockEldritchRenderer.java index f23f6e9e..3866114d 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/client/render/BlockEldritchRenderer.java +++ b/src/main/java/info/jbcs/minecraft/chisel/client/render/BlockEldritchRenderer.java @@ -1,7 +1,7 @@ package info.jbcs.minecraft.chisel.client.render; import info.jbcs.minecraft.chisel.Chisel; -import info.jbcs.minecraft.utilities.Drawing; +import info.jbcs.minecraft.chisel.utils.Drawing; import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.world.IBlockAccess; diff --git a/src/main/java/info/jbcs/minecraft/chisel/client/render/BlockMarblePaneRenderer.java b/src/main/java/info/jbcs/minecraft/chisel/client/render/BlockMarblePaneRenderer.java index 6f513ec9..12e1b0d8 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/client/render/BlockMarblePaneRenderer.java +++ b/src/main/java/info/jbcs/minecraft/chisel/client/render/BlockMarblePaneRenderer.java @@ -1,6 +1,6 @@ package info.jbcs.minecraft.chisel.client.render; -import info.jbcs.minecraft.utilities.Drawing; +import info.jbcs.minecraft.chisel.utils.Drawing; import net.minecraft.block.Block; import net.minecraft.block.BlockPane; import net.minecraft.client.renderer.EntityRenderer; diff --git a/src/main/java/info/jbcs/minecraft/chisel/client/render/BlockMarblePillarRenderer.java b/src/main/java/info/jbcs/minecraft/chisel/client/render/BlockMarblePillarRenderer.java index f7b276bc..b9875245 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/client/render/BlockMarblePillarRenderer.java +++ b/src/main/java/info/jbcs/minecraft/chisel/client/render/BlockMarblePillarRenderer.java @@ -2,7 +2,7 @@ package info.jbcs.minecraft.chisel.client.render; import info.jbcs.minecraft.chisel.carving.CarvableHelper; import info.jbcs.minecraft.chisel.block.BlockMarblePillar; -import info.jbcs.minecraft.utilities.Drawing; +import info.jbcs.minecraft.chisel.utils.Drawing; import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.world.IBlockAccess; diff --git a/src/main/java/info/jbcs/minecraft/chisel/client/render/BlockMarbleStairsRenderer.java b/src/main/java/info/jbcs/minecraft/chisel/client/render/BlockMarbleStairsRenderer.java index 3fb6960e..5157a25d 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/client/render/BlockMarbleStairsRenderer.java +++ b/src/main/java/info/jbcs/minecraft/chisel/client/render/BlockMarbleStairsRenderer.java @@ -1,7 +1,7 @@ package info.jbcs.minecraft.chisel.client.render; import info.jbcs.minecraft.chisel.block.BlockMarbleStairs; -import info.jbcs.minecraft.utilities.Drawing; +import info.jbcs.minecraft.chisel.utils.Drawing; import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.world.IBlockAccess; diff --git a/src/main/java/info/jbcs/minecraft/chisel/client/render/BlockNoCTMRenderer.java b/src/main/java/info/jbcs/minecraft/chisel/client/render/BlockNoCTMRenderer.java index 6bfd14f2..06579385 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/client/render/BlockNoCTMRenderer.java +++ b/src/main/java/info/jbcs/minecraft/chisel/client/render/BlockNoCTMRenderer.java @@ -1,6 +1,6 @@ package info.jbcs.minecraft.chisel.client.render; -import info.jbcs.minecraft.utilities.Drawing; +import info.jbcs.minecraft.chisel.utils.Drawing; import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.world.IBlockAccess; diff --git a/src/main/java/info/jbcs/minecraft/chisel/client/render/BlockRoadLineRenderer.java b/src/main/java/info/jbcs/minecraft/chisel/client/render/BlockRoadLineRenderer.java index 742cfe7f..9cf0f1e1 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/client/render/BlockRoadLineRenderer.java +++ b/src/main/java/info/jbcs/minecraft/chisel/client/render/BlockRoadLineRenderer.java @@ -1,7 +1,7 @@ package info.jbcs.minecraft.chisel.client.render; import info.jbcs.minecraft.chisel.block.BlockRoadLine; -import info.jbcs.minecraft.utilities.Drawing; +import info.jbcs.minecraft.chisel.utils.Drawing; import net.minecraft.block.Block; import net.minecraft.client.renderer.EntityRenderer; import net.minecraft.client.renderer.RenderBlocks; diff --git a/src/main/java/info/jbcs/minecraft/chisel/client/render/BlockSnakeStoneRenderer.java b/src/main/java/info/jbcs/minecraft/chisel/client/render/BlockSnakeStoneRenderer.java index 73b933d8..5193cbdc 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/client/render/BlockSnakeStoneRenderer.java +++ b/src/main/java/info/jbcs/minecraft/chisel/client/render/BlockSnakeStoneRenderer.java @@ -1,7 +1,7 @@ package info.jbcs.minecraft.chisel.client.render; import info.jbcs.minecraft.chisel.block.BlockSnakestone; -import info.jbcs.minecraft.utilities.Drawing; +import info.jbcs.minecraft.chisel.utils.Drawing; import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.world.IBlockAccess; diff --git a/src/main/java/info/jbcs/minecraft/chisel/client/render/BlockSpikesRenderer.java b/src/main/java/info/jbcs/minecraft/chisel/client/render/BlockSpikesRenderer.java index 98046a79..a998d977 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/client/render/BlockSpikesRenderer.java +++ b/src/main/java/info/jbcs/minecraft/chisel/client/render/BlockSpikesRenderer.java @@ -1,7 +1,7 @@ package info.jbcs.minecraft.chisel.client.render; -import info.jbcs.minecraft.chisel.ChiselBlocks; -import info.jbcs.minecraft.utilities.Drawing; +import info.jbcs.minecraft.chisel.init.ModBlocks; +import info.jbcs.minecraft.chisel.utils.Drawing; import java.util.Random; @@ -66,22 +66,14 @@ public class BlockSpikesRenderer implements ISimpleBlockRenderingHandler @Override public boolean renderWorldBlock(IBlockAccess world, int x, int y, int z, Block block, int modelId, RenderBlocks renderer) { - int meta = world.getBlockMetadata(x, y, z); - renderer.renderStandardBlock(block, x, y, z); Tessellator tessellator = Tessellator.instance; - IIcon icon = ChiselBlocks.blockSpiketrap.iconSpike; -// Icon icon=Chisel.blockSpiketrap.iconBase; + IIcon icon = ModBlocks.spikeTrap.iconSpike; - double h = 0.85; double d = 1.5 / 16; double r = d / 2; - - double tx = x + 0.25; - double ty = y + h; - double tz = z + 0.25; double skew = 0.5; // tessellator.setBrightness(block.getMixedBrightnessForBlock(world, x, y, z)); diff --git a/src/main/java/info/jbcs/minecraft/chisel/client/render/BlockTexturedOreRenderer.java b/src/main/java/info/jbcs/minecraft/chisel/client/render/BlockTexturedOreRenderer.java index 3897ce31..f92011d3 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/client/render/BlockTexturedOreRenderer.java +++ b/src/main/java/info/jbcs/minecraft/chisel/client/render/BlockTexturedOreRenderer.java @@ -1,7 +1,7 @@ package info.jbcs.minecraft.chisel.client.render; import info.jbcs.minecraft.chisel.block.BlockTexturedOre; -import info.jbcs.minecraft.utilities.Drawing; +import info.jbcs.minecraft.chisel.utils.Drawing; import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.init.Blocks; diff --git a/src/main/java/info/jbcs/minecraft/chisel/Compatibility.java b/src/main/java/info/jbcs/minecraft/chisel/compat/Compatibility.java similarity index 94% rename from src/main/java/info/jbcs/minecraft/chisel/Compatibility.java rename to src/main/java/info/jbcs/minecraft/chisel/compat/Compatibility.java index 80749118..7a12f3d3 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/Compatibility.java +++ b/src/main/java/info/jbcs/minecraft/chisel/compat/Compatibility.java @@ -1,8 +1,9 @@ -package info.jbcs.minecraft.chisel; +package info.jbcs.minecraft.chisel.compat; import cpw.mods.fml.common.Loader; import cpw.mods.fml.common.event.FMLPostInitializationEvent; import cpw.mods.fml.common.registry.GameRegistry; +import info.jbcs.minecraft.chisel.ChiselModCompatibility; import info.jbcs.minecraft.chisel.carving.Carving; public class Compatibility diff --git a/src/main/java/info/jbcs/minecraft/chisel/compat/FMPIntegration.java b/src/main/java/info/jbcs/minecraft/chisel/compat/FMPIntegration.java new file mode 100644 index 00000000..36f4f057 --- /dev/null +++ b/src/main/java/info/jbcs/minecraft/chisel/compat/FMPIntegration.java @@ -0,0 +1,76 @@ +package info.jbcs.minecraft.chisel.compat; + +import cpw.mods.fml.common.event.FMLInterModComms; +import info.jbcs.minecraft.chisel.compat.ModIntegration.IModIntegration; +import info.jbcs.minecraft.chisel.init.ModBlocks; +import net.minecraft.block.Block; +import net.minecraft.item.ItemStack; + +public class FMPIntegration implements IModIntegration{ + @Override + public String getModId(){ + return "ForgeMultipart"; + } + + @Override + public void onInit(){ + registerMaterial(ModBlocks.marble); + registerMaterial(ModBlocks.marbleSlab); + registerMaterial(ModBlocks.marblePillar); + registerMaterial(ModBlocks.marblePillarSlab); + registerMaterial(ModBlocks.marbleStairs); + registerMaterial(ModBlocks.limestone); + registerMaterial(ModBlocks.limestoneSlab); + registerMaterial(ModBlocks.limestoneStairs); + registerMaterial(ModBlocks.cobblestone); + registerMaterial(ModBlocks.glass); + registerMaterial(ModBlocks.sandstone, 3, 15); + 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); + registerMaterial(ModBlocks.lapis, 1, 8); + registerMaterial(ModBlocks.emerald, 1, 11); + registerMaterial(ModBlocks.netherBrick, 1, 15); + registerMaterial(ModBlocks.netherrack, 1, 14); + registerMaterial(ModBlocks.cobblestoneMossy, 1, 15); + registerMaterial(ModBlocks.stoneBrick, 4, 15); + registerMaterial(ModBlocks.dirt, 0, 12); + registerMaterial(ModBlocks.ice, 1, 15); + registerMaterial(ModBlocks.icePillar); + registerMaterial(ModBlocks.iceStairs); + registerMaterial(ModBlocks.obsidian, 1, 15); + registerMaterial(ModBlocks.paneIron, 1, 9); + registerMaterial(ModBlocks.redstone, 1, 15); + registerMaterial(ModBlocks.holystone, 0, 13); + registerMaterial(ModBlocks.lavastone, 0, 6); + registerMaterial(ModBlocks.fantasy); + registerMaterial(ModBlocks.carpet); + registerMaterial(ModBlocks.carpetFloor); + registerMaterial(ModBlocks.bookshelf, 0, 8); + registerMaterial(ModBlocks.tyrian); + registerMaterial(ModBlocks.temple); + registerMaterial(ModBlocks.templeMossy); + registerMaterial(ModBlocks.cloud, 0, 0); + registerMaterial(ModBlocks.factory); + registerMaterial(ModBlocks.paperWall, 0, 8); + registerMaterial(ModBlocks.laboratory); + } + + @Override + public void onPostInit(){ + + } + + private void registerMaterial(Block block){ + registerMaterial(block, 0, 15); + } + + private void registerMaterial(Block block, int minMeta, int maxMeta){ + for(int c = minMeta; c <= maxMeta; c++){ + FMLInterModComms.sendMessage(getModId(), "microMaterial", new ItemStack(block, 1, c)); + } + } +} diff --git a/src/main/java/info/jbcs/minecraft/chisel/compat/ModIntegration.java b/src/main/java/info/jbcs/minecraft/chisel/compat/ModIntegration.java new file mode 100644 index 00000000..2a6bbe08 --- /dev/null +++ b/src/main/java/info/jbcs/minecraft/chisel/compat/ModIntegration.java @@ -0,0 +1,49 @@ +package info.jbcs.minecraft.chisel.compat; + +import cpw.mods.fml.common.Loader; + +import java.util.ArrayList; +import java.util.List; + +public class ModIntegration { + + private static List integratedMods = new ArrayList(); + + public static void addMod(Class cls){ + try{ + IModIntegration obj = cls.newInstance(); + + if(Loader.isModLoaded(obj.getModId())){ + integratedMods.add(obj); + } + } catch(Throwable throwable){ + throwable.printStackTrace(); + } + } + + public static void init(){ + try{ + for(IModIntegration integration : integratedMods){ + integration.onInit(); + } + } catch (Throwable throwable){ + throwable.printStackTrace(); + } + } + + public static void postInit(){ + try { + for (IModIntegration integration : integratedMods){ + integration.onPostInit(); + } + } catch (Throwable throwable){ + throwable.printStackTrace(); + } + } + + static interface IModIntegration{ + String getModId(); + void onInit(); + void onPostInit(); + } +} diff --git a/src/main/java/info/jbcs/minecraft/chisel/entity/EntityBallOMoss.java b/src/main/java/info/jbcs/minecraft/chisel/entity/EntityBallOMoss.java index 0cee1f9a..adc8ca1f 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/entity/EntityBallOMoss.java +++ b/src/main/java/info/jbcs/minecraft/chisel/entity/EntityBallOMoss.java @@ -1,9 +1,9 @@ package info.jbcs.minecraft.chisel.entity; import info.jbcs.minecraft.chisel.Chisel; -import info.jbcs.minecraft.chisel.ChiselBlocks; import info.jbcs.minecraft.chisel.client.GeneralChiselClient; -import info.jbcs.minecraft.utilities.General; +import info.jbcs.minecraft.chisel.init.ModBlocks; +import info.jbcs.minecraft.chisel.utils.General; import net.minecraft.block.Block; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.projectile.EntityThrowable; @@ -106,12 +106,12 @@ public class EntityBallOMoss extends EntityThrowable } else if(block.equals(Blocks.cobblestone_wall) && meta == 0) { resMeta = 1; - } else if(block.equals(ChiselBlocks.blockCobblestone)) + } else if(block.equals(ModBlocks.cobblestone)) { - resBlock = ChiselBlocks.blockCobblestoneMossy; - } else if(block.equals(ChiselBlocks.blockTemple)) + resBlock = ModBlocks.cobblestoneMossy; + } else if(block.equals(ModBlocks.temple)) { - resBlock = ChiselBlocks.blockTempleMossy; + resBlock = ModBlocks.templeMossy; } else if(block.equals(Blocks.stonebrick)) { resMeta = 1; diff --git a/src/main/java/info/jbcs/minecraft/chisel/entity/EntityCloudInABottle.java b/src/main/java/info/jbcs/minecraft/chisel/entity/EntityCloudInABottle.java index 45caf98a..943edbcc 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/entity/EntityCloudInABottle.java +++ b/src/main/java/info/jbcs/minecraft/chisel/entity/EntityCloudInABottle.java @@ -1,10 +1,8 @@ package info.jbcs.minecraft.chisel.entity; -import info.jbcs.minecraft.chisel.Chisel; -import info.jbcs.minecraft.chisel.ChiselBlocks; - import java.util.Random; +import info.jbcs.minecraft.chisel.init.ModBlocks; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.projectile.EntityThrowable; import net.minecraft.util.MovingObjectPosition; @@ -109,7 +107,7 @@ public class EntityCloudInABottle extends EntityThrowable { 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, ChiselBlocks.blockCloud); + world.setBlock(j2, k2, l2, ModBlocks.cloud); count++; } } diff --git a/src/main/java/info/jbcs/minecraft/chisel/entity/EntitySmashingRock.java b/src/main/java/info/jbcs/minecraft/chisel/entity/EntitySmashingRock.java index c432c7c6..656535e3 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/entity/EntitySmashingRock.java +++ b/src/main/java/info/jbcs/minecraft/chisel/entity/EntitySmashingRock.java @@ -1,8 +1,6 @@ package info.jbcs.minecraft.chisel.entity; -import info.jbcs.minecraft.chisel.ChiselBlocks; -import info.jbcs.minecraft.chisel.client.GeneralChiselClient; -import info.jbcs.minecraft.utilities.General; +import info.jbcs.minecraft.chisel.utils.General; import net.minecraft.block.Block; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.projectile.EntityThrowable; diff --git a/src/main/java/info/jbcs/minecraft/chisel/entity/EntityBallOMossFX.java b/src/main/java/info/jbcs/minecraft/chisel/entity/fx/EntityBallOMossFX.java similarity index 94% rename from src/main/java/info/jbcs/minecraft/chisel/entity/EntityBallOMossFX.java rename to src/main/java/info/jbcs/minecraft/chisel/entity/fx/EntityBallOMossFX.java index fa9ddab5..9081d5de 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/entity/EntityBallOMossFX.java +++ b/src/main/java/info/jbcs/minecraft/chisel/entity/fx/EntityBallOMossFX.java @@ -1,8 +1,9 @@ -package info.jbcs.minecraft.chisel.entity; +package info.jbcs.minecraft.chisel.entity.fx; import info.jbcs.minecraft.chisel.Chisel; import info.jbcs.minecraft.chisel.block.BlockSnakestoneObsidian; -import info.jbcs.minecraft.utilities.General; +import info.jbcs.minecraft.chisel.init.ModItems; +import info.jbcs.minecraft.chisel.utils.General; import net.minecraft.client.particle.EntityFX; import net.minecraft.client.renderer.Tessellator; import net.minecraft.util.IIcon; @@ -107,7 +108,7 @@ public class EntityBallOMossFX extends EntityFX // setParticleIcon(block.particles[General.rand.nextInt(block.particles.length)]); - icon = Chisel.itemBallOMoss.getIconFromDamage(0); + icon = ModItems.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/info/jbcs/minecraft/chisel/entity/EntityHolystoneFX.java b/src/main/java/info/jbcs/minecraft/chisel/entity/fx/EntityHolystoneFX.java similarity index 94% rename from src/main/java/info/jbcs/minecraft/chisel/entity/EntityHolystoneFX.java rename to src/main/java/info/jbcs/minecraft/chisel/entity/fx/EntityHolystoneFX.java index 88646fa8..5b7d9ba5 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/entity/EntityHolystoneFX.java +++ b/src/main/java/info/jbcs/minecraft/chisel/entity/fx/EntityHolystoneFX.java @@ -1,7 +1,7 @@ -package info.jbcs.minecraft.chisel.entity; +package info.jbcs.minecraft.chisel.entity.fx; import info.jbcs.minecraft.chisel.block.BlockHolystone; -import info.jbcs.minecraft.utilities.General; +import info.jbcs.minecraft.chisel.utils.General; import net.minecraft.client.particle.EntityFX; import net.minecraft.client.renderer.Tessellator; import net.minecraft.world.World; diff --git a/src/main/java/info/jbcs/minecraft/chisel/entity/EntitySnakestoneObsidianFX.java b/src/main/java/info/jbcs/minecraft/chisel/entity/fx/EntitySnakestoneObsidianFX.java similarity index 97% rename from src/main/java/info/jbcs/minecraft/chisel/entity/EntitySnakestoneObsidianFX.java rename to src/main/java/info/jbcs/minecraft/chisel/entity/fx/EntitySnakestoneObsidianFX.java index 9fa0d0a9..58fb6bf2 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/entity/EntitySnakestoneObsidianFX.java +++ b/src/main/java/info/jbcs/minecraft/chisel/entity/fx/EntitySnakestoneObsidianFX.java @@ -1,7 +1,7 @@ -package info.jbcs.minecraft.chisel.entity; +package info.jbcs.minecraft.chisel.entity.fx; import info.jbcs.minecraft.chisel.block.BlockSnakestoneObsidian; -import info.jbcs.minecraft.utilities.General; +import info.jbcs.minecraft.chisel.utils.General; import net.minecraft.client.particle.EntityFX; import net.minecraft.client.renderer.Tessellator; import net.minecraft.world.World; diff --git a/src/main/java/info/jbcs/minecraft/chisel/init/ModBlocks.java b/src/main/java/info/jbcs/minecraft/chisel/init/ModBlocks.java new file mode 100644 index 00000000..978efced --- /dev/null +++ b/src/main/java/info/jbcs/minecraft/chisel/init/ModBlocks.java @@ -0,0 +1,1264 @@ +package info.jbcs.minecraft.chisel.init; + +import cpw.mods.fml.common.registry.GameRegistry; +import info.jbcs.minecraft.chisel.Chisel; +import info.jbcs.minecraft.chisel.Configurations; +import info.jbcs.minecraft.chisel.block.*; +import info.jbcs.minecraft.chisel.carving.CarvableHelper; +import info.jbcs.minecraft.chisel.carving.CarvableVariation; +import info.jbcs.minecraft.chisel.carving.Carving; +import info.jbcs.minecraft.chisel.item.ItemCarvable; +import info.jbcs.minecraft.chisel.item.ItemMarbleSlab; +import net.minecraft.block.Block; +import net.minecraft.block.material.Material; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.init.Blocks; +import net.minecraft.item.ItemStack; +import net.minecraft.util.StatCollector; +import net.minecraftforge.oredict.OreDictionary; + +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 BlockMarbleIceStairs iceStairs; + public static BlockCarvable[] planks = new BlockCarvable[6]; + public static BlockCarvable obsidian; + public static BlockCarvablePowered redstone; + public static BlockHolystone holystone; + public static BlockLavastone lavastone; + public static BlockCarvable fantasy; + 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 pumpkinOn; + public static BlockCarvablePumpkin pumpkinOff; + public static Block autoChisel; + public static BlockSnakestone snakestone; + public static BlockSnakestone sandSnakestone; + public static BlockSnakestoneObsidian obsidianSnakestone; + + public static BlockSpikes spikeTrap; + + // 1.7 + public static BlockCarvableGlass[] stainedGlass = new BlockCarvableGlass[4]; + public static BlockCarvablePane[] stainedGlassPane = new BlockCarvablePane[8]; + + public static void load() + { + if(Configurations.featureEnabled("autoChisel")){ + autoChisel = new BlockAutoChisel().setBlockTextureName("Chisel:autoChisel").setCreativeTab(CreativeTabs.tabTools); + GameRegistry.registerBlock(autoChisel, autoChisel.getUnlocalizedName()); + Chisel.proxy.registerTileEntities(); + } + + if(Configurations.featureEnabled("marble")) + { + marble = (BlockCarvable) new BlockCarvable().setHardness(2.0F).setResistance(10F).setStepSound(Block.soundTypeStone); + marble.carverHelper.setChiselBlockName("Marble"); + marble.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.marble.0.desc"), 0, "marble"); + marble.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.marble.1.desc"), 1, "marble/a1-stoneornamental-marblebrick"); + marble.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.marble.2.desc"), 2, "marble/a1-stoneornamental-marbleclassicpanel"); + marble.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.marble.3.desc"), 3, "marble/a1-stoneornamental-marbleornate"); + marble.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.marble.4.desc"), 4, "marble/panel"); + marble.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.marble.5.desc"), 5, "marble/block"); + marble.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.marble.6.desc"), 6, "marble/terrain-pistonback-marblecreeperdark"); + marble.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.marble.7.desc"), 7, "marble/terrain-pistonback-marblecreeperlight"); + marble.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.marble.8.desc"), 8, "marble/a1-stoneornamental-marblecarved"); + marble.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.marble.9.desc"), 9, "marble/a1-stoneornamental-marblecarvedradial"); + marble.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.marble.10.desc"), 10, "marble/terrain-pistonback-marbledent"); + marble.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.marble.11.desc"), 11, "marble/terrain-pistonback-marbledent-small"); + marble.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.marble.12.desc"), 12, "marble/marble-bricks"); + marble.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.marble.13.desc"), 13, "marble/marble-arranged-bricks"); + marble.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.marble.14.desc"), 14, "marble/marble-fancy-bricks"); + marble.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.marble.15.desc"), 15, "marble/marble-blocks"); + marble.carverHelper.register(marble, "marble"); + OreDictionary.registerOre("marble", 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("chisel.tile.marbleSlab.0.desc"), 0, "marble"); + marbleSlab.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.marbleSlab.1.desc"), 1, "marbleslab/a1-stoneornamental-marblebrick"); + marbleSlab.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.marbleSlab.2.desc"), 2, "marbleslab/a1-stoneornamental-marbleclassicpanel"); + marbleSlab.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.marbleSlab.3.desc"), 3, "marbleslab/a1-stoneornamental-marbleornate"); + marbleSlab.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.marbleSlab.4.desc"), 4, "marbleslab/a1-stoneornamental-marblepanel"); + marbleSlab.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.marbleSlab.5.desc"), 5, "marbleslab/terrain-pistonback-marble"); + marbleSlab.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.marbleSlab.6.desc"), 6, "marbleslab/terrain-pistonback-marblecreeperdark"); + marbleSlab.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.marbleSlab.7.desc"), 7, "marbleslab/terrain-pistonback-marblecreeperlight"); + marbleSlab.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.marbleSlab.8.desc"), 8, "marbleslab/a1-stoneornamental-marblecarved"); + marbleSlab.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.marbleSlab.9.desc"), 9, "marbleslab/a1-stoneornamental-marblecarvedradial"); + marbleSlab.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.marbleSlab.10.desc"), 10, "marbleslab/terrain-pistonback-marbledent"); + marbleSlab.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.marbleSlab.11.desc"), 11, "marbleslab/terrain-pistonback-marbledent-small"); + marbleSlab.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.marbleSlab.12.desc"), 12, "marbleslab/marble-bricks"); + marbleSlab.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.marbleSlab.13.desc"), 13, "marbleslab/marble-arranged-bricks"); + marbleSlab.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.marbleSlab.14.desc"), 14, "marbleslab/marble-fancy-bricks"); + marbleSlab.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.marbleSlab.15.desc"), 15, "marbleslab/marble-blocks"); + marbleSlab.carverHelper.register(marbleSlab, "marble_slab", ItemMarbleSlab.class); + + if(Configurations.featureEnabled("marblePillar")) + { + if(Configurations.oldPillars) + { + marblePillar = (BlockCarvable) new BlockCarvable().setHardness(2.0F).setResistance(10F).setStepSound(Block.soundTypeStone); + marblePillar.carverHelper.setChiselBlockName("Marble Pillar"); + marblePillar.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.marblePillarOld.0.desc"), 0, "marblepillarold/column"); + marblePillar.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.marblePillarOld.1.desc"), 1, "marblepillarold/capstone"); + marblePillar.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.marblePillarOld.2.desc"), 2, "marblepillarold/base"); + marblePillar.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.marblePillarOld.3.desc"), 3, "marblepillarold/small"); + marblePillar.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.marblePillarOld.4.desc"), 4, "marblepillarold/pillar-carved"); + marblePillar.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.marblePillarOld.5.desc"), 5, "marblepillarold/a1-stoneornamental-marblegreek"); + marblePillar.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.marblePillarOld.6.desc"), 6, "marblepillarold/a1-stonepillar-greek"); + marblePillar.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.marblePillarOld.7.desc"), 7, "marblepillarold/a1-stonepillar-plain"); + marblePillar.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.marblePillarOld.8.desc"), 8, "marblepillarold/a1-stonepillar-greektopplain"); + marblePillar.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.marblePillarOld.9.desc"), 9, "marblepillarold/a1-stonepillar-plaintopplain"); + marblePillar.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.marblePillarOld.10.desc"), 10, "marblepillarold/a1-stonepillar-greekbottomplain"); + marblePillar.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.marblePillarOld.11.desc"), 11, "marblepillarold/a1-stonepillar-plainbottomplain"); + marblePillar.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.marblePillarOld.12.desc"), 12, "marblepillarold/a1-stonepillar-greektopgreek"); + marblePillar.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.marblePillarOld.13.desc"), 13, "marblepillarold/a1-stonepillar-plaintopgreek"); + marblePillar.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.marblePillarOld.14.desc"), 14, "marblepillarold/a1-stonepillar-greekbottomgreek"); + marblePillar.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.marblePillarOld.15.desc"), 15, "marblepillarold/a1-stonepillar-plainbottomgreek"); + } else + { + marblePillar = (BlockCarvable) new BlockMarblePillar(Material.rock).setHardness(2.0F).setResistance(10F).setStepSound(Block.soundTypeStone); + marblePillar.carverHelper.setChiselBlockName("Marble Pillar"); + marblePillar.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.marblePillar.0.desc"), 0, "marblepillar/pillar"); + marblePillar.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.marblePillar.1.desc"), 1, "marblepillar/default"); + marblePillar.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.marblePillar.2.desc"), 2, "marblepillar/simple"); + marblePillar.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.marblePillar.3.desc"), 3, "marblepillar/convex"); + marblePillar.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.marblePillar.4.desc"), 4, "marblepillar/rough"); + marblePillar.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.marblePillar.5.desc"), 5, "marblepillar/greekdecor"); + marblePillar.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.marblePillar.6.desc"), 6, "marblepillar/greekgreek"); + marblePillar.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.marblePillar.7.desc"), 7, "marblepillar/greekplain"); + marblePillar.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.marblePillar.8.desc"), 8, "marblepillar/plaindecor"); + marblePillar.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.marblePillar.9.desc"), 9, "marblepillar/plaingreek"); + marblePillar.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.marblePillar.10.desc"), 10, "marblepillar/plainplain"); + marblePillar.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.marblePillar.11.desc"), 11, "marblepillar/widedecor"); + marblePillar.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.marblePillar.12.desc"), 12, "marblepillar/widegreek"); + marblePillar.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.marblePillar.13.desc"), 13, "marblepillar/wideplain"); + marblePillar.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.marblePillar.14.desc"), 14, "marblepillar/carved"); + marblePillar.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.marblePillar.15.desc"), 15, "marblepillar/ornamental"); + } + marblePillar.carverHelper.register(marblePillar, "marble_pillar"); + Carving.chisel.setGroupClass("marble_pillar", "marble"); + + marblePillarSlab = (BlockMarbleSlab) new BlockMarbleSlab(marblePillar).setHardness(2.0F).setResistance(10F).setStepSound(Block.soundTypeStone); + marblePillarSlab.carverHelper.setChiselBlockName("Marble Pillar Slab"); + if(Configurations.oldPillars) + { + marblePillarSlab.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.marblePillarSlabOld.0.desc"), 0, "marblepillarslabold/column"); + marblePillarSlab.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.marblePillarSlabOld.1.desc"), 1, "marblepillarslabold/capstone"); + marblePillarSlab.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.marblePillarSlabOld.2.desc"), 2, "marblepillarslabold/base"); + marblePillarSlab.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.marblePillarSlabOld.3.desc"), 3, "marblepillarslabold/small"); + marblePillarSlab.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.marblePillarSlabOld.4.desc"), 4, "marblepillarslabold/pillar-carved"); + marblePillarSlab.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.marblePillarSlabOld.5.desc"), 5, "marblepillarslabold/a1-stoneornamental-marblegreek"); + marblePillarSlab.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.marblePillarSlabOld.6.desc"), 6, "marblepillarslabold/a1-stonepillar-greek"); + marblePillarSlab.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.marblePillarSlabOld.7.desc"), 7, "marblepillarslabold/a1-stonepillar-plain"); + marblePillarSlab.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.marblePillarSlabOld.8.desc"), 8, "marblepillarslabold/a1-stonepillar-greektopplain"); + marblePillarSlab.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.marblePillarSlabOld.9.desc"), 9, "marblepillarslabold/a1-stonepillar-plaintopplain"); + marblePillarSlab.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.marblePillarSlabOld.10.desc"), 10, "marblepillarslabold/a1-stonepillar-greekbottomplain"); + marblePillarSlab.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.marblePillarSlabOld.11.desc"), 11, "marblepillarslabold/a1-stonepillar-plainbottomplain"); + marblePillarSlab.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.marblePillarSlabOld.12.desc"), 12, "marblepillarslabold/a1-stonepillar-greektopgreek"); + marblePillarSlab.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.marblePillarSlabOld.13.desc"), 13, "marblepillarslabold/a1-stonepillar-plaintopgreek"); + marblePillarSlab.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.marblePillarSlabOld.14.desc"), 14, "marblepillarslabold/a1-stonepillar-greekbottomgreek"); + marblePillarSlab.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.marblePillarSlabOld.15.desc"), 15, "marblepillarslabold/a1-stonepillar-plainbottomgreek"); + } else + { + marblePillarSlab.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.marblePillarSlab.0.desc"), 0, "marblepillarslab/pillar"); + marblePillarSlab.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.marblePillarSlab.1.desc"), 1, "marblepillarslab/default"); + marblePillarSlab.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.marblePillarSlab.2.desc"), 2, "marblepillarslab/simple"); + marblePillarSlab.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.marblePillarSlab.3.desc"), 3, "marblepillarslab/convex"); + marblePillarSlab.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.marblePillarSlab.4.desc"), 4, "marblepillarslab/rough"); + marblePillarSlab.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.marblePillarSlab.5.desc"), 5, "marblepillarslab/greekdecor"); + marblePillarSlab.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.marblePillarSlab.6.desc"), 6, "marblepillarslab/greekgreek"); + marblePillarSlab.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.marblePillarSlab.7.desc"), 7, "marblepillarslab/greekplain"); + marblePillarSlab.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.marblePillarSlab.8.desc"), 8, "marblepillarslab/plaindecor"); + marblePillarSlab.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.marblePillarSlab.9.desc"), 9, "marblepillarslab/plaingreek"); + marblePillarSlab.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.marblePillarSlab.10.desc"), 10, "marblepillarslab/plainplain"); + marblePillarSlab.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.marblePillarSlab.11.desc"), 11, "marblepillarslab/widedecor"); + marblePillarSlab.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.marblePillarSlab.12.desc"), 12, "marblepillarslab/widegreek"); + marblePillarSlab.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.marblePillarSlab.13.desc"), 13, "marblepillarslab/wideplain"); + marblePillarSlab.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.marblePillarSlab.14.desc"), 14, "marblepillarslab/carved"); + marblePillarSlab.carverHelper.addVariation(StatCollector.translateToLocal("chisel.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("chisel.tile.marbleStairs.0.desc"), 0, "marble"); + makerMarbleStairs.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.marbleStairs.6.desc"), 1, "marbleslab/a1-stoneornamental-marblebrick"); + makerMarbleStairs.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.marbleStairs.2.desc"), 2, "marbleslab/a1-stoneornamental-marbleclassicpanel"); + makerMarbleStairs.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.marbleStairs.3.desc"), 3, "marbleslab/a1-stoneornamental-marbleornate"); + makerMarbleStairs.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.marbleStairs.4.desc"), 4, "marbleslab/a1-stoneornamental-marblepanel"); + makerMarbleStairs.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.marbleStairs.5.desc"), 5, "marbleslab/terrain-pistonback-marble"); + makerMarbleStairs.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.marbleStairs.6.desc"), 6, "marbleslab/terrain-pistonback-marblecreeperdark"); + makerMarbleStairs.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.marbleStairs.7.desc"), 7, "marbleslab/terrain-pistonback-marblecreeperlight"); + makerMarbleStairs.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.marbleStairs.8.desc"), 8, "marbleslab/a1-stoneornamental-marblecarved"); + makerMarbleStairs.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.marbleStairs.9.desc"), 9, "marbleslab/a1-stoneornamental-marblecarvedradial"); + makerMarbleStairs.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.marbleStairs.10.desc"), 10, "marbleslab/terrain-pistonback-marbledent"); + makerMarbleStairs.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.marbleStairs.11.desc"), 11, "marbleslab/terrain-pistonback-marbledent-small"); + makerMarbleStairs.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.marbleStairs.12.desc"), 12, "marbleslab/marble-bricks"); + makerMarbleStairs.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.marbleStairs.13.desc"), 13, "marbleslab/marble-arranged-bricks"); + makerMarbleStairs.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.marbleStairs.14.desc"), 14, "marbleslab/marble-fancy-bricks"); + makerMarbleStairs.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.marbleStairs.15.desc"), 15, "marbleslab/marble-blocks"); + makerMarbleStairs.create("marble_stairs"); + } + + if(Configurations.featureEnabled("limestone")) + { + limestone = (BlockCarvable) new BlockCarvable().setHardness(2.0F).setResistance(10F).setStepSound(Block.soundTypeStone); + limestone.carverHelper.setChiselBlockName("Limestone"); + limestone.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.limestone.0.desc"), 0, "limestone"); + limestone.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.limestone.1.desc"), 1, "limestone/terrain-cobbsmalltilelight"); + limestone.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.limestone.2.desc"), 2, "limestone/terrain-cob-frenchlight"); + limestone.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.limestone.3.desc"), 3, "limestone/terrain-cob-french2light"); + limestone.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.limestone.4.desc"), 4, "limestone/terrain-cobmoss-creepdungeonlight"); + limestone.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.limestone.5.desc"), 5, "limestone/terrain-cob-smallbricklight"); + limestone.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.limestone.6.desc"), 6, "limestone/terrain-mossysmalltilelight"); + limestone.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.limestone.7.desc"), 7, "limestone/terrain-pistonback-dungeon"); + limestone.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.limestone.8.desc"), 8, "limestone/terrain-pistonback-dungeonornate"); + limestone.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.limestone.9.desc"), 9, "limestone/terrain-pistonback-dungeonvent"); + limestone.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.limestone.10.desc"), 10, "limestone/terrain-pistonback-lightcreeper"); + limestone.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.limestone.11.desc"), 11, "limestone/terrain-pistonback-lightdent"); + limestone.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.limestone.12.desc"), 12, "limestone/terrain-pistonback-lightemboss"); + limestone.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.limestone.13.desc"), 13, "limestone/terrain-pistonback-lightfour"); + limestone.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.limestone.14.desc"), 14, "limestone/terrain-pistonback-lightmarker"); + limestone.carverHelper.addVariation(StatCollector.translateToLocal("chisel.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).setHardness(2.0F).setResistance(10F); + limestoneSlab.carverHelper.setChiselBlockName("Limestone Slab"); + limestoneSlab.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.limestoneSlab.0.desc"), 0, "limestone"); + limestoneSlab.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.limestoneSlab.1.desc"), 1, "limestone/terrain-cobbsmalltilelight"); + limestoneSlab.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.limestoneSlab.2.desc"), 2, "limestone/terrain-cob-frenchlight"); + limestoneSlab.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.limestoneSlab.3.desc"), 3, "limestone/terrain-cob-french2light"); + limestoneSlab.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.limestoneSlab.4.desc"), 4, "limestone/terrain-cobmoss-creepdungeonlight"); + limestoneSlab.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.limestoneSlab.5.desc"), 5, "limestone/terrain-cob-smallbricklight"); + limestoneSlab.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.limestoneSlab.6.desc"), 6, "limestone/terrain-mossysmalltilelight"); + limestoneSlab.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.limestoneSlab.7.desc"), 7, "limestone/terrain-pistonback-dungeon"); + limestoneSlab.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.limestoneSlab.8.desc"), 8, "limestone/terrain-pistonback-dungeonornate"); + limestoneSlab.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.limestoneSlab.9.desc"), 9, "limestone/terrain-pistonback-dungeonvent"); + limestoneSlab.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.limestoneSlab.10.desc"), 10, "limestone/terrain-pistonback-lightcreeper"); + limestoneSlab.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.limestoneSlab.11.desc"), 11, "limestone/terrain-pistonback-lightdent"); + limestoneSlab.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.limestoneSlab.12.desc"), 12, "limestone/terrain-pistonback-lightemboss"); + limestoneSlab.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.limestoneSlab.13.desc"), 13, "limestone/terrain-pistonback-lightfour"); + limestoneSlab.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.limestoneSlab.14.desc"), 14, "limestone/terrain-pistonback-lightmarker"); + limestoneSlab.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.limestoneSlab.15.desc"), 15, "limestone/terrain-pistonback-lightpanel"); + limestoneSlab.carverHelper.register(limestoneSlab, "limestone_slab", ItemMarbleSlab.class); + + BlockMarbleStairsMaker makerLimestoneStairs = new BlockMarbleStairsMaker(limestone); + makerLimestoneStairs.carverHelper.setChiselBlockName("Limestone Stairs"); + makerLimestoneStairs.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.limestoneStairs.0.desc"), 0, "limestone"); + makerLimestoneStairs.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.limestoneStairs.1.desc"), 1, "limestone/terrain-cobbsmalltilelight"); + makerLimestoneStairs.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.limestoneStairs.2.desc"), 2, "limestone/terrain-cob-frenchlight"); + makerLimestoneStairs.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.limestoneStairs.3.desc"), 3, "limestone/terrain-cob-french2light"); + makerLimestoneStairs.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.limestoneStairs.4.desc"), 4, "limestone/terrain-cobmoss-creepdungeonlight"); + makerLimestoneStairs.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.limestoneStairs.5.desc"), 5, "limestone/terrain-cob-smallbricklight"); + makerLimestoneStairs.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.limestoneStairs.6.desc"), 6, "limestone/terrain-mossysmalltilelight"); + makerLimestoneStairs.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.limestoneStairs.7.desc"), 7, "limestone/terrain-pistonback-dungeon"); + makerLimestoneStairs.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.limestoneStairs.8.desc"), 8, "limestone/terrain-pistonback-dungeonornate"); + makerLimestoneStairs.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.limestoneStairs.9.desc"), 9, "limestone/terrain-pistonback-dungeonvent"); + makerLimestoneStairs.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.limestoneStairs.10.desc"), 10, "limestone/terrain-pistonback-lightcreeper"); + makerLimestoneStairs.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.limestoneStairs.11.desc"), 11, "limestone/terrain-pistonback-lightdent"); + makerLimestoneStairs.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.limestoneStairs.12.desc"), 12, "limestone/terrain-pistonback-lightemboss"); + makerLimestoneStairs.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.limestoneStairs.13.desc"), 13, "limestone/terrain-pistonback-lightfour"); + makerLimestoneStairs.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.limestoneStairs.14.desc"), 14, "limestone/terrain-pistonback-lightmarker"); + makerLimestoneStairs.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.limestoneStairs.15.desc"), 15, "limestone/terrain-pistonback-lightpanel"); + makerLimestoneStairs.create("limestone_stairs"); + } + + if(Configurations.featureEnabled("cobblestone")) + { + cobblestone = (BlockCarvable) new BlockCarvable().setHardness(2.0F).setResistance(10F).setStepSound(Block.soundTypeStone); + Carving.chisel.addVariation("cobblestone", Blocks.cobblestone, 0, 0); + cobblestone.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.cobblestone.0.desc"), 1, "cobblestone/terrain-cobb-brickaligned"); + cobblestone.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.cobblestone.1.desc"), 2, "cobblestone/terrain-cob-detailedbrick"); + cobblestone.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.cobblestone.2.desc"), 3, "cobblestone/terrain-cob-smallbrick"); + cobblestone.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.cobblestone.3.desc"), 4, "cobblestone/terrain-cobblargetiledark"); + cobblestone.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.cobblestone.4.desc"), 5, "cobblestone/terrain-cobbsmalltile"); + cobblestone.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.cobblestone.5.desc"), 6, "cobblestone/terrain-cob-french"); + cobblestone.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.cobblestone.6.desc"), 7, "cobblestone/terrain-cob-french2"); + cobblestone.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.cobblestone.7.desc"), 8, "cobblestone/terrain-cobmoss-creepdungeon"); + cobblestone.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.cobblestone.8.desc"), 9, "cobblestone/terrain-mossysmalltiledark"); + cobblestone.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.cobblestone.9.desc"), 10, "cobblestone/terrain-pistonback-dungeontile"); + cobblestone.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.cobblestone.10.desc"), 11, "cobblestone/terrain-pistonback-darkcreeper"); + cobblestone.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.cobblestone.11.desc"), 12, "cobblestone/terrain-pistonback-darkdent"); + cobblestone.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.cobblestone.12.desc"), 13, "cobblestone/terrain-pistonback-darkemboss"); + cobblestone.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.cobblestone.13.desc"), 14, "cobblestone/terrain-pistonback-darkmarker"); + cobblestone.carverHelper.addVariation(StatCollector.translateToLocal("chisel.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().setHardness(0.3F).setStepSound(Block.soundTypeGlass); + Carving.chisel.addVariation("glass", Blocks.glass, 0, 0); + glass.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.glass.1.desc"), 1, "glass/terrain-glassbubble"); + glass.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.glass.2.desc"), 2, "glass/terrain-glass-chinese"); + glass.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.glass.3.desc"), 3, "glass/japanese"); + glass.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.glass.4.desc"), 4, "glass/terrain-glassdungeon"); + glass.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.glass.5.desc"), 5, "glass/terrain-glasslight"); + glass.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.glass.6.desc"), 6, "glass/terrain-glassnoborder"); + glass.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.glass.7.desc"), 7, "glass/terrain-glass-ornatesteel"); + glass.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.glass.8.desc"), 8, "glass/terrain-glass-screen"); + glass.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.glass.9.desc"), 9, "glass/terrain-glassshale"); + glass.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.glass.10.desc"), 10, "glass/terrain-glass-steelframe"); + glass.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.glass.11.desc"), 11, "glass/terrain-glassstone"); + glass.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.glass.12.desc"), 12, "glass/terrain-glassstreak"); + glass.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.glass.13.desc"), 13, "glass/terrain-glass-thickgrid"); + glass.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.glass.14.desc"), 14, "glass/terrain-glass-thingrid"); + glass.carverHelper.addVariation(StatCollector.translateToLocal("chisel.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().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("chisel.tile.sandstone.3.desc"), 3, "sandstone/faded"); + sandstone.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.sandstone.4.desc"), 4, "sandstone/column"); + sandstone.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.sandstone.5.desc"), 5, "sandstone/capstone"); + sandstone.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.sandstone.6.desc"), 6, "sandstone/small"); + sandstone.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.sandstone.7.desc"), 7, "sandstone/base"); + sandstone.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.sandstone.8.desc"), 8, "sandstone/smooth"); + sandstone.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.sandstone.9.desc"), 9, "sandstone/smooth-cap"); + sandstone.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.sandstone.10.desc"), 10, "sandstone/smooth-small"); + sandstone.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.sandstone.11.desc"), 11, "sandstone/smooth-base"); + sandstone.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.sandstone.12.desc"), 12, "sandstone/block"); + sandstone.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.sandstone.13.desc"), 13, "sandstone/blocks"); + sandstone.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.sandstone.14.desc"), 14, "sandstone/mosaic"); + sandstone.carverHelper.addVariation(StatCollector.translateToLocal("chisel.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/").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); + } + } + + if(Configurations.featureEnabled("sandstoneScribbles")) + { + sandstoneScribbles = (BlockCarvable) new BlockCarvable().setStepSound(Block.soundTypeStone).setHardness(0.8F); + sandstoneScribbles.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.sandstoneScribbles.desc"), 0, "sandstone-scribbles/scribbles-0"); + sandstoneScribbles.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.sandstoneScribbles.desc"), 1, "sandstone-scribbles/scribbles-1"); + sandstoneScribbles.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.sandstoneScribbles.desc"), 2, "sandstone-scribbles/scribbles-2"); + sandstoneScribbles.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.sandstoneScribbles.desc"), 3, "sandstone-scribbles/scribbles-3"); + sandstoneScribbles.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.sandstoneScribbles.desc"), 4, "sandstone-scribbles/scribbles-4"); + sandstoneScribbles.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.sandstoneScribbles.desc"), 5, "sandstone-scribbles/scribbles-5"); + sandstoneScribbles.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.sandstoneScribbles.desc"), 6, "sandstone-scribbles/scribbles-6"); + sandstoneScribbles.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.sandstoneScribbles.desc"), 7, "sandstone-scribbles/scribbles-7"); + sandstoneScribbles.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.sandstoneScribbles.desc"), 8, "sandstone-scribbles/scribbles-8"); + sandstoneScribbles.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.sandstoneScribbles.desc"), 9, "sandstone-scribbles/scribbles-9"); + sandstoneScribbles.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.sandstoneScribbles.desc"), 10, "sandstone-scribbles/scribbles-10"); + sandstoneScribbles.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.sandstoneScribbles.desc"), 11, "sandstone-scribbles/scribbles-11"); + sandstoneScribbles.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.sandstoneScribbles.desc"), 12, "sandstone-scribbles/scribbles-12"); + sandstoneScribbles.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.sandstoneScribbles.desc"), 13, "sandstone-scribbles/scribbles-13"); + sandstoneScribbles.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.sandstoneScribbles.desc"), 14, "sandstone-scribbles/scribbles-14"); + sandstoneScribbles.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.sandstoneScribbles.desc"), 15, "sandstone-scribbles/scribbles-15"); + sandstoneScribbles.carverHelper.register(sandstoneScribbles, "sandstone_scribbles"); + } + + if(Configurations.featureEnabled("concrete")) + { + concrete = (BlockConcrete) new BlockConcrete().setStepSound(Block.soundTypeStone).setHardness(0.5F); + concrete.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.concrete.0.desc"), 0, "concrete/default"); + concrete.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.concrete.1.desc"), 1, "concrete/block"); + concrete.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.concrete.2.desc"), 2, "concrete/doubleslab"); + concrete.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.concrete.3.desc"), 3, "concrete/blocks"); + concrete.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.concrete.4.desc"), 4, "concrete/weathered"); + concrete.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.concrete.5.desc"), 5, "concrete/weathered-block"); + concrete.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.concrete.6.desc"), 6, "concrete/weathered-doubleslab"); + concrete.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.concrete.7.desc"), 7, "concrete/weathered-blocks"); + concrete.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.concrete.8.desc"), 8, "concrete/weathered-half"); + concrete.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.concrete.9.desc"), 9, "concrete/weathered-block-half"); + concrete.carverHelper.addVariation(StatCollector.translateToLocal("chisel.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).setHardness(0.01F).setBlockName("roadLine"); + GameRegistry.registerBlock(roadLine, ItemCarvable.class, "road_line"); + //TODO- flag + //LanguageRegistry.addName(new ItemStack(roadLine, 1, 0), "Road lines"); + } + + if(Configurations.featureEnabled("ironBlock")) + { + iron = (BlockBeaconBase) new BlockBeaconBase().setHardness(5F).setResistance(10F).setStepSound(Block.soundTypeMetal); + Carving.chisel.addVariation("iron_block", Blocks.iron_block, 0, 0); + iron.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.iron.1.desc"), 1, "iron/terrain-iron-largeingot"); + iron.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.iron.2.desc"), 2, "iron/terrain-iron-smallingot"); + iron.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.iron.3.desc"), 3, "iron/terrain-iron-gears"); + iron.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.iron.4.desc"), 4, "iron/terrain-iron-brick"); + iron.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.iron.5.desc"), 5, "iron/terrain-iron-plates"); + iron.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.iron.6.desc"), 6, "iron/terrain-iron-rivets"); + iron.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.iron.7.desc"), 7, "iron/terrain-iron-coin-heads"); + iron.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.iron.8.desc"), 8, "iron/terrain-iron-coin-tails"); + iron.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.iron.9.desc"), 9, "iron/terrain-iron-crate-dark"); + iron.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.iron.10.desc"), 10, "iron/terrain-iron-crate-light"); + iron.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.iron.11.desc"), 11, "iron/terrain-iron-moon"); + iron.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.iron.12.desc"), 12, "iron/terrain-iron-space"); + iron.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.iron.13.desc"), 13, "iron/terrain-iron-spaceblack"); + iron.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.iron.14.desc"), 14, "iron/terrain-iron-vents"); + iron.carverHelper.addVariation(StatCollector.translateToLocal("chisel.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().setHardness(3F).setResistance(10F).setStepSound(Block.soundTypeMetal); + Carving.chisel.addVariation("gold_block", Blocks.gold_block, 0, 0); + gold.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.gold.1.desc"), 1, "gold/terrain-gold-largeingot"); + gold.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.gold.2.desc"), 2, "gold/terrain-gold-smallingot"); + gold.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.gold.3.desc"), 3, "gold/terrain-gold-brick"); + gold.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.gold.4.desc"), 4, "gold/terrain-gold-cart"); + gold.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.gold.5.desc"), 5, "gold/terrain-gold-coin-heads"); + gold.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.gold.6.desc"), 6, "gold/terrain-gold-coin-tails"); + gold.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.gold.7.desc"), 7, "gold/terrain-gold-crate-dark"); + gold.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.gold.8.desc"), 8, "gold/terrain-gold-crate-light"); + gold.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.gold.9.desc"), 9, "gold/terrain-gold-plates"); + gold.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.gold.10.desc"), 10, "gold/terrain-gold-rivets"); + gold.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.gold.11.desc"), 11, "gold/terrain-gold-star"); + gold.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.gold.12.desc"), 12, "gold/terrain-gold-space"); + gold.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.gold.13.desc"), 13, "gold/terrain-gold-spaceblack"); + gold.carverHelper.addVariation(StatCollector.translateToLocal("chisel.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().setHardness(5F).setResistance(10F).setStepSound(Block.soundTypeMetal); + Carving.chisel.addVariation("diamond_block", Blocks.diamond_block, 0, 0); + diamond.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.diamond.1.desc"), 1, "diamond/terrain-diamond-embossed"); + diamond.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.diamond.2.desc"), 2, "diamond/terrain-diamond-gem"); + diamond.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.diamond.3.desc"), 3, "diamond/terrain-diamond-cells"); + diamond.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.diamond.4.desc"), 4, "diamond/terrain-diamond-space"); + diamond.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.diamond.5.desc"), 5, "diamond/terrain-diamond-spaceblack"); + diamond.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.diamond.6.desc"), 6, "diamond/terrain-diamond-simple"); + diamond.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.diamond.7.desc"), 7, "diamond/a1-blockdiamond-bismuth"); + diamond.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.diamond.8.desc"), 8, "diamond/a1-blockdiamond-crushed"); + diamond.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.diamond.9.desc"), 9, "diamond/a1-blockdiamond-four"); + diamond.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.diamond.10.desc"), 10, "diamond/a1-blockdiamond-fourornate"); + diamond.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.diamond.11.desc"), 11, "diamond/a1-blockdiamond-zelda"); + diamond.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.diamond.12.desc"), 12, "diamond/a1-blockdiamond-ornatelayer"); + diamond.carverHelper.register(diamond, "diamond_block"); + Carving.chisel.registerOre("diamond_block", "diamond"); + } + + if(Configurations.featureEnabled("glowstone")) + { + lightstone = (BlockLightstoneCarvable) new BlockLightstoneCarvable().setHardness(0.3F).setLightLevel(1.0F).setStepSound(Block.soundTypeGlass); + Carving.chisel.addVariation("glowstone", Blocks.glowstone, 0, 0); + lightstone.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.lightstone.1.desc"), 1, "lightstone/terrain-sulphur-cobble"); + lightstone.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.lightstone.2.desc"), 2, "lightstone/terrain-sulphur-corroded"); + lightstone.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.lightstone.3.desc"), 3, "lightstone/terrain-sulphur-glass"); + lightstone.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.lightstone.4.desc"), 4, "lightstone/terrain-sulphur-neon"); + lightstone.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.lightstone.5.desc"), 5, "lightstone/terrain-sulphur-ornate"); + lightstone.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.lightstone.6.desc"), 6, "lightstone/terrain-sulphur-rocky"); + lightstone.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.lightstone.7.desc"), 7, "lightstone/terrain-sulphur-shale"); + lightstone.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.lightstone.8.desc"), 8, "lightstone/terrain-sulphur-tile"); + lightstone.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.lightstone.9.desc"), 9, "lightstone/terrain-sulphur-weavelanternlight"); + lightstone.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.lightstone.10.desc"), 10, "lightstone/a1-glowstone-cobble"); + lightstone.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.lightstone.11.desc"), 11, "lightstone/a1-glowstone-growth"); + lightstone.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.lightstone.12.desc"), 12, "lightstone/a1-glowstone-layers"); + lightstone.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.lightstone.13.desc"), 13, "lightstone/a1-glowstone-tilecorroded"); + lightstone.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.lightstone.14.desc"), 14, "lightstone/glowstone-bismuth"); + lightstone.carverHelper.addVariation(StatCollector.translateToLocal("chisel.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().setHardness(3F).setResistance(5F).setStepSound(Block.soundTypeStone); + Carving.chisel.addVariation("lapis_block", Blocks.lapis_block, 0, 0); + lapis.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.lapis.1.desc"), 1, "lapis/terrain-lapisblock-chunky"); + lapis.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.lapis.2.desc"), 2, "lapis/terrain-lapisblock-panel"); + lapis.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.lapis.3.desc"), 3, "lapis/terrain-lapisblock-zelda"); + lapis.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.lapis.4.desc"), 4, "lapis/terrain-lapisornate"); + lapis.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.lapis.5.desc"), 5, "lapis/terrain-lapistile"); + lapis.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.lapis.6.desc"), 6, "lapis/a1-blocklapis-panel"); + lapis.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.lapis.7.desc"), 7, "lapis/a1-blocklapis-smooth"); + lapis.carverHelper.addVariation(StatCollector.translateToLocal("chisel.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().setHardness(5.0F).setResistance(10.0F).setStepSound(Block.soundTypeMetal); + Carving.chisel.addVariation("emerald_block", Blocks.emerald_block, 0, 0); + emerald.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.emerald.1.desc"), 1, "emerald/a1-blockemerald-emeraldpanel"); + emerald.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.emerald.2.desc"), 2, "emerald/a1-blockemerald-emeraldpanelclassic"); + emerald.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.emerald.3.desc"), 3, "emerald/a1-blockemerald-emeraldsmooth"); + emerald.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.emerald.4.desc"), 4, "emerald/a1-blockemerald-emeraldchunk"); + emerald.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.emerald.5.desc"), 5, "emerald/a1-blockemerald-emeraldornatelayer"); + emerald.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.emerald.6.desc"), 6, "emerald/a1-blockemerald-emeraldzelda"); + emerald.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.emerald.7.desc"), 7, "emerald/a1-blockquartz-cell"); + emerald.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.emerald.8.desc"), 8, "emerald/a1-blockquartz-cellbismuth"); + emerald.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.emerald.9.desc"), 9, "emerald/a1-blockquartz-four"); + emerald.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.emerald.10.desc"), 10, "emerald/a1-blockquartz-fourornate"); + emerald.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.emerald.11.desc"), 11, "emerald/a1-blockquartz-ornate"); + emerald.carverHelper.register(emerald, "emerald_block"); + Carving.chisel.registerOre("emerald_block", "emerald"); + } + + if(Configurations.featureEnabled("netherBrick")) + { + netherBrick = (BlockCarvable) new BlockCarvable().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("chisel.tile.netherBrick.1.desc"), 1, "netherbrick/a1-netherbrick-brinstar"); + netherBrick.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.netherBrick.2.desc"), 2, "netherbrick/a1-netherbrick-classicspatter"); + netherBrick.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.netherBrick.3.desc"), 3, "netherbrick/a1-netherbrick-guts"); + netherBrick.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.netherBrick.4.desc"), 4, "netherbrick/a1-netherbrick-gutsdark"); + netherBrick.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.netherBrick.5.desc"), 5, "netherbrick/a1-netherbrick-gutssmall"); + netherBrick.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.netherBrick.6.desc"), 6, "netherbrick/a1-netherbrick-lavabrinstar"); + netherBrick.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.netherBrick.7.desc"), 7, "netherbrick/a1-netherbrick-lavabrown"); + netherBrick.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.netherBrick.8.desc"), 8, "netherbrick/a1-netherbrick-lavaobsidian"); + netherBrick.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.netherBrick.9.desc"), 9, "netherbrick/a1-netherbrick-lavastonedark"); + netherBrick.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.netherBrick.10.desc"), 10, "netherbrick/a1-netherbrick-meat"); + netherBrick.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.netherBrick.11.desc"), 11, "netherbrick/a1-netherbrick-meatred"); + netherBrick.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.netherBrick.12.desc"), 12, "netherbrick/a1-netherbrick-meatredsmall"); + netherBrick.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.netherBrick.13.desc"), 13, "netherbrick/a1-netherbrick-meatsmall"); + netherBrick.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.netherBrick.14.desc"), 14, "netherbrick/a1-netherbrick-red"); + netherBrick.carverHelper.addVariation(StatCollector.translateToLocal("chisel.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().setHardness(0.4F).setStepSound(Block.soundTypeStone); + Carving.chisel.addVariation("netherrack", Blocks.netherrack, 0, 0); + netherrack.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.hellrock.1.desc"), 1, "netherrack/a1-netherrack-bloodgravel"); + netherrack.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.hellrock.2.desc"), 2, "netherrack/a1-netherrack-bloodrock"); + netherrack.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.hellrock.3.desc"), 3, "netherrack/a1-netherrack-bloodrockgrey"); + netherrack.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.hellrock.4.desc"), 4, "netherrack/a1-netherrack-brinstar"); + netherrack.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.hellrock.5.desc"), 5, "netherrack/a1-netherrack-brinstarshale"); + netherrack.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.hellrock.6.desc"), 6, "netherrack/a1-netherrack-classic"); + netherrack.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.hellrock.7.desc"), 7, "netherrack/a1-netherrack-classicspatter"); + netherrack.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.hellrock.8.desc"), 8, "netherrack/a1-netherrack-guts"); + netherrack.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.hellrock.9.desc"), 9, "netherrack/a1-netherrack-gutsdark"); + netherrack.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.hellrock.10.desc"), 10, "netherrack/a1-netherrack-meat"); + netherrack.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.hellrock.11.desc"), 11, "netherrack/a1-netherrack-meatred"); + netherrack.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.hellrock.12.desc"), 12, "netherrack/a1-netherrack-meatrock"); + netherrack.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.hellrock.13.desc"), 13, "netherrack/a1-netherrack-red"); + netherrack.carverHelper.addVariation(StatCollector.translateToLocal("chisel.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().setHardness(2.0F).setResistance(10.0F).setStepSound(Block.soundTypeStone); + Carving.chisel.addVariation("mossy_cobblestone", Blocks.mossy_cobblestone, 0, 0); + cobblestoneMossy.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.stoneMoss.1.desc"), 1, "cobblestonemossy/terrain-cobb-brickaligned"); + cobblestoneMossy.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.stoneMoss.2.desc"), 2, "cobblestonemossy/terrain-cob-detailedbrick"); + cobblestoneMossy.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.stoneMoss.3.desc"), 3, "cobblestonemossy/terrain-cob-smallbrick"); + cobblestoneMossy.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.stoneMoss.4.desc"), 4, "cobblestonemossy/terrain-cobblargetiledark"); + cobblestoneMossy.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.stoneMoss.5.desc"), 5, "cobblestonemossy/terrain-cobbsmalltile"); + cobblestoneMossy.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.stoneMoss.6.desc"), 6, "cobblestonemossy/terrain-cob-french"); + cobblestoneMossy.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.stoneMoss.7.desc"), 7, "cobblestonemossy/terrain-cob-french2"); + cobblestoneMossy.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.stoneMoss.8.desc"), 8, "cobblestonemossy/terrain-cobmoss-creepdungeon"); + cobblestoneMossy.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.stoneMoss.9.desc"), 9, "cobblestonemossy/terrain-mossysmalltiledark"); + cobblestoneMossy.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.stoneMoss.10.desc"), 10, "cobblestonemossy/terrain-pistonback-dungeontile"); + cobblestoneMossy.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.stoneMoss.11.desc"), 11, "cobblestonemossy/terrain-pistonback-darkcreeper"); + cobblestoneMossy.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.stoneMoss.12.desc"), 12, "cobblestonemossy/terrain-pistonback-darkdent"); + cobblestoneMossy.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.stoneMoss.13.desc"), 13, "cobblestonemossy/terrain-pistonback-darkemboss"); + cobblestoneMossy.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.stoneMoss.14.desc"), 14, "cobblestonemossy/terrain-pistonback-darkmarker"); + cobblestoneMossy.carverHelper.addVariation(StatCollector.translateToLocal("chisel.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().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("stonebrick", Blocks.stonebrick, i, i); + } else + Carving.chisel.addVariation("stonebrick", Blocks.stonebrick, i, i); + } + stoneBrick.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.stoneBrick.4.desc"), 4, "stonebrick/smallbricks"); + stoneBrick.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.stoneBrick.5.desc"), 5, "stonebrick/largebricks"); + stoneBrick.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.stoneBrick.6.desc"), 6, "stonebrick/smallchaotic"); + stoneBrick.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.stoneBrick.7.desc"), 7, "stonebrick/chaoticbricks"); + stoneBrick.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.stoneBrick.8.desc"), 8, "stonebrick/chaotic"); + stoneBrick.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.stoneBrick.9.desc"), 9, "stonebrick/fancy"); + stoneBrick.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.stoneBrick.10.desc"), 10, "stonebrick/ornate"); + stoneBrick.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.stoneBrick.11.desc"), 11, "stonebrick/largeornate"); + stoneBrick.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.stoneBrick.12.desc"), 12, "stonebrick/panel-hard"); + stoneBrick.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.stoneBrick.13.desc"), 13, "stonebrick/sunken"); + stoneBrick.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.stoneBrick.14.desc"), 14, "stonebrick/ornatepanel"); + stoneBrick.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.stoneBrick.15.desc"), 15, "stonebrick/poison"); + stoneBrick.carverHelper.register(stoneBrick, "stonebrick"); + Carving.chisel.registerOre("stonebrick", "stonebrick"); + } + + if(Configurations.featureEnabled("snakestone")) + { + snakestone = (BlockSnakestone) new BlockSnakestone("Chisel:snakestone/snake/").setBlockName("snakestoneStone"); + 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); + } + + if(Configurations.featureEnabled("dirt")) + { + dirt = (BlockCarvable) new BlockCarvable(Material.ground).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("chisel.tile.dirt.0.desc"), 0, "dirt/bricks"); + dirt.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.dirt.1.desc"), 1, "dirt/netherbricks"); + dirt.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.dirt.2.desc"), 2, "dirt/bricks3"); + dirt.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.dirt.3.desc"), 3, "dirt/cobble"); + dirt.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.dirt.4.desc"), 4, "dirt/reinforced"); + dirt.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.dirt.5.desc"), 5, "dirt/dirt-reinforced"); + dirt.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.dirt.6.desc"), 6, "dirt/happy"); + dirt.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.dirt.7.desc"), 7, "dirt/bricks2"); + dirt.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.dirt.8.desc"), 8, "dirt/bricks+dirt2"); + dirt.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.dirt.9.desc"), 9, "dirt/hor"); + dirt.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.dirt.10.desc"), 10, "dirt/vert"); + dirt.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.dirt.11.desc"), 11, "dirt/layers"); + dirt.carverHelper.addVariation(StatCollector.translateToLocal("chisel.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().setHardness(0.5F).setLightOpacity(3).setStepSound(Block.soundTypeGlass); + Carving.chisel.addVariation("ice", Blocks.ice, 0, 0); + ice.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.ice.1.desc"), 1, "ice/a1-ice-light"); + ice.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.ice.2.desc"), 2, "ice/a1-stonecobble-icecobble"); + ice.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.ice.3.desc"), 3, "ice/a1-netherbrick-ice"); + ice.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.ice.4.desc"), 4, "ice/a1-stonecobble-icebrick"); + ice.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.ice.5.desc"), 5, "ice/a1-stonecobble-icebricksmall"); + ice.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.ice.6.desc"), 6, "ice/a1-stonecobble-icedungeon"); + ice.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.ice.7.desc"), 7, "ice/a1-stonecobble-icefour"); + ice.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.ice.8.desc"), 8, "ice/a1-stonecobble-icefrench"); + ice.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.ice.9.desc"), 9, "ice/sunkentiles"); + ice.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.ice.10.desc"), 10, "ice/tiles"); + ice.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.ice.11.desc"), 11, "ice/a1-stonecobble-icepanel"); + ice.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.ice.12.desc"), 12, "ice/a1-stoneslab-ice"); + ice.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.ice.13.desc"), 13, "ice/zelda"); + ice.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.ice.14.desc"), 14, "ice/bismuth"); + ice.carverHelper.addVariation(StatCollector.translateToLocal("chisel.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().setHardness(0.5F).setLightOpacity(3).setStepSound(Block.soundTypeGlass); + icePillar.carverHelper.setChiselBlockName("Ice Pillar"); + icePillar.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.icePillar.0.desc"), 0, "icepillar/column"); + icePillar.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.icePillar.1.desc"), 1, "icepillar/capstone"); + icePillar.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.icePillar.2.desc"), 2, "icepillar/base"); + icePillar.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.icePillar.3.desc"), 3, "icepillar/small"); + icePillar.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.icePillar.4.desc"), 4, "icepillar/pillar-carved"); + icePillar.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.icePillar.5.desc"), 5, "icepillar/a1-stoneornamental-marblegreek"); + icePillar.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.icePillar.6.desc"), 6, "icepillar/a1-stonepillar-greek"); + icePillar.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.icePillar.7.desc"), 7, "icepillar/a1-stonepillar-plain"); + icePillar.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.icePillar.8.desc"), 8, "icepillar/a1-stonepillar-greektopplain"); + icePillar.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.icePillar.9.desc"), 9, "icepillar/a1-stonepillar-plaintopplain"); + icePillar.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.icePillar.10.desc"), 10, "icepillar/a1-stonepillar-greekbottomplain"); + icePillar.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.icePillar.11.desc"), 11, "icepillar/a1-stonepillar-plainbottomplain"); + icePillar.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.icePillar.12.desc"), 12, "icepillar/a1-stonepillar-greektopgreek"); + icePillar.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.icePillar.13.desc"), 13, "icepillar/a1-stonepillar-plaintopgreek"); + icePillar.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.icePillar.14.desc"), 14, "icepillar/a1-stonepillar-greekbottomgreek"); + icePillar.carverHelper.addVariation(StatCollector.translateToLocal("chisel.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("chisel.tile.iceStairs.0.desc"), 0, Blocks.ice); + makerIceStairs.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.iceStairs.1.desc"), 1, "ice/a1-ice-light"); + makerIceStairs.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.iceStairs.2.desc"), 2, "ice/a1-stonecobble-icecobble"); + makerIceStairs.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.iceStairs.3.desc"), 3, "ice/a1-netherbrick-ice"); + makerIceStairs.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.iceStairs.4.desc"), 4, "ice/a1-stonecobble-icebrick"); + makerIceStairs.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.iceStairs.5.desc"), 5, "ice/a1-stonecobble-icebricksmall"); + makerIceStairs.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.iceStairs.6.desc"), 6, "ice/a1-stonecobble-icedungeon"); + makerIceStairs.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.iceStairs.7.desc"), 7, "ice/a1-stonecobble-icefour"); + makerIceStairs.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.iceStairs.8.desc"), 8, "ice/a1-stonecobble-icefrench"); + makerIceStairs.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.iceStairs.9.desc"), 9, "ice/sunkentiles"); + makerIceStairs.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.iceStairs.10.desc"), 10, "ice/tiles"); + makerIceStairs.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.iceStairs.11.desc"), 11, "ice/a1-stonecobble-icepanel"); + makerIceStairs.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.iceStairs.12.desc"), 12, "ice/a1-stoneslab-ice"); + makerIceStairs.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.iceStairs.13.desc"), 13, "ice/zelda"); + makerIceStairs.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.iceStairs.14.desc"), 14, "ice/bismuth"); + makerIceStairs.carverHelper.addVariation(StatCollector.translateToLocal("chisel.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"); + } + } + + 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()).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"); + if(i < 4) + { // TODO: We lack textures for these! + 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); + Blocks.planks.setHarvestLevel("chisel", 0, i); + planks[i].setHarvestLevel("axe", 0); + + Carving.chisel.setVariationSound(orename, Chisel.MOD_ID+":chisel.wood"); + } + } + + if(Configurations.featureEnabled("obsidian")) + { + obsidian = (BlockCarvable) new BlockCarvable().setHardness(50.0F).setResistance(2000.0F).setStepSound(Block.soundTypeStone); + Carving.chisel.addVariation("obsidian", Blocks.obsidian, 0, 0); + obsidian.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.obsidian.1.desc"), 1, "obsidian/pillar"); + obsidian.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.obsidian.2.desc"), 2, "obsidian/pillar-quartz"); + obsidian.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.obsidian.3.desc"), 3, "obsidian/chiseled"); + obsidian.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.obsidian.4.desc"), 4, "obsidian/panel-shiny"); + obsidian.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.obsidian.5.desc"), 5, "obsidian/panel"); + obsidian.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.obsidian.6.desc"), 6, "obsidian/chunks"); + obsidian.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.obsidian.7.desc"), 7, "obsidian/growth"); + obsidian.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.obsidian.8.desc"), 8, "obsidian/crystal"); + obsidian.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.obsidian.9.desc"), 9, "obsidian/map-a"); + obsidian.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.obsidian.10.desc"), 10, "obsidian/map-b"); + obsidian.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.obsidian.11.desc"), 11, "obsidian/panel-light"); + obsidian.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.obsidian.12.desc"), 12, "obsidian/blocks"); + obsidian.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.obsidian.13.desc"), 13, "obsidian/tiles"); + obsidian.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.obsidian.14.desc"), 14, "obsidian/greek"); + obsidian.carverHelper.addVariation(StatCollector.translateToLocal("chisel.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"); + //LanguageRegistry.addName(new ItemStack(obsidianSnakestone, 1, 1), "Obsidian snakestone head"); + //LanguageRegistry.addName(new ItemStack(obsidianSnakestone, 1, 13), "Obsidian snakestone body"); + Carving.chisel.addVariation("obsidian", obsidianSnakestone, 1, 16); + Carving.chisel.addVariation("obsidian", obsidianSnakestone, 13, 17); + } + + if(Configurations.featureEnabled("ironBars")) + { + paneIron = (BlockCarvablePane) new BlockCarvablePane(Material.iron, true).setHardness(0.3F).setStepSound(Block.soundTypeMetal); + Carving.chisel.addVariation("iron_bars", Blocks.iron_bars, 0, 0); + paneIron.carverHelper.addVariation("Iron bars without frame", 1, "ironpane/fenceIron"); + paneIron.carverHelper.addVariation("Menacing iron bars", 2, "ironpane/barbedwire"); + paneIron.carverHelper.addVariation("Iron cage bars", 3, "ironpane/cage"); + paneIron.carverHelper.addVariation("Menacing iron spikes", 4, "ironpane/fenceIronTop"); + paneIron.carverHelper.addVariation("Thick iron grid", 5, "ironpane/terrain-glass-thickgrid"); + paneIron.carverHelper.addVariation("Thin iron grid", 6, "ironpane/terrain-glass-thingrid"); + paneIron.carverHelper.addVariation("Ornate iron pane fence", 7, "ironpane/terrain-glass-ornatesteel"); + paneIron.carverHelper.addVariation("Vertical iron bars", 8, "ironpane/bars"); + paneIron.carverHelper.addVariation("Iron spikes", 9, "ironpane/spikes"); + paneIron.carverHelper.register(paneIron, "iron_bars"); + } + + if(Configurations.featureEnabled("glassPane")) + { + paneGlass = (BlockCarvablePane) new BlockCarvablePane(Material.glass, false).setHardness(0.3F).setStepSound(Block.soundTypeGlass); + Carving.chisel.addVariation("glass_pane", Blocks.glass_pane, 0, 0); + paneGlass.carverHelper.addVariation("Bubble glass pane", 1, "glasspane/terrain-glassbubble"); + paneGlass.carverHelper.addVariation("Borderless glass pane", 2, "glasspane/terrain-glassnoborder"); + paneGlass.carverHelper.addVariation("Screen pane", 3, "glasspane/terrain-glass-screen"); + paneGlass.carverHelper.addVariation("Streak glass pane", 4, "glasspane/terrain-glassstreak"); + paneGlass.carverHelper.addVariation("Chinese glass pane", 12, "glasspane/chinese"); + paneGlass.carverHelper.addVariation("Chinese glass pane with golden frame", 13, "glasspane/chinese2"); + paneGlass.carverHelper.addVariation("Japanese glass pane", 14, "glasspane/japanese"); + paneGlass.carverHelper.addVariation("Ornate japanese glass pane", 15, "glasspane/japanese2"); + paneGlass.carverHelper.register(paneGlass, "glass_pane"); + } + + if(Configurations.featureEnabled("redstoneBlock")) + { + redstone = (BlockCarvablePowered) (new BlockCarvablePowered(Material.iron)).setHardness(5.0F).setResistance(10.0F).setStepSound(Block.soundTypeMetal); + Carving.chisel.addVariation("redstone_block", Blocks.redstone_block, 0, 0); + redstone.carverHelper.addVariation("Smooth redstone", 1, "redstone/smooth"); + redstone.carverHelper.addVariation("Large redstone block", 2, "redstone/block"); + redstone.carverHelper.addVariation("Small redstone blocks", 3, "redstone/blocks"); + redstone.carverHelper.addVariation("Redstone bricks", 4, "redstone/bricks"); + redstone.carverHelper.addVariation("Small redstone bricks", 5, "redstone/smallbricks"); + redstone.carverHelper.addVariation("Chaotic redstone bricks", 6, "redstone/smallchaotic"); + redstone.carverHelper.addVariation("Chiseled redstone", 7, "redstone/chiseled"); + redstone.carverHelper.addVariation("Redstone Greek decoration", 8, "redstone/ere"); + redstone.carverHelper.addVariation("Ornate redstone tiles", 9, "redstone/ornate-tiles"); + redstone.carverHelper.addVariation("Redstone pillar", 10, "redstone/pillar"); + redstone.carverHelper.addVariation("Redstone tiles", 11, "redstone/tiles"); + redstone.carverHelper.addVariation("Redstone circuit", 12, "redstone/circuit"); + redstone.carverHelper.addVariation("Redstone supaplex circuit", 13, "redstone/supaplex"); + redstone.carverHelper.addVariation("Redstone skulls", 14, "redstone/a1-blockredstone-skullred"); + redstone.carverHelper.addVariation("Redstone Zelda block", 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).setHardness(2.0F).setResistance(10F).setStepSound(Chisel.soundHolystoneFootstep); + holystone.carverHelper.addVariation("Holystone", 0, "holystone/holystone"); + holystone.carverHelper.addVariation("Smooth holystone", 1, "holystone/smooth"); + holystone.carverHelper.addVariation("Mysterious holystone symbol", 2, "holystone/love"); + holystone.carverHelper.addVariation("Chiseled holystone", 3, "holystone/chiseled"); + holystone.carverHelper.addVariation("Holystone blocks", 4, "holystone/blocks"); + holystone.carverHelper.addVariation("Rough holystone blocks", 5, "holystone/blocks-rough"); + holystone.carverHelper.addVariation("Holystone bricks", 6, "holystone/brick"); + holystone.carverHelper.addVariation("Large holystone bricks", 7, "holystone/largebricks"); + holystone.carverHelper.addVariation("Holystone platform", 8, "holystone/platform"); + holystone.carverHelper.addVariation("Holystone platform tiles", 9, "holystone/platform-tiles"); + holystone.carverHelper.addVariation("Fancy holystone construction", 10, "holystone/construction"); + holystone.carverHelper.addVariation("Fancy holystone tiles", 11, "holystone/fancy-tiles"); + holystone.carverHelper.addVariation("Smooth holystone plate", 12, "holystone/plate"); + holystone.carverHelper.addVariation("Holystone plate", 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").setHardness(2.0F).setResistance(10F); + lavastone.carverHelper.addVariation("Lavastone", 0, "lavastone/cobble"); + lavastone.carverHelper.addVariation("Black lavastone", 1, "lavastone/black"); + lavastone.carverHelper.addVariation("Lavastone tiles", 2, "lavastone/tiles"); + lavastone.carverHelper.addVariation("Chaotic lavastone bricks", 3, "lavastone/chaotic"); + lavastone.carverHelper.addVariation("Lava creeper in tiles", 4, "lavastone/creeper"); + lavastone.carverHelper.addVariation("Lava panel", 5, "lavastone/panel"); + lavastone.carverHelper.addVariation("Ornate lava panel", 6, "lavastone/panel-ornate"); + lavastone.carverHelper.register(lavastone, "lavastone"); + OreDictionary.registerOre("lavastone", lavastone); + Carving.chisel.registerOre("lavastone", "lavastone"); + } + + if(Configurations.featureEnabled("fantasy")) + { + fantasy = (BlockCarvable) new BlockCarvable(Material.rock).setHardness(2.0F).setResistance(10F); + fantasy.carverHelper.setChiselBlockName("Fantasy Block"); + fantasy.carverHelper.addVariation("Fantasy brick", 0, "fantasy/brick"); + fantasy.carverHelper.addVariation("Faded fantasy brick", 1, "fantasy/brick-faded"); + fantasy.carverHelper.addVariation("Weared fantasy brick", 2, "fantasy/brick-wear"); + fantasy.carverHelper.addVariation("Damaged fantasy bricks", 3, "fantasy/bricks"); + fantasy.carverHelper.addVariation("Fantasy decoration", 4, "fantasy/decor"); + fantasy.carverHelper.addVariation("Fantasy decoration block", 5, "fantasy/decor-block"); + fantasy.carverHelper.addVariation("Fantasy pillar", 6, "fantasy/pillar"); + fantasy.carverHelper.addVariation("Fantasy pillar decoration", 7, "fantasy/pillar-decorated"); + fantasy.carverHelper.addVariation("Fantasy gold snake decoration", 8, "fantasy/gold-decor-1"); + fantasy.carverHelper.addVariation("Fantasy gold noise decoration", 9, "fantasy/gold-decor-2"); + fantasy.carverHelper.addVariation("Fantasy gold engravings decoration", 10, "fantasy/gold-decor-3"); + fantasy.carverHelper.addVariation("Fantasy gold chains decoration", 11, "fantasy/gold-decor-4"); + fantasy.carverHelper.addVariation("Fantasy plate decoration", 12, "fantasy/plate"); + fantasy.carverHelper.addVariation("Fantasy block", 13, "fantasy/block"); + fantasy.carverHelper.addVariation("Fantasy bricks in disarray", 14, "fantasy/bricks-chaotic"); + fantasy.carverHelper.addVariation("Weared fantasy bricks", 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).setHardness(2.0F).setResistance(10F).setStepSound(Block.soundTypeCloth); + carpet.carverHelper.setChiselBlockName("Carpet Block"); + carpet.carverHelper.addVariation("White carpet block", 0, "carpet/white"); + carpet.carverHelper.addVariation("Orange carpet block", 1, "carpet/orange"); + carpet.carverHelper.addVariation("Magenta carpet block", 2, "carpet/lily"); + carpet.carverHelper.addVariation("Light blue carpet block", 3, "carpet/lightblue"); + carpet.carverHelper.addVariation("Yellow carpet block", 4, "carpet/yellow"); + carpet.carverHelper.addVariation("Light green carpet block", 5, "carpet/lightgreen"); + carpet.carverHelper.addVariation("Pink carpet block", 6, "carpet/pink"); + carpet.carverHelper.addVariation("Dark grey carpet block", 7, "carpet/darkgrey"); + carpet.carverHelper.addVariation("Grey carpet block", 8, "carpet/grey"); + carpet.carverHelper.addVariation("Teal carpet block", 9, "carpet/teal"); + carpet.carverHelper.addVariation("Purple carpet block", 10, "carpet/purple"); + carpet.carverHelper.addVariation("Dark blue carpet block", 11, "carpet/darkblue"); + carpet.carverHelper.addVariation("Brown carpet block", 12, "carpet/brown"); + carpet.carverHelper.addVariation("Green carpet block", 13, "carpet/green"); + carpet.carverHelper.addVariation("Red carpet block", 14, "carpet/red"); + carpet.carverHelper.addVariation("Black carpet block", 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).setHardness(2.0F).setResistance(10F).setStepSound(Block.soundTypeCloth); + carpetFloor.carverHelper.setChiselBlockName("Carpet"); + carpetFloor.carverHelper.addVariation("White carpet", 0, "carpet/white"); + carpetFloor.carverHelper.addVariation("Orange carpet", 1, "carpet/orange"); + carpetFloor.carverHelper.addVariation("Magenta carpet", 2, "carpet/lily"); + carpetFloor.carverHelper.addVariation("Light blue carpet", 3, "carpet/lightblue"); + carpetFloor.carverHelper.addVariation("Yellow carpet", 4, "carpet/yellow"); + carpetFloor.carverHelper.addVariation("Light green carpet", 5, "carpet/lightgreen"); + carpetFloor.carverHelper.addVariation("Pink carpet", 6, "carpet/pink"); + carpetFloor.carverHelper.addVariation("Dark grey carpet", 7, "carpet/darkgrey"); + carpetFloor.carverHelper.addVariation("Grey carpet", 8, "carpet/grey"); + carpetFloor.carverHelper.addVariation("Teal carpet", 9, "carpet/teal"); + carpetFloor.carverHelper.addVariation("Purple carpet", 10, "carpet/purple"); + carpetFloor.carverHelper.addVariation("Dark blue carpet", 11, "carpet/darkblue"); + carpetFloor.carverHelper.addVariation("Brown carpet", 12, "carpet/brown"); + carpetFloor.carverHelper.addVariation("Green carpet", 13, "carpet/green"); + carpetFloor.carverHelper.addVariation("Red carpet", 14, "carpet/red"); + carpetFloor.carverHelper.addVariation("Black carpet", 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); + } + } + + if(Configurations.featureEnabled("bookshelf")) + { + bookshelf = (BlockCarvable) new BlockMarbleBookshelf().setHardness(1.5F).setStepSound(Block.soundTypeWood); + Carving.chisel.addVariation("bookshelf", Blocks.bookshelf, 0, 0); + bookshelf.carverHelper.addVariation("Bookshelf with rainbow colored books", 1, "bookshelf/rainbow"); + bookshelf.carverHelper.addVariation("Necromancer novice's bookshelf", 2, "bookshelf/necromancer-novice"); + bookshelf.carverHelper.addVariation("Necromancer's bookshelf", 3, "bookshelf/necromancer"); + bookshelf.carverHelper.addVariation("Bookshelf with red tomes", 4, "bookshelf/redtomes"); + bookshelf.carverHelper.addVariation("Abandoned bookshelf", 5, "bookshelf/abandoned"); + bookshelf.carverHelper.addVariation("Hoarder's bookshelf", 6, "bookshelf/hoarder"); + bookshelf.carverHelper.addVariation("Bookshelf filled to brim with boring pastel books", 7, "bookshelf/brim"); + bookshelf.carverHelper.addVariation("Historician's bookshelf", 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).setHardness(5.0F).setResistance(10.0F).setStepSound(Block.soundTypeMetal); + tyrian.carverHelper.setChiselBlockName("Futuristic Armor Plating Block"); + tyrian.carverHelper.addVariation("Futuristic armor plating block", 0, "tyrian/shining"); + tyrian.carverHelper.addVariation("Bleak futuristic armor plating block", 1, "tyrian/tyrian"); + tyrian.carverHelper.addVariation("Purple futuristic armor plating block", 2, "tyrian/chaotic"); + tyrian.carverHelper.addVariation("Faded purple futuristic armor plating block", 3, "tyrian/softplate"); + tyrian.carverHelper.addVariation("Rusted futuristic armor plating block", 4, "tyrian/rust"); + tyrian.carverHelper.addVariation("Elaborate futuristic armor plating block", 5, "tyrian/elaborate"); + tyrian.carverHelper.addVariation("Futuristic armor plating block with many seams", 6, "tyrian/routes"); + tyrian.carverHelper.addVariation("Futuristic platform block", 7, "tyrian/platform"); + tyrian.carverHelper.addVariation("Futuristic armor plating tiles", 8, "tyrian/platetiles"); + tyrian.carverHelper.addVariation("Diagonal futuristic armor plating block", 9, "tyrian/diagonal"); + tyrian.carverHelper.addVariation("Futuristic armor plating block with dent", 10, "tyrian/dent"); + tyrian.carverHelper.addVariation("Blue futuristic armor plating block", 11, "tyrian/blueplating"); + tyrian.carverHelper.addVariation("Black futuristic armor plating block", 12, "tyrian/black"); + tyrian.carverHelper.addVariation("Black futuristic armor plating tiles", 13, "tyrian/black2"); + tyrian.carverHelper.addVariation("Black futuristic armor plating block with an opening", 14, "tyrian/opening"); + tyrian.carverHelper.addVariation("Futuristic armor plating with shining metal bits", 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).setResistance(10F).setStepSound(Chisel.soundTempleFootstep); + temple.carverHelper.setChiselBlockName("Temple Block"); + temple.carverHelper.addVariation("Temple cobblestone", 0, "temple/cobble"); + temple.carverHelper.addVariation("Orante temple block", 1, "temple/ornate"); + temple.carverHelper.addVariation("Temple plate", 2, "temple/plate"); + temple.carverHelper.addVariation("Cracked temple plate", 3, "temple/plate-cracked"); + temple.carverHelper.addVariation("Temple bricks", 4, "temple/bricks"); + temple.carverHelper.addVariation("Large temple bricks", 5, "temple/bricks-large"); + temple.carverHelper.addVariation("Weared temple bricks", 6, "temple/bricks-weared"); + temple.carverHelper.addVariation("Temple bricks in disarray", 7, "temple/bricks-disarray"); + temple.carverHelper.addVariation("Temple column", 8, "temple/column"); + temple.carverHelper.addVariation("Temple stand", 9, "temple/stand"); + temple.carverHelper.addVariation("Temple mosaic stand", 10, "temple/stand-mosaic"); + temple.carverHelper.addVariation("Temple creeper stand", 11, "temple/stand-creeper"); + temple.carverHelper.addVariation("Temple tiles", 12, "temple/tiles"); + temple.carverHelper.addVariation("Small temple tiles", 13, "temple/smalltiles"); + temple.carverHelper.addVariation("Light temple tiles", 14, "temple/tiles-light"); + temple.carverHelper.addVariation("Small light temple tiles", 15, "temple/smalltiles-light"); + temple.carverHelper.register(temple, "templeblock"); + + if(Configurations.featureEnabled("templeBlockMossy")) + { + templeMossy = (BlockCarvable) new BlockEldritch().setHardness(2.0F).setResistance(10F).setStepSound(Chisel.soundTempleFootstep); + templeMossy.carverHelper.setChiselBlockName("Mossy Temple Block"); + templeMossy.carverHelper.addVariation("Mossy temple cobblestone", 0, "templemossy/cobble"); + templeMossy.carverHelper.addVariation("Orante mossy temple block", 1, "templemossy/ornate"); + templeMossy.carverHelper.addVariation("Mossy temple plate", 2, "templemossy/plate"); + templeMossy.carverHelper.addVariation("Cracked mossy temple plate", 3, "templemossy/plate-cracked"); + templeMossy.carverHelper.addVariation("Mossy temple bricks", 4, "templemossy/bricks"); + templeMossy.carverHelper.addVariation("Large mossy temple bricks", 5, "templemossy/bricks-large"); + templeMossy.carverHelper.addVariation("Weared mossy temple bricks", 6, "templemossy/bricks-weared"); + templeMossy.carverHelper.addVariation("Mossy temple bricks in disarray", 7, "templemossy/bricks-disarray"); + templeMossy.carverHelper.addVariation("Mossy temple column", 8, "templemossy/column"); + templeMossy.carverHelper.addVariation("Mossy temple stand", 9, "templemossy/stand"); + templeMossy.carverHelper.addVariation("Mossy temple mosaic stand", 10, "templemossy/stand-mosaic"); + templeMossy.carverHelper.addVariation("Mossy temple creeper stand", 11, "templemossy/stand-creeper"); + templeMossy.carverHelper.addVariation("Mossy temple tiles", 12, "templemossy/tiles"); + templeMossy.carverHelper.addVariation("Small mossy temple tiles", 13, "templemossy/smalltiles"); + templeMossy.carverHelper.addVariation("Light mossy temple tiles", 14, "templemossy/tiles-light"); + templeMossy.carverHelper.addVariation("Small light mossy temple tiles", 15, "templemossy/smalltiles-light"); + templeMossy.carverHelper.register(templeMossy, "mossy_templeblock"); + } + } + + if(Configurations.featureEnabled("cloud")) + { + cloud = (BlockCloud) new BlockCloud().setHardness(0.2F).setLightOpacity(3).setStepSound(Block.soundTypeCloth); + cloud.carverHelper.addVariation("Cloud block", 0, "cloud/cloud"); + cloud.carverHelper.register(cloud, "cloud"); + OreDictionary.registerOre("cloud", cloud); + Carving.chisel.registerOre("cloud", "cloud"); + } + + if(Configurations.featureEnabled("factory")) + { + factory = (BlockCarvable) new BlockCarvable().setHardness(2.0F).setResistance(10F).setStepSound(Chisel.soundMetalFootstep); + factory.carverHelper.setChiselBlockName("factoryblock"); + factory.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.factory.0.desc"), 0, "factory/dots"); + factory.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.factory.1.desc"), 1, "factory/rust2"); + factory.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.factory.2.desc"), 2, "factory/rust"); + factory.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.factory.3.desc"), 3, "factory/platex"); + factory.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.factory.4.desc"), 4, "factory/wireframewhite"); + factory.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.factory.5.desc"), 5, "factory/wireframe"); + factory.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.factory.6.desc"), 6, "factory/hazard"); + factory.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.factory.7.desc"), 7, "factory/hazardorange"); + factory.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.factory.8.desc"), 8, "factory/circuit"); + factory.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.factory.9.desc"), 9, "factory/metalbox"); + factory.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.factory.10.desc"), 10, "factory/goldplate"); + factory.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.factory.11.desc"), 11, "factory/goldplating"); + factory.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.factory.12.desc"), 12, "factory/grinder"); + factory.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.factory.13.desc"), 13, "factory/plating"); + factory.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.factory.14.desc"), 14, "factory/rustplates"); + factory.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.factory.15.desc"), 15, "factory/column"); + factory.carverHelper.register(factory, "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.blockName = "Stained Glass"; + } + 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, false).setStained(true).setHardness(0.3F).setStepSound(Block.soundTypeGlass).setBlockName("Stained Glass Pane"); + 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.tabChiselBlocks).setHardness(0.5F).setResistance(10F); + paperWall.carverHelper.setChiselBlockName("Paper Wall"); + paperWall.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.paperwall.0.desc"), 0, "paper/box"); + paperWall.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.paperwall.1.desc"), 1, "paper/throughMiddle"); + paperWall.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.paperwall.2.desc"), 2, "paper/cross"); + paperWall.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.paperwall.3.desc"), 3, "paper/sixSections"); + paperWall.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.paperwall.4.desc"), 4, "paper/vertical"); + paperWall.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.paperwall.5.desc"), 5, "paper/horizontal"); + paperWall.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.paperwall.6.desc"), 6, "paper/floral"); + paperWall.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.paperwall.7.desc"), 7, "paper/plain"); + paperWall.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.paperwall.8.desc"), 8, "paper/door"); + + paperWall.carverHelper.register(paperWall, "paperwall"); + + } + + if(Configurations.featureEnabled("woolenClay")) + { + woolenClay = (BlockCarvable) new BlockCarvable().setCreativeTab(ModTabs.tabChiselBlocks).setHardness(2F).setResistance(10F); + woolenClay.carverHelper.setChiselBlockName("Woolen Clay"); + + for(int i = 0; i < 16; i++) + woolenClay.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.woolenClay." + i + ".desc"), i, "woolenClay/" + sGNames[i].replaceAll(" ", "").toLowerCase()); + woolenClay.carverHelper.register(woolenClay, "woolen_clay"); + + + } + + if(Configurations.featureEnabled("laboratory")) + { + laboratory = (BlockCarvable) new BlockCarvable().setHardness(2.0F).setResistance(10F).setStepSound(Chisel.soundMetalFootstep); + laboratory.carverHelper.setChiselBlockName("laboratoryblock"); + laboratory.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.laboratory.0.desc"), 0, "laboratory/wallpanel"); + laboratory.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.laboratory.1.desc"), 1, "laboratory/dottedpanel"); + laboratory.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.laboratory.2.desc"), 2, "laboratory/largewall"); + laboratory.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.laboratory.3.desc"), 3, "laboratory/roundel"); + laboratory.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.laboratory.4.desc"), 4, "laboratory/wallvents"); + laboratory.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.laboratory.5.desc"), 5, "laboratory/largetile"); + laboratory.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.laboratory.6.desc"), 6, "laboratory/smalltile"); + laboratory.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.laboratory.7.desc"), 7, "laboratory/floortile"); + laboratory.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.laboratory.8.desc"), 8, "laboratory/checkertile"); + laboratory.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.laboratory.9.desc"), 9, "laboratory/clearscreen"); + laboratory.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.laboratory.10.desc"), 10, "laboratory/fuzzscreen"); + laboratory.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.laboratory.11.desc"), 11, "laboratory/largesteel"); + laboratory.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.laboratory.12.desc"), 12, "laboratory/smallsteel"); + laboratory.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.laboratory.13.desc"), 13, "laboratory/directionright"); + laboratory.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.laboratory.14.desc"), 14, "laboratory/directionleft"); + laboratory.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.laboratory.15.desc"), 15, "laboratory/infocon"); + laboratory.carverHelper.register(laboratory, "laboratoryblock"); + } + + if(Configurations.featureEnabled("pumpkin")) + { + //TODO + } + + Blocks.stone.setHarvestLevel("chisel", 0, 0); + } +} diff --git a/src/main/java/info/jbcs/minecraft/chisel/init/ModItems.java b/src/main/java/info/jbcs/minecraft/chisel/init/ModItems.java new file mode 100644 index 00000000..81537f34 --- /dev/null +++ b/src/main/java/info/jbcs/minecraft/chisel/init/ModItems.java @@ -0,0 +1,47 @@ +package info.jbcs.minecraft.chisel.init; + +import cpw.mods.fml.common.registry.EntityRegistry; +import cpw.mods.fml.common.registry.GameRegistry; +import info.jbcs.minecraft.chisel.Chisel; +import info.jbcs.minecraft.chisel.Configurations; +import info.jbcs.minecraft.chisel.entity.EntityBallOMoss; +import info.jbcs.minecraft.chisel.entity.EntityCloudInABottle; +import info.jbcs.minecraft.chisel.entity.EntitySmashingRock; +import info.jbcs.minecraft.chisel.item.ItemBallOMoss; +import info.jbcs.minecraft.chisel.item.ItemChisel; +import info.jbcs.minecraft.chisel.item.ItemCloudInABottle; +import info.jbcs.minecraft.chisel.item.ItemSmashingRock; +import net.minecraft.creativetab.CreativeTabs; + +public class ModItems { + public static ItemChisel chisel; + public static ItemCloudInABottle itemCloudInABottle; + public static ItemBallOMoss itemBallOMoss; + public static ItemSmashingRock smashingRock; + + public static void load(){ + chisel = (ItemChisel) new ItemChisel().setTextureName("chisel:chisel").setCreativeTab(CreativeTabs.tabTools); + GameRegistry.registerItem(chisel, "chisel"); + + if(Configurations.featureEnabled("cloud")) + { + itemCloudInABottle = (ItemCloudInABottle) new ItemCloudInABottle().setTextureName("Chisel:cloudinabottle").setCreativeTab(CreativeTabs.tabTools); + 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(CreativeTabs.tabTools); + 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(CreativeTabs.tabTools); + EntityRegistry.registerModEntity(EntitySmashingRock.class, "SmashingRock", 2, Chisel.instance, 40, 1, true); + GameRegistry.registerItem(smashingRock, "smashingrock"); + } + } +} diff --git a/src/main/java/info/jbcs/minecraft/chisel/init/ModTabs.java b/src/main/java/info/jbcs/minecraft/chisel/init/ModTabs.java new file mode 100644 index 00000000..311c77c7 --- /dev/null +++ b/src/main/java/info/jbcs/minecraft/chisel/init/ModTabs.java @@ -0,0 +1,28 @@ +package info.jbcs.minecraft.chisel.init; + +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.item.Item; + +public class ModTabs { + + public static CreativeTabs tabChisel; + public static CreativeTabs tabChiselBlocks; + + public static void load(){ + tabChisel = new CreativeTabs("tabChisel") + { + @Override + public Item getTabIconItem() + { + return Item.getItemFromBlock(ModBlocks.holystone); + } + }; + + tabChiselBlocks = new CreativeTabs("tabChiselBlocks") { + @Override + public Item getTabIconItem() { + return ModItems.chisel; + } + }; + } +} diff --git a/src/main/java/info/jbcs/minecraft/chisel/inventory/ContainerChisel.java b/src/main/java/info/jbcs/minecraft/chisel/inventory/ContainerChisel.java index 74404ce7..dff2f7b0 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/inventory/ContainerChisel.java +++ b/src/main/java/info/jbcs/minecraft/chisel/inventory/ContainerChisel.java @@ -2,7 +2,7 @@ package info.jbcs.minecraft.chisel.inventory; import info.jbcs.minecraft.chisel.carving.Carving; import info.jbcs.minecraft.chisel.item.ItemChisel; -import info.jbcs.minecraft.utilities.General; +import info.jbcs.minecraft.chisel.utils.General; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; diff --git a/src/main/java/info/jbcs/minecraft/chisel/inventory/SlotChiselSelection.java b/src/main/java/info/jbcs/minecraft/chisel/inventory/SlotChiselSelection.java index 5a9b5e1a..b9a82192 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/inventory/SlotChiselSelection.java +++ b/src/main/java/info/jbcs/minecraft/chisel/inventory/SlotChiselSelection.java @@ -1,6 +1,6 @@ package info.jbcs.minecraft.chisel.inventory; -import info.jbcs.minecraft.utilities.General; +import info.jbcs.minecraft.chisel.utils.General; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.Slot; diff --git a/src/main/java/info/jbcs/minecraft/chisel/item/ItemCarvable.java b/src/main/java/info/jbcs/minecraft/chisel/item/ItemCarvable.java index f516e86a..74a419e6 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/item/ItemCarvable.java +++ b/src/main/java/info/jbcs/minecraft/chisel/item/ItemCarvable.java @@ -3,7 +3,7 @@ package info.jbcs.minecraft.chisel.item; import info.jbcs.minecraft.chisel.Configurations; import info.jbcs.minecraft.chisel.api.ICarvable; import info.jbcs.minecraft.chisel.carving.CarvableVariation; -import info.jbcs.minecraft.utilities.General; +import info.jbcs.minecraft.chisel.utils.General; import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; diff --git a/src/main/java/info/jbcs/minecraft/chisel/ClientProxy.java b/src/main/java/info/jbcs/minecraft/chisel/proxy/ClientProxy.java similarity index 87% rename from src/main/java/info/jbcs/minecraft/chisel/ClientProxy.java rename to src/main/java/info/jbcs/minecraft/chisel/proxy/ClientProxy.java index d92dbe16..80d9f3c6 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/ClientProxy.java +++ b/src/main/java/info/jbcs/minecraft/chisel/proxy/ClientProxy.java @@ -1,5 +1,6 @@ -package info.jbcs.minecraft.chisel; +package info.jbcs.minecraft.chisel.proxy; +import info.jbcs.minecraft.chisel.Chisel; import info.jbcs.minecraft.chisel.entity.EntityBallOMoss; import info.jbcs.minecraft.chisel.entity.EntityCloudInABottle; import info.jbcs.minecraft.chisel.client.render.BlockAdvancedMarbleRenderer; @@ -14,6 +15,7 @@ import info.jbcs.minecraft.chisel.client.render.BlockSnakeStoneRenderer; import info.jbcs.minecraft.chisel.client.render.BlockSpikesRenderer; import info.jbcs.minecraft.chisel.client.render.BlockTexturedOreRenderer; import info.jbcs.minecraft.chisel.client.render.ItemChiselRenderer; +import info.jbcs.minecraft.chisel.init.ModItems; import net.minecraft.client.renderer.entity.RenderSnowball; import net.minecraftforge.client.MinecraftForgeClient; import cpw.mods.fml.client.registry.RenderingRegistry; @@ -43,9 +45,9 @@ public class ClientProxy extends CommonProxy RenderingRegistry.registerBlockHandler(new BlockTexturedOreRenderer()); - RenderingRegistry.registerEntityRenderingHandler(EntityCloudInABottle.class, new RenderSnowball(Chisel.itemCloudInABottle)); - RenderingRegistry.registerEntityRenderingHandler(EntityBallOMoss.class, new RenderSnowball(Chisel.itemBallOMoss)); + RenderingRegistry.registerEntityRenderingHandler(EntityCloudInABottle.class, new RenderSnowball(ModItems.itemCloudInABottle)); + RenderingRegistry.registerEntityRenderingHandler(EntityBallOMoss.class, new RenderSnowball(ModItems.itemBallOMoss)); - MinecraftForgeClient.registerItemRenderer(Chisel.chisel, renderer); + MinecraftForgeClient.registerItemRenderer(ModItems.chisel, renderer); } } diff --git a/src/main/java/info/jbcs/minecraft/chisel/CommonProxy.java b/src/main/java/info/jbcs/minecraft/chisel/proxy/CommonProxy.java similarity index 92% rename from src/main/java/info/jbcs/minecraft/chisel/CommonProxy.java rename to src/main/java/info/jbcs/minecraft/chisel/proxy/CommonProxy.java index d6fc4c4a..2d793146 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/CommonProxy.java +++ b/src/main/java/info/jbcs/minecraft/chisel/proxy/CommonProxy.java @@ -1,4 +1,4 @@ -package info.jbcs.minecraft.chisel; +package info.jbcs.minecraft.chisel.proxy; import info.jbcs.minecraft.chisel.block.tileentity.TileEntityAutoChisel; import net.minecraft.tileentity.TileEntity; diff --git a/src/main/java/info/jbcs/minecraft/utilities/BlockTexturedOre.java b/src/main/java/info/jbcs/minecraft/chisel/utils/BlockTexturedOre.java similarity index 96% rename from src/main/java/info/jbcs/minecraft/utilities/BlockTexturedOre.java rename to src/main/java/info/jbcs/minecraft/chisel/utils/BlockTexturedOre.java index ca782c03..f1522da7 100644 --- a/src/main/java/info/jbcs/minecraft/utilities/BlockTexturedOre.java +++ b/src/main/java/info/jbcs/minecraft/chisel/utils/BlockTexturedOre.java @@ -1,4 +1,4 @@ -package info.jbcs.minecraft.utilities; +package info.jbcs.minecraft.chisel.utils; import net.minecraft.block.Block; import net.minecraft.block.material.Material; diff --git a/src/main/java/info/jbcs/minecraft/utilities/BlockTexturedOreRenderer.java b/src/main/java/info/jbcs/minecraft/chisel/utils/BlockTexturedOreRenderer.java similarity index 98% rename from src/main/java/info/jbcs/minecraft/utilities/BlockTexturedOreRenderer.java rename to src/main/java/info/jbcs/minecraft/chisel/utils/BlockTexturedOreRenderer.java index 7431b3f6..a00a22b7 100644 --- a/src/main/java/info/jbcs/minecraft/utilities/BlockTexturedOreRenderer.java +++ b/src/main/java/info/jbcs/minecraft/chisel/utils/BlockTexturedOreRenderer.java @@ -1,4 +1,4 @@ -package info.jbcs.minecraft.utilities; +package info.jbcs.minecraft.chisel.utils; import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; diff --git a/src/main/java/info/jbcs/minecraft/utilities/Drawing.java b/src/main/java/info/jbcs/minecraft/chisel/utils/Drawing.java similarity index 98% rename from src/main/java/info/jbcs/minecraft/utilities/Drawing.java rename to src/main/java/info/jbcs/minecraft/chisel/utils/Drawing.java index 5c36230c..881f8fc8 100644 --- a/src/main/java/info/jbcs/minecraft/utilities/Drawing.java +++ b/src/main/java/info/jbcs/minecraft/chisel/utils/Drawing.java @@ -1,4 +1,4 @@ -package info.jbcs.minecraft.utilities; +package info.jbcs.minecraft.chisel.utils; import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; diff --git a/src/main/java/info/jbcs/minecraft/utilities/DummyContainer.java b/src/main/java/info/jbcs/minecraft/chisel/utils/DummyContainer.java similarity index 85% rename from src/main/java/info/jbcs/minecraft/utilities/DummyContainer.java rename to src/main/java/info/jbcs/minecraft/chisel/utils/DummyContainer.java index 90140190..57dbac59 100644 --- a/src/main/java/info/jbcs/minecraft/utilities/DummyContainer.java +++ b/src/main/java/info/jbcs/minecraft/chisel/utils/DummyContainer.java @@ -1,4 +1,4 @@ -package info.jbcs.minecraft.utilities; +package info.jbcs.minecraft.chisel.utils; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.Container; diff --git a/src/main/java/info/jbcs/minecraft/utilities/General.java b/src/main/java/info/jbcs/minecraft/chisel/utils/General.java similarity index 98% rename from src/main/java/info/jbcs/minecraft/utilities/General.java rename to src/main/java/info/jbcs/minecraft/chisel/utils/General.java index 524a28f7..9ee8e248 100644 --- a/src/main/java/info/jbcs/minecraft/utilities/General.java +++ b/src/main/java/info/jbcs/minecraft/chisel/utils/General.java @@ -1,4 +1,4 @@ -package info.jbcs.minecraft.utilities; +package info.jbcs.minecraft.chisel.utils; import java.util.HashMap; import java.util.Random; diff --git a/src/main/java/info/jbcs/minecraft/utilities/GeneralClient.java b/src/main/java/info/jbcs/minecraft/chisel/utils/GeneralClient.java similarity index 96% rename from src/main/java/info/jbcs/minecraft/utilities/GeneralClient.java rename to src/main/java/info/jbcs/minecraft/chisel/utils/GeneralClient.java index 5c66fd6c..52500a9f 100644 --- a/src/main/java/info/jbcs/minecraft/utilities/GeneralClient.java +++ b/src/main/java/info/jbcs/minecraft/chisel/utils/GeneralClient.java @@ -1,4 +1,4 @@ -package info.jbcs.minecraft.utilities; +package info.jbcs.minecraft.chisel.utils; import java.util.HashMap; import java.util.Random; diff --git a/src/main/java/info/jbcs/minecraft/utilities/GuiHandler.java b/src/main/java/info/jbcs/minecraft/chisel/utils/GuiHandler.java similarity index 97% rename from src/main/java/info/jbcs/minecraft/utilities/GuiHandler.java rename to src/main/java/info/jbcs/minecraft/chisel/utils/GuiHandler.java index 95143774..0dbb157d 100644 --- a/src/main/java/info/jbcs/minecraft/utilities/GuiHandler.java +++ b/src/main/java/info/jbcs/minecraft/chisel/utils/GuiHandler.java @@ -1,4 +1,4 @@ -package info.jbcs.minecraft.utilities; +package info.jbcs.minecraft.chisel.utils; import java.util.ArrayList; import java.util.Collections; diff --git a/src/main/java/info/jbcs/minecraft/utilities/ItemMetaBlock.java b/src/main/java/info/jbcs/minecraft/chisel/utils/ItemMetaBlock.java similarity index 93% rename from src/main/java/info/jbcs/minecraft/utilities/ItemMetaBlock.java rename to src/main/java/info/jbcs/minecraft/chisel/utils/ItemMetaBlock.java index 944dfb42..5874d40f 100644 --- a/src/main/java/info/jbcs/minecraft/utilities/ItemMetaBlock.java +++ b/src/main/java/info/jbcs/minecraft/chisel/utils/ItemMetaBlock.java @@ -1,4 +1,4 @@ -package info.jbcs.minecraft.utilities; +package info.jbcs.minecraft.chisel.utils; import net.minecraft.block.Block; import net.minecraft.item.ItemBlock; diff --git a/src/main/resources/assets/chisel/textures/blocks/fft/block-ctm.png b/src/main/resources/assets/chisel/textures/blocks/fantasy/block-ctm.png similarity index 100% rename from src/main/resources/assets/chisel/textures/blocks/fft/block-ctm.png rename to src/main/resources/assets/chisel/textures/blocks/fantasy/block-ctm.png diff --git a/src/main/resources/assets/chisel/textures/blocks/fft/block.png b/src/main/resources/assets/chisel/textures/blocks/fantasy/block.png similarity index 100% rename from src/main/resources/assets/chisel/textures/blocks/fft/block.png rename to src/main/resources/assets/chisel/textures/blocks/fantasy/block.png diff --git a/src/main/resources/assets/chisel/textures/blocks/fft/brick-faded-side.png b/src/main/resources/assets/chisel/textures/blocks/fantasy/brick-faded-side.png similarity index 100% rename from src/main/resources/assets/chisel/textures/blocks/fft/brick-faded-side.png rename to src/main/resources/assets/chisel/textures/blocks/fantasy/brick-faded-side.png diff --git a/src/main/resources/assets/chisel/textures/blocks/fft/brick-faded-top.png b/src/main/resources/assets/chisel/textures/blocks/fantasy/brick-faded-top.png similarity index 100% rename from src/main/resources/assets/chisel/textures/blocks/fft/brick-faded-top.png rename to src/main/resources/assets/chisel/textures/blocks/fantasy/brick-faded-top.png diff --git a/src/main/resources/assets/chisel/textures/blocks/fft/brick-side.png b/src/main/resources/assets/chisel/textures/blocks/fantasy/brick-side.png similarity index 100% rename from src/main/resources/assets/chisel/textures/blocks/fft/brick-side.png rename to src/main/resources/assets/chisel/textures/blocks/fantasy/brick-side.png diff --git a/src/main/resources/assets/chisel/textures/blocks/fft/brick-top.png b/src/main/resources/assets/chisel/textures/blocks/fantasy/brick-top.png similarity index 100% rename from src/main/resources/assets/chisel/textures/blocks/fft/brick-top.png rename to src/main/resources/assets/chisel/textures/blocks/fantasy/brick-top.png diff --git a/src/main/resources/assets/chisel/textures/blocks/fft/brick-wear-ctmv.png b/src/main/resources/assets/chisel/textures/blocks/fantasy/brick-wear-ctmv.png similarity index 100% rename from src/main/resources/assets/chisel/textures/blocks/fft/brick-wear-ctmv.png rename to src/main/resources/assets/chisel/textures/blocks/fantasy/brick-wear-ctmv.png diff --git a/src/main/resources/assets/chisel/textures/blocks/fft/brick-wear-top.png b/src/main/resources/assets/chisel/textures/blocks/fantasy/brick-wear-top.png similarity index 100% rename from src/main/resources/assets/chisel/textures/blocks/fft/brick-wear-top.png rename to src/main/resources/assets/chisel/textures/blocks/fantasy/brick-wear-top.png diff --git a/src/main/resources/assets/chisel/textures/blocks/fft/bricks-chaotic.png b/src/main/resources/assets/chisel/textures/blocks/fantasy/bricks-chaotic.png similarity index 100% rename from src/main/resources/assets/chisel/textures/blocks/fft/bricks-chaotic.png rename to src/main/resources/assets/chisel/textures/blocks/fantasy/bricks-chaotic.png diff --git a/src/main/resources/assets/chisel/textures/blocks/fft/bricks-side.png b/src/main/resources/assets/chisel/textures/blocks/fantasy/bricks-side.png similarity index 100% rename from src/main/resources/assets/chisel/textures/blocks/fft/bricks-side.png rename to src/main/resources/assets/chisel/textures/blocks/fantasy/bricks-side.png diff --git a/src/main/resources/assets/chisel/textures/blocks/fft/bricks-top.png b/src/main/resources/assets/chisel/textures/blocks/fantasy/bricks-top.png similarity index 100% rename from src/main/resources/assets/chisel/textures/blocks/fft/bricks-top.png rename to src/main/resources/assets/chisel/textures/blocks/fantasy/bricks-top.png diff --git a/src/main/resources/assets/chisel/textures/blocks/fft/bricks-wear-ctmv.png b/src/main/resources/assets/chisel/textures/blocks/fantasy/bricks-wear-ctmv.png similarity index 100% rename from src/main/resources/assets/chisel/textures/blocks/fft/bricks-wear-ctmv.png rename to src/main/resources/assets/chisel/textures/blocks/fantasy/bricks-wear-ctmv.png diff --git a/src/main/resources/assets/chisel/textures/blocks/fft/bricks-wear-top.png b/src/main/resources/assets/chisel/textures/blocks/fantasy/bricks-wear-top.png similarity index 100% rename from src/main/resources/assets/chisel/textures/blocks/fft/bricks-wear-top.png rename to src/main/resources/assets/chisel/textures/blocks/fantasy/bricks-wear-top.png diff --git a/src/main/resources/assets/chisel/textures/blocks/fft/decor-block-side.png b/src/main/resources/assets/chisel/textures/blocks/fantasy/decor-block-side.png similarity index 100% rename from src/main/resources/assets/chisel/textures/blocks/fft/decor-block-side.png rename to src/main/resources/assets/chisel/textures/blocks/fantasy/decor-block-side.png diff --git a/src/main/resources/assets/chisel/textures/blocks/fft/decor-block-top.png b/src/main/resources/assets/chisel/textures/blocks/fantasy/decor-block-top.png similarity index 100% rename from src/main/resources/assets/chisel/textures/blocks/fft/decor-block-top.png rename to src/main/resources/assets/chisel/textures/blocks/fantasy/decor-block-top.png diff --git a/src/main/resources/assets/chisel/textures/blocks/fft/decor-side.png b/src/main/resources/assets/chisel/textures/blocks/fantasy/decor-side.png similarity index 100% rename from src/main/resources/assets/chisel/textures/blocks/fft/decor-side.png rename to src/main/resources/assets/chisel/textures/blocks/fantasy/decor-side.png diff --git a/src/main/resources/assets/chisel/textures/blocks/fft/decor-top.png b/src/main/resources/assets/chisel/textures/blocks/fantasy/decor-top.png similarity index 100% rename from src/main/resources/assets/chisel/textures/blocks/fft/decor-top.png rename to src/main/resources/assets/chisel/textures/blocks/fantasy/decor-top.png diff --git a/src/main/resources/assets/chisel/textures/blocks/fft/gold-decor-1-side.png b/src/main/resources/assets/chisel/textures/blocks/fantasy/gold-decor-1-side.png similarity index 100% rename from src/main/resources/assets/chisel/textures/blocks/fft/gold-decor-1-side.png rename to src/main/resources/assets/chisel/textures/blocks/fantasy/gold-decor-1-side.png diff --git a/src/main/resources/assets/chisel/textures/blocks/fft/gold-decor-1-top.png b/src/main/resources/assets/chisel/textures/blocks/fantasy/gold-decor-1-top.png similarity index 100% rename from src/main/resources/assets/chisel/textures/blocks/fft/gold-decor-1-top.png rename to src/main/resources/assets/chisel/textures/blocks/fantasy/gold-decor-1-top.png diff --git a/src/main/resources/assets/chisel/textures/blocks/fft/gold-decor-2-side.png b/src/main/resources/assets/chisel/textures/blocks/fantasy/gold-decor-2-side.png similarity index 100% rename from src/main/resources/assets/chisel/textures/blocks/fft/gold-decor-2-side.png rename to src/main/resources/assets/chisel/textures/blocks/fantasy/gold-decor-2-side.png diff --git a/src/main/resources/assets/chisel/textures/blocks/fft/gold-decor-2-top.png b/src/main/resources/assets/chisel/textures/blocks/fantasy/gold-decor-2-top.png similarity index 100% rename from src/main/resources/assets/chisel/textures/blocks/fft/gold-decor-2-top.png rename to src/main/resources/assets/chisel/textures/blocks/fantasy/gold-decor-2-top.png diff --git a/src/main/resources/assets/chisel/textures/blocks/fft/gold-decor-3-side.png b/src/main/resources/assets/chisel/textures/blocks/fantasy/gold-decor-3-side.png similarity index 100% rename from src/main/resources/assets/chisel/textures/blocks/fft/gold-decor-3-side.png rename to src/main/resources/assets/chisel/textures/blocks/fantasy/gold-decor-3-side.png diff --git a/src/main/resources/assets/chisel/textures/blocks/fft/gold-decor-3-top.png b/src/main/resources/assets/chisel/textures/blocks/fantasy/gold-decor-3-top.png similarity index 100% rename from src/main/resources/assets/chisel/textures/blocks/fft/gold-decor-3-top.png rename to src/main/resources/assets/chisel/textures/blocks/fantasy/gold-decor-3-top.png diff --git a/src/main/resources/assets/chisel/textures/blocks/fft/gold-decor-4-side.png b/src/main/resources/assets/chisel/textures/blocks/fantasy/gold-decor-4-side.png similarity index 100% rename from src/main/resources/assets/chisel/textures/blocks/fft/gold-decor-4-side.png rename to src/main/resources/assets/chisel/textures/blocks/fantasy/gold-decor-4-side.png diff --git a/src/main/resources/assets/chisel/textures/blocks/fft/gold-decor-4-top.png b/src/main/resources/assets/chisel/textures/blocks/fantasy/gold-decor-4-top.png similarity index 100% rename from src/main/resources/assets/chisel/textures/blocks/fft/gold-decor-4-top.png rename to src/main/resources/assets/chisel/textures/blocks/fantasy/gold-decor-4-top.png diff --git a/src/main/resources/assets/chisel/textures/blocks/fft/pillar+-ctm.png b/src/main/resources/assets/chisel/textures/blocks/fantasy/pillar+-ctm.png similarity index 100% rename from src/main/resources/assets/chisel/textures/blocks/fft/pillar+-ctm.png rename to src/main/resources/assets/chisel/textures/blocks/fantasy/pillar+-ctm.png diff --git a/src/main/resources/assets/chisel/textures/blocks/fft/pillar+.png b/src/main/resources/assets/chisel/textures/blocks/fantasy/pillar+.png similarity index 100% rename from src/main/resources/assets/chisel/textures/blocks/fft/pillar+.png rename to src/main/resources/assets/chisel/textures/blocks/fantasy/pillar+.png diff --git a/src/main/resources/assets/chisel/textures/blocks/fft/pillar-decorated-side.png b/src/main/resources/assets/chisel/textures/blocks/fantasy/pillar-decorated-side.png similarity index 100% rename from src/main/resources/assets/chisel/textures/blocks/fft/pillar-decorated-side.png rename to src/main/resources/assets/chisel/textures/blocks/fantasy/pillar-decorated-side.png diff --git a/src/main/resources/assets/chisel/textures/blocks/fft/pillar-decorated-top.png b/src/main/resources/assets/chisel/textures/blocks/fantasy/pillar-decorated-top.png similarity index 100% rename from src/main/resources/assets/chisel/textures/blocks/fft/pillar-decorated-top.png rename to src/main/resources/assets/chisel/textures/blocks/fantasy/pillar-decorated-top.png diff --git a/src/main/resources/assets/chisel/textures/blocks/fft/pillar-side.png b/src/main/resources/assets/chisel/textures/blocks/fantasy/pillar-side.png similarity index 100% rename from src/main/resources/assets/chisel/textures/blocks/fft/pillar-side.png rename to src/main/resources/assets/chisel/textures/blocks/fantasy/pillar-side.png diff --git a/src/main/resources/assets/chisel/textures/blocks/fft/pillar-top.png b/src/main/resources/assets/chisel/textures/blocks/fantasy/pillar-top.png similarity index 100% rename from src/main/resources/assets/chisel/textures/blocks/fft/pillar-top.png rename to src/main/resources/assets/chisel/textures/blocks/fantasy/pillar-top.png diff --git a/src/main/resources/assets/chisel/textures/blocks/fft/plate-side.png b/src/main/resources/assets/chisel/textures/blocks/fantasy/plate-side.png similarity index 100% rename from src/main/resources/assets/chisel/textures/blocks/fft/plate-side.png rename to src/main/resources/assets/chisel/textures/blocks/fantasy/plate-side.png diff --git a/src/main/resources/assets/chisel/textures/blocks/fft/plate-top.png b/src/main/resources/assets/chisel/textures/blocks/fantasy/plate-top.png similarity index 100% rename from src/main/resources/assets/chisel/textures/blocks/fft/plate-top.png rename to src/main/resources/assets/chisel/textures/blocks/fantasy/plate-top.png