From b110eab3c360b8471053a4159f256a705668a736 Mon Sep 17 00:00:00 2001 From: tterrag1098 Date: Sat, 31 Jan 2015 01:23:27 -0500 Subject: [PATCH] Clean up @Drullkus' mess --- .../com/cricketcraft/chisel/Features.java | 96 ++++++++++++------- 1 file changed, 59 insertions(+), 37 deletions(-) diff --git a/src/main/java/com/cricketcraft/chisel/Features.java b/src/main/java/com/cricketcraft/chisel/Features.java index 10d02798..9440c5e5 100644 --- a/src/main/java/com/cricketcraft/chisel/Features.java +++ b/src/main/java/com/cricketcraft/chisel/Features.java @@ -109,12 +109,15 @@ public enum Features { @Override void addBlocks() { - BlockCarvable copper = (BlockCarvable) new BlockBeaconBase(Material.iron).setStepSound(Block.soundTypeMetal).setCreativeTab(ChiselTabs.tabModdedChiselBlocks).setHardness(5F) + BlockCarvable aluminum = (BlockCarvable) new BlockBeaconBase(Material.iron).setStepSound(Block.soundTypeMetal).setCreativeTab(ChiselTabs.tabModdedChiselBlocks).setHardness(5F) .setResistance(10F); - copper.carverHelper.addVariation("tile.aluminum.0.desc", 0, "metals/aluminum/caution"); - copper.carverHelper.addVariation("tile.aluminum.1.desc", 1, "metals/aluminum/crate"); - copper.carverHelper.addVariation("tile.aluminum.2.desc", 2, "metals/aluminum/thermal"); - copper.carverHelper.registerAll(copper, "aluminumblock"); + aluminum.carverHelper.addVariation("tile.aluminum.0.desc", 0, "metals/aluminum/caution"); + aluminum.carverHelper.addVariation("tile.aluminum.1.desc", 1, "metals/aluminum/crate"); + aluminum.carverHelper.addVariation("tile.aluminum.2.desc", 2, "metals/aluminum/thermal"); + aluminum.carverHelper.addVariation("tile.aluminum.3.desc", 3, "metals/aluminum/adv"); + aluminum.carverHelper.addVariation("tile.aluminum.4.desc", 4, "metals/aluminum/egregious"); + aluminum.carverHelper.addVariation("tile.aluminum.5.desc", 5, "metals/aluminum/bolted"); + aluminum.carverHelper.registerAll(aluminum, "aluminumblock"); Carving.chisel.registerOre("aluminumblock", "blockAluminum"); } }, @@ -316,12 +319,15 @@ public enum Features { @Override void addBlocks() { - BlockCarvable copper = (BlockCarvable) new BlockBeaconBase(Material.iron).setStepSound(Block.soundTypeMetal).setCreativeTab(ChiselTabs.tabModdedChiselBlocks).setHardness(5F) + BlockCarvable bronze = (BlockCarvable) new BlockBeaconBase(Material.iron).setStepSound(Block.soundTypeMetal).setCreativeTab(ChiselTabs.tabModdedChiselBlocks).setHardness(5F) .setResistance(10F); - copper.carverHelper.addVariation("tile.bronze.0.desc", 0, "metals/bronze/caution"); - copper.carverHelper.addVariation("tile.bronze.1.desc", 1, "metals/bronze/crate"); - copper.carverHelper.addVariation("tile.bronze.2.desc", 2, "metals/bronze/thermal"); - copper.carverHelper.registerAll(copper, "bronzeblock"); + bronze.carverHelper.addVariation("tile.bronze.0.desc", 0, "metals/bronze/caution"); + bronze.carverHelper.addVariation("tile.bronze.1.desc", 1, "metals/bronze/crate"); + bronze.carverHelper.addVariation("tile.bronze.2.desc", 2, "metals/bronze/thermal"); + bronze.carverHelper.addVariation("tile.bronze.3.desc", 3, "metals/bronze/adv"); + bronze.carverHelper.addVariation("tile.bronze.4.desc", 4, "metals/bronze/egregious"); + bronze.carverHelper.addVariation("tile.bronze.5.desc", 5, "metals/bronze/bolted"); + bronze.carverHelper.registerAll(bronze, "bronzeblock"); Carving.chisel.registerOre("bronzeblock", "blockBronze"); } }, @@ -561,6 +567,9 @@ public enum Features { copper.carverHelper.addVariation("tile.copper.0.desc", 0, "metals/copper/caution"); copper.carverHelper.addVariation("tile.copper.1.desc", 1, "metals/copper/crate"); copper.carverHelper.addVariation("tile.copper.2.desc", 2, "metals/copper/thermal"); + copper.carverHelper.addVariation("tile.copper.3.desc", 3, "metals/copper/adv"); + copper.carverHelper.addVariation("tile.copper.4.desc", 4, "metals/copper/egregious"); + copper.carverHelper.addVariation("tile.copper.5.desc", 5, "metals/copper/bolted"); copper.carverHelper.registerAll(copper, "copperblock"); Carving.chisel.registerOre("copperblock", "blockCopper"); } @@ -1252,12 +1261,15 @@ public enum Features { @Override void addBlocks() { - BlockCarvable copper = (BlockCarvable) new BlockBeaconBase(Material.iron).setStepSound(Block.soundTypeMetal).setCreativeTab(ChiselTabs.tabModdedChiselBlocks).setHardness(5F) + BlockCarvable lead = (BlockCarvable) new BlockBeaconBase(Material.iron).setStepSound(Block.soundTypeMetal).setCreativeTab(ChiselTabs.tabModdedChiselBlocks).setHardness(5F) .setResistance(10F); - copper.carverHelper.addVariation("tile.lead.0.desc", 0, "metals/lead/caution"); - copper.carverHelper.addVariation("tile.lead.1.desc", 1, "metals/lead/crate"); - copper.carverHelper.addVariation("tile.lead.2.desc", 2, "metals/lead/thermal"); - copper.carverHelper.registerAll(copper, "leadblock"); + lead.carverHelper.addVariation("tile.lead.0.desc", 0, "metals/lead/caution"); + lead.carverHelper.addVariation("tile.lead.1.desc", 1, "metals/lead/crate"); + lead.carverHelper.addVariation("tile.lead.2.desc", 2, "metals/lead/thermal"); + lead.carverHelper.addVariation("tile.lead.3.desc", 3, "metals/lead/adv"); + lead.carverHelper.addVariation("tile.lead.4.desc", 4, "metals/lead/egregious"); + lead.carverHelper.addVariation("tile.lead.5.desc", 5, "metals/lead/bolted"); + lead.carverHelper.registerAll(lead, "leadblock"); Carving.chisel.registerOre("leadblock", "blockLead"); } }, @@ -2049,12 +2061,15 @@ public enum Features { @Override void addBlocks() { - BlockCarvable copper = (BlockCarvable) new BlockBeaconBase(Material.iron).setStepSound(Block.soundTypeMetal).setCreativeTab(ChiselTabs.tabModdedChiselBlocks).setHardness(5F) + BlockCarvable silver = (BlockCarvable) new BlockBeaconBase(Material.iron).setStepSound(Block.soundTypeMetal).setCreativeTab(ChiselTabs.tabModdedChiselBlocks).setHardness(5F) .setResistance(10F); - copper.carverHelper.addVariation("tile.silver.0.desc", 0, "metals/silver/caution"); - copper.carverHelper.addVariation("tile.silver.1.desc", 1, "metals/silver/crate"); - copper.carverHelper.addVariation("tile.silver.2.desc", 2, "metals/silver/thermal"); - copper.carverHelper.registerAll(copper, "silverblock"); + silver.carverHelper.addVariation("tile.silver.0.desc", 0, "metals/silver/caution"); + silver.carverHelper.addVariation("tile.silver.1.desc", 1, "metals/silver/crate"); + silver.carverHelper.addVariation("tile.silver.2.desc", 2, "metals/silver/thermal"); + silver.carverHelper.addVariation("tile.silver.3.desc", 3, "metals/silver/adv"); + silver.carverHelper.addVariation("tile.silver.4.desc", 4, "metals/silver/egregious"); + silver.carverHelper.addVariation("tile.silver.5.desc", 5, "metals/silver/bolted"); + silver.carverHelper.registerAll(silver, "silverblock"); Carving.chisel.registerOre("silverblock", "blockSilver"); } }, @@ -2126,12 +2141,15 @@ public enum Features { @Override void addBlocks() { - BlockCarvable copper = (BlockCarvable) new BlockBeaconBase(Material.iron).setStepSound(Block.soundTypeMetal).setCreativeTab(ChiselTabs.tabModdedChiselBlocks).setHardness(5F) + BlockCarvable steel = (BlockCarvable) new BlockBeaconBase(Material.iron).setStepSound(Block.soundTypeMetal).setCreativeTab(ChiselTabs.tabModdedChiselBlocks).setHardness(5F) .setResistance(10F); - copper.carverHelper.addVariation("tile.steel.0.desc", 0, "metals/steel/caution"); - copper.carverHelper.addVariation("tile.steel.1.desc", 1, "metals/steel/crate"); - copper.carverHelper.addVariation("tile.steel.2.desc", 2, "metals/steel/thermal"); - copper.carverHelper.registerAll(copper, "steelblock"); + steel.carverHelper.addVariation("tile.steel.0.desc", 0, "metals/steel/caution"); + steel.carverHelper.addVariation("tile.steel.1.desc", 1, "metals/steel/crate"); + steel.carverHelper.addVariation("tile.steel.2.desc", 2, "metals/steel/thermal"); + steel.carverHelper.addVariation("tile.steel.3.desc", 3, "metals/steel/adv"); + steel.carverHelper.addVariation("tile.steel.4.desc", 4, "metals/steel/egregious"); + steel.carverHelper.addVariation("tile.steel.5.desc", 5, "metals/steel/bolted"); + steel.carverHelper.registerAll(steel, "steelblock"); Carving.chisel.registerOre("steelblock", "blockSteel"); } }, @@ -2289,12 +2307,15 @@ public enum Features { @Override void addBlocks() { - BlockCarvable copper = (BlockCarvable) new BlockBeaconBase(Material.iron).setStepSound(Block.soundTypeMetal).setCreativeTab(ChiselTabs.tabModdedChiselBlocks).setHardness(5F) + BlockCarvable tin = (BlockCarvable) new BlockBeaconBase(Material.iron).setStepSound(Block.soundTypeMetal).setCreativeTab(ChiselTabs.tabModdedChiselBlocks).setHardness(5F) .setResistance(10F); - copper.carverHelper.addVariation("tile.tin.0.desc", 0, "metals/tin/caution"); - copper.carverHelper.addVariation("tile.tin.1.desc", 1, "metals/tin/crate"); - copper.carverHelper.addVariation("tile.tin.2.desc", 2, "metals/tin/thermal"); - copper.carverHelper.registerAll(copper, "tinblock"); + tin.carverHelper.addVariation("tile.tin.0.desc", 0, "metals/tin/caution"); + tin.carverHelper.addVariation("tile.tin.1.desc", 1, "metals/tin/crate"); + tin.carverHelper.addVariation("tile.tin.2.desc", 2, "metals/tin/thermal"); + tin.carverHelper.addVariation("tile.tin.3.desc", 3, "metals/tin/adv"); + tin.carverHelper.addVariation("tile.tin.4.desc", 4, "metals/tin/egregious"); + tin.carverHelper.addVariation("tile.tin.5.desc", 5, "metals/tin/bolted"); + tin.carverHelper.registerAll(tin, "tinblock"); Carving.chisel.registerOre("tinblock", "blockTin"); } }, @@ -2417,14 +2438,15 @@ public enum Features { @Override void addBlocks() { - BlockCarvable uraniumblock = (BlockCarvable) new BlockBeaconBase(Material.iron).setStepSound(Block.soundTypeMetal).setCreativeTab(ChiselTabs.tabModdedChiselBlocks).setHardness(5F) + BlockCarvable uranium = (BlockCarvable) new BlockBeaconBase(Material.iron).setStepSound(Block.soundTypeMetal).setCreativeTab(ChiselTabs.tabModdedChiselBlocks).setHardness(5F) .setResistance(10F); - uraniumblock.carverHelper.addVariation("tile.uranium.0.desc", 0, "metals/uranium/caution"); - uraniumblock.carverHelper.addVariation("tile.uranium.1.desc", 1, "metals/uranium/crate"); - uraniumblock.carverHelper.addVariation("tile.uranium.2.desc", 2, "metals/uranium/thermal"); - uraniumblock.carverHelper.addVariation("tile.uranium.3.desc", 3, "metals/uranium/adv"); - uraniumblock.carverHelper.addVariation("tile.uranium.4.desc", 4, "metals/uranium/egregious"); - uraniumblock.carverHelper.registerAll(uraniumblock, "uraniumblock"); + uranium.carverHelper.addVariation("tile.uranium.0.desc", 0, "metals/uranium/caution"); + uranium.carverHelper.addVariation("tile.uranium.1.desc", 1, "metals/uranium/crate"); + uranium.carverHelper.addVariation("tile.uranium.2.desc", 2, "metals/uranium/thermal"); + uranium.carverHelper.addVariation("tile.uranium.3.desc", 3, "metals/uranium/adv"); + uranium.carverHelper.addVariation("tile.uranium.4.desc", 4, "metals/uranium/egregious"); + uranium.carverHelper.addVariation("tile.uranium.5.desc", 5, "metals/uranium/bolted"); + uranium.carverHelper.registerAll(uranium, "uraniumblock"); Carving.chisel.registerOre("uraniumblock", "blockUranium"); } },